Theme update as in upstream merge

This commit is contained in:
SpiritCroc 2020-08-22 11:23:59 +02:00
parent 7b4b5be759
commit ce90a36891
3 changed files with 26 additions and 76 deletions

View File

@ -1,76 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AppTheme.SC.v21" parent="AppTheme.Base.SC">
<item name="android:statusBarColor">@color/background_black_sc</item>
<item name="android:navigationBarColor">@color/background_black_sc</item>
<!-- enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
<!-- specify shared element enter and exit transitions -->
<item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
<item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
</style>
<style name="AppTheme.SC.Dark.v21" parent="AppTheme.Base.SC.Dark">
<item name="android:statusBarColor">@color/background_dark_sc</item>
<item name="android:navigationBarColor">@color/background_black_sc</item>
<!-- enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
<!-- specify shared element enter and exit transitions -->
<item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
<item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
</style>
<style name="AppTheme.SC.Colored.v21" parent="AppTheme.Base.SC.Colored">
<item name="android:statusBarColor">@color/background_black_sc</item>
<item name="android:navigationBarColor">@color/background_black_sc</item>
<!-- enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
<!-- specify shared element enter and exit transitions -->
<item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
<item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
</style>
<style name="AppTheme.SC.Dark.Colored.v21" parent="AppTheme.Base.SC.Dark.Colored">
<item name="android:statusBarColor">@color/background_dark_sc</item>
<item name="android:navigationBarColor">@color/background_black_sc</item>
<!-- enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
<!-- specify shared element enter and exit transitions -->
<item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
<item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
</style>
<style name="AppTheme.SC.Light.v21" parent="AppTheme.Base.SC.Light">
<!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ -->
<item name="android:statusBarColor">@color/riotx_header_panel_background_dark</item>
<!-- Use dark color, to have enough contrast with icons color. windowLightNavigationBar is only available in API 27+ -->
<item name="android:navigationBarColor">@color/background_black_sc</item>
<!-- enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
<!-- specify shared element enter and exit transitions -->
<item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
<item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
</style>
<style name="AppTheme.SC" parent="AppTheme.SC.v21" />
<style name="AppTheme.SC.Dark" parent="AppTheme.SC.Dark.v21" />
<style name="AppTheme.SC.Colored" parent="AppTheme.SC.Colored.v21" />
<style name="AppTheme.SC.Dark.Colored" parent="AppTheme.SC.Dark.Colored.v21" />
<style name="AppTheme.SC.Light" parent="AppTheme.SC.Light.v21" />
</resources>

View File

@ -209,6 +209,16 @@
<item name="riotx_positive_accent">@color/accent_sc</item>
<item name="riotx_positive_accent_alpha12">@color/accent_sc_alpha12</item>
<item name="riotx_toolbar_bg">?riotx_background</item>
<item name="android:statusBarColor">@color/background_black_sc</item>
<item name="android:navigationBarColor">@color/background_black_sc</item>
<!-- enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
<!-- specify shared element enter and exit transitions -->
<item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
<item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
</style>
<style name="AppTheme.Base.SC.Dark">
@ -216,6 +226,9 @@
<item name="riotx_background">@color/background_dark_sc</item>
<item name="riotx_base">@color/background_sc</item>
<item name="riotx_header_panel_background">@color/background_sc</item>
<item name="android:statusBarColor">@color/background_dark_sc</item>
<item name="android:navigationBarColor">@color/background_black_sc</item>
</style>

View File

@ -50,6 +50,19 @@
<item name="riotx_toolbar_bg">?riotx_background</item>
<item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.Light</item>
<!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ -->
<item name="android:statusBarColor">@color/riotx_header_panel_background_dark</item>
<!-- Use dark color, to have enough contrast with icons color. windowLightNavigationBar is only available in API 27+ -->
<item name="android:navigationBarColor">@color/background_black_sc</item>
<!-- enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
<!-- specify shared element enter and exit transitions -->
<item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
<item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
</style>
<!-- Default AppTheme for usage where settings don't apply -->