filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7791 from vector-im/fix/mna/filter-bottom-sheet-content-cut 

[Session manager] Other sessions: Filter bottom sheet cut in landscape mode (PSG-1107)
This commit is contained in:
Maxime NATUREL 2022-12-19 14:49:07 +01:00 committed by GitHub
parent f08a3f7966 5bde84c059
commit 8dd2ebf249
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 86 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/7786.bugfix Normal file
View File

@ -0,0 +1 @@
[Session manager] Other sessions: Filter bottom sheet cut in landscape mode

51
vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml
View File

@ -2,9 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical">
android:paddingHorizontal="24dp"
android:paddingBottom="32dp">
<View <View
android:layout_width="36dp" android:layout_width="36dp"
@ -18,14 +16,22 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:paddingHorizontal="24dp"
android:text="@string/device_manager_filter_bottom_sheet_title" /> android:text="@string/device_manager_filter_bottom_sheet_title" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingHorizontal="24dp"
android:paddingBottom="32dp"
android:scrollbarStyle="outsideOverlay">
<RadioGroup <RadioGroup
android:id="@+id/filterOptionsRadioGroup" android:id="@+id/filterOptionsRadioGroup"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="24dp" android:paddingTop="24dp"
android:layoutDirection="rtl"
android:showDividers="none"> android:showDividers="none">
<RadioButton <RadioButton
@ -33,25 +39,34 @@
style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement" style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start"
android:background="?android:selectableItemBackground"
android:button="@null"
android:checked="true" android:checked="true"
android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
android:minHeight="0dp" android:minHeight="0dp"
android:text="@string/device_manager_filter_option_all_sessions" /> android:text="@string/device_manager_filter_option_all_sessions"
android:textAlignment="textStart" />
<RadioButton <RadioButton
android:id="@+id/filterOptionVerifiedRadioButton" android:id="@+id/filterOptionVerifiedRadioButton"
style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement" style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:background="?android:selectableItemBackground"
android:button="@null"
android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
android:minHeight="0dp" android:minHeight="0dp"
android:text="@string/device_manager_filter_option_verified" /> android:text="@string/device_manager_filter_option_verified"
android:textAlignment="textStart" />
<TextView <TextView
android:id="@+id/filterOptionVerifiedTextView" android:id="@+id/filterOptionVerifiedTextView"
style="@style/TextAppearance.Vector.Body.DevicesManagement" style="@style/TextAppearance.Vector.Body.DevicesManagement"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="@string/device_manager_filter_option_verified_description" /> android:text="@string/device_manager_filter_option_verified_description" />
<RadioButton <RadioButton
@ -59,16 +74,20 @@
style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement" style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:background="?android:selectableItemBackground"
android:button="@null"
android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
android:minHeight="0dp" android:minHeight="0dp"
android:text="@string/device_manager_filter_option_unverified" /> android:text="@string/device_manager_filter_option_unverified"
android:textAlignment="textStart" />
<TextView <TextView
android:id="@+id/filterOptionUnverifiedTextView" android:id="@+id/filterOptionUnverifiedTextView"
style="@style/TextAppearance.Vector.Body.DevicesManagement" style="@style/TextAppearance.Vector.Body.DevicesManagement"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="@string/device_manager_filter_option_unverified_description" /> android:text="@string/device_manager_filter_option_unverified_description" />
<RadioButton <RadioButton
@ -76,17 +95,23 @@
style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement" style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:background="?android:selectableItemBackground"
android:button="@null"
android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
android:minHeight="0dp" android:minHeight="0dp"
android:text="@string/device_manager_filter_option_inactive" /> android:text="@string/device_manager_filter_option_inactive"
android:textAlignment="textStart" />
<TextView <TextView
android:id="@+id/filterOptionInactiveTextView" android:id="@+id/filterOptionInactiveTextView"
style="@style/TextAppearance.Vector.Body.DevicesManagement" style="@style/TextAppearance.Vector.Body.DevicesManagement"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
android:layout_gravity="end" />
</RadioGroup> </RadioGroup>
</ScrollView>
</LinearLayout> </LinearLayout>