Update SC themes to v1.0.5

This commit is contained in:
SpiritCroc 2020-08-22 14:55:18 +02:00
parent 3ea56d5e53
commit 94eee632ba
12 changed files with 15 additions and 200 deletions

View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<!-- required on android < 4.2 devices -->
<solid android:color="@android:color/transparent" />
<stroke
android:width="4dp"
android:color="@color/direct_chat_ring_color_sc" />
</shape>

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_sc" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_sc" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
<!-- Focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_sc" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_sc" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
<!-- Pressed -->
<!-- Non focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_sc" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_sc" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
<!-- Focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_sc" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_sc" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
</selector>

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_sc_light" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_sc_light" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
<!-- Focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_sc_light" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_sc_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_sc_light" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_sc_light" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
<!-- Focused states -->
<item android:drawable="@drawable/vector_tabbar_unselected_background_sc_light" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
<item android:drawable="@drawable/vector_tabbar_selected_background_sc_light" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
</selector>

View File

@ -2,7 +2,7 @@
<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/riotx_accent" /> <solid android:color="?colorAccent" />
<padding android:bottom="2dp" /> <padding android:bottom="2dp" />
</shape> </shape>
</item> </item>

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_sc" />
<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/background_dark_sc" />
</shape>
</item>
</layer-list>

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="?colorAccent" />
</shape>
</item>
</layer-list>

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/background_dark_sc" />
</shape>
</item>
</layer-list>

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="?colorAccent" />
</shape>
</item>
</layer-list>

View File

@ -1,23 +1,23 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="AppTheme.SC.v23" parent="AppTheme.SC.v21"> <style name="AppTheme.SC.v23" parent="AppTheme.Base.SC">
<item name="android:windowLightStatusBar">false</item> <item name="android:windowLightStatusBar">false</item>
</style> </style>
<style name="AppTheme.SC.Dark.v23" parent="AppTheme.SC.Dark.v21"> <style name="AppTheme.SC.Dark.v23" parent="AppTheme.Base.SC.Dark">
<item name="android:windowLightStatusBar">false</item> <item name="android:windowLightStatusBar">false</item>
</style> </style>
<style name="AppTheme.SC.Colored.v23" parent="AppTheme.SC.Colored.v21"> <style name="AppTheme.SC.Colored.v23" parent="AppTheme.Base.SC.Colored">
<item name="android:windowLightStatusBar">false</item> <item name="android:windowLightStatusBar">false</item>
</style> </style>
<style name="AppTheme.SC.Dark.Colored.v23" parent="AppTheme.SC.Dark.Colored.v21"> <style name="AppTheme.SC.Dark.Colored.v23" parent="AppTheme.Base.SC.Dark.Colored">
<item name="android:windowLightStatusBar">false</item> <item name="android:windowLightStatusBar">false</item>
</style> </style>
<style name="AppTheme.SC.Light.v23" parent="AppTheme.SC.Light.v21"> <style name="AppTheme.SC.Light.v23" parent="AppTheme.Base.SC.Light">
<item name="android:statusBarColor">@color/riotx_header_panel_background_light</item> <item name="android:statusBarColor">@color/riotx_header_panel_background_light</item>
<item name="android:windowLightStatusBar">true</item> <item name="android:windowLightStatusBar">true</item>
</style> </style>

View File

@ -19,16 +19,6 @@
<item name="android:textColor">?colorAccent</item> <item name="android:textColor">?colorAccent</item>
</style> </style>
<style name="Vector.TabView.SC" parent="Vector.TabView.Dark">
<item name="android:background">@drawable/vector_tabbar_background_sc</item>
<item name="background">@drawable/vector_tabbar_background_sc</item>
</style>
<style name="Vector.TabView.Light.SC" parent="Vector.TabView.Dark">
<item name="android:background">@drawable/vector_tabbar_background_sc_light</item>
<item name="background">@drawable/vector_tabbar_background_sc_light</item>
</style>
<!-- custom action bar --> <!-- custom action bar -->
<style name="Vector.Styled.ActionBar.SC"> <style name="Vector.Styled.ActionBar.SC">
<item name="android:background">@color/background_dark_sc</item> <item name="android:background">@color/background_dark_sc</item>

View File

@ -79,36 +79,25 @@
<item name="vctr_toolbar_secondary_text_color">@color/text_color_secondary_sc</item> <item name="vctr_toolbar_secondary_text_color">@color/text_color_secondary_sc</item>
<item name="vctr_toolbar_link_text_color">@color/link_color_dark</item> <item name="vctr_toolbar_link_text_color">@color/link_color_dark</item>
<!-- application bar text hint color -->
<item name="vctr_primary_hint_text_color">@color/text_color_secondary_sc</item>
<item name="vctr_tab_home">@color/background_dark_sc</item>
<item name="vctr_tab_home_secondary">@color/background_black_sc</item>
<!-- default text colors --> <!-- default text colors -->
<item name="vctr_default_text_hint_color">@color/text_color_disabled_sc</item> <item name="vctr_default_text_hint_color">@color/text_color_disabled_sc</item>
<!-- room message colors --> <!-- room message colors -->
<!--Unread Room Indent--> <!--Unread Room Indent-->
<item name="vctr_unread_room_indent_color">@color/background_dark_sc</item>
<item name="vctr_notice_secondary">@color/text_color_secondary_sc</item> <item name="vctr_notice_secondary">@color/text_color_secondary_sc</item>
<item name="vctr_unsent_message_text_color">@color/vector_fuchsia_color</item> <item name="vctr_unsent_message_text_color">@color/vector_fuchsia_color</item>
<item name="vctr_message_text_color">@android:color/white</item> <item name="vctr_message_text_color">@android:color/white</item>
<item name="vctr_notice_text_color">@color/text_color_primary_sc</item> <item name="vctr_notice_text_color">@color/text_color_primary_sc</item>
<item name="vctr_encrypting_message_text_color">@color/accent_sc</item> <item name="vctr_encrypting_message_text_color">@color/accent_sc</item>
<item name="vctr_sending_message_text_color">@color/text_color_secondary_sc</item> <item name="vctr_sending_message_text_color">@color/text_color_secondary_sc</item>
<item name="vctr_highlighted_message_text_color">@color/vector_fuchsia_color</item>
<item name="vctr_highlighted_searched_message_text_color">@color/accent_sc</item>
<item name="vctr_search_mode_room_name_text_color">@color/secondary_color</item>
<item name="vctr_unread_marker_line_color">@color/accent_sc</item>
<item name="vctr_markdown_block_background_color">@android:color/black</item> <item name="vctr_markdown_block_background_color">@android:color/black</item>
<item name="vctr_spoiler_background_color">#FFFFFFFF</item> <item name="vctr_spoiler_background_color">#FFFFFFFF</item>
<item name="vctr_room_activity_divider_color">#565656</item>
<item name="riot_primary_text_color">@color/text_color_primary_sc</item>
<item name="riot_primary_text_color_disabled">@color/text_color_disabled_sc</item>
<!-- tab bar colors --> <!-- tab bar colors -->
<item name="vctr_tab_bar_inverted_background_color">?colorPrimary</item> <item name="vctr_tab_bar_inverted_background_color">?colorPrimary</item>
<item name="vctr_tab_bar_selected_background_color">@color/background_dark_sc</item>
<item name="vctr_tab_bar_unselected_background_color">@color/background_dark_sc</item>
<!-- list colors --> <!-- list colors -->
<!--Header/Panel Background--> <!--Header/Panel Background-->
@ -121,20 +110,9 @@
<item name="riotx_list_bottom_sheet_divider_color">#80ffffff</item> <item name="riotx_list_bottom_sheet_divider_color">#80ffffff</item>
<item name="vctr_list_divider_color">@color/background_dark_sc</item> <item name="vctr_list_divider_color">@color/background_dark_sc</item>
<item name="vctr_redacted_message_color">@color/text_color_disabled_sc</item>
<!-- gradient on the home bottom -->
<item name="vctr_activity_bottom_gradient_color">#80000000</item>
<!-- outgoing call background color --> <!-- outgoing call background color -->
<item name="vctr_pending_outgoing_view_background_color">#33FFFFFF</item> <item name="vctr_pending_outgoing_view_background_color">#33FFFFFF</item>
<!-- multi selection member background color -->
<item name="vctr_multi_selection_background_color">#424242</item>
<!-- sliding menu icon colors -->
<item name="vctr_home_navigation_icon_color">@color/text_color_primary_sc</item>
<!-- room notification text color (typing, unsent...) --> <!-- room notification text color (typing, unsent...) -->
<!--Notice (secondary)--> <!--Notice (secondary)-->
<item name="vctr_room_notification_text_color">@color/text_color_secondary_sc</item> <item name="vctr_room_notification_text_color">@color/text_color_secondary_sc</item>
@ -142,28 +120,8 @@
<!-- icon colors --> <!-- icon colors -->
<item name="vctr_settings_icon_tint_color">@android:color/white</item> <item name="vctr_settings_icon_tint_color">@android:color/white</item>
<item name="vctr_icon_tint_on_light_action_bar_color">@color/accent_sc</item> <item name="vctr_icon_tint_on_light_action_bar_color">@color/accent_sc</item>
<item name="vctr_icon_tint_on_dark_action_bar_color">@android:color/white</item>
<!-- theses colours are requested a background cannot be set by an ?att on android < 5 --> <item name="list_divider_color">@color/list_divider_color_sc</item>
<!-- dedicated drawables are created for each theme -->
<item name="vctr_line_divider">@drawable/line_divider_sc</item>
<item name="vctr_shadow_bottom">@drawable/shadow_bottom_dark</item>
<item name="vctr_shadow_top">@drawable/shadow_top_dark</item>
<item name="vctr_tabbar_selected_background">@drawable/vector_tabbar_selected_background_sc</item>
<item name="vctr_tabbar_unselected_background">@drawable/vector_tabbar_unselected_background_sc</item>
<item name="vctr_tabbar_background">@drawable/vector_tabbar_background_sc</item>
<item name="vctr_pill_background_user_id">@drawable/pill_background_user_id_sc</item>
<item name="vctr_pill_background_room_alias">@drawable/pill_background_room_alias_sc</item>
<item name="vctr_pill_text_color_user_id">@android:color/white</item>
<item name="vctr_pill_text_color_room_alias">@color/text_color_primary_sc</item>
<item name="vctr_pill_receipt">@drawable/pill_receipt_sc</item>
<item name="vctr_direct_chat_circle">@drawable/direct_chat_circle_sc</item>
<item name="vctr_widget_banner_background">@color/background_floating_sc</item>
<!-- activities background --> <!-- activities background -->
<item name="android:windowBackground">?riotx_background</item> <item name="android:windowBackground">?riotx_background</item>
@ -184,13 +142,16 @@
<item name="android:actionBarDivider">@null</item> <item name="android:actionBarDivider">@null</item>
<!-- tabbar background --> <!-- tabbar background -->
<item name="android:actionBarTabStyle">@style/Vector.TabView.SC</item> <item name="android:actionBarTabStyle">@style/Vector.TabView</item>
<item name="actionBarTabStyle">@style/Vector.TabView.SC</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/background_dark_sc</item>
<item name="tab_bar_unselected_background_color">@color/background_dark_sc</item>
<!-- Preference --> <!-- Preference -->
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>

View File

@ -13,36 +13,15 @@
<item name="materialButtonStyle">@style/VectorButtonStyle.SC</item> <item name="materialButtonStyle">@style/VectorButtonStyle.SC</item>
<item name="alertDialogTheme">@style/VectorAlertDialogStyleLight.SC</item> <item name="alertDialogTheme">@style/VectorAlertDialogStyleLight.SC</item>
<item name="vctr_tab_home">@color/accent_sc</item>
<item name="vctr_encrypting_message_text_color">@color/accent_sc</item> <item name="vctr_encrypting_message_text_color">@color/accent_sc</item>
<item name="vctr_highlighted_searched_message_text_color">@color/accent_sc</item>
<item name="vctr_unread_marker_line_color">@color/accent_sc</item>
<!-- tab bar colors -->
<item name="vctr_tab_bar_selected_background_color">@color/accent_sc</item>
<item name="vctr_tab_bar_unselected_background_color">@color/accent_sc</item>
<!-- icon colors --> <!-- icon colors -->
<item name="vctr_icon_tint_on_light_action_bar_color">@color/accent_sc</item> <item name="vctr_icon_tint_on_light_action_bar_color">@color/accent_sc</item>
<item name="vctr_tabbar_selected_background">
@drawable/vector_tabbar_selected_background_sc_light
</item>
<item name="vctr_tabbar_unselected_background">
@drawable/vector_tabbar_unselected_background_sc_light
</item>
<item name="vctr_direct_chat_circle">@drawable/direct_chat_circle_sc</item>
<!-- custom action bar --> <!-- custom action bar -->
<item name="android:actionBarStyle">@style/Vector.Styled.ActionBar.SC</item> <item name="android:actionBarStyle">@style/Vector.Styled.ActionBar.SC</item>
<item name="actionBarStyle">@style/Vector.Styled.ActionBar.SC</item> <item name="actionBarStyle">@style/Vector.Styled.ActionBar.SC</item>
<!-- tabbar background -->
<item name="android:actionBarTabStyle">@style/Vector.TabView.Light.SC</item>
<item name="actionBarTabStyle">@style/Vector.TabView.Light.SC</item>
<item name="sc_message_bg_incoming">#FFEEEEEE</item> <item name="sc_message_bg_incoming">#FFEEEEEE</item>
<item name="sc_message_bg_outgoing">@color/accent_sc_alpha12</item> <item name="sc_message_bg_outgoing">@color/accent_sc_alpha12</item>
<item name="riotx_positive_accent">@color/accent_sc</item> <item name="riotx_positive_accent">@color/accent_sc</item>