forked from GitHub-Mirror/riotX-android
Merge branch 'develop' into feature/crypto
This commit is contained in:
ganfra
@ -4,6 +4,7 @@
|
||||
<declare-styleable name="VectorStyles">
|
||||
|
||||
<attr name="vctr_bottom_nav_background_color" format="color" />
|
||||
<attr name="vctr_bottom_nav_background_border_color" format="color" />
|
||||
|
||||
<!-- waiting view background -->
|
||||
<attr name="vctr_waiting_background_color" format="color" />
|
||||
|
||||
13
vector/src/main/res/values/attrs_state_button.xml
Normal file
13
vector/src/main/res/values/attrs_state_button.xml
Normal file
@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<declare-styleable name="ButtonStateView">
|
||||
|
||||
<attr name="bsv_use_flat_button" format="boolean" />
|
||||
<attr name="bsv_loaded_image_src" format="reference" />
|
||||
<attr name="bsv_button_text" format="reference|string" />
|
||||
|
||||
</declare-styleable>
|
||||
|
||||
|
||||
</resources>
|
||||
@ -1,21 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="pale_grey">#f2f5f8</color>
|
||||
<color name="dark">#2e3649</color>
|
||||
<color name="pale_teal">#7ac9a1</color>
|
||||
<color name="black">#212121</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>
|
||||
<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="brown_grey">#a5a5a5</color>
|
||||
<color name="grey_lynch">#61708B</color>
|
||||
|
||||
</resources>
|
||||
@ -19,6 +19,7 @@
|
||||
<color name="tab_rooms">@color/accent_color_light</color>
|
||||
<color name="tab_rooms_secondary">#5EA584</color>
|
||||
<color name="tab_groups">#a6d0e5</color>
|
||||
|
||||
<color name="tab_groups_secondary">#81bddb</color>
|
||||
|
||||
<!-- color of the direct chat avatar ring (it's 50% of color accent) -->
|
||||
@ -40,7 +41,7 @@
|
||||
<!--Default/Android Status Bar-->
|
||||
<color name="primary_color_dark_light">#FF1A2027</color>
|
||||
<!--Default/Base-->
|
||||
<color name="primary_color_light">#FF27303A</color>
|
||||
<color name="primary_color_light">#03b381</color>
|
||||
<!--Default/Accent-->
|
||||
<color name="accent_color_light">#03b381</color>
|
||||
|
||||
@ -112,11 +113,6 @@
|
||||
<color name="soft_resource_limit_exceeded">#2f9edb</color>
|
||||
<color name="hard_resource_limit_exceeded">@color/vector_fuchsia_color</color>
|
||||
|
||||
<!-- Avatar colors -->
|
||||
<color name="avatar_color_1">#03b381</color>
|
||||
<color name="avatar_color_2">#368bd6</color>
|
||||
<color name="avatar_color_3">#ac3ba8</color>
|
||||
|
||||
<!-- Password Strength bar colors -->
|
||||
<color name="password_strength_bar_weak">#FFF56679</color>
|
||||
<color name="password_strength_bar_low">#FFFFC666</color>
|
||||
@ -128,16 +124,6 @@
|
||||
<color name="button_enabled_text_color">#FFFFFFFF</color>
|
||||
<color name="button_disabled_text_color">#FF7F7F7F</color>
|
||||
|
||||
<!-- User names color -->
|
||||
<color name="username_1">#368bd6</color>
|
||||
<color name="username_2">#ac3ba8</color>
|
||||
<color name="username_3">#03b381</color>
|
||||
<color name="username_4">#e64f7a</color>
|
||||
<color name="username_5">#ff812d</color>
|
||||
<color name="username_6">#2dc2c5</color>
|
||||
<color name="username_7">#5c56f5</color>
|
||||
<color name="username_8">#74d12c</color>
|
||||
|
||||
<!-- Link color -->
|
||||
<color name="link_color_light">#368BD6</color>
|
||||
<color name="link_color_dark">#368BD6</color>
|
||||
|
||||
151
vector/src/main/res/values/colors_riotx.xml
Normal file
151
vector/src/main/res/values/colors_riotx.xml
Normal file
@ -0,0 +1,151 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<!-- Source: https://zpl.io/aBKw9Mk -->
|
||||
|
||||
<!-- Accents -->
|
||||
<color name="riotx_accent">#FF03B381</color>
|
||||
|
||||
<color name="riotx_notice">#FFFF4B55</color>
|
||||
<color name="riotx_notice_secondary">#FF61708B</color>
|
||||
<color name="riotx_links">#FF368BD6</color>
|
||||
|
||||
<color name="riotx_avatar_fill_1">#FF03b381</color>
|
||||
<color name="riotx_avatar_fill_2">#FF368bd6</color>
|
||||
<color name="riotx_avatar_fill_3">#FFac3ba8</color>
|
||||
|
||||
<color name="riotx_username_1">#368bd6</color>
|
||||
<color name="riotx_username_2">#ac3ba8</color>
|
||||
<color name="riotx_username_3">#03b381</color>
|
||||
<color name="riotx_username_4">#e64f7a</color>
|
||||
<color name="riotx_username_5">#ff812d</color>
|
||||
<color name="riotx_username_6">#2dc2c5</color>
|
||||
<color name="riotx_username_7">#5c56f5</color>
|
||||
<color name="riotx_username_8">#74d12c</color>
|
||||
|
||||
<!-- Other usefull color -->
|
||||
<color name="black">#FF000000</color>
|
||||
<color name="white">#FFFFFFFF</color>
|
||||
|
||||
<!-- Palette: format fo naming:
|
||||
'riotx_<name in the palette snake case>_<theme>'
|
||||
-->
|
||||
|
||||
<attr name="riotx_background" format="color" />
|
||||
<color name="riotx_background_light">#FFFFFFFF</color>
|
||||
<color name="riotx_background_dark">#FF181B21</color>
|
||||
<color name="riotx_background_black">#FF000000</color>
|
||||
|
||||
<attr name="riotx_base" format="color" />
|
||||
<color name="riotx_base_light">#FF27303A</color>
|
||||
<color name="riotx_base_dark">#FF15171B</color>
|
||||
<color name="riotx_base_black">#FF060708</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" />
|
||||
<color name="riotx_search_background_mobile_light">#FFFFFFFF</color>
|
||||
<color name="riotx_search_background_mobile_dark">#FF181B21</color>
|
||||
<color name="riotx_search_background_mobile_black">#FF181B21</color>
|
||||
|
||||
<attr name="riotx_header_panel_background" format="color" />
|
||||
<color name="riotx_header_panel_background_light">#FFF3F8FD</color>
|
||||
<color name="riotx_header_panel_background_dark">#FF22262E</color>
|
||||
<color name="riotx_header_panel_background_black">#FF090A0C</color>
|
||||
|
||||
<attr name="riotx_header_panel_border_mobile" format="color" />
|
||||
<color name="riotx_header_panel_border_mobile_light">#FFE9EDF1</color>
|
||||
<color name="riotx_header_panel_border_mobile_dark">#FF181B21</color>
|
||||
<color name="riotx_header_panel_border_mobile_black">#FF0D0F12</color>
|
||||
|
||||
<attr name="riotx_header_panel_text_primary" format="color" />
|
||||
<color name="riotx_header_panel_text_primary_light">#FF61708B</color>
|
||||
<color name="riotx_header_panel_text_primary_dark">#FFA1B2D1</color>
|
||||
<color name="riotx_header_panel_text_primary_black">#FFA1B2D1</color>
|
||||
|
||||
<attr name="riotx_header_panel_text_secondary" format="color" />
|
||||
<color name="riotx_header_panel_text_secondary_light">#FFC8C8CD</color>
|
||||
<color name="riotx_header_panel_text_secondary_dark">#FFC8C8CD</color>
|
||||
<color name="riotx_header_panel_text_secondary_black">#FFC8C8CD</color>
|
||||
|
||||
<attr name="riotx_text_primary" format="color" />
|
||||
<color name="riotx_text_primary_light">#FF2E2F32</color>
|
||||
<color name="riotx_text_primary_dark">#FFEDF3FF</color>
|
||||
<color name="riotx_text_primary_black">#FFEDF3FF</color>
|
||||
|
||||
<attr name="riotx_text_secondary" format="color" />
|
||||
<color name="riotx_text_secondary_light">#FF9E9E9E</color>
|
||||
<color name="riotx_text_secondary_dark">#FFA1B2D1</color>
|
||||
<color name="riotx_text_secondary_black">#FFA1B2D1</color>
|
||||
|
||||
<attr name="riotx_android_secondary" format="color" />
|
||||
<color name="riotx_android_secondary_light">#FF7E899C</color>
|
||||
<color name="riotx_android_secondary_dark">#FF7E899C</color>
|
||||
<color name="riotx_android_secondary_black">#FF7E899C</color>
|
||||
|
||||
<attr name="riotx_search_placeholder" format="color" />
|
||||
<color name="riotx_search_placeholder_light">#FF61708B</color>
|
||||
<color name="riotx_search_placeholder_dark">#FF61708B</color>
|
||||
<color name="riotx_search_placeholder_black">#FF61708B</color>
|
||||
|
||||
<attr name="riotx_room_highlight" format="color" />
|
||||
<color name="riotx_room_highlight_light">#FFFFFFFF</color>
|
||||
<color name="riotx_room_highlight_dark">#FF343446</color>
|
||||
<color name="riotx_room_highlight_black">#FF22262E</color>
|
||||
|
||||
<attr name="riotx_unread_room_indent" format="color" />
|
||||
<color name="riotx_unread_room_indent_light">#FF2E3648</color>
|
||||
<color name="riotx_unread_room_indent_dark">#FF2E3648</color>
|
||||
<color name="riotx_unread_room_indent_black">#FF2E3648</color>
|
||||
|
||||
<attr name="riotx_android_status_bar" format="color" />
|
||||
<color name="riotx_android_status_bar_light">#FF2E3648</color>
|
||||
<color name="riotx_android_status_bar_dark">#FF0D0E10</color>
|
||||
<color name="riotx_android_status_bar_black">#FF000000</color>
|
||||
|
||||
<attr name="riotx_line_break_mobile" format="color" />
|
||||
<color name="riotx_line_break_mobile_light">#FFEEEFEF</color>
|
||||
<color name="riotx_line_break_mobile_dark">#FF61708B</color>
|
||||
<color name="riotx_line_break_mobile_black">#FF22262E</color>
|
||||
|
||||
<!-- 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">#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>
|
||||
@ -26,4 +26,5 @@
|
||||
<dimen name="pill_avatar_size">16dp</dimen>
|
||||
<dimen name="pill_min_height">20dp</dimen>
|
||||
<dimen name="pill_text_padding">4dp</dimen>
|
||||
|
||||
</resources>
|
||||
@ -4,11 +4,40 @@
|
||||
<!-- Strings not defined in Riot -->
|
||||
<string name="global_retry">"Retry"</string>
|
||||
<string name="room_list_empty">"Join a room to start using the app."</string>
|
||||
<string name="send_you_invite">"Sent you an invitation"</string>
|
||||
<string name="invited_by">Invited by %s</string>
|
||||
|
||||
<string name="room_list_catchup_empty_title">You’re all caught up!</string>
|
||||
<string name="room_list_catchup_empty_body">You have no more unread messages</string>
|
||||
<string name="room_list_catchup_welcome_title">Welcome home!</string>
|
||||
<string name="room_list_catchup_welcome_body">Catch up on unread messages here</string>
|
||||
<string name="room_list_people_empty_title">Conversations</string>
|
||||
<string name="room_list_people_empty_body">Your direct message conversation will be displayed here</string>
|
||||
<string name="room_list_rooms_empty_title">Rooms</string>
|
||||
<string name="room_list_rooms_empty_body">Your rooms will be displayed here</string>
|
||||
|
||||
<string name="title_activity_emoji_reaction_picker">Reactions</string>
|
||||
<string name="reactions_agree">Agree</string>
|
||||
<string name="reactions_like">Like</string>
|
||||
<string name="message_add_reaction">Add Reaction</string>
|
||||
|
||||
<string name="event_redacted_by_user_reason">Event deleted by user</string>
|
||||
<string name="event_redacted_by_admin_reason">Event moderated by room admin</string>
|
||||
<string name="last_edited_info_message">Last edited by %s on %s</string>
|
||||
|
||||
|
||||
<string name="malformed_message">Malformed event, cannot display</string>
|
||||
<string name="create_new_room">Create New Room</string>
|
||||
<string name="error_no_network">No network. Please check your Internet connection.</string>
|
||||
<string name="action_change">"Change"</string>
|
||||
<string name="change_room_directory_network">"Change network"</string>
|
||||
<string name="please_wait">"Please wait…"</string>
|
||||
<string name="group_all_communities">"All Communities"</string>
|
||||
|
||||
<string name="room_preview_no_preview">"This room can't be previewed"</string>
|
||||
<string name="room_preview_world_readable_room_not_supported_yet">"The preview of world-readable room is not supported yet in RiotX"</string>
|
||||
|
||||
<string name="fab_menu_create_room">"Rooms"</string>
|
||||
<string name="fab_menu_create_chat">"Direct Messages"</string>
|
||||
|
||||
</resources>
|
||||
@ -3,23 +3,12 @@
|
||||
|
||||
<!-- ************************ Common items ************************ -->
|
||||
|
||||
<!-- Launcher Theme, only used for VectorLauncherActivity (will be use even before the Activity is started) -->
|
||||
<style name="AppTheme.Launcher" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="android:windowBackground">@drawable/splash</item>
|
||||
|
||||
<item name="colorPrimaryDark">@color/primary_color_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- toolbar styles-->
|
||||
<style name="VectorToolbarStyle" parent="Widget.MaterialComponents.Toolbar">
|
||||
<item name="android:background">?colorPrimary</item>
|
||||
<item name="background">?colorPrimary</item>
|
||||
|
||||
<!-- main text -->
|
||||
<item name="titleTextAppearance">@style/Vector.Toolbar.Title</item>
|
||||
<item name="subtitleTextAppearance">@style/Vector.Toolbar.SubTitle</item>
|
||||
|
||||
<item name="theme">@style/VectorToolbarTheme</item>
|
||||
<item name="android:background">?riotx_background</item>
|
||||
</style>
|
||||
|
||||
<style name="VectorToolbarStyle.Group">
|
||||
@ -27,23 +16,33 @@
|
||||
<item name="background">@color/tab_groups</item>
|
||||
</style>
|
||||
|
||||
<style name="VectorToolbarTheme">
|
||||
<!-- toolbar icons -->
|
||||
<item name="colorControlNormal">@android:color/white</item>
|
||||
</style>
|
||||
|
||||
<style name="Vector.Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
|
||||
<item name="android:textSize">20sp</item>
|
||||
<item name="android:textColor">?attr/vctr_toolbar_primary_text_color</item>
|
||||
<item name="android:fontFamily">"sans-serif-medium"</item>
|
||||
</style>
|
||||
|
||||
<style name="Vector.Toolbar.SubTitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
|
||||
<item name="android:textSize">16sp</item>
|
||||
<item name="android:textColor">?attr/vctr_toolbar_primary_text_color</item>
|
||||
<item name="android:fontFamily">"sans-serif"</item>
|
||||
</style>
|
||||
|
||||
<!-- Alert Dialog: Button color are not colorAccent by default -->
|
||||
<style name="VectorAlertDialogStyleLight" parent="Theme.MaterialComponents.Light.Dialog.Alert">
|
||||
<item name="buttonBarButtonStyle">@style/VectorAlertDialogButtonStyle</item>
|
||||
</style>
|
||||
|
||||
<style name="VectorAlertDialogStyleDark" parent="Theme.MaterialComponents.Dialog.Alert">
|
||||
<item name="buttonBarButtonStyle">@style/VectorAlertDialogButtonStyle</item>
|
||||
</style>
|
||||
|
||||
<style name="VectorAlertDialogButtonStyle" parent="Widget.MaterialComponents.Button.TextButton">
|
||||
<item name="android:textColor">@color/riotx_accent</item>
|
||||
</style>
|
||||
|
||||
|
||||
<!-- TextInputLayout -->
|
||||
<style name="VectorTextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
|
||||
|
||||
<!-- tabbar text color -->
|
||||
<style name="Vector.TabText" parent="Widget.AppCompat.ActionBar.TabText">
|
||||
<item name="android:textColor">@android:color/white</item>
|
||||
@ -66,12 +65,12 @@
|
||||
</style>
|
||||
|
||||
<!-- actionbar icons color -->
|
||||
<style name="Vector.ActionBarTheme" parent="ThemeOverlay.AppCompat.ActionBar">
|
||||
<style name="Vector.ActionBarTheme" parent="ThemeOverlay.MaterialComponents.ActionBar">
|
||||
<item name="colorControlNormal">@android:color/white</item>
|
||||
</style>
|
||||
|
||||
<!-- custom action bar -->
|
||||
<style name="Vector.Styled.ActionBar" parent="Widget.AppCompat.Toolbar">
|
||||
<style name="Vector.Styled.ActionBar" parent="Widget.MaterialComponents.Toolbar">
|
||||
<item name="android:background">?colorPrimary</item>
|
||||
<item name="background">?colorPrimary</item>
|
||||
|
||||
@ -114,7 +113,8 @@
|
||||
Widget.AppCompat.Button.Colored, which sets the button color to colorAccent,
|
||||
using colorControlHighlight as an overlay for focused and pressed states.
|
||||
-->
|
||||
<style name="VectorButtonStyle" parent="Widget.AppCompat.Button.Colored">
|
||||
<style name="VectorButtonStyle" parent="Widget.MaterialComponents.Button">
|
||||
<item name="backgroundTint">?colorAccent</item>
|
||||
<item name="android:paddingLeft">16dp</item>
|
||||
<item name="android:paddingRight">16dp</item>
|
||||
<item name="android:minWidth">94dp</item>
|
||||
@ -128,11 +128,13 @@
|
||||
|
||||
<!--Widget.AppCompat.Button.Borderless.Colored, which sets the text color to colorAccent,
|
||||
using colorControlHighlight as an overlay for focused and pressed states.-->
|
||||
<style name="VectorButtonStyleFlat" parent="Widget.AppCompat.Button.Borderless.Colored">
|
||||
<style name="VectorButtonStyleFlat" parent="Widget.MaterialComponents.Button.TextButton">
|
||||
<item name="android:textStyle">bold</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<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="colorControlHighlight">?colorAccent</item>
|
||||
</style>
|
||||
|
||||
@ -260,7 +262,7 @@
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_marginStart">8dp</item>
|
||||
<item name="android:layout_marginLeft">8dp</item>
|
||||
<item name="android:layout_marginBottom">8dp</item>
|
||||
<item name="android:layout_marginBottom">4dp</item>
|
||||
<item name="android:layout_marginTop">4dp</item>
|
||||
<item name="layout_constraintBottom_toBottomOf">parent</item>
|
||||
<item name="layout_constraintEnd_toEndOf">parent</item>
|
||||
@ -276,4 +278,18 @@
|
||||
<item name="layout_constraintTop_toBottomOf">@id/messageMemberNameView</item>
|
||||
<item name="layout_constraintBottom_toTopOf">@id/messageBottomInfo</item>
|
||||
</style>
|
||||
|
||||
<style name="VectorLabel">
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:paddingLeft">12dp</item>
|
||||
<item name="android:paddingRight">12dp</item>
|
||||
<item name="android:paddingTop">4dp</item>
|
||||
<item name="android:paddingBottom">4dp</item>
|
||||
<item name="android:textSize">15sp</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>
|
||||
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<style name="Widget.Button" parent="Widget.AppCompat.Button">
|
||||
<item name="android:minHeight">48dp</item>
|
||||
<item name="android:background">?attr/colorAccent</item>
|
||||
<item name="android:textColor">@android:color/white</item>
|
||||
</style>
|
||||
|
||||
|
||||
</resources>
|
||||
@ -1,5 +1,40 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<?xml version="1.0" encoding="utf-8"?><!--
|
||||
~ Copyright 2019 New Vector Ltd
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
-->
|
||||
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<style name="TextAppearance.Vector.Title" parent="TextAppearance.AppCompat">
|
||||
<item name="android:textSize">16sp</item>
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textStyle">normal</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">?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">?riotx_text_primary</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
@ -6,8 +6,57 @@
|
||||
<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>
|
||||
<!-- Riotx attribute for palette -->
|
||||
<item name="riotx_background">@color/riotx_background_black</item>
|
||||
<item name="riotx_base">@color/riotx_base_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_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_text_primary">@color/riotx_header_panel_text_primary_black</item>
|
||||
<item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_black</item>
|
||||
<item name="riotx_text_primary">@color/riotx_text_primary_black</item>
|
||||
<item name="riotx_text_secondary">@color/riotx_text_secondary_black</item>
|
||||
<item name="riotx_android_secondary">@color/riotx_android_secondary_black</item>
|
||||
<item name="riotx_search_placeholder">@color/riotx_search_placeholder_black</item>
|
||||
<item name="riotx_room_highlight">@color/riotx_room_highlight_black</item>
|
||||
<item name="riotx_unread_room_indent">@color/riotx_unread_room_indent_black</item>
|
||||
<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>
|
||||
<!--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/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="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/VectorAlertDialogStyleDark</item>
|
||||
|
||||
<item name="android:textColorLink">@color/riotx_links</item>
|
||||
|
||||
<!-- Menu text color -->
|
||||
<!--item name="android:actionMenuTextColor">#FFFFFFFF</item-->
|
||||
|
||||
<!-- list colors -->
|
||||
<!--Header/Panel Background-->
|
||||
@ -21,95 +70,16 @@
|
||||
<!-- 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 -->
|
||||
<item name="android:windowBackground">@color/riot_primary_background_color_black</item>
|
||||
<item name="vctr_bottom_nav_background_color">@color/primary_color_black</item>
|
||||
<item name="vctr_bottom_nav_background_border_color">#FFE9EDF1</item>
|
||||
|
||||
<item name="vctr_direct_chat_circle">@drawable/direct_chat_circle_black</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.Black" parent="AppTheme.Base.Black" />
|
||||
|
||||
<style name="Theme.Vector.Lock.Black" parent="Theme.Vector.Lock.Dark">
|
||||
<item name="colorPrimary">@color/riot_primary_background_color_black</item>
|
||||
<item name="android:colorBackground">@color/riot_primary_background_color_black</item>
|
||||
</style>
|
||||
|
||||
<!-- home activity -->
|
||||
<style name="HomeActivityTheme.Black" parent="AppTheme.Black">
|
||||
<item name="editTextColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:editTextColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:textColorHint">?attr/vctr_default_text_hint_color</item>
|
||||
</style>
|
||||
|
||||
<!-- call activity -->
|
||||
<style name="CallActivityTheme.Black" parent="AppTheme.Black">
|
||||
<!-- status bar color -->
|
||||
<item name="colorPrimaryDark">@android:color/black</item>
|
||||
</style>
|
||||
|
||||
<!-- NoActionBar + FullScreen -->
|
||||
<style name="AppTheme.NoActionBar.FullScreen.Black" parent="AppTheme.Black">
|
||||
<item name="android:windowFullscreen">true</item>
|
||||
<!-- activities background -->
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
</style>
|
||||
|
||||
<!-- Picker activities -->
|
||||
<style name="CountryPickerTheme.Black" parent="AppTheme.Black">
|
||||
<item name="editTextColor">@android:color/white</item>
|
||||
<item name="android:editTextColor">@android:color/white</item>
|
||||
<item name="android:textColorHint">?attr/vctr_activity_bottom_gradient_color</item>
|
||||
</style>
|
||||
|
||||
<!-- searches activity -->
|
||||
<style name="SearchesAppTheme.Black" parent="AppTheme.Black">
|
||||
<!-- custom action bar -->
|
||||
<item name="android:actionBarStyle">@style/VectorSearches.Styled.ActionBar</item>
|
||||
<item name="actionBarStyle">@style/VectorSearches.Styled.ActionBar</item>
|
||||
|
||||
<!-- no divider -->
|
||||
<item name="android:actionBarDivider">@null</item>
|
||||
|
||||
<!-- edit text -->
|
||||
<item name="android:editTextStyle">@style/VectorSearches.EditText</item>
|
||||
|
||||
<!-- actionbar icons color -->
|
||||
<item name="actionBarTheme">@style/VectorSearches.ActionBarTheme</item>
|
||||
</style>
|
||||
|
||||
<style name="CallAppTheme.Black" parent="AppTheme.Black">
|
||||
<item name="android:colorBackground">?attr/colorBackgroundFloating</item>
|
||||
<item name="android:colorBackgroundCacheHint">@null</item>
|
||||
|
||||
<item name="android:windowFrame">@null</item>
|
||||
<item name="android:windowTitleStyle">@style/RtlOverlay.DialogWindowTitle.AppCompat</item>
|
||||
<item name="android:windowTitleBackgroundStyle">
|
||||
@style/Base.DialogWindowTitleBackground.AppCompat
|
||||
</item>
|
||||
<item name="android:windowBackground">@drawable/abc_dialog_material_background</item>
|
||||
<item name="android:windowIsFloating">true</item>
|
||||
<item name="android:backgroundDimEnabled">true</item>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="android:windowAnimationStyle">@style/Animation.AppCompat.Dialog</item>
|
||||
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
|
||||
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
|
||||
<item name="listPreferredItemPaddingLeft">24dip</item>
|
||||
<item name="listPreferredItemPaddingRight">24dip</item>
|
||||
|
||||
<item name="android:listDivider">@null</item>
|
||||
</style>
|
||||
|
||||
<style name="GroupAppTheme.Black" parent="AppTheme.Black">
|
||||
<item name="colorPrimaryDark">@color/tab_groups_secondary</item>
|
||||
|
||||
<item name="android:actionBarTabStyle">@style/Vector.TabView.Group</item>
|
||||
<item name="actionBarTabStyle">@style/Vector.TabView.Group</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
||||
11
vector/src/main/res/values/theme_common.xml
Normal file
11
vector/src/main/res/values/theme_common.xml
Normal file
@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<!-- Launcher Theme, only used for VectorLauncherActivity (will be use even before the Activity is started) -->
|
||||
<style name="AppTheme.Launcher" parent="Theme.MaterialComponents.Light.NoActionBar">
|
||||
<item name="android:windowBackground">@drawable/splash</item>
|
||||
|
||||
<item name="colorPrimaryDark">@color/primary_color_dark</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
@ -4,23 +4,61 @@
|
||||
<!-- 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>
|
||||
<!-- Riotx attribute for palette -->
|
||||
<item name="riotx_background">@color/riotx_background_dark</item>
|
||||
<item name="riotx_base">@color/riotx_base_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_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_text_primary">@color/riotx_header_panel_text_primary_dark</item>
|
||||
<item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_dark</item>
|
||||
<item name="riotx_text_primary">@color/riotx_text_primary_dark</item>
|
||||
<item name="riotx_text_secondary">@color/riotx_text_secondary_dark</item>
|
||||
<item name="riotx_android_secondary">@color/riotx_android_secondary_dark</item>
|
||||
<item name="riotx_search_placeholder">@color/riotx_search_placeholder_dark</item>
|
||||
<item name="riotx_room_highlight">@color/riotx_room_highlight_dark</item>
|
||||
<item name="riotx_unread_room_indent">@color/riotx_unread_room_indent_dark</item>
|
||||
<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>
|
||||
|
||||
<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>
|
||||
<!-- 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/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="android:colorBackground">?riotx_background</item>
|
||||
<item name="colorOnBackground">?riotx_text_primary</item>
|
||||
|
||||
<item name="android:textColorLink">@color/link_color_dark</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/VectorAlertDialogStyleDark</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>
|
||||
|
||||
<!-- waiting view background -->
|
||||
<item name="vctr_waiting_background_color">#55555555</item>
|
||||
@ -163,101 +201,9 @@
|
||||
|
||||
<style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
|
||||
|
||||
<style name="Theme.Vector.Lock.Dark" parent="Theme.AppCompat.Dialog">
|
||||
<item name="colorPrimary">@color/primary_color_dark</item>
|
||||
<item name="colorAccent">@color/accent_color_dark</item>
|
||||
|
||||
<item name="android:textColorPrimary">@color/riot_primary_text_color_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="vctr_primary_hint_text_color">@color/primary_hint_text_color_dark</item>
|
||||
<item name="vctr_message_text_color">?android:attr/textColorPrimary</item>
|
||||
|
||||
<item name="android:background">@color/riot_primary_background_color_dark</item>
|
||||
<item name="android:textColor">@color/riot_tertiary_text_color_dark</item>
|
||||
<item name="editTextColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:editTextColor">?android:attr/textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<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>
|
||||
|
||||
<!-- home activity -->
|
||||
<style name="HomeActivityTheme.Dark" parent="AppTheme.Dark">
|
||||
<item name="editTextColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:editTextColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:textColorHint">?attr/vctr_default_text_hint_color</item>
|
||||
</style>
|
||||
|
||||
<!-- call activity -->
|
||||
<style name="CallActivityTheme.Dark" parent="AppTheme.Dark">
|
||||
<!-- status bar color -->
|
||||
<item name="colorPrimaryDark">@android:color/black</item>
|
||||
</style>
|
||||
|
||||
<!-- NoActionBar + FullScreen -->
|
||||
<style name="AppTheme.NoActionBar.FullScreen.Dark" parent="AppTheme.Dark">
|
||||
<item name="android:windowFullscreen">true</item>
|
||||
<!-- activities background -->
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
</style>
|
||||
|
||||
<!-- Picker activities -->
|
||||
<style name="CountryPickerTheme.Dark" parent="AppTheme.Dark">
|
||||
<item name="editTextColor">@android:color/white</item>
|
||||
<item name="android:editTextColor">@android:color/white</item>
|
||||
<item name="android:textColorHint">?attr/vctr_activity_bottom_gradient_color</item>
|
||||
</style>
|
||||
|
||||
<!-- searches activity -->
|
||||
<style name="SearchesAppTheme.Dark" parent="AppTheme.Dark">
|
||||
<!-- custom action bar -->
|
||||
<item name="android:actionBarStyle">@style/VectorSearches.Styled.ActionBar</item>
|
||||
<item name="actionBarStyle">@style/VectorSearches.Styled.ActionBar</item>
|
||||
|
||||
<!-- no divider -->
|
||||
<item name="android:actionBarDivider">@null</item>
|
||||
|
||||
<!-- edit text -->
|
||||
<item name="android:editTextStyle">@style/VectorSearches.EditText</item>
|
||||
|
||||
<!-- actionbar icons color -->
|
||||
<item name="actionBarTheme">@style/VectorSearches.ActionBarTheme</item>
|
||||
</style>
|
||||
|
||||
<style name="CallAppTheme.Dark" parent="AppTheme.Dark">
|
||||
<item name="android:colorBackground">@color/primary_color_dark</item>
|
||||
<item name="android:colorBackgroundCacheHint">@null</item>
|
||||
|
||||
<item name="android:windowFrame">@null</item>
|
||||
<item name="android:windowTitleStyle">@style/RtlOverlay.DialogWindowTitle.AppCompat</item>
|
||||
<item name="android:windowTitleBackgroundStyle">
|
||||
@style/Base.DialogWindowTitleBackground.AppCompat
|
||||
</item>
|
||||
<item name="android:windowBackground">@drawable/abc_dialog_material_background</item>
|
||||
<item name="android:windowIsFloating">true</item>
|
||||
<item name="android:backgroundDimEnabled">true</item>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="android:windowAnimationStyle">@style/Animation.AppCompat.Dialog</item>
|
||||
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
|
||||
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
|
||||
<item name="listPreferredItemPaddingLeft">24dip</item>
|
||||
<item name="listPreferredItemPaddingRight">24dip</item>
|
||||
|
||||
<item name="android:listDivider">@null</item>
|
||||
</style>
|
||||
|
||||
<style name="GroupAppTheme.Dark" parent="AppTheme.Dark">
|
||||
<item name="colorPrimaryDark">@color/tab_groups_secondary</item>
|
||||
|
||||
<item name="android:actionBarTabStyle">@style/Vector.TabView.Group</item>
|
||||
<item name="actionBarTabStyle">@style/Vector.TabView.Group</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
||||
@ -3,34 +3,72 @@
|
||||
|
||||
<!-- LIGHT THEME COLORS -->
|
||||
|
||||
<style name="AppTheme.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
|
||||
<item name="colorPrimaryDark">@color/primary_color_dark_light</item>
|
||||
<item name="colorPrimary">@color/primary_color_light</item>
|
||||
<item name="colorAccent">@color/accent_color_light</item>
|
||||
<style name="AppTheme.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
|
||||
<!-- Riotx attribute for palette -->
|
||||
<item name="riotx_background">@color/riotx_background_light</item>
|
||||
<item name="riotx_base">@color/riotx_base_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_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_text_primary">@color/riotx_header_panel_text_primary_light</item>
|
||||
<item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_light</item>
|
||||
<item name="riotx_text_primary">@color/riotx_text_primary_light</item>
|
||||
<item name="riotx_text_secondary">@color/riotx_text_secondary_light</item>
|
||||
<item name="riotx_android_secondary">@color/riotx_android_secondary_light</item>
|
||||
<item name="riotx_search_placeholder">@color/riotx_search_placeholder_light</item>
|
||||
<item name="riotx_room_highlight">@color/riotx_room_highlight_light</item>
|
||||
<item name="riotx_unread_room_indent">@color/riotx_unread_room_indent_light</item>
|
||||
<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>
|
||||
|
||||
<item name="android:textColorPrimary">@color/primary_text_color_selector_light</item>
|
||||
<item name="android:textColorSecondary">@color/riot_secondary_text_color_light</item>
|
||||
<!-- Default color for text View -->
|
||||
<item name="android:textColorTertiary">@color/riot_tertiary_text_color_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>
|
||||
<!--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_light</item>
|
||||
<item name="colorOnSecondary">@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="android:colorBackground">?riotx_background</item>
|
||||
<item name="colorOnBackground">?riotx_text_primary</item>
|
||||
|
||||
<item name="android:textColorLink">@color/link_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/VectorAlertDialogStyleLight</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_light</item>
|
||||
<item name="vctr_bottom_nav_background_color">#FFF3F8FD</item>
|
||||
<item name="vctr_bottom_nav_background_border_color">#FFE9EDF1</item>
|
||||
|
||||
<!-- waiting view background -->
|
||||
<item name="vctr_waiting_background_color">#AAAAAAAA</item>
|
||||
|
||||
<!-- application bar text color -->
|
||||
<!-- Base Text Primary-->
|
||||
<item name="vctr_toolbar_primary_text_color">#FFFFFFFF</item>
|
||||
<item name="vctr_toolbar_primary_text_color">@color/riotx_text_primary_light</item>
|
||||
<!-- Base Text Secondary-->
|
||||
<item name="vctr_toolbar_secondary_text_color">#FFFFFFFF</item>
|
||||
<item name="vctr_toolbar_link_text_color">@color/link_color_light</item>
|
||||
<item name="vctr_toolbar_secondary_text_color">@color/riotx_text_primary_light</item>
|
||||
<item name="vctr_toolbar_link_text_color">@color/riotx_links</item>
|
||||
|
||||
<!-- application bar text hint color -->
|
||||
<item name="vctr_primary_hint_text_color">@color/primary_hint_text_color_light</item>
|
||||
@ -165,108 +203,9 @@
|
||||
|
||||
<style name="AppTheme.Light" parent="AppTheme.Base.Light" />
|
||||
|
||||
<style name="Theme.Vector.Lock.Light" parent="Theme.AppCompat.Light.Dialog">
|
||||
<item name="colorPrimary">@color/primary_color_light</item>
|
||||
<item name="colorAccent">@color/accent_color_light</item>
|
||||
|
||||
<item name="android:textColorPrimary">@color/riot_primary_text_color_light</item>
|
||||
<item name="android:textColorSecondary">@color/riot_secondary_text_color_light</item>
|
||||
<!-- Default color for text View -->
|
||||
<item name="android:textColorTertiary">@color/riot_tertiary_text_color_light</item>
|
||||
|
||||
<item name="vctr_primary_hint_text_color">@color/primary_hint_text_color_light</item>
|
||||
<item name="vctr_message_text_color">?android:attr/textColorPrimary</item>
|
||||
|
||||
<item name="android:background">@color/riot_primary_background_color_light</item>
|
||||
<item name="android:textColor">@color/riot_tertiary_text_color_light</item>
|
||||
<item name="editTextColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:editTextColor">?android:attr/textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<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>
|
||||
|
||||
<!-- home activity -->
|
||||
<style name="HomeActivityTheme.Light" parent="AppTheme.Light">
|
||||
<item name="editTextColor">@android:color/white</item>
|
||||
<item name="android:editTextColor">@android:color/white</item>
|
||||
<item name="android:textColorHint">?attr/vctr_activity_bottom_gradient_color</item>
|
||||
</style>
|
||||
|
||||
<!-- call activity -->
|
||||
<style name="CallActivityTheme.Light" parent="AppTheme.Light">
|
||||
<!-- status bar color -->
|
||||
<item name="colorPrimaryDark">@android:color/black</item>
|
||||
</style>
|
||||
|
||||
<!-- NoActionBar + FullScreen -->
|
||||
<style name="AppTheme.NoActionBar.FullScreen.Light" parent="AppTheme.Light">
|
||||
<item name="android:windowFullscreen">true</item>
|
||||
<!-- activities background -->
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
</style>
|
||||
|
||||
<!-- Picker activities -->
|
||||
<style name="CountryPickerTheme.Light" parent="AppTheme.Light">
|
||||
<item name="editTextColor">@android:color/white</item>
|
||||
<item name="android:editTextColor">@android:color/white</item>
|
||||
<item name="android:textColorHint">?attr/vctr_activity_bottom_gradient_color</item>
|
||||
</style>
|
||||
|
||||
<!-- searches activity -->
|
||||
<style name="SearchesAppTheme.Light" parent="AppTheme.Light">
|
||||
<!-- custom action bar -->
|
||||
<item name="android:actionBarStyle">@style/VectorSearches.Styled.ActionBar</item>
|
||||
<item name="actionBarStyle">@style/VectorSearches.Styled.ActionBar</item>
|
||||
|
||||
<!-- no divider -->
|
||||
<item name="android:actionBarDivider">@null</item>
|
||||
|
||||
<!-- edit text -->
|
||||
<item name="android:editTextStyle">@style/VectorSearches.EditText</item>
|
||||
|
||||
<!-- actionbar icons color -->
|
||||
<item name="actionBarTheme">@style/VectorSearches.ActionBarTheme</item>
|
||||
</style>
|
||||
|
||||
<style name="CallAppTheme.Light" parent="AppTheme.Light">
|
||||
<item name="android:colorBackground">?attr/colorBackgroundFloating</item>
|
||||
<item name="android:colorBackgroundCacheHint">@null</item>
|
||||
|
||||
<item name="android:windowFrame">@null</item>
|
||||
<item name="android:windowTitleStyle">@style/RtlOverlay.DialogWindowTitle.AppCompat</item>
|
||||
<item name="android:windowTitleBackgroundStyle">
|
||||
@style/Base.DialogWindowTitleBackground.AppCompat
|
||||
</item>
|
||||
<item name="android:windowBackground">@drawable/abc_dialog_material_background</item>
|
||||
<item name="android:windowIsFloating">true</item>
|
||||
<item name="android:backgroundDimEnabled">true</item>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="android:windowAnimationStyle">@style/Animation.AppCompat.Dialog</item>
|
||||
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
|
||||
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
|
||||
<item name="listPreferredItemPaddingLeft">24dip</item>
|
||||
<item name="listPreferredItemPaddingRight">24dip</item>
|
||||
|
||||
<item name="android:listDivider">@null</item>
|
||||
</style>
|
||||
|
||||
<style name="GroupAppTheme.Light" parent="AppTheme.Light">
|
||||
<item name="colorPrimaryDark">@color/tab_groups_secondary</item>
|
||||
|
||||
<item name="android:actionBarTabStyle">@style/Vector.TabView.Group</item>
|
||||
<item name="actionBarTabStyle">@style/Vector.TabView.Group</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat">
|
||||
<item name="titleTextColor">?attr/actionMenuTextColor</item>
|
||||
<item name="android:background">?attr/colorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.Dialog.Light" parent="Theme.AppCompat.Light.Dialog.Alert" />
|
||||
|
||||
</resources>
|
||||
|
||||
@ -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>
|
||||
@ -23,6 +24,7 @@
|
||||
<item name="android:colorBackground">@color/riot_primary_background_color_status</item>
|
||||
<item name="vctr_bottom_nav_background_color">@color/riot_primary_background_color_status
|
||||
</item>
|
||||
<item name="vctr_bottom_nav_background_border_color">#FFE9EDF1</item>
|
||||
|
||||
<!-- waiting view background -->
|
||||
<item name="vctr_waiting_background_color">#AAAAAAAA</item>
|
||||
@ -160,103 +162,9 @@
|
||||
|
||||
<style name="AppTheme.Status" parent="AppTheme.Base.Status" />
|
||||
|
||||
<style name="Theme.Vector.Lock.Status" parent="Theme.AppCompat.Light.Dialog">
|
||||
<item name="colorPrimary">@color/primary_color_status</item>
|
||||
<item name="colorAccent">@color/accent_color_status</item>
|
||||
|
||||
<item name="android:textColorPrimary">@color/riot_primary_text_color_status</item>
|
||||
<item name="android:textColorSecondary">@color/riot_secondary_text_color_status</item>
|
||||
<!-- Default color for text View -->
|
||||
<item name="android:textColorTertiary">@color/riot_tertiary_text_color_status</item>
|
||||
|
||||
<item name="vctr_primary_hint_text_color">@color/primary_hint_text_color_light</item>
|
||||
<item name="vctr_message_text_color">?android:attr/textColorPrimary</item>
|
||||
|
||||
<item name="android:background">@color/riot_primary_background_color_status</item>
|
||||
<item name="android:textColor">@color/riot_tertiary_text_color_status</item>
|
||||
<item name="editTextColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:editTextColor">?android:attr/textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<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>
|
||||
|
||||
<!-- home activity -->
|
||||
<style name="HomeActivityTheme.Status" parent="AppTheme.Status">
|
||||
<item name="editTextColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:editTextColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:textColorHint">?attr/vctr_default_text_hint_color</item>
|
||||
</style>
|
||||
|
||||
<!-- call activity -->
|
||||
<style name="CallActivityTheme.Status" parent="AppTheme.Status">
|
||||
<!-- status bar color -->
|
||||
<item name="colorPrimaryDark">@android:color/black</item>
|
||||
</style>
|
||||
|
||||
<!-- NoActionBar + FullScreen -->
|
||||
<style name="AppTheme.NoActionBar.FullScreen.Status" parent="AppTheme.Status">
|
||||
<item name="android:windowFullscreen">true</item>
|
||||
<!-- activities background -->
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
</style>
|
||||
|
||||
<!-- Picker activities -->
|
||||
<style name="CountryPickerTheme.Status" parent="AppTheme.Status">
|
||||
<item name="editTextColor">@android:color/white</item>
|
||||
<item name="android:editTextColor">@android:color/white</item>
|
||||
<item name="android:textColorHint">?attr/vctr_activity_bottom_gradient_color</item>
|
||||
</style>
|
||||
|
||||
<!-- searches activity -->
|
||||
<style name="SearchesAppTheme.Status" parent="AppTheme.Status">
|
||||
<!-- custom action bar -->
|
||||
<item name="android:actionBarStyle">@style/VectorSearches.Styled.ActionBar</item>
|
||||
<item name="actionBarStyle">@style/VectorSearches.Styled.ActionBar</item>
|
||||
|
||||
<!-- no divider -->
|
||||
<item name="android:actionBarDivider">@null</item>
|
||||
|
||||
<!-- edit text -->
|
||||
<item name="android:editTextStyle">@style/VectorSearches.EditText</item>
|
||||
|
||||
<!-- actionbar icons color -->
|
||||
<item name="actionBarTheme">@style/VectorSearches.ActionBarTheme</item>
|
||||
</style>
|
||||
|
||||
<style name="CallAppTheme.Status" parent="AppTheme.Status">
|
||||
<item name="android:colorBackground">?attr/colorBackgroundFloating</item>
|
||||
<item name="android:colorBackgroundCacheHint">@null</item>
|
||||
|
||||
<item name="android:windowFrame">@null</item>
|
||||
<item name="android:windowTitleStyle">@style/RtlOverlay.DialogWindowTitle.AppCompat</item>
|
||||
<item name="android:windowTitleBackgroundStyle">
|
||||
@style/Base.DialogWindowTitleBackground.AppCompat
|
||||
</item>
|
||||
<item name="android:windowBackground">@drawable/abc_dialog_material_background</item>
|
||||
<item name="android:windowIsFloating">true</item>
|
||||
<item name="android:backgroundDimEnabled">true</item>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="android:windowAnimationStyle">@style/Animation.AppCompat.Dialog</item>
|
||||
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
|
||||
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
|
||||
<item name="listPreferredItemPaddingLeft">24dip</item>
|
||||
<item name="listPreferredItemPaddingRight">24dip</item>
|
||||
|
||||
<item name="android:listDivider">@null</item>
|
||||
</style>
|
||||
|
||||
<style name="GroupAppTheme.Status" parent="AppTheme.Status">
|
||||
<item name="colorPrimaryDark">@color/tab_groups_secondary</item>
|
||||
|
||||
<item name="android:actionBarTabStyle">@style/Vector.TabView.Group</item>
|
||||
<item name="actionBarTabStyle">@style/Vector.TabView.Group</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.Dialog.Status" parent="Theme.AppCompat.Light.Dialog.Alert" />
|
||||
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user