From 68c03b79af5fd8d035758c027021087b2c0adedf Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 15 May 2020 14:00:38 +0200 Subject: [PATCH] Tweak theming default values and fix login theme Same theme for both light and dark theme for easier login screen theming --- .../im/vector/riotx/features/themes/BubbleThemeUtils.kt | 2 +- .../main/java/im/vector/riotx/features/themes/ThemeUtils.kt | 4 ++-- .../res/drawable-anydpi-v24/bg_login_server_checked.xml | 2 +- vector/src/main/res/drawable/bg_login_server.xml | 6 +++--- vector/src/main/res/drawable/bg_login_server_checked.xml | 6 +++--- .../src/main/res/layout/fragment_login_server_selection.xml | 2 ++ vector/src/main/res/values/styles_login.xml | 4 ++-- vector/src/main/res/values/styles_sc.xml | 4 ++++ vector/src/main/res/xml/vector_settings_preferences.xml | 6 +++--- 9 files changed, 21 insertions(+), 15 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/features/themes/BubbleThemeUtils.kt b/vector/src/main/java/im/vector/riotx/features/themes/BubbleThemeUtils.kt index bf765d0f94..a077403237 100644 --- a/vector/src/main/java/im/vector/riotx/features/themes/BubbleThemeUtils.kt +++ b/vector/src/main/java/im/vector/riotx/features/themes/BubbleThemeUtils.kt @@ -16,7 +16,7 @@ object BubbleThemeUtils { fun getBubbleStyle(context: Context): String { if (mBubbleStyle == "") { - mBubbleStyle = PreferenceManager.getDefaultSharedPreferences(context).getString(BUBBLE_STYLE_KEY, BUBBLE_STYLE_START)!! + mBubbleStyle = PreferenceManager.getDefaultSharedPreferences(context).getString(BUBBLE_STYLE_KEY, BUBBLE_STYLE_BOTH)!! } return mBubbleStyle } 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 6041bf5ba6..2198ba2f71 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 @@ -61,8 +61,8 @@ object ThemeUtils { fun getApplicationTheme(context: Context): String { val currentNightMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK return when (currentNightMode) { - Configuration.UI_MODE_NIGHT_YES -> PreferenceManager.getDefaultSharedPreferences(context).getString(APPLICATION_DARK_THEME_KEY, THEME_DARK_VALUE)!! - else -> PreferenceManager.getDefaultSharedPreferences(context).getString(APPLICATION_THEME_KEY, THEME_LIGHT_VALUE)!! + Configuration.UI_MODE_NIGHT_YES -> PreferenceManager.getDefaultSharedPreferences(context).getString(APPLICATION_DARK_THEME_KEY, THEME_SC_DARK_COLORED_VALUE)!! + else -> PreferenceManager.getDefaultSharedPreferences(context).getString(APPLICATION_THEME_KEY, THEME_SC_DARK_COLORED_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 index a4367d5759..46c50ba98f 100644 --- 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 @@ -7,6 +7,6 @@ android:width="1.2dp" android:color="?colorAccent" /> - + \ 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 5aecd26292..af4a43b40e 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 @@ + android:color="#212121" /> - + - \ No newline at end of file + diff --git a/vector/src/main/res/drawable/bg_login_server_checked.xml b/vector/src/main/res/drawable/bg_login_server_checked.xml index 1aea622462..c2bd656696 100644 --- a/vector/src/main/res/drawable/bg_login_server_checked.xml +++ b/vector/src/main/res/drawable/bg_login_server_checked.xml @@ -5,8 +5,8 @@ + android:color="@color/accent_sc" /> - + - \ No newline at end of file + diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml index ecc9bb78b8..b042ef34df 100644 --- a/vector/src/main/res/layout/fragment_login_server_selection.xml +++ b/vector/src/main/res/layout/fragment_login_server_selection.xml @@ -61,6 +61,7 @@ android:layout_height="wrap_content" android:importantForAccessibility="no" android:src="@drawable/ic_logo_matrix_org" + android:tint="@color/white" app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceMatrixOrgText" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -101,6 +102,7 @@ android:layout_height="wrap_content" android:importantForAccessibility="no" android:src="@drawable/ic_logo_modular" + android:tint="@color/white" app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceModularText" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/vector/src/main/res/values/styles_login.xml b/vector/src/main/res/values/styles_login.xml index 3bcda048dc..e2bac132fb 100644 --- a/vector/src/main/res/values/styles_login.xml +++ b/vector/src/main/res/values/styles_login.xml @@ -53,12 +53,12 @@ parent - - diff --git a/vector/src/main/res/values/styles_sc.xml b/vector/src/main/res/values/styles_sc.xml index 9584156897..151649f9dc 100644 --- a/vector/src/main/res/values/styles_sc.xml +++ b/vector/src/main/res/values/styles_sc.xml @@ -34,4 +34,8 @@ @color/riotx_links + + diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml index 2d057b0efe..dbabceacda 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 @@ android:title="@string/settings_interface_language" />