From efd8a4d88be9748e6f5b13c12e409f802c92b209 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Mon, 20 Jul 2020 15:38:06 +0200
Subject: [PATCH] Make both dark and light themes work for login
-> Allows us to use SC light theme for default theme again
- Also tweak default dark theme
---
.../im/vector/riotx/features/themes/ThemeUtils.kt | 4 ++--
.../drawable-anydpi-v24/bg_login_server_checked.xml | 12 ------------
vector/src/main/res/drawable/bg_login_server.xml | 4 ++--
.../src/main/res/xml/vector_settings_preferences.xml | 4 ++--
4 files changed, 6 insertions(+), 18 deletions(-)
delete mode 100644 vector/src/main/res/drawable-anydpi-v24/bg_login_server_checked.xml
diff --git a/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
index a991934def..396757da97 100644
--- a/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
@@ -104,7 +104,7 @@ object ThemeUtils {
*/
fun getApplicationLightTheme(context: Context): String {
return PreferenceManager.getDefaultSharedPreferences(context)
- .getString(APPLICATION_THEME_KEY, THEME_SC_DARK_COLORED_VALUE) ?: THEME_SC_DARK_COLORED_VALUE
+ .getString(APPLICATION_THEME_KEY, THEME_SC_LIGHT_VALUE) ?: THEME_SC_LIGHT_VALUE
}
@@ -116,7 +116,7 @@ object ThemeUtils {
*/
fun getApplicationDarkTheme(context: Context): String {
return PreferenceManager.getDefaultSharedPreferences(context)
- .getString(APPLICATION_DARK_THEME_KEY, THEME_SC_DARK_COLORED_VALUE) ?: THEME_SC_DARK_COLORED_VALUE
+ .getString(APPLICATION_DARK_THEME_KEY, THEME_SC_DARK_VALUE) ?: THEME_SC_DARK_VALUE
}
/**
diff --git a/vector/src/main/res/drawable-anydpi-v24/bg_login_server_checked.xml b/vector/src/main/res/drawable-anydpi-v24/bg_login_server_checked.xml
deleted file mode 100644
index 46c50ba98f..0000000000
--- a/vector/src/main/res/drawable-anydpi-v24/bg_login_server_checked.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
- <corners android:radius="4dp" />
-
- <stroke
- android:width="1.2dp"
- android:color="?colorAccent" />
-
- <solid android:color="@color/black" />
-
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_login_server.xml b/vector/src/main/res/drawable/bg_login_server.xml
index af4a43b40e..10560cfff7 100644
--- a/vector/src/main/res/drawable/bg_login_server.xml
+++ b/vector/src/main/res/drawable/bg_login_server.xml
@@ -5,8 +5,8 @@
<stroke
android:width="1.2dp"
- android:color="#212121" />
+ android:color="?android:textColorSecondary" />
- <solid android:color="@color/black" />
+ <solid android:color="?riotx_background" />
</shape>
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index d0181a68dc..5057e116f7 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -13,7 +13,7 @@
app:fragment="im.vector.riotx.features.settings.locale.LocalePickerFragment" />
<im.vector.riotx.core.preference.VectorListPreference
- android:defaultValue="sc_dark_colored"
+ android:defaultValue="sc_light"
android:entries="@array/theme_entries"
android:entryValues="@array/theme_values"
android:key="APPLICATION_THEME_KEY"
@@ -22,7 +22,7 @@
app:iconSpaceReserved="false" />
<im.vector.riotx.core.preference.VectorListPreference
- android:defaultValue="sc_dark_colored"
+ android:defaultValue="sc_dark"
android:entries="@array/theme_entries"
android:entryValues="@array/theme_values"
android:key="APPLICATION_DARK_THEME_KEY"