Skip to content

Commit 6246fb5

Browse files
author
zhangwei
committed
screen cast
1 parent b13f8bd commit 6246fb5

39 files changed

Lines changed: 290 additions & 203 deletions

‎src/android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ android {
4949
externalNativeBuild {
5050
cmake {
5151
path "../../../CMakeLists.txt"
52-
version '3.22.1'
52+
version '3.31.0'
5353
}
5454
}
5555

56-
ndkVersion = '26.3.11579264'
56+
ndkVersion = '27.2.12479018'
5757
lint {
5858
abortOnError false
5959
}

‎src/android/app/src/main/assets/3dstdb-en.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,11 @@
44
000400300000A102 = Home Menu
55
000400300000A902 = Home Menu
66
000400300000B102 = Home Menu
7+
000400300000C002 = Software Keyboard
8+
000400300000C802 = Software Keyboard
9+
000400300000D002 = Software Keyboard
10+
000400300000D802 = Software Keyboard
11+
000400300000DE02 = Software Keyboard
12+
000400300000E402 = Software Keyboard
713
0004000000127900 = Super Robot Taisen BX
814
00040000000F4000 = Little Battlers Wars

‎src/android/app/src/main/assets/3dstdb-zh_CN.txt‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
000400300000A102 = Home Menu
55
000400300000A902 = Home Menu
66
000400300000B102 = Home Menu
7+
000400300000C002 = Software Keyboard
8+
000400300000C802 = Software Keyboard
9+
000400300000D002 = Software Keyboard
10+
000400300000D802 = Software Keyboard
11+
000400300000DE02 = Software Keyboard
12+
000400300000E402 = Software Keyboard
713
0004000000090700 = 任天狗
814
0004000000030B00 = 任天狗
915
0004000000030C00 = 任天狗
@@ -16,6 +22,9 @@
1622
0004000000031500 = 任天狗
1723
0004000000031600 = 任天狗
1824
0004000000031700 = 任天狗
25+
000400000008FF00 = 平衡的艺术
26+
000400000008F000 = 平衡的艺术
27+
00040000000E8900 = 平衡的艺术
1928
000400000015D800 = 钢铁陨落 入侵
2029
000400000015B100 = 钢铁陨落 入侵
2130
00040000001C1C00 = 超回转 寿司强袭者 寿司道
@@ -24,6 +33,7 @@
2433
0004000000167A00 = 僵尸梦游仙境DX
2534
00040000000F5600 = 僵尸梦游仙境DX
2635
0004000000187E00 = 立体绘图方块2
36+
0004000000187D00 = 立体绘图方块2
2737
0004000000169A00 = 立体绘图方块2
2838
00040000000FB800 = 剑与暗
2939
0004000000065C00 = 拉比利斯的彼方
@@ -172,13 +182,13 @@
172182
0004000000032000 = 死或生 多重维度
173183
0004000000034F00 = 死或生 多重维度
174184
0004000000038A00 = 死或生 多重维度
175-
00040000000CF500 = 勇者斗恶龙怪兽篇2
176-
00040000001C3A00 = 勇者斗恶龙1
177-
00040000001C3800 = 勇者斗恶龙2
178-
00040000001C3900 = 勇者斗恶龙3
179-
000400000018F100 = 勇者斗恶龙8
180-
000400000018F200 = 勇者斗恶龙8
181-
000400000015CD00 = 勇者斗恶龙8
185+
00040000000CF500 = 勇者斗恶龙怪兽篇 2
186+
00040000001C3A00 = 勇者斗恶龙 1
187+
00040000001C3800 = 勇者斗恶龙 2
188+
00040000001C3900 = 勇者斗恶龙 3
189+
000400000018F100 = 勇者斗恶龙 8
190+
000400000018F200 = 勇者斗恶龙 8
191+
000400000015CD00 = 勇者斗恶龙 8
182192
000400000016AD00 = 勇者斗恶龙怪兽篇 joker3
183193
00040000001ACB00 = 勇者斗恶龙怪兽篇 joker3 专家版
184194
00040000001AA900 = 龙珠 融合计划
@@ -452,6 +462,8 @@
452462
000400000008C500 = 朋友聚会 新生活
453463
00040000000C3600 = 女神异闻录 Q
454464
00040000001CBE00 = 女神异闻录 Q2
465+
0004000000088A00 = 真女神转生 4
466+
00040000000E5C00 = 真女神转生 4
455467
0004000000166B00 = 真女神转生 4 FINAL
456468
00040000001A6B00 = 真女神转生 4 FINAL
457469
000400000019A200 = 真女神转生 4 FINAL

‎src/android/app/src/main/assets/config/config-games.ini‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
000400000013CB00 // FIFA 15
1414

1515
[disable_shadow_rendering]
16-
00040000001CB000 // Captain Toad: Treasure Tracker
17-
00040000001CB200 // Captain Toad: Treasure Tracker
18-
00040000001CB100 // Captain Toad: Treasure Tracker
1916
00040000000D0000 // Luigi's Mansion: Dark Moon
2017
0004000000076400 // Luigi's Mansion: Dark Moon
2118
0004000000055F00 // Luigi's Mansion: Dark Moon
@@ -151,6 +148,7 @@
151148
000400000008FE00,1,4,2,2 // 1001 Spikes
152149
0004000000120900,1,4,2,2 // Lord of Magna: Maiden Heaven
153150
0004000000164300,1,4,2,2 // Lord of Magna: Maiden Heaven
151+
0004000000165500,1,4,2,2 // Lord of Magna: Maiden Heaven
154152
00040000001CCD00,1,4,2,2 // The Alliance Alive
155153
00040000001B4500,1,4,2,2 // The Alliance Alive
156154
0004000000053700,1,4,2,2 // EX Troopers
@@ -239,11 +237,16 @@
239237
0004000000030400 // Star Fox 64
240238
0004000000049000 // Star Fox 64
241239
0004000000187E00 // Picross 2
240+
0004000000187D00 // Picross 2
242241
0004000000169A00 // Picross 2
242+
000400000008FF00 // Art of Balance
243+
000400000008F000 // Art of Balance
244+
00040000000E8900 // Art of Balance
243245
244246
[skip_cpu_write]
245247
0004000000120900 // Lord of Magna: Maiden Heaven
246248
0004000000164300 // Lord of Magna: Maiden Heaven
249+
0004000000165500 // Lord of Magna: Maiden Heaven
247250
248251
[disable_hw_gs]
249252
00040000000A0000 // BIOHAZARD Revelations
@@ -255,6 +258,7 @@
255258
256259
[hw_shader_limit]
257260
0004000000187500,512 // Creeping Terror
261+
00040000001CB600,512 // Creeping Terror
258262
259263
[use_separable_shader]
260264

‎src/android/app/src/main/res/layout-land/activity_about.xml‎

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
xmlns:tools="http://schemas.android.com/tools"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
tools:context=".ui.AboutActivity">
8+
9+
<androidx.appcompat.widget.Toolbar
10+
android:id="@+id/toolbar"
11+
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
12+
app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight"
13+
android:background="?attr/colorPrimary"
14+
android:layout_width="match_parent"
15+
android:layout_height="?attr/actionBarSize"
16+
android:layout_alignParentTop="true" />
17+
18+
<View
19+
android:id="@+id/center_view"
20+
android:layout_centerHorizontal="true"
21+
android:layout_centerVertical="true"
22+
android:layout_width="1px"
23+
android:layout_height="1px"/>
24+
25+
<LinearLayout
26+
android:orientation="vertical"
27+
android:gravity="center"
28+
android:layout_centerVertical="true"
29+
android:layout_alignParentStart="true"
30+
android:layout_toStartOf="@id/center_view"
31+
android:layout_width="match_parent"
32+
android:layout_height="wrap_content">
33+
34+
<ImageView
35+
android:id="@+id/banner"
36+
android:src="@mipmap/ic_launcher_foreground"
37+
android:scaleType="centerCrop"
38+
android:layout_width="96dp"
39+
android:layout_height="94dp"/>
40+
41+
<TextView
42+
android:id="@+id/version"
43+
android:text="2022/02/02T02:02:02"
44+
style="@style/CitraTheme.Caption"
45+
android:textSize="14sp"
46+
android:gravity="center"
47+
android:layout_width="wrap_content"
48+
android:layout_height="wrap_content"/>
49+
50+
</LinearLayout>
51+
52+
<LinearLayout
53+
android:id="@+id/layout_group"
54+
android:layout_marginStart="16dp"
55+
android:layout_marginEnd="16dp"
56+
android:background="@color/background_color"
57+
android:elevation="2dp"
58+
android:gravity="center"
59+
android:layout_centerVertical="true"
60+
android:layout_alignParentEnd="true"
61+
android:layout_toEndOf="@id/center_view"
62+
android:orientation="vertical"
63+
android:layout_width="match_parent"
64+
android:layout_height="wrap_content">
65+
66+
<Button
67+
android:id="@+id/btn_official_website"
68+
android:text="@string/citra_official_website"
69+
android:textAllCaps="false"
70+
android:textStyle="normal"
71+
android:layout_margin="0dp"
72+
android:padding="16dp"
73+
android:minWidth="0dp"
74+
android:minHeight="0dp"
75+
android:stateListAnimator="@null"
76+
android:gravity="center_vertical"
77+
style="@style/CitraTheme.Borderless"
78+
android:layout_width="match_parent"
79+
android:layout_height="wrap_content"/>
80+
81+
<View
82+
android:layout_width="match_parent"
83+
android:layout_marginStart="16dp"
84+
android:layout_marginEnd="16dp"
85+
android:layout_height="1dp"
86+
android:background="@color/light_grey"/>
87+
88+
<Button
89+
android:id="@+id/btn_open_weibo"
90+
android:text="@string/open_weibo"
91+
android:textAllCaps="false"
92+
android:textStyle="normal"
93+
android:layout_margin="0dp"
94+
android:padding="16dp"
95+
android:minWidth="0dp"
96+
android:minHeight="0dp"
97+
android:stateListAnimator="@null"
98+
android:gravity="center_vertical"
99+
style="@style/CitraTheme.Borderless"
100+
android:layout_width="match_parent"
101+
android:layout_height="wrap_content"/>
102+
103+
<View
104+
android:layout_width="match_parent"
105+
android:layout_marginStart="16dp"
106+
android:layout_marginEnd="16dp"
107+
android:layout_height="1dp"
108+
android:background="@color/light_grey"/>
109+
110+
<RelativeLayout
111+
android:layout_width="match_parent"
112+
android:layout_height="wrap_content">
113+
<Button
114+
android:id="@+id/btn_latest_version"
115+
android:text="@string/latest_version"
116+
android:textAllCaps="false"
117+
android:textStyle="normal"
118+
android:layout_margin="0dp"
119+
android:padding="16dp"
120+
android:minWidth="0dp"
121+
android:minHeight="0dp"
122+
android:stateListAnimator="@null"
123+
android:gravity="center_vertical"
124+
style="@style/CitraTheme.Borderless"
125+
android:layout_width="match_parent"
126+
android:layout_height="wrap_content"/>
127+
128+
<ProgressBar
129+
android:id="@+id/latest_version_progress"
130+
style="?android:attr/progressBarStyleHorizontal"
131+
android:layout_marginStart="16dp"
132+
android:layout_marginEnd="16dp"
133+
android:padding="0dp"
134+
android:indeterminate="true"
135+
android:visibility="invisible"
136+
android:layout_alignBottom="@id/btn_latest_version"
137+
android:layout_width="match_parent"
138+
android:layout_height="wrap_content"/>
139+
</RelativeLayout>
140+
141+
</LinearLayout>
142+
143+
<TextView
144+
android:id="@+id/device_info"
145+
android:textAlignment="center"
146+
android:gravity="center"
147+
android:layout_margin="8dp"
148+
android:textSize="12sp"
149+
style="@style/CitraTheme.Caption"
150+
android:layout_centerHorizontal="true"
151+
android:layout_alignParentBottom="true"
152+
android:layout_width="match_parent"
153+
android:layout_height="wrap_content"/>
154+
155+
<SurfaceView
156+
android:id="@+id/surface_about"
157+
android:layout_height="1dp"
158+
android:layout_width="match_parent"
159+
android:layout_alignParentBottom="true"
160+
android:focusable="false"
161+
android:focusableInTouchMode="false"/>
162+
163+
</RelativeLayout>

‎src/android/app/src/main/res/layout/amiibo_list_item.xml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/android/app/src/main/res/layout/dialog_amiibo.xml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎src/android/app/src/main/res/layout/fragment_bottom_sheet_dialog_list.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:id="@+id/list"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:clipToPadding="false"
8+
tools:orientation="horizontal"
9+
tools:context=".ui.MenuDialogFragment"
10+
tools:listitem="@layout/fragment_bottom_sheet_list_item" />

‎src/android/app/src/main/res/layout/fragment_bottom_sheet_list_item.xml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="wrap_content"
4+
android:layout_height="wrap_content"
5+
xmlns:app="http://schemas.android.com/apk/res-auto"
6+
android:background="?android:attr/selectableItemBackground"
7+
android:focusable="true"
8+
android:clickable="true">
9+
10+
<ImageView
11+
android:id="@+id/image_icon"
12+
android:src="@drawable/ic_home"
13+
app:tint="@color/foreground_color"
14+
android:layout_width="56dp"
15+
android:layout_height="56dp"
16+
android:layout_alignParentTop="true"
17+
android:layout_centerHorizontal="true"
18+
android:layout_marginStart="20dp"
19+
android:layout_marginEnd="20dp"
20+
android:layout_marginTop="6dp"
21+
android:layout_marginBottom="6dp"/>
22+
23+
<TextView
24+
android:id="@+id/text_title"
25+
android:text=""
26+
android:textAlignment="gravity"
27+
android:gravity="top|center"
28+
android:layout_marginStart="2dp"
29+
android:layout_marginEnd="2dp"
30+
android:singleLine="false"
31+
android:textColor="@color/foreground_color"
32+
android:layout_below="@id/image_icon"
33+
android:layout_centerHorizontal="true"
34+
android:layout_width="108dp"
35+
android:layout_height="48dp" />
36+
37+
</RelativeLayout>

0 commit comments

Comments
 (0)