From 9736a8f5710e3304029e13dea3fbe5a8e5c51fe7 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Thu, 15 Dec 2022 11:26:12 +0100
Subject: [PATCH 1/4] Adding changelog entry

---
 changelog.d/7786.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/7786.bugfix

diff --git a/changelog.d/7786.bugfix b/changelog.d/7786.bugfix
new file mode 100644
index 0000000000..60a4a324d4
--- /dev/null
+++ b/changelog.d/7786.bugfix
@@ -0,0 +1 @@
+[Session manager] Other sessions: Filter bottom sheet cut in landscape mode

From a86f2e03cca9ecbeb6d688dcaa1976bd8c6ea5c9 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Thu, 15 Dec 2022 14:14:48 +0100
Subject: [PATCH 2/4] Make the radiogroup scrollable to better support
 landscape on small devices

---
 .../bottom_sheet_device_manager_filter.xml    | 120 +++++++++---------
 1 file changed, 63 insertions(+), 57 deletions(-)

diff --git a/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml b/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml
index a7987e70b5..56421532b5 100644
--- a/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml
+++ b/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml
@@ -20,73 +20,79 @@
         android:layout_marginTop="12dp"
         android:text="@string/device_manager_filter_bottom_sheet_title" />
 
-    <RadioGroup
-        android:id="@+id/filterOptionsRadioGroup"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:layoutDirection="rtl"
-        android:showDividers="none">
+        android:layout_height="match_parent">
 
-        <RadioButton
-            android:id="@+id/filterOptionAllSessionsRadioButton"
-            style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:checked="true"
-            android:minHeight="0dp"
-            android:text="@string/device_manager_filter_option_all_sessions" />
-
-        <RadioButton
-            android:id="@+id/filterOptionVerifiedRadioButton"
-            style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+        <RadioGroup
+            android:id="@+id/filterOptionsRadioGroup"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:minHeight="0dp"
-            android:text="@string/device_manager_filter_option_verified" />
+            android:layoutDirection="rtl"
+            android:showDividers="none">
 
-        <TextView
-            android:id="@+id/filterOptionVerifiedTextView"
-            style="@style/TextAppearance.Vector.Body.DevicesManagement"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:text="@string/device_manager_filter_option_verified_description" />
+            <RadioButton
+                android:id="@+id/filterOptionAllSessionsRadioButton"
+                style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                android:minHeight="0dp"
+                android:text="@string/device_manager_filter_option_all_sessions" />
 
-        <RadioButton
-            android:id="@+id/filterOptionUnverifiedRadioButton"
-            style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:minHeight="0dp"
-            android:text="@string/device_manager_filter_option_unverified" />
+            <RadioButton
+                android:id="@+id/filterOptionVerifiedRadioButton"
+                style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:minHeight="0dp"
+                android:text="@string/device_manager_filter_option_verified" />
 
-        <TextView
-            android:id="@+id/filterOptionUnverifiedTextView"
-            style="@style/TextAppearance.Vector.Body.DevicesManagement"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:text="@string/device_manager_filter_option_unverified_description" />
+            <TextView
+                android:id="@+id/filterOptionVerifiedTextView"
+                style="@style/TextAppearance.Vector.Body.DevicesManagement"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:text="@string/device_manager_filter_option_verified_description" />
 
-        <RadioButton
-            android:id="@+id/filterOptionInactiveRadioButton"
-            style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:minHeight="0dp"
-            android:text="@string/device_manager_filter_option_inactive" />
+            <RadioButton
+                android:id="@+id/filterOptionUnverifiedRadioButton"
+                style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:minHeight="0dp"
+                android:text="@string/device_manager_filter_option_unverified" />
 
-        <TextView
-            android:id="@+id/filterOptionInactiveTextView"
-            style="@style/TextAppearance.Vector.Body.DevicesManagement"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end" />
+            <TextView
+                android:id="@+id/filterOptionUnverifiedTextView"
+                style="@style/TextAppearance.Vector.Body.DevicesManagement"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:text="@string/device_manager_filter_option_unverified_description" />
 
-    </RadioGroup>
+            <RadioButton
+                android:id="@+id/filterOptionInactiveRadioButton"
+                style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:minHeight="0dp"
+                android:text="@string/device_manager_filter_option_inactive" />
+
+            <TextView
+                android:id="@+id/filterOptionInactiveTextView"
+                style="@style/TextAppearance.Vector.Body.DevicesManagement"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end" />
+
+        </RadioGroup>
+
+    </ScrollView>
 
 </LinearLayout>

From 7ea1f65fe35d77b6a3da66701c88afdbe9bc0d8f Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Mon, 19 Dec 2022 10:19:56 +0100
Subject: [PATCH 3/4] Fixing padding of the scrollbar and avoid using rtl
 layout in RadioGroup

---
 .../bottom_sheet_device_manager_filter.xml    | 42 ++++++++++++++-----
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml b/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml
index 56421532b5..519b85b899 100644
--- a/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml
+++ b/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -22,14 +23,16 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:paddingEnd="5dp"
+        android:scrollbarStyle="outsideOverlay"
+        tools:ignore="RtlSymmetry">
 
         <RadioGroup
             android:id="@+id/filterOptionsRadioGroup"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:layoutDirection="rtl"
+            android:paddingTop="24dp"
             android:showDividers="none">
 
             <RadioButton
@@ -37,25 +40,34 @@
                 style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:background="?android:selectableItemBackground"
+                android:button="@null"
                 android:checked="true"
+                android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
                 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
                 android:id="@+id/filterOptionVerifiedRadioButton"
                 style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_gravity="start"
                 android:layout_marginTop="24dp"
+                android:background="?android:selectableItemBackground"
+                android:button="@null"
+                android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
                 android:minHeight="0dp"
-                android:text="@string/device_manager_filter_option_verified" />
+                android:text="@string/device_manager_filter_option_verified"
+                android:textAlignment="textStart" />
 
             <TextView
                 android:id="@+id/filterOptionVerifiedTextView"
                 style="@style/TextAppearance.Vector.Body.DevicesManagement"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end"
                 android:text="@string/device_manager_filter_option_verified_description" />
 
             <RadioButton
@@ -63,16 +75,20 @@
                 style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_gravity="start"
                 android:layout_marginTop="16dp"
+                android:background="?android:selectableItemBackground"
+                android:button="@null"
+                android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
                 android:minHeight="0dp"
-                android:text="@string/device_manager_filter_option_unverified" />
+                android:text="@string/device_manager_filter_option_unverified"
+                android:textAlignment="textStart" />
 
             <TextView
                 android:id="@+id/filterOptionUnverifiedTextView"
                 style="@style/TextAppearance.Vector.Body.DevicesManagement"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end"
                 android:text="@string/device_manager_filter_option_unverified_description" />
 
             <RadioButton
@@ -80,16 +96,20 @@
                 style="@style/TextAppearance.Vector.Subtitle.Medium.DevicesManagement"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_gravity="start"
                 android:layout_marginTop="16dp"
+                android:background="?android:selectableItemBackground"
+                android:button="@null"
+                android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
                 android:minHeight="0dp"
-                android:text="@string/device_manager_filter_option_inactive" />
+                android:text="@string/device_manager_filter_option_inactive"
+                android:textAlignment="textStart" />
 
             <TextView
                 android:id="@+id/filterOptionInactiveTextView"
                 style="@style/TextAppearance.Vector.Body.DevicesManagement"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end" />
+                android:layout_height="wrap_content" />
 
         </RadioGroup>
 

From 5bde84c059dd6d69db6d3b0dd0fcda1b2c07d0ea Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Mon, 19 Dec 2022 10:53:45 +0100
Subject: [PATCH 4/4] Better fix for scrollbar padding

---
 .../layout/bottom_sheet_device_manager_filter.xml   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml b/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml
index 519b85b899..fd66aec1ea 100644
--- a/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml
+++ b/vector/src/main/res/layout/bottom_sheet_device_manager_filter.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingHorizontal="24dp"
-    android:paddingBottom="32dp">
+    android:orientation="vertical">
 
     <View
         android:layout_width="36dp"
@@ -19,14 +16,16 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="12dp"
+        android:paddingHorizontal="24dp"
         android:text="@string/device_manager_filter_bottom_sheet_title" />
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingEnd="5dp"
-        android:scrollbarStyle="outsideOverlay"
-        tools:ignore="RtlSymmetry">
+        android:clipToPadding="false"
+        android:paddingHorizontal="24dp"
+        android:paddingBottom="32dp"
+        android:scrollbarStyle="outsideOverlay">
 
         <RadioGroup
             android:id="@+id/filterOptionsRadioGroup"