6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Fix issue in theme

Browse Source
This commit is contained in:
Benoit Marty
2019-06-06 14:37:30 +02:00
parent 311d8484a2
commit 75b8932395
28 changed files with 136 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vector/src/main/res/values/colors.xml
View File

@ -1,25 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- TODO remove those colors-->
<color name="pale_grey">#f2f5f8</color>
<color name="dark">#2e3649</color>
<color name="pale_teal">#7ac9a1</color>
<color name="deep_sky_blue">#007aff</color>
<color name="rosy_pink">#f56679</color>
<color name="bluey_grey">#a5a5a6</color>
<color name="slate_grey">#5f6268</color>
<color name="sky_blue">#7bb2ea</color>
<color name="bluey_grey_two">#929eb4</color>
<color name="light_blue_grey">#4ac1c9d6</color>
<!-- Now use ?colorOnPrimary or ?vctr_toolbar_primary_text_color -->
<!--color name="dark_grey">#2e2f32</color-->
<color name="light_grey_blue">#9fa9ba</color>
<color name="cool_grey">#a5aab2</color>
<color name="pale_grey_two">#ebedf8</color>
<color name="grey_lynch">#61708B</color>
<color name="black_87">#de000000</color>
<color name="black_38">#61000000</color>
<color name="black_37">#5d000000</color>
<color name="grey_lynch">#61708B</color>
<color name="black">#000000</color>
</resources>

2
vector/src/main/res/values/styles_riot.xml
View File

@ -129,7 +129,7 @@
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:background">@null</item>
<item name="android:textColor">?colorAccent</item>
<!--item name="android:textColor">?colorAccent</item-->
<item name="colorControlHighlight">?colorAccent</item>
</style>

6
vector/src/main/res/values/text_appearances.xml
View File

@ -20,21 +20,21 @@
<item name="android:textSize">16sp</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textStyle">normal</item>
<item name="android:textColor">@color/black_87</item>
<item name="android:textColor">?riotx_text_primary</item>
</style>
<style name="TextAppearance.Vector.Subtitle" parent="TextAppearance.AppCompat">
<item name="android:textSize">14sp</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textStyle">normal</item>
<item name="android:textColor">@color/black_37</item>
<item name="android:textColor">?riotx_text_primary</item>
</style>
<style name="TextAppearance.Vector.Subtitle2" parent="TextAppearance.AppCompat">
<item name="android:textSize">14sp</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textStyle">normal</item>
<item name="android:textColor">@color/black_38</item>
<item name="android:textColor">?riotx_text_primary</item>
</style>
</resources>

33
vector/src/main/res/values/theme_black.xml
View File

@ -6,11 +6,6 @@
<style name="AppTheme.Base.Black" parent="AppTheme.Base.Dark">
<!-- Only setting the items we need to override to get the background to be pure black, otherwise inheriting -->
<item name="colorPrimaryDark">@color/primary_color_dark_black</item>
<item name="colorPrimary">@color/primary_color_black</item>
<item name="android:textColorLink">@color/riotx_links</item>
<!-- Riotx attribute for palette -->
<item name="riotx_background">@color/riotx_background_black</item>
<item name="riotx_base">@color/riotx_base_black</item>
@ -30,6 +25,33 @@
<item name="riotx_android_status_bar">@color/riotx_android_status_bar_black</item>
<item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_black</item>
<!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
<item name="colorPrimary">@color/riotx_accent</item>
<!--item name="colorPrimaryVariant">@color/primary_color_dark_light</item-->
<item name="colorOnPrimary">@color/riotx_text_primary_light</item>
<!-- We do not use color secondary, default will be colorPrimary values: It does not work so declare again the value -->
<item name="colorSecondary">@color/riotx_accent</item>
<item name="colorSecondaryVariant">@color/primary_color_dark_black</item>
<item name="colorOnSecondary">@color/riotx_text_primary_black</item>
<item name="colorError">@color/riotx_notice</item>
<item name="colorOnError">#FFFFFF</item>
<!--item name="colorSurface">#FFFFFF</item>
<item name="colorOnSurface">#212121</item-->
<item name="android:colorBackground">?riotx_background</item>
<item name="colorOnBackground">?riotx_text_primary</item>
<!-- Keep color accent for legacy widget-->
<item name="colorAccent">@color/riotx_accent</item>
<item name="materialButtonStyle">@style/VectorButtonStyle</item>
<item name="toolbarStyle">@style/VectorToolbarStyle</item>
<item name="alertDialogTheme">@style/VectorAlertDialogStyle</item>
<item name="android:textColorLink">@color/riotx_links</item>
<!-- Menu text color -->
<!--item name="android:actionMenuTextColor">#FFFFFFFF</item-->
<!-- list colors -->
<!--Header/Panel Background-->
<item name="vctr_list_header_background_color">#FF090A0C</item>
@ -42,7 +64,6 @@
<!-- color for dividers in settings -->
<item name="vctr_preference_divider_color">@color/list_divider_color_black</item>
<item name="android:colorBackground">@color/riot_primary_background_color_black</item>
<item name="vctr_markdown_block_background_color">#FF4D4D4D</item>
<!-- activities background -->

38
vector/src/main/res/values/theme_dark.xml
View File

@ -4,17 +4,6 @@
<!-- DARK THEME COLORS -->
<style name="AppTheme.Base.Dark" parent="Theme.MaterialComponents.NoActionBar.Bridge">
<item name="colorPrimaryDark">@color/primary_color_dark_dark</item>
<item name="colorPrimary">@color/primary_color_dark</item>
<item name="colorAccent">@color/accent_color_dark</item>
<item name="android:textColorPrimary">@color/primary_text_color_selector_dark</item>
<item name="android:textColorSecondary">@color/riot_secondary_text_color_dark</item>
<!-- Default color for text View -->
<item name="android:textColorTertiary">@color/riot_tertiary_text_color_dark</item>
<item name="android:textColorLink">@color/link_color_dark</item>
<!-- Riotx attribute for palette -->
<item name="riotx_background">@color/riotx_background_dark</item>
<item name="riotx_base">@color/riotx_base_dark</item>
@ -34,11 +23,34 @@
<item name="riotx_android_status_bar">@color/riotx_android_status_bar_dark</item>
<item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_dark</item>
<!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
<item name="colorPrimary">@color/riotx_accent</item>
<item name="colorPrimaryVariant">@color/primary_color_dark_light</item>
<item name="colorOnPrimary">@color/riotx_text_primary_light</item>
<!-- We do not use color secondary, default will be colorPrimary values: It does not work so declare again the value -->
<item name="colorSecondary">@color/riotx_accent</item>
<item name="colorSecondaryVariant">@color/primary_color_dark_dark</item>
<item name="colorOnSecondary">@color/riotx_text_primary_dark</item>
<item name="colorError">@color/riotx_notice</item>
<item name="colorOnError">#FFFFFF</item>
<!--item name="colorSurface">#FFFFFF</item>
<item name="colorOnSurface">#212121</item-->
<item name="android:colorBackground">?riotx_background</item>
<item name="colorOnBackground">?riotx_text_primary</item>
<!-- Keep color accent for legacy widget-->
<item name="colorAccent">@color/riotx_accent</item>
<item name="materialButtonStyle">@style/VectorButtonStyle</item>
<item name="toolbarStyle">@style/VectorToolbarStyle</item>
<item name="alertDialogTheme">@style/VectorAlertDialogStyle</item>
<item name="android:textColorLink">@color/riotx_links</item>
<!-- Menu text color -->
<item name="android:actionMenuTextColor">#FFFFFFFF</item>
<!--item name="android:actionMenuTextColor">#FFFFFFFF</item-->
<!-- default background color -->
<item name="android:colorBackground">@color/riot_primary_background_color_dark</item>
<item name="vctr_bottom_nav_background_color">@color/primary_color_dark</item>
<item name="vctr_bottom_nav_background_border_color">#FFE9EDF1</item>

21
vector/src/main/res/values/theme_light.xml
View File

@ -25,33 +25,28 @@
<!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
<item name="colorPrimary">@color/riotx_accent</item>
<item name="colorPrimaryVariant">@color/primary_color_dark_light</item>
<!--item name="colorPrimaryVariant">@color/primary_color_dark_light</item-->
<item name="colorOnPrimary">@color/riotx_text_primary_light</item>
<item name="colorSecondary">@color/accent_color_light</item>
<!-- We do not use color secondary, default will be colorPrimary values-->
<!--item name="colorSecondary">@color/accent_color_light</item>
<item name="colorSecondaryVariant">#0039CB</item>
<item name="colorOnSecondary">@android:color/white</item>
<item name="colorOnSecondary">@android:color/white</item-->
<item name="colorError">@color/riotx_notice</item>
<item name="colorOnError">#FFFFFF</item>
<item name="colorSurface">#FFFFFF</item>
<item name="colorOnSurface">#212121</item>
<!--item name="colorSurface">#FFFFFF</item>
<item name="colorOnSurface">#212121</item-->
<item name="android:colorBackground">?riotx_background</item>
<item name="colorOnBackground">?riotx_text_primary</item>
<!-- TODO is it still required? -->
<item name="colorAccent">@color/accent_color_light</item>
<!-- Keep color accent for legacy widget-->
<item name="colorAccent">@color/riotx_accent</item>
<item name="materialButtonStyle">@style/VectorButtonStyle</item>
<item name="toolbarStyle">@style/VectorToolbarStyle</item>
<item name="alertDialogTheme">@style/VectorAlertDialogStyle</item>
<!--item name="android:textColorPrimary">@color/black_87</item>
<item name="android:textColorSecondary">@color/black_38</item>
<item name="android:textColorTertiary">@color/black_37</item-->
<item name="android:textColorLink">@color/riotx_links</item>
<!-- Menu text color -->
<!--item name="android:actionMenuTextColor">#FFFFFFFF</item-->