From f15605a26184cb82c2a95085478e2362e47026a8 Mon Sep 17 00:00:00 2001
From: AgarwalsRahul <rahul.agarwal2019@vitstudent.ac.in>
Date: Wed, 2 Mar 2022 10:41:07 +0530
Subject: [PATCH 1/2] Fix screen rotation issue in permission activity layout

---
 .../main/res/layout/activity_permission.xml   | 66 ++++++++++++-------
 1 file changed, 42 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/layout/activity_permission.xml b/app/src/main/res/layout/activity_permission.xml
index 2279dd6e5..5ebba0bb5 100644
--- a/app/src/main/res/layout/activity_permission.xml
+++ b/app/src/main/res/layout/activity_permission.xml
@@ -29,33 +29,51 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/appNameText" />
 
-    <code.name.monkey.retromusic.views.PermissionItem
-        android:id="@+id/storagePermission"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/finish"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/divider"
-        app:permissionButtonTitle="Grant access"
-        app:permissionIcon="@drawable/ic_sd_storage"
-        app:permissionTitle="@string/permission_title"
-        app:permissionTitleNumber="1"
-        app:permissionTitleSubTitle="@string/permission_summary" />
+        android:fillViewport="true"
+        app:layout_constraintTop_toBottomOf="@+id/divider">
+
+       <LinearLayout
+           android:layout_width="match_parent"
+           android:layout_height="match_parent"
+           android:orientation="vertical">
+
+           <code.name.monkey.retromusic.views.PermissionItem
+               android:id="@+id/storagePermission"
+               android:layout_width="match_parent"
+               android:layout_height="wrap_content"
+               app:layout_constraintEnd_toEndOf="parent"
+               app:layout_constraintStart_toStartOf="parent"
+               app:layout_constraintTop_toBottomOf="@id/divider"
+               app:permissionButtonTitle="Grant access"
+               app:permissionIcon="@drawable/ic_sd_storage"
+               app:permissionTitle="@string/permission_title"
+               app:permissionTitleNumber="1"
+               app:permissionTitleSubTitle="@string/permission_summary" />
+
+           <code.name.monkey.retromusic.views.PermissionItem
+               android:id="@+id/audioPermission"
+               android:layout_width="match_parent"
+               android:layout_height="wrap_content"
+               android:visibility="gone"
+               app:layout_constraintEnd_toEndOf="parent"
+               app:layout_constraintStart_toStartOf="parent"
+               app:layout_constraintTop_toBottomOf="@id/storagePermission"
+               app:permissionButtonTitle="Grant access"
+               app:permissionIcon="@drawable/ic_phonelink_ring"
+               app:permissionTitle="@string/ringtone_title"
+               app:permissionTitleNumber="2"
+               app:permissionTitleSubTitle="@string/ringtone_summary"
+               tools:visibility="visible" />
+       </LinearLayout>
+    </ScrollView>
+
 
-    <code.name.monkey.retromusic.views.PermissionItem
-        android:id="@+id/audioPermission"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/storagePermission"
-        app:permissionButtonTitle="Grant access"
-        app:permissionIcon="@drawable/ic_phonelink_ring"
-        app:permissionTitle="@string/ringtone_title"
-        app:permissionTitleNumber="2"
-        app:permissionTitleSubTitle="@string/ringtone_summary"
-        tools:visibility="visible" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/finish"

From 5a2d43fcd73f3f5c382079d48755d6f7563c8e8a Mon Sep 17 00:00:00 2001
From: AgarwalsRahul <rahul.agarwal2019@vitstudent.ac.in>
Date: Thu, 3 Mar 2022 09:12:01 +0530
Subject: [PATCH 2/2] Fix Orientation Issue

---
 .../main/res/layout/activity_permission.xml   | 61 +++++++++----------
 app/src/main/res/values-land/integers.xml     |  5 ++
 app/src/main/res/values-sw600dp/integers.xml  |  2 +
 app/src/main/res/values/integers.xml          |  2 +
 4 files changed, 37 insertions(+), 33 deletions(-)
 create mode 100644 app/src/main/res/values-land/integers.xml

diff --git a/app/src/main/res/layout/activity_permission.xml b/app/src/main/res/layout/activity_permission.xml
index 5ebba0bb5..8b6798acf 100644
--- a/app/src/main/res/layout/activity_permission.xml
+++ b/app/src/main/res/layout/activity_permission.xml
@@ -32,49 +32,44 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:fillViewport="true"
         app:layout_constraintBottom_toTopOf="@+id/finish"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:fillViewport="true"
         app:layout_constraintTop_toBottomOf="@+id/divider">
 
-       <LinearLayout
-           android:layout_width="match_parent"
-           android:layout_height="match_parent"
-           android:orientation="vertical">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="@integer/permission_orientation">
 
-           <code.name.monkey.retromusic.views.PermissionItem
-               android:id="@+id/storagePermission"
-               android:layout_width="match_parent"
-               android:layout_height="wrap_content"
-               app:layout_constraintEnd_toEndOf="parent"
-               app:layout_constraintStart_toStartOf="parent"
-               app:layout_constraintTop_toBottomOf="@id/divider"
-               app:permissionButtonTitle="Grant access"
-               app:permissionIcon="@drawable/ic_sd_storage"
-               app:permissionTitle="@string/permission_title"
-               app:permissionTitleNumber="1"
-               app:permissionTitleSubTitle="@string/permission_summary" />
+            <code.name.monkey.retromusic.views.PermissionItem
+                android:id="@+id/storagePermission"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="@integer/permission_layout_weight"
+                app:permissionButtonTitle="Grant access"
+                app:permissionIcon="@drawable/ic_sd_storage"
+                app:permissionTitle="@string/permission_title"
+                app:permissionTitleNumber="1"
+                app:permissionTitleSubTitle="@string/permission_summary" />
 
-           <code.name.monkey.retromusic.views.PermissionItem
-               android:id="@+id/audioPermission"
-               android:layout_width="match_parent"
-               android:layout_height="wrap_content"
-               android:visibility="gone"
-               app:layout_constraintEnd_toEndOf="parent"
-               app:layout_constraintStart_toStartOf="parent"
-               app:layout_constraintTop_toBottomOf="@id/storagePermission"
-               app:permissionButtonTitle="Grant access"
-               app:permissionIcon="@drawable/ic_phonelink_ring"
-               app:permissionTitle="@string/ringtone_title"
-               app:permissionTitleNumber="2"
-               app:permissionTitleSubTitle="@string/ringtone_summary"
-               tools:visibility="visible" />
-       </LinearLayout>
+            <code.name.monkey.retromusic.views.PermissionItem
+                android:id="@+id/audioPermission"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:layout_weight="@integer/permission_layout_weight"
+                app:permissionButtonTitle="Grant access"
+                app:permissionIcon="@drawable/ic_phonelink_ring"
+                app:permissionTitle="@string/ringtone_title"
+                app:permissionTitleNumber="2"
+                app:permissionTitleSubTitle="@string/ringtone_summary"
+                tools:visibility="visible" />
+        </LinearLayout>
     </ScrollView>
 
 
-
     <com.google.android.material.button.MaterialButton
         android:id="@+id/finish"
         style="@style/Widget.Material3.Button"
diff --git a/app/src/main/res/values-land/integers.xml b/app/src/main/res/values-land/integers.xml
new file mode 100644
index 000000000..e56b97117
--- /dev/null
+++ b/app/src/main/res/values-land/integers.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="permission_orientation">0</integer>
+    <integer name="permission_layout_weight">1</integer>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw600dp/integers.xml b/app/src/main/res/values-sw600dp/integers.xml
index 826769fc2..f4fd56db6 100644
--- a/app/src/main/res/values-sw600dp/integers.xml
+++ b/app/src/main/res/values-sw600dp/integers.xml
@@ -8,4 +8,6 @@
 
     <integer name="max_columns">6</integer>
     <integer name="max_columns_land">8</integer>
+    <integer name="permission_orientation">1</integer>
+    <integer name="permission_layout_weight">1</integer>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
index 70dd6eb89..f038ad856 100644
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -10,4 +10,6 @@
     <integer name="max_columns_land">6</integer>
 
     <integer name="anim_duration_medium">200</integer>
+    <integer name="permission_orientation">1</integer>
+    <integer name="permission_layout_weight">0</integer>
 </resources>
\ No newline at end of file