mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-24 18:35:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix bottom sheet backgrounds.

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

1
vector/src/main/res/layout/bottom_sheet_bootstrap.xml
View file

@ -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">

1
vector/src/main/res/layout/bottom_sheet_call_controls.xml
View file

@ -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">
<im.vector.riotx.core.ui.views.BottomSheetActionButton

1
vector/src/main/res/layout/bottom_sheet_generic_list.xml
View file

@ -4,6 +4,7 @@
android:id="@+id/bottomSheetRecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?riotx_bottom_sheet_background"
android:fadeScrollbars="false"
android:scrollbars="vertical"
tools:itemCount="5"

7
vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
View file

@ -3,8 +3,9 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:orientation="vertical">
android:background="?riotx_bottom_sheet_background"
android:orientation="vertical"
android:paddingTop="8dp">
<TextView
android:id="@+id/bottomSheetTitle"
@ -12,7 +13,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:padding="8dp"
android:textColor="?android:textColorSecondary"
android:textColor="?riotx_text_primary"
android:textSize="16sp"
tools:text="@string/reactions" />

3
vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
View file

@ -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" />
</LinearLayout>

9
vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
View file

@ -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" />
<TextView
@ -59,9 +60,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAlignment="center"
android:textColor="?riotx_text_primary"
android:textSize="18sp"
android:textStyle="bold"
android:textColor="?riotx_text_primary"
tools:text="User name" />
<TextView
@ -69,8 +70,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAlignment="center"
android:textSize="14sp"
android:textColor="?riotx_text_secondary"
android:textSize="14sp"
tools:text="\@foo:matrix.org" />
</LinearLayout>
</LinearLayout>
@ -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" />
<com.google.android.material.button.MaterialButton
android:id="@+id/widgetPermissionContinue"

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

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorBackgroundFloating"
android:background="?riotx_bottom_sheet_background"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp">

1
vector/src/main/res/layout/bottom_sheet_verification.xml
View file

@ -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">

3
vector/src/main/res/layout/bottom_sheet_with_fragments.xml
View file

@ -2,6 +2,7 @@
<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/bottomSheetFragmentContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:background="?riotx_bottom_sheet_background" />

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

@ -54,6 +54,12 @@
<color name="riotx_base_dark">#FF22282F</color>
<color name="riotx_base_black">#FF000000</color>
<!-- Background color of bottom sheets -->
<attr name="riotx_bottom_sheet_background" format="color" />
<color name="riotx_bottom_sheet_background_light">#FFFFFFFF</color>
<color name="riotx_bottom_sheet_background_dark">#FF282C35</color>
<color name="riotx_bottom_sheet_background_black">#FF000000</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>

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

@ -56,6 +56,8 @@
<item name="android:colorBackground">?riotx_background</item>
<item name="colorOnBackground">?riotx_text_primary</item>
<item name="riotx_bottom_sheet_background">@color/riotx_bottom_sheet_background_black</item>
<!-- Keep color accent for legacy widget-->
<item name="colorAccent">@color/riotx_accent</item>

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

@ -56,6 +56,8 @@
<item name="android:colorBackground">?riotx_background</item>
<item name="colorOnBackground">?riotx_text_primary</item>
<item name="riotx_bottom_sheet_background">@color/riotx_bottom_sheet_background_dark</item>
<!-- Keep color accent for legacy widget-->
<item name="colorAccent">@color/riotx_accent</item>

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

@ -55,6 +55,8 @@
<item name="android:colorBackground">?riotx_background</item>
<item name="colorOnBackground">?riotx_text_primary</item>
<item name="riotx_bottom_sheet_background">@color/riotx_bottom_sheet_background_light</item>
<!-- Keep color accent for legacy widget-->
<item name="colorAccent">@color/riotx_accent</item>