From e5c89c0b8b9e0b38efdf83b790077f077adc924c Mon Sep 17 00:00:00 2001
From: Pratham Pahariya <54663429+Pratham2305@users.noreply.github.com>
Date: Mon, 1 Mar 2021 19:11:09 +0530
Subject: [PATCH] Fixed two item was inaccessable with bottom sheet in
 landscape mode. (#4187)

scrollview is added so that last options are scrollable.
---
 .../res/layout/fragment_more_bottom_sheet.xml | 155 ++++++++++--------
 .../fragment_more_bottom_sheet_logged_out.xml | 115 +++++++------
 2 files changed, 150 insertions(+), 120 deletions(-)

diff --git a/app/src/main/res/layout/fragment_more_bottom_sheet.xml b/app/src/main/res/layout/fragment_more_bottom_sheet.xml
index 505e2c4dd..4042e2ead 100644
--- a/app/src/main/res/layout/fragment_more_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_more_bottom_sheet.xml
@@ -5,80 +5,95 @@
     android:theme="?attr/more_bottom_sheet_style"
     android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/more_profile"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        android:drawableStart="@drawable/ic_person_black_24dp"
-        android:drawablePadding="12dp"
-        android:padding="8dp"
-        android:text="@string/Profile"
-        android:textSize="18sp" />
+    <ScrollView
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:nestedScrollingEnabled="true">
 
-    <TextView
-        android:id="@+id/more_peer_review"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        android:drawableStart="@drawable/ic_check_black_24dp"
-        android:drawablePadding="12dp"
-        android:padding="8dp"
-        android:text="@string/navigation_item_review"
-        android:textSize="18sp" />
+        <LinearLayout
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/more_settings"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        android:drawableStart="@drawable/ic_settings_black_24dp"
-        android:drawablePadding="12dp"
-        android:padding="8dp"
-        android:text="@string/menu_settings"
-        android:textSize="18sp" />
+            <TextView
+              android:id="@+id/more_profile"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_margin="12dp"
+              android:drawableStart="@drawable/ic_person_black_24dp"
+              android:drawablePadding="12dp"
+              android:padding="8dp"
+              android:text="@string/Profile"
+              android:textSize="18sp" />
 
-    <TextView
-        android:id="@+id/more_tutorial"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        android:drawableStart="@drawable/ic_help_black_24dp"
-        android:drawablePadding="12dp"
-        android:padding="8dp"
-        android:text="@string/navigation_item_info"
-        android:textSize="18sp" />
+            <TextView
+              android:id="@+id/more_peer_review"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_margin="12dp"
+              android:drawableStart="@drawable/ic_check_black_24dp"
+              android:drawablePadding="12dp"
+              android:padding="8dp"
+              android:text="@string/navigation_item_review"
+              android:textSize="18sp" />
 
-    <TextView
-        android:id="@+id/more_feedback"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        android:drawableLeft="@drawable/ic_feedback_black_24dp"
-        android:drawablePadding="12dp"
-        android:padding="8dp"
-        android:text="@string/navigation_item_feedback"
-        android:textSize="18sp" />
+            <TextView
+              android:id="@+id/more_settings"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_margin="12dp"
+              android:drawableStart="@drawable/ic_settings_black_24dp"
+              android:drawablePadding="12dp"
+              android:padding="8dp"
+              android:text="@string/menu_settings"
+              android:textSize="18sp" />
 
-    <TextView
-        android:id="@+id/more_about"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        android:drawableStart="@drawable/ic_info_outline_24dp"
-        android:drawablePadding="12dp"
-        android:padding="8dp"
-        android:text="@string/navigation_item_about"
-        android:textSize="18sp" />
+            <TextView
+              android:id="@+id/more_tutorial"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_margin="12dp"
+              android:drawableStart="@drawable/ic_help_black_24dp"
+              android:drawablePadding="12dp"
+              android:padding="8dp"
+              android:text="@string/navigation_item_info"
+              android:textSize="18sp" />
+
+            <TextView
+              android:id="@+id/more_feedback"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_margin="12dp"
+              android:drawableLeft="@drawable/ic_feedback_black_24dp"
+              android:drawablePadding="12dp"
+              android:padding="8dp"
+              android:text="@string/navigation_item_feedback"
+              android:textSize="18sp" />
+
+            <TextView
+              android:id="@+id/more_about"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_margin="12dp"
+              android:drawableStart="@drawable/ic_info_outline_24dp"
+              android:drawablePadding="12dp"
+              android:padding="8dp"
+              android:text="@string/navigation_item_about"
+              android:textSize="18sp" />
+
+            <TextView
+              android:id="@+id/more_logout"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_margin="12dp"
+              android:drawableStart="@drawable/ic_exit_to_app_black_24dp"
+              android:drawablePadding="12dp"
+              android:padding="8dp"
+              android:text="@string/navigation_item_logout"
+              android:textSize="18sp" />
+
+        </LinearLayout>
+
+    </ScrollView>
 
-    <TextView
-        android:id="@+id/more_logout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        android:drawableStart="@drawable/ic_exit_to_app_black_24dp"
-        android:drawablePadding="12dp"
-        android:padding="8dp"
-        android:text="@string/navigation_item_logout"
-        android:textSize="18sp" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_more_bottom_sheet_logged_out.xml b/app/src/main/res/layout/fragment_more_bottom_sheet_logged_out.xml
index 2c5a3fa3c..ecb56cee1 100644
--- a/app/src/main/res/layout/fragment_more_bottom_sheet_logged_out.xml
+++ b/app/src/main/res/layout/fragment_more_bottom_sheet_logged_out.xml
@@ -5,58 +5,73 @@
     android:theme="?attr/more_bottom_sheet_style"
     android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/more_settings"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        android:drawableStart="@drawable/ic_settings_black_24dp"
-        android:drawablePadding="12dp"
-        android:padding="8dp"
-        android:text="@string/menu_settings"
-        android:textSize="18sp" />
+    <ScrollView
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:nestedScrollingEnabled="true">
 
-    <TextView
-        android:id="@+id/more_tutorial"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        android:drawableStart="@drawable/ic_help_black_24dp"
-        android:drawablePadding="12dp"
-        android:padding="8dp"
-        android:text="@string/navigation_item_info"
-        android:textSize="18sp" />
+        <LinearLayout
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:orientation="vertical" >
 
-    <TextView
-        android:id="@+id/more_feedback"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        android:drawableLeft="@drawable/ic_feedback_black_24dp"
-        android:drawablePadding="12dp"
-        android:padding="8dp"
-        android:text="@string/navigation_item_feedback"
-        android:textSize="18sp" />
+            <TextView
+              android:id="@+id/more_settings"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_margin="12dp"
+              android:drawableStart="@drawable/ic_settings_black_24dp"
+              android:drawablePadding="12dp"
+              android:padding="8dp"
+              android:text="@string/menu_settings"
+              android:textSize="18sp" />
 
-    <TextView
-        android:id="@+id/more_about"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        android:drawableStart="@drawable/ic_info_outline_24dp"
-        android:drawablePadding="12dp"
-        android:padding="8dp"
-        android:text="@string/navigation_item_about"
-        android:textSize="18sp" />
+            <TextView
+              android:id="@+id/more_tutorial"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_margin="12dp"
+              android:drawableStart="@drawable/ic_help_black_24dp"
+              android:drawablePadding="12dp"
+              android:padding="8dp"
+              android:text="@string/navigation_item_info"
+              android:textSize="18sp" />
+
+            <TextView
+              android:id="@+id/more_feedback"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_margin="12dp"
+              android:drawableLeft="@drawable/ic_feedback_black_24dp"
+              android:drawablePadding="12dp"
+              android:padding="8dp"
+              android:text="@string/navigation_item_feedback"
+              android:textSize="18sp" />
+
+            <TextView
+              android:id="@+id/more_about"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_margin="12dp"
+              android:drawableStart="@drawable/ic_info_outline_24dp"
+              android:drawablePadding="12dp"
+              android:padding="8dp"
+              android:text="@string/navigation_item_about"
+              android:textSize="18sp" />
+
+            <TextView
+              android:id="@+id/more_login"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_margin="12dp"
+              android:drawableStart="@drawable/ic_baseline_person_24"
+              android:drawablePadding="12dp"
+              android:padding="8dp"
+              android:text="@string/navigation_item_login"
+              android:textSize="18sp" />
+
+        </LinearLayout>
+
+    </ScrollView>
 
-    <TextView
-        android:id="@+id/more_login"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        android:drawableStart="@drawable/ic_baseline_person_24"
-        android:drawablePadding="12dp"
-        android:padding="8dp"
-        android:text="@string/navigation_item_login"
-        android:textSize="18sp" />
 </LinearLayout>