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

Theme FAB menu

Browse Source
This commit is contained in:
Benoit Marty
2019-06-06 16:33:22 +02:00
parent dd563ec9ae
commit bfbb29b2cf
14 changed files with 94 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
vector/src/main/res/values/colors_riotx.xml
View File

@ -119,8 +119,33 @@
<!-- Other colors, which are not in the pallette -->
<attr name="riotx_unread_room_badge" format="color" />
<color name="riotx_unread_room_badge_light">#FF61708B</color>
<color name="riotx_unread_room_badge_dark">#FF181B21</color>
<color name="riotx_unread_room_badge_dark">#FF61708B</color>
<color name="riotx_unread_room_badge_black">#FF61708B</color>
<attr name="riotx_fab_secondary_bg" format="color" />
<color name="riotx_fab_secondary_bg_light">@color/white</color>
<color name="riotx_fab_secondary_bg_dark">#FF181B21</color>
<color name="riotx_fab_secondary_bg_black">#FF181B21</color>
<attr name="riotx_fab_secondary_color" format="color" />
<color name="riotx_fab_secondary_color_light">@color/black</color>
<color name="riotx_fab_secondary_color_dark">@color/white</color>
<color name="riotx_fab_secondary_color_black">@color/white</color>
<attr name="riotx_fab_label_bg" format="color" />
<color name="riotx_fab_label_bg_light">@color/white</color>
<color name="riotx_fab_label_bg_dark">#FF181B21</color>
<color name="riotx_fab_label_bg_black">#FF181B21</color>
<attr name="riotx_fab_label_color" format="color" />
<color name="riotx_fab_label_color_light">#FF2E2F32</color>
<color name="riotx_fab_label_color_dark">#FFA1B2D1</color>
<color name="riotx_fab_label_color_black">#FFA1B2D1</color>
<attr name="riotx_touch_guard_bg" format="color" />
<color name="riotx_touch_guard_bg_light">#66000000</color>
<color name="riotx_touch_guard_bg_dark">#BF000000</color>
<color name="riotx_touch_guard_bg_black">#BF000000</color>
</resources>

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

@ -274,8 +274,9 @@
<item name="android:paddingTop">4dp</item>
<item name="android:paddingBottom">4dp</item>
<item name="android:textSize">15sp</item>
<item name="android:textColor">?riotx_text_primary</item>
<item name="android:background">@drawable/vector_label_background</item>
<item name="android:textColor">?riotx_fab_label_color</item>
<!-- Note bg will be updated in the code -->
<item name="android:background">@drawable/vector_label_background_light</item>
</style>
</resources>

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

@ -25,6 +25,11 @@
<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>
<item name="riotx_unread_room_badge">@color/riotx_unread_room_badge_black</item>
<item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_black</item>
<item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_black</item>
<item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_black</item>
<item name="riotx_fab_label_color">@color/riotx_fab_label_color_black</item>
<item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_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>

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

@ -23,6 +23,11 @@
<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>
<item name="riotx_unread_room_badge">@color/riotx_unread_room_badge_dark</item>
<item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_dark</item>
<item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_dark</item>
<item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_dark</item>
<item name="riotx_fab_label_color">@color/riotx_fab_label_color_dark</item>
<item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_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>

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

@ -23,6 +23,11 @@
<item name="riotx_android_status_bar">@color/riotx_android_status_bar_light</item>
<item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_light</item>
<item name="riotx_unread_room_badge">@color/riotx_unread_room_badge_light</item>
<item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_light</item>
<item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_light</item>
<item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_light</item>
<item name="riotx_fab_label_color">@color/riotx_fab_label_color_light</item>
<item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_light</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>

3
vector/src/main/res/values/theme_status.xml
View File

@ -3,7 +3,8 @@
<!-- STATUS.IM THEME COLORS -->
<style name="AppTheme.Base.Status" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
<!-- Inherit of Light theme to avoid crash TODO Adapt color (phase 2) -->
<style name="AppTheme.Base.Status" parent="AppTheme.Base.Light">
<item name="colorPrimaryDark">@color/primary_color_dark_status</item>
<item name="colorPrimary">@color/primary_color_status</item>
<item name="colorAccent">@color/accent_color_status</item>