Skip to content

Commit a9103d0

Browse files
update UI
1 parent 79809c6 commit a9103d0

4 files changed

Lines changed: 62 additions & 47 deletions

File tree

app/src/main/res/values-in/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,9 @@ Tolong kasih izinnya di Settingan Sistem."</string>
538538
<string name="ip_info_bottom_bar_summary">Tampilin juga IP publik, negara, sama bendera pas bilah bawah di-tap</string>
539539
<string name="ip_info_show_ip_in_two_line_summary">Nampilin info IP di baris kedua (di atas info ping) pas lagi ngetes koneksi</string>
540540
<string name="ip_info_show_ip_in_two_line_title">Tampilin Info IP di baris terpisah</string>
541+
<string name="theme_category">Tema</string>
542+
<string name="bottom_bar_category">Bilah bawah</string>
543+
<string name="opsional_category">Tambahan</string>
541544

542545
<string name="uwu_about_miku_title">Siapa itu Hatsune Miku?</string>
543546
<string name="uwu_about_miku_summary">Hatsune Miku itu penyanyi virtual berbasis Vocaloid yang dirilis sama Crypton Future Media, kode namanya CV01. Dikenal gara-gara rambut twintail panjang warna biru kehijauan sama suaranya yang jernih, dia itu cewek 16 tahun dan idola virtual yang terkenal sedunia. Dia aktif di musik, konser, dan anime, plus disayang banget sama fans-fansnya.</string>

app/src/main/res/values-zh-rCN/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,9 @@
534534
<string name="ip_info_bottom_bar_summary">点击底部栏时也显示公共 IP, 国家和旗帜</string>
535535
<string name="ip_info_show_ip_in_two_line_summary">连接测试时,IP 信息将显示在第二行(延迟信息上方)</string>
536536
<string name="ip_info_show_ip_in_two_line_title">IP 信息分行显示</string>
537+
<string name="theme_category">主题</string>
538+
<string name="bottom_bar_category">底部栏</string>
539+
<string name="opsional_category">可选</string>
537540

538541
<!-- uwu -->
539542
<string name="uwu_about_miku_title">谁是 Hatsune Miku?</string>

app/src/main/res/values/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,9 @@ Please grant this permission in System Settings."</string>
633633
<string name="ip_info_bottom_bar_summary">Also show public IP, country, and flag when tapping the bottom bar</string>
634634
<string name="ip_info_show_ip_in_two_line_summary">Displays IP info results in the second line (above latency) during connection tests</string>
635635
<string name="ip_info_show_ip_in_two_line_title">Display IP Info in Separate Line</string>
636+
<string name="theme_category">Theme</string>
637+
<string name="bottom_bar_category">Bottom bar</string>
638+
<string name="opsional_category">Opsional</string>
636639

637640
<!-- uwu -->
638641
<string name="uwu_about_miku_title">Who is Hatsune Miku?</string>

app/src/main/res/xml/theme_preferences.xml

Lines changed: 53 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:layout="@layout/uwu_banner_theme"
77
android:selectable="false" />
88
<PreferenceCategory
9-
app:title="@string/uwu_theme_settings_title">
9+
app:title="@string/theme_category">
1010
<moe.matsuri.nb4a.ui.ColorPickerPreference
1111
android:layout="@layout/uwu_top_switch"
1212
android:title="@string/theme"
@@ -31,24 +31,71 @@
3131
app:title="@string/night_mode"
3232
app:useSimpleSummaryProvider="true" />
3333
<SwitchPreference
34-
android:layout="@layout/uwu_mid_switch"
34+
android:layout="@layout/uwu_bot_switch"
3535
android:title="@string/pref_true_black_title"
3636
android:key="true_dark_enabled"
3737
android:summary="@string/pref_true_black_summary"
3838
android:widgetLayout="@layout/uwu_switch"
3939
android:defaultValue="false"
4040
app:icon="@drawable/ic_toggle_switch" />
41-
<moe.matsuri.nb4a.ui.DpiEditTextPreference
41+
</PreferenceCategory>
42+
<PreferenceCategory
43+
app:title="@string/opsional_category">
44+
<SwitchPreference
45+
android:layout="@layout/uwu_top_switch"
46+
android:title="@string/pref_font_bold_title"
47+
android:key="bold_font_switch"
48+
android:summary="@string/pref_font_bold_summary"
49+
android:widgetLayout="@layout/uwu_switch"
50+
android:defaultValue="false"
51+
app:icon="@drawable/ic_format_font" />
52+
<SwitchPreference
53+
android:layout="@layout/uwu_mid_switch"
54+
android:title="@string/sound_connect_title"
55+
android:key="sound_connect"
56+
android:summary="@string/sound_connect_summary"
57+
android:widgetLayout="@layout/uwu_switch"
58+
android:defaultValue="true"
59+
app:icon="@drawable/ic_audio" />
60+
<com.takisoft.preferencex.SimpleMenuPreference
4261
android:layout="@layout/uwu_mid"
62+
app:defaultValue=""
63+
app:entries="@array/language_entry"
64+
app:entryValues="@array/language_value"
65+
app:icon="@drawable/ic_baseline_translate_24"
66+
app:isPreferenceVisible="true"
67+
app:key="app_language"
68+
app:title="@string/language" />
69+
<SwitchPreference
70+
android:layout="@layout/uwu_mid_switch"
71+
android:title="@string/banner_home_title"
72+
android:key="show_banner_layout"
73+
android:summary="@string/banner_home_summary"
74+
android:widgetLayout="@layout/uwu_switch"
75+
android:defaultValue="true"
76+
app:icon="@drawable/ic_toggle_switch" />
77+
<SwitchPreference
78+
android:layout="@layout/uwu_mid_switch"
79+
android:title="@string/pref_show_splash_title"
80+
android:key="show_splash_screen"
81+
android:summary="@string/pref_show_splash_summary"
82+
android:widgetLayout="@layout/uwu_switch"
83+
android:defaultValue="true"
84+
app:icon="@drawable/ic_toggle_switch" />
85+
<moe.matsuri.nb4a.ui.DpiEditTextPreference
86+
android:layout="@layout/uwu_bot"
4387
android:inputType="number"
4488
app:defaultValue="0"
4589
app:dialogMessage="@string/pref_custom_dpi_dialog_massage"
4690
app:icon="@drawable/ic_cellphone_screenshot"
4791
app:key="custom_dpi"
4892
app:title="@string/pref_custom_dpi"
4993
app:useSimpleSummaryProvider="true" />
94+
</PreferenceCategory>
95+
<PreferenceCategory
96+
app:title="@string/bottom_bar_category">
5097
<SwitchPreference
51-
android:layout="@layout/uwu_mid_switch"
98+
android:layout="@layout/uwu_top_switch"
5299
android:widgetLayout="@layout/uwu_switch"
53100
android:summaryOn="@string/on"
54101
android:summaryOff="@string/off"
@@ -72,54 +119,13 @@
72119
android:defaultValue="false"
73120
app:icon="@drawable/ic_toggle_switch" />
74121
<com.takisoft.preferencex.SimpleMenuPreference
75-
android:layout="@layout/uwu_mid"
122+
android:layout="@layout/uwu_bot"
76123
app:defaultValue="1"
77124
app:entries="@array/fab_style_entry"
78125
app:entryValues="@array/int_array_2"
79126
app:icon="@drawable/ic_service_busy"
80127
app:key="fab_style"
81128
app:title="@string/fab_style"
82129
app:useSimpleSummaryProvider="true" />
83-
<SwitchPreference
84-
android:layout="@layout/uwu_mid_switch"
85-
android:title="@string/pref_font_bold_title"
86-
android:key="bold_font_switch"
87-
android:summary="@string/pref_font_bold_summary"
88-
android:widgetLayout="@layout/uwu_switch"
89-
android:defaultValue="false"
90-
app:icon="@drawable/ic_format_font" />
91-
<SwitchPreference
92-
android:layout="@layout/uwu_mid_switch"
93-
android:title="@string/sound_connect_title"
94-
android:key="sound_connect"
95-
android:summary="@string/sound_connect_summary"
96-
android:widgetLayout="@layout/uwu_switch"
97-
android:defaultValue="true"
98-
app:icon="@drawable/ic_audio" />
99-
<com.takisoft.preferencex.SimpleMenuPreference
100-
android:layout="@layout/uwu_mid"
101-
app:defaultValue=""
102-
app:entries="@array/language_entry"
103-
app:entryValues="@array/language_value"
104-
app:icon="@drawable/ic_baseline_translate_24"
105-
app:isPreferenceVisible="true"
106-
app:key="app_language"
107-
app:title="@string/language" />
108-
<SwitchPreference
109-
android:layout="@layout/uwu_mid_switch"
110-
android:title="@string/banner_home_title"
111-
android:key="show_banner_layout"
112-
android:summary="@string/banner_home_summary"
113-
android:widgetLayout="@layout/uwu_switch"
114-
android:defaultValue="true"
115-
app:icon="@drawable/ic_toggle_switch" />
116-
<SwitchPreference
117-
android:layout="@layout/uwu_bot_switch"
118-
android:title="@string/pref_show_splash_title"
119-
android:key="show_splash_screen"
120-
android:summary="@string/pref_show_splash_summary"
121-
android:widgetLayout="@layout/uwu_switch"
122-
android:defaultValue="true"
123-
app:icon="@drawable/ic_toggle_switch" />
124130
</PreferenceCategory>
125-
</PreferenceScreen>
131+
</PreferenceScreen>

0 commit comments

Comments
 (0)