diff options
| author | desperateCoder <echotodevnull@gmail.com> | 2020-12-15 13:25:53 +0300 |
|---|---|---|
| committer | desperateCoder <echotodevnull@gmail.com> | 2020-12-15 13:25:53 +0300 |
| commit | cf06fdbbd0aefeb0622ec398f506b1b2ed414034 (patch) | |
| tree | 277b586107fb324916e225586886ae83d17dba6f /app/src/main/res/values | |
| parent | f16b0e8fca76d7ed6bdbc32cd9227511e4db905d (diff) | |
| parent | 404c07f9086a19af47edc1037649790869347360 (diff) | |
merge master into branch
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/setup.xml | 11 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml index ac4e7d73d..f8f43fb1e 100644 --- a/app/src/main/res/values/setup.xml +++ b/app/src/main/res/values/setup.xml @@ -30,14 +30,17 @@ <item>@string/pref_value_background_6_hours</item> </string-array> - <string name="pref_value_theme_light" translatable="false">LIGHT</string> - <string name="pref_value_theme_dark" translatable="false">DARK</string> - <string name="pref_value_theme_system_default" translatable="false">SYSTEM_DEFAULT</string> + <!-- @see AppCompatDelegate#MODE_NIGHT_FOLLOW_SYSTEM --> + <string name="pref_value_theme_system_default" translatable="false">-1</string> + <!-- @see AppCompatDelegate#MODE_NIGHT_NO --> + <string name="pref_value_theme_light" translatable="false">1</string> + <!-- @see AppCompatDelegate#MODE_NIGHT_YES --> + <string name="pref_value_theme_dark" translatable="false">2</string> <string-array name="darkMode_values"> + <item>@string/pref_value_theme_system_default</item> <item>@string/pref_value_theme_light</item> <item>@string/pref_value_theme_dark</item> - <item>@string/pref_value_theme_system_default</item> </string-array> <!-- To be concatenated with the account id --> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9eccafcfa..23084532c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -155,9 +155,9 @@ <string name="pref_value_wifi_and_mobile">Sync on Wi-Fi and mobile data</string> <string name="pref_value_wifi_only">Sync only on Wi-Fi</string> <string-array name="darkmode_entries"> + <item>System Default</item> <item>Light</item> <item>Dark</item> - <item>System Default</item> </string-array> <string name="unassigned_user">Unassigned %1$s</string> <string name="no_activities">There are no activities on this card. You need to be connected to the internet to load and display activities.</string> |