diff --git a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml index 69060a57da..0011bf1987 100644 --- a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml +++ b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml @@ -6,6 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:animateLayoutChanges="true" + android:background="?riotx_bottom_sheet_background" android:fadeScrollbars="false" android:scrollbars="vertical"> diff --git a/vector/src/main/res/layout/bottom_sheet_call_controls.xml b/vector/src/main/res/layout/bottom_sheet_call_controls.xml index 04cb2af20d..c9fc1cdad4 100644 --- a/vector/src/main/res/layout/bottom_sheet_call_controls.xml +++ b/vector/src/main/res/layout/bottom_sheet_call_controls.xml @@ -5,6 +5,7 @@ android:id="@+id/callControlsWrapper" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="?riotx_bottom_sheet_background" android:orientation="vertical"> + android:background="?riotx_bottom_sheet_background" + android:orientation="vertical" + android:paddingTop="8dp"> diff --git a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml index feaa79e1dc..5d428bd570 100644 --- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml +++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml @@ -5,6 +5,7 @@ android:id="@+id/root_layout" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="?riotx_bottom_sheet_background" android:orientation="vertical" android:paddingTop="8dp" android:paddingBottom="8dp"> @@ -131,8 +132,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:textColor="?riotx_text_secondary" android:text="@string/keys_backup_activate" + android:textColor="?riotx_text_secondary" android:textSize="17sp" /> diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml index 1aa77a6c3b..e4df4b5c9a 100644 --- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml +++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml @@ -4,6 +4,7 @@ android:id="@+id/root_layout" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="?riotx_bottom_sheet_background" android:orientation="vertical" android:paddingTop="8dp" android:paddingBottom="8dp"> @@ -16,8 +17,8 @@ android:layout_marginEnd="@dimen/layout_horizontal_margin" android:layout_marginBottom="8dp" android:text="@string/room_widget_permission_title" - android:textSize="20sp" android:textColor="?riotx_text_primary" + android:textSize="20sp" android:textStyle="bold" /> @@ -100,7 +101,7 @@ android:layout_marginEnd="@dimen/layout_vertical_margin" android:layout_marginRight="@dimen/layout_vertical_margin" android:text="@string/decline" - android:textAllCaps="true"/> + android:textAllCaps="true" /> diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml index 8de64de060..88c7e536d8 100644 --- a/vector/src/main/res/layout/bottom_sheet_verification.xml +++ b/vector/src/main/res/layout/bottom_sheet_verification.xml @@ -7,6 +7,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:animateLayoutChanges="true" + android:background="?riotx_bottom_sheet_background" android:fadeScrollbars="false" android:scrollbars="vertical"> diff --git a/vector/src/main/res/layout/bottom_sheet_with_fragments.xml b/vector/src/main/res/layout/bottom_sheet_with_fragments.xml index e013b2a7b1..70c9872a09 100644 --- a/vector/src/main/res/layout/bottom_sheet_with_fragments.xml +++ b/vector/src/main/res/layout/bottom_sheet_with_fragments.xml @@ -2,6 +2,7 @@ + android:layout_height="wrap_content" + android:background="?riotx_bottom_sheet_background" /> diff --git a/vector/src/main/res/values/colors_riotx.xml b/vector/src/main/res/values/colors_riotx.xml index 92c21e2382..a4a7badce2 100644 --- a/vector/src/main/res/values/colors_riotx.xml +++ b/vector/src/main/res/values/colors_riotx.xml @@ -54,6 +54,12 @@ #FF22282F #FF000000 + + + #FFFFFFFF + #FF282C35 + #FF000000 + #FFFFFFFF #FFEDF3FF diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml index 91ae2c9f0b..1f8a4c5cc4 100644 --- a/vector/src/main/res/values/theme_black.xml +++ b/vector/src/main/res/values/theme_black.xml @@ -56,6 +56,8 @@ ?riotx_background ?riotx_text_primary + @color/riotx_bottom_sheet_background_black + @color/riotx_accent diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml index 42ba8ad381..98bfb4e6cd 100644 --- a/vector/src/main/res/values/theme_dark.xml +++ b/vector/src/main/res/values/theme_dark.xml @@ -56,6 +56,8 @@ ?riotx_background ?riotx_text_primary + @color/riotx_bottom_sheet_background_dark + @color/riotx_accent diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml index 869fdad3ee..5292f20dd6 100644 --- a/vector/src/main/res/values/theme_light.xml +++ b/vector/src/main/res/values/theme_light.xml @@ -55,6 +55,8 @@ ?riotx_background ?riotx_text_primary + @color/riotx_bottom_sheet_background_light + @color/riotx_accent