filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup riotx_base colors

This commit is contained in:
Benoit Marty 2021-02-15 18:25:56 +01:00 committed by Benoit Marty
parent acbb796649
commit d4d7c6cb4a
5 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/res/layout/fragment_home_drawer.xml
View File

@ -12,7 +12,7 @@
android:id="@+id/homeDrawerHeader" android:id="@+id/homeDrawerHeader"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?riotx_base" android:background="?vctr_home_drawer_header_background"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">

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

@ -161,10 +161,10 @@
<color name="riotx_background_dark">#FF15191E</color> <color name="riotx_background_dark">#FF15191E</color>
<color name="riotx_background_black">#FF000000</color> <color name="riotx_background_black">#FF000000</color>
<attr name="riotx_base" format="color" /> <attr name="vctr_home_drawer_header_background" format="color" />
<color name="riotx_base_light">#FFF5F7FA</color> <color name="vctr_home_drawer_header_background_light">#FFF5F7FA</color>
<color name="riotx_base_dark">#FF22282F</color> <color name="vctr_home_drawer_header_background_dark">#FF22282F</color>
<color name="riotx_base_black">#FF000000</color> <color name="vctr_home_drawer_header_background_black">#FF000000</color>
<!-- Background color of bottom sheets --> <!-- Background color of bottom sheets -->
<attr name="riotx_bottom_sheet_background" format="color" /> <attr name="riotx_bottom_sheet_background" format="color" />
@ -172,16 +172,6 @@
<color name="riotx_bottom_sheet_background_dark">#FF282C35</color> <color name="riotx_bottom_sheet_background_dark">#FF282C35</color>
<color name="riotx_bottom_sheet_background_black">#FF282C35</color> <color name="riotx_bottom_sheet_background_black">#FF282C35</color>
<attr name="riotx_base_text_icon_primary" format="color" />
<color name="riotx_base_text_icon_primary_light">#FFFFFFFF</color>
<color name="riotx_base_text_icon_primary_dark">#FFEDF3FF</color>
<color name="riotx_base_text_icon_primary_black">#FFEDF3FF</color>
<attr name="riotx_base_text_icon_secondary" format="color" />
<color name="riotx_base_text_icon_secondary_light">#FFFFFFFF</color>
<color name="riotx_base_text_icon_secondary_dark">#FFEDF3FF</color>
<color name="riotx_base_text_icon_secondary_black">#FFEDF3FF</color>
<attr name="riotx_search_background_mobile" format="color" /> <attr name="riotx_search_background_mobile" format="color" />
<color name="riotx_search_background_mobile_light">#FFFFFFFF</color> <color name="riotx_search_background_mobile_light">#FFFFFFFF</color>
<color name="riotx_search_background_mobile_dark">#FF181B21</color> <color name="riotx_search_background_mobile_dark">#FF181B21</color>

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

@ -8,9 +8,7 @@
<!-- Riotx attribute for palette --> <!-- Riotx attribute for palette -->
<item name="riotx_background">@color/riotx_background_black</item> <item name="riotx_background">@color/riotx_background_black</item>
<item name="riotx_base">@color/riotx_base_black</item> <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_black</item>
<item name="riotx_base_text_icon_primary">@color/riotx_base_text_icon_primary_black</item>
<item name="riotx_base_text_icon_secondary">@color/riotx_base_text_icon_secondary_black</item>
<item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_black</item> <item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_black</item>
<item name="riotx_header_panel_background">@color/riotx_header_panel_background_black</item> <item name="riotx_header_panel_background">@color/riotx_header_panel_background_black</item>
<item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_black</item> <item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_black</item>

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

@ -6,9 +6,7 @@
<style name="AppTheme.Base.Dark" parent="Theme.MaterialComponents.NoActionBar.Bridge"> <style name="AppTheme.Base.Dark" parent="Theme.MaterialComponents.NoActionBar.Bridge">
<!-- Riotx attribute for palette --> <!-- Riotx attribute for palette -->
<item name="riotx_background">@color/riotx_background_dark</item> <item name="riotx_background">@color/riotx_background_dark</item>
<item name="riotx_base">@color/riotx_base_dark</item> <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_dark</item>
<item name="riotx_base_text_icon_primary">@color/riotx_base_text_icon_primary_dark</item>
<item name="riotx_base_text_icon_secondary">@color/riotx_base_text_icon_secondary_dark</item>
<item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_dark</item> <item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_dark</item>
<item name="riotx_header_panel_background">@color/riotx_header_panel_background_dark</item> <item name="riotx_header_panel_background">@color/riotx_header_panel_background_dark</item>
<item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_dark</item> <item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_dark</item>

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

@ -6,9 +6,7 @@
<style name="AppTheme.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar"> <style name="AppTheme.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
<!-- Riotx attribute for palette --> <!-- Riotx attribute for palette -->
<item name="riotx_background">@color/riotx_background_light</item> <item name="riotx_background">@color/riotx_background_light</item>
<item name="riotx_base">@color/riotx_base_light</item> <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_light</item>
<item name="riotx_base_text_icon_primary">@color/riotx_base_text_icon_primary_light</item>
<item name="riotx_base_text_icon_secondary">@color/riotx_base_text_icon_secondary_light</item>
<item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_light</item> <item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_light</item>
<item name="riotx_header_panel_background">@color/riotx_header_panel_background_light</item> <item name="riotx_header_panel_background">@color/riotx_header_panel_background_light</item>
<item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_light</item> <item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_light</item>