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

Rework tabbar style

This commit is contained in:
Benoit Marty 2020-08-05 19:26:00 +02:00
parent 7ab55d46c0
commit 06d927a911
16 changed files with 62 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vector/src/main/res/drawable/vector_tabbar_background.xml Normal file
View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Non focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
<!-- Focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
<!-- Pressed -->
<!-- Non focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
<!-- Focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
</selector>

21
vector/src/main/res/drawable/vector_tabbar_background_dark.xml
View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Non focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_dark" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_dark" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
<!-- Focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_dark" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_dark" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
<!-- Pressed -->
<!-- Non focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_dark" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_dark" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
<!-- Focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_dark" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_dark" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
</selector>

21
vector/src/main/res/drawable/vector_tabbar_background_light.xml
View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Non focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_light" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_light" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
<!-- Focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_light" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_light" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
<!-- Pressed -->
<!-- Non focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_light" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_light" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
<!-- Focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_light" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_light" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
</selector>

21
vector/src/main/res/drawable/vector_tabbar_background_status.xml
View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Non focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_status" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_status" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
<!-- Focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_status" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_status" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
<!-- Pressed -->
<!-- Non focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_status" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_status" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
<!-- Focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_status" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_status" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
</selector>

14
vector/src/main/res/drawable/vector_tabbar_selected_background.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/riotx_accent" />
<padding android:bottom="2dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="?tab_bar_selected_background_color" />
</shape>
</item>
</layer-list>

22
vector/src/main/res/drawable/vector_tabbar_selected_background_dark.xml
View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/list_divider_color_dark" />
<padding android:bottom="1dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@android:color/white" />
<padding android:bottom="2dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/tab_bar_selected_background_color_dark" />
</shape>
</item>
</layer-list>

22
vector/src/main/res/drawable/vector_tabbar_selected_background_light.xml
View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/list_divider_color_light" />
<padding android:bottom="1dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@android:color/white" />
<padding android:bottom="2dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/tab_bar_selected_background_color_light" />
</shape>
</item>
</layer-list>

22
vector/src/main/res/drawable/vector_tabbar_selected_background_status.xml
View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/list_divider_color_light" />
<padding android:bottom="1dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@android:color/white" />
<padding android:bottom="2dp" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/tab_bar_selected_background_color_status" />
</shape>
</item>
</layer-list>

3
vector/src/main/res/drawable/vector_tabbar_unselected_background_dark.xml → vector/src/main/res/drawable/vector_tabbar_unselected_background.xml
View File

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/tab_bar_unselected_background_color_dark" /> <solid android:color="?tab_bar_unselected_background_color" />
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

9
vector/src/main/res/drawable/vector_tabbar_unselected_background_light.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/tab_bar_unselected_background_color_light" />
</shape>
</item>
</layer-list>

9
vector/src/main/res/drawable/vector_tabbar_unselected_background_status.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/tab_bar_unselected_background_color_status" />
</shape>
</item>
</layer-list>

14
vector/src/main/res/values/colors_riot.xml
View File

@ -53,13 +53,15 @@
<!--Black/Line break mobile--> <!--Black/Line break mobile-->
<color name="list_divider_color_black">#FF22262E</color> <color name="list_divider_color_black">#FF22262E</color>
<color name="tab_bar_selected_background_color_light">@color/primary_color_light</color> <attr name="tab_bar_selected_background_color" format="color" />
<color name="tab_bar_selected_background_color_dark">@color/primary_color_dark</color> <color name="tab_bar_selected_background_color_light">@color/riotx_android_secondary_light</color>
<color name="tab_bar_selected_background_color_status">@color/primary_color_status</color> <color name="tab_bar_selected_background_color_dark">@color/riotx_android_secondary_dark</color>
<color name="tab_bar_selected_background_color_status">@color/riotx_android_secondary_black</color>
<color name="tab_bar_unselected_background_color_light">@color/primary_color_light</color> <attr name="tab_bar_unselected_background_color" format="color" />
<color name="tab_bar_unselected_background_color_dark">@color/primary_color_dark</color> <color name="tab_bar_unselected_background_color_light">@color/riotx_background_light</color>
<color name="tab_bar_unselected_background_color_status">@color/primary_color_status</color> <color name="tab_bar_unselected_background_color_dark">@color/riotx_background_dark</color>
<color name="tab_bar_unselected_background_color_status">@color/riotx_background_black</color>
<!-- Hint Colors --> <!-- Hint Colors -->
<color name="primary_hint_text_color_light">#FFFFFF</color> <color name="primary_hint_text_color_light">#FFFFFF</color>

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

@ -371,4 +371,9 @@
<item name="android:textColor">?vctr_message_text_color</item> <item name="android:textColor">?vctr_message_text_color</item>
</style> </style>
<style name="Vector.TabView" parent="Widget.AppCompat.ActionBar.TabView">
<item name="android:background">@drawable/vector_tabbar_background</item>
<item name="background">@drawable/vector_tabbar_background</item>
</style>
</resources> </resources>

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

@ -147,13 +147,16 @@
<item name="android:actionBarDivider">@null</item> <item name="android:actionBarDivider">@null</item>
<!-- tabbar background --> <!-- tabbar background -->
<item name="android:actionBarTabStyle">@style/Vector.TabView.Dark</item> <item name="android:actionBarTabStyle">@style/Vector.TabView</item>
<item name="actionBarTabStyle">@style/Vector.TabView.Dark</item> <item name="actionBarTabStyle">@style/Vector.TabView</item>
<!-- tabbar text color --> <!-- tabbar text color -->
<item name="android:actionBarTabTextStyle">@style/Vector.TabText</item> <item name="android:actionBarTabTextStyle">@style/Vector.TabText</item>
<item name="actionBarTabTextStyle">@style/Vector.TabText</item> <item name="actionBarTabTextStyle">@style/Vector.TabText</item>
<item name="tab_bar_selected_background_color">@color/tab_bar_selected_background_color_dark</item>
<item name="tab_bar_unselected_background_color">@color/tab_bar_unselected_background_color_dark</item>
<!-- Preference --> <!-- Preference -->
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
@ -180,9 +183,4 @@
<style name="AppTheme.Dark" parent="AppTheme.Base.Dark" /> <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
<style name="Vector.TabView.Dark" parent="Widget.AppCompat.ActionBar.TabView">
<item name="android:background">@drawable/vector_tabbar_background_dark</item>
<item name="background">@drawable/vector_tabbar_background_dark</item>
</style>
</resources> </resources>

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

@ -147,13 +147,16 @@
<item name="android:actionBarDivider">@null</item> <item name="android:actionBarDivider">@null</item>
<!-- tabbar background --> <!-- tabbar background -->
<item name="android:actionBarTabStyle">@style/Vector.TabView.Light</item> <item name="android:actionBarTabStyle">@style/Vector.TabView</item>
<item name="actionBarTabStyle">@style/Vector.TabView.Light</item> <item name="actionBarTabStyle">@style/Vector.TabView</item>
<!-- tabbar text color --> <!-- tabbar text color -->
<item name="android:actionBarTabTextStyle">@style/Vector.TabText</item> <item name="android:actionBarTabTextStyle">@style/Vector.TabText</item>
<item name="actionBarTabTextStyle">@style/Vector.TabText</item> <item name="actionBarTabTextStyle">@style/Vector.TabText</item>
<item name="tab_bar_selected_background_color">@color/tab_bar_selected_background_color_light</item>
<item name="tab_bar_unselected_background_color">@color/tab_bar_unselected_background_color_light</item>
<!-- Preference --> <!-- Preference -->
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
@ -180,9 +183,4 @@
<style name="AppTheme.Light" parent="AppTheme.Base.Light" /> <style name="AppTheme.Light" parent="AppTheme.Base.Light" />
<style name="Vector.TabView.Light" parent="Widget.AppCompat.ActionBar.TabView">
<item name="android:background">@drawable/vector_tabbar_background_light</item>
<item name="background">@drawable/vector_tabbar_background_light</item>
</style>
</resources> </resources>

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

@ -85,14 +85,13 @@
<!-- no divider --> <!-- no divider -->
<item name="android:actionBarDivider">@null</item> <item name="android:actionBarDivider">@null</item>
<!-- tabbar background -->
<item name="android:actionBarTabStyle">@style/Vector.TabView.Status</item>
<item name="actionBarTabStyle">@style/Vector.TabView.Status</item>
<!-- tabbar text color --> <!-- tabbar text color -->
<item name="android:actionBarTabTextStyle">@style/Vector.TabText</item> <item name="android:actionBarTabTextStyle">@style/Vector.TabText</item>
<item name="actionBarTabTextStyle">@style/Vector.TabText</item> <item name="actionBarTabTextStyle">@style/Vector.TabText</item>
<item name="tab_bar_selected_background_color">@color/tab_bar_selected_background_color_status</item>
<item name="tab_bar_unselected_background_color">@color/tab_bar_unselected_background_color_status</item>
<!-- Preference --> <!-- Preference -->
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
@ -101,9 +100,4 @@
<style name="AppTheme.Status" parent="AppTheme.Base.Status" /> <style name="AppTheme.Status" parent="AppTheme.Base.Status" />
<style name="Vector.TabView.Status" parent="Widget.AppCompat.ActionBar.TabView">
<item name="android:background">@drawable/vector_tabbar_background_status</item>
<item name="background">@drawable/vector_tabbar_background_status</item>
</style>
</resources> </resources>