Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '2131-follow-system-theme' into 'master'

Browse Source 
Change default theme to 'follow system' instead of 'light'

Closes #2131

See merge request briar/briar!1824
This commit is contained in:
akwizgran
2024-05-24 13:39:11 +00:00
parent ccd191b692 fd7088389f
commit ab223da18c
7 changed files with 8 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-android/src/main/res/values/arrays.xml
View File

@@ -63,17 +63,14 @@
<string-array name="pref_theme_entries">
<item>@string/pref_theme_light</item>
<item>@string/pref_theme_dark</item>
<item>@string/pref_theme_auto</item>
<item>@string/pref_theme_system</item>
</string-array>
<string name="pref_theme_light_value" translatable="false">light</string>
<string name="pref_theme_dark_value" translatable="false">dark</string>
<string name="pref_theme_auto_value" translatable="false">auto</string>
<string name="pref_theme_system_value" translatable="false">system</string>
<string-array name="pref_theme_values">
<item>@string/pref_theme_light_value</item>
<item>@string/pref_theme_dark_value</item>
<item>@string/pref_theme_auto_value</item>
<item>@string/pref_theme_system_value</item>
</string-array>

1
briar-android/src/main/res/values/strings.xml
View File

@@ -546,7 +546,6 @@
<string name="pref_theme_title">Theme</string>
<string name="pref_theme_light">Light</string>
<string name="pref_theme_dark">Dark</string>
<string name="pref_theme_auto">Automatic (Daytime)</string>
<string name="pref_theme_system">System default</string>
<!-- Settings Connections -->

2
briar-android/src/main/res/xml/settings_display.xml
View File

@@ -13,7 +13,7 @@
tools:summary="System default" />
<ListPreference
android:defaultValue="@string/pref_theme_light_value"
android:defaultValue="@string/pref_theme_system_value"
android:entries="@array/pref_theme_entries"
android:entryValues="@array/pref_theme_values"
android:key="pref_key_theme"