mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-29 06:28:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Adjust colors and remove divider between notification settings and leave room action.

Browse source
This commit is contained in:
Onuray Sahin 2020-07-07 13:12:24 +03:00
parent 9514835232
commit 09ca2361d7
9 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt
View file

@ -21,7 +21,7 @@ import im.vector.riotx.R
/** /**
* Default background color is for the bottom sheets (R.attr.vctr_list_bottom_sheet_divider_color). * Default background color is for the bottom sheets (R.attr.vctr_list_bottom_sheet_divider_color).
* To use in fragment, set color using R.attr.vctr_list_divider_color * To use in fragment, set color using R.attr.riotx_list_divider_color
*/ */
@EpoxyModelClass(layout = R.layout.item_divider) @EpoxyModelClass(layout = R.layout.item_divider)
abstract class DividerItem : VectorEpoxyModel<DividerItem.Holder>() { abstract class DividerItem : VectorEpoxyModel<DividerItem.Holder>() {

4
vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
View file

@ -65,10 +65,6 @@ class RoomListQuickActionsEpoxyController @Inject constructor(
RoomListQuickActionsSharedAction.NotificationsMute(roomSummary.roomId).toBottomSheetItem(3, selectedRoomState) RoomListQuickActionsSharedAction.NotificationsMute(roomSummary.roomId).toBottomSheetItem(3, selectedRoomState)
if (showAll) { if (showAll) {
// Leave
dividerItem {
id("leave_separator")
}
RoomListQuickActionsSharedAction.Leave(roomSummary.roomId).toBottomSheetItem(5) RoomListQuickActionsSharedAction.Leave(roomSummary.roomId).toBottomSheetItem(5)
} }
} }

12
vector/src/main/res/drawable/ic_radio_button_off.xml Normal file
View file

@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<!-- Note: I adapted this vector manually since clip-path is API24+ -->
<path
android:fillColor="?riotx_disabled_view_color"
android:pathData="M10,5M10,0C4.5,0 0,4.5 0,10C0,15.5 4.5,20 10,20C15.5,20 20,15.5 20,10C20,4.5 15.5,0 10,0ZM10,18C5.6,18 2,14.4 2,10C2,5.6 5.6,2 10,2C14.4,2 18,5.6 18,10C18,14.4 14.4,18 10,18Z" />
</vector>

2
vector/src/main/res/layout/item_divider.xml
View file

@ -3,5 +3,5 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?attr/vctr_list_bottom_sheet_divider_color" android:background="?riotx_list_bottom_sheet_divider_color"
tools:layout_height="100dp" /> tools:layout_height="100dp" />

1
vector/src/main/res/values/attrs.xml
View file

@ -40,7 +40,6 @@
<attr name="vctr_list_header_primary_text_color" format="color" /> <attr name="vctr_list_header_primary_text_color" format="color" />
<attr name="vctr_list_header_secondary_text_color" format="color" /> <attr name="vctr_list_header_secondary_text_color" format="color" />
<attr name="vctr_list_bottom_sheet_divider_color" format="color" />
<attr name="vctr_list_divider_color" format="color" /> <attr name="vctr_list_divider_color" format="color" />
<attr name="vctr_redacted_message_color" format="color" /> <attr name="vctr_redacted_message_color" format="color" />

7
vector/src/main/res/values/colors_riotx.xml
View file

@ -213,7 +213,14 @@
<color name="riotx_waiting_background_color_dark">#FF15171b</color> <color name="riotx_waiting_background_color_dark">#FF15171b</color>
<color name="riotx_waiting_background_color_status">#AAAAAAAA</color> <color name="riotx_waiting_background_color_status">#AAAAAAAA</color>
<attr name="riotx_disabled_view_color" format="color" />
<color name="riotx_disabled_view_color_light">#EEEEEE</color>
<color name="riotx_disabled_view_color_dark">#61708B</color>
<attr name="riotx_list_bottom_sheet_divider_color" format="color" />
<color name="riotx_list_bottom_sheet_divider_color_light">#C0C0C2</color>
<color name="riotx_list_bottom_sheet_divider_color_dark">#444E60</color>
<color name="riotx_list_bottom_sheet_divider_color_black">#444E60</color>
<!-- (color from RiotWeb) --> <!-- (color from RiotWeb) -->
<attr name="riotx_keys_backup_banner_accent_color" format="color" /> <attr name="riotx_keys_backup_banner_accent_color" format="color" />

2
vector/src/main/res/values/theme_black.xml
View file

@ -78,7 +78,7 @@
<!--Header/Panel Text Secondary--> <!--Header/Panel Text Secondary-->
<item name="vctr_tab_home_secondary">@color/primary_color_dark_black</item> <item name="vctr_tab_home_secondary">@color/primary_color_dark_black</item>
<item name="vctr_list_bottom_sheet_divider_color">@color/list_divider_color_black</item> <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_dark</item>
<item name="vctr_list_divider_color">@color/riotx_header_panel_background_black</item> <item name="vctr_list_divider_color">@color/riotx_header_panel_background_black</item>
<item name="vctr_redacted_message_color">@color/list_divider_color_black</item> <item name="vctr_redacted_message_color">@color/list_divider_color_black</item>

2
vector/src/main/res/values/theme_dark.xml
View file

@ -126,7 +126,7 @@
<!--Header/Panel Text Secondary--> <!--Header/Panel Text Secondary-->
<item name="vctr_list_header_secondary_text_color">#FFC8C8CD</item> <item name="vctr_list_header_secondary_text_color">#FFC8C8CD</item>
<item name="vctr_list_bottom_sheet_divider_color">@color/list_divider_color_dark</item> <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_dark</item>
<item name="vctr_list_divider_color">@color/riotx_header_panel_background_dark</item> <item name="vctr_list_divider_color">@color/riotx_header_panel_background_dark</item>
<item name="vctr_redacted_message_color">@color/list_divider_color_dark</item> <item name="vctr_redacted_message_color">@color/list_divider_color_dark</item>

2
vector/src/main/res/values/theme_light.xml
View file

@ -126,7 +126,7 @@
<!--Header/Panel Text Secondary--> <!--Header/Panel Text Secondary-->
<item name="vctr_list_header_secondary_text_color">#FFC8C8CD</item> <item name="vctr_list_header_secondary_text_color">#FFC8C8CD</item>
<item name="vctr_list_bottom_sheet_divider_color">@color/list_divider_color_light</item> <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_dark</item>
<item name="vctr_list_divider_color">@color/riotx_header_panel_background_light</item> <item name="vctr_list_divider_color">@color/riotx_header_panel_background_light</item>
<item name="vctr_redacted_message_color">@color/list_divider_color_light</item> <item name="vctr_redacted_message_color">@color/list_divider_color_light</item>