diff --git a/vector/src/main/java/im/vector/riotx/features/themes/ActivityOtherThemes.kt b/vector/src/main/java/im/vector/riotx/features/themes/ActivityOtherThemes.kt index c5ae0915f3..bd482e0b0d 100644 --- a/vector/src/main/java/im/vector/riotx/features/themes/ActivityOtherThemes.kt +++ b/vector/src/main/java/im/vector/riotx/features/themes/ActivityOtherThemes.kt @@ -26,6 +26,7 @@ import im.vector.riotx.R sealed class ActivityOtherThemes(@StyleRes val dark: Int, @StyleRes val black: Int, @StyleRes val status: Int, + @StyleRes val sc_light: Int, @StyleRes val sc: Int, @StyleRes val sc_dark: Int, @StyleRes val sc_colored: Int, @@ -35,6 +36,7 @@ sealed class ActivityOtherThemes(@StyleRes val dark: Int, R.style.AppTheme_Dark, R.style.AppTheme_Black, R.style.AppTheme_Status, + R.style.AppTheme_SC_Light, R.style.AppTheme_SC, R.style.AppTheme_SC_Dark, R.style.AppTheme_SC_Colored, @@ -48,6 +50,7 @@ sealed class ActivityOtherThemes(@StyleRes val dark: Int, R.style.AppTheme_AttachmentsPreview_SC, R.style.AppTheme_AttachmentsPreview_SC, R.style.AppTheme_AttachmentsPreview_SC, + R.style.AppTheme_AttachmentsPreview_SC, R.style.AppTheme_AttachmentsPreview_SC ) @@ -58,6 +61,7 @@ sealed class ActivityOtherThemes(@StyleRes val dark: Int, R.style.AppTheme_Transparent_SC, R.style.AppTheme_Transparent_SC, R.style.AppTheme_Transparent_SC, + R.style.AppTheme_Transparent_SC, R.style.AppTheme_Transparent_SC ) } 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 dbdc22bbc9..a991934def 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 @@ -43,6 +43,7 @@ object ThemeUtils { private const val THEME_LIGHT_VALUE = "light" private const val THEME_BLACK_VALUE = "black" private const val THEME_STATUS_VALUE = "status" + private const val THEME_SC_LIGHT_VALUE = "sc_light" private const val THEME_SC_VALUE = "sc" private const val THEME_SC_DARK_VALUE = "sc_dark" private const val THEME_SC_COLORED_VALUE = "sc_colored" @@ -78,6 +79,7 @@ object ThemeUtils { fun isLightTheme(context: Context): Boolean { return when (getApplicationTheme(context)) { THEME_LIGHT_VALUE, + THEME_SC_LIGHT_VALUE, THEME_STATUS_VALUE -> true else -> false } @@ -126,7 +128,11 @@ object ThemeUtils { fun isScTheme(context: Context?): Boolean { if (context != null) { mIsScTheme = when (getApplicationTheme(context)) { - THEME_SC_VALUE, THEME_SC_DARK_VALUE, THEME_SC_COLORED_VALUE, THEME_SC_DARK_COLORED_VALUE -> true + THEME_SC_LIGHT_VALUE, + THEME_SC_VALUE, + THEME_SC_DARK_VALUE, + THEME_SC_COLORED_VALUE, + THEME_SC_DARK_COLORED_VALUE -> true else -> false } } @@ -144,6 +150,7 @@ object ThemeUtils { THEME_DARK_VALUE -> context.setTheme(R.style.AppTheme_Dark) THEME_BLACK_VALUE -> context.setTheme(R.style.AppTheme_Black) THEME_STATUS_VALUE -> context.setTheme(R.style.AppTheme_Status) + THEME_SC_LIGHT_VALUE -> context.setTheme(R.style.AppTheme_SC_Light) THEME_SC_VALUE -> context.setTheme(R.style.AppTheme_SC) THEME_SC_DARK_VALUE -> context.setTheme(R.style.AppTheme_SC_Dark) THEME_SC_COLORED_VALUE -> context.setTheme(R.style.AppTheme_SC_Colored) @@ -173,6 +180,7 @@ object ThemeUtils { THEME_DARK_VALUE -> activity.setTheme(otherThemes.dark) THEME_BLACK_VALUE -> activity.setTheme(otherThemes.black) THEME_STATUS_VALUE -> activity.setTheme(otherThemes.status) + THEME_SC_LIGHT_VALUE -> activity.setTheme(otherThemes.sc_light) THEME_SC_VALUE -> activity.setTheme(otherThemes.sc) THEME_SC_DARK_VALUE -> activity.setTheme(otherThemes.sc_dark) THEME_SC_COLORED_VALUE -> activity.setTheme(otherThemes.sc_colored) diff --git a/vector/src/main/res/drawable/vector_tabbar_background_sc_light.xml b/vector/src/main/res/drawable/vector_tabbar_background_sc_light.xml new file mode 100644 index 0000000000..4ae6058004 --- /dev/null +++ b/vector/src/main/res/drawable/vector_tabbar_background_sc_light.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vector/src/main/res/drawable/vector_tabbar_selected_background_sc_light.xml b/vector/src/main/res/drawable/vector_tabbar_selected_background_sc_light.xml new file mode 100644 index 0000000000..7e900e1111 --- /dev/null +++ b/vector/src/main/res/drawable/vector_tabbar_selected_background_sc_light.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vector/src/main/res/drawable/vector_tabbar_unselected_background_sc_light.xml b/vector/src/main/res/drawable/vector_tabbar_unselected_background_sc_light.xml new file mode 100644 index 0000000000..50d50e4d17 --- /dev/null +++ b/vector/src/main/res/drawable/vector_tabbar_unselected_background_sc_light.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/vector/src/main/res/values-de/strings_sc.xml b/vector/src/main/res/values-de/strings_sc.xml index dcfa93ced7..4b3fa26459 100644 --- a/vector/src/main/res/values-de/strings_sc.xml +++ b/vector/src/main/res/values-de/strings_sc.xml @@ -2,6 +2,7 @@ Nacht-Design + SC Hell SC Schwarz SC Dunkel SC Schwarz, bunte Blasen diff --git a/vector/src/main/res/values-v21/theme_sc.xml b/vector/src/main/res/values-v21/theme_sc.xml index 3cce94c80c..c659bec90d 100644 --- a/vector/src/main/res/values-v21/theme_sc.xml +++ b/vector/src/main/res/values-v21/theme_sc.xml @@ -49,6 +49,20 @@ @transition/image_preview_transition + + + + + + + + @@ -19,6 +24,11 @@ @drawable/vector_tabbar_background_sc + + - - - - diff --git a/vector/src/main/res/values/theme_sc_light.xml b/vector/src/main/res/values/theme_sc_light.xml new file mode 100644 index 0000000000..75f8072f33 --- /dev/null +++ b/vector/src/main/res/values/theme_sc_light.xml @@ -0,0 +1,55 @@ + + + + + + + +