From 364b9702f4884908c9be7249e8ab51b9d70e402c Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Wed, 29 Jul 2020 16:27:40 +0200
Subject: [PATCH] Android: Use narrow layout for savestate slot picker in
 portrait

---
 .../res/layout/fragment_saveload_state.xml     | 18 +++++++++---------
 .../src/main/res/values-w540dp/integers.xml    |  5 +++++
 .../src/main/res/values-w660dp/integers.xml    |  5 +++++
 .../app/src/main/res/values/integers.xml       |  2 ++
 4 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 Source/Android/app/src/main/res/values-w540dp/integers.xml
 create mode 100644 Source/Android/app/src/main/res/values-w660dp/integers.xml

diff --git a/Source/Android/app/src/main/res/layout/fragment_saveload_state.xml b/Source/Android/app/src/main/res/layout/fragment_saveload_state.xml
index 0fb87d44a3..d8c0f6354a 100644
--- a/Source/Android/app/src/main/res/layout/fragment_saveload_state.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_saveload_state.xml
@@ -2,51 +2,51 @@
             android:id="@+id/grid_state_slots"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:columnCount="3"
-            android:rowCount="2"
+            android:columnCount="@integer/loadsave_state_columns"
+            android:rowCount="@integer/loadsave_state_rows"
             android:layout_gravity="center"
             android:background="#af000000">
 
     <Button
         android:id="@+id/loadsave_state_button_1"
         android:layout_width="128dp"
-        android:layout_height="128dp"
+        android:layout_height="96dp"
         android:text="@string/emulation_slot1"
         style="@style/OverlayInGameMenuOption"/>
 
     <Button
         android:id="@+id/loadsave_state_button_2"
         android:layout_width="128dp"
-        android:layout_height="128dp"
+        android:layout_height="96dp"
         android:text="@string/emulation_slot2"
         style="@style/OverlayInGameMenuOption"/>
 
     <Button
         android:id="@+id/loadsave_state_button_3"
         android:layout_width="128dp"
-        android:layout_height="128dp"
+        android:layout_height="96dp"
         android:text="@string/emulation_slot3"
         style="@style/OverlayInGameMenuOption"/>
 
     <Button
         android:id="@+id/loadsave_state_button_4"
         android:layout_width="128dp"
-        android:layout_height="128dp"
+        android:layout_height="96dp"
         android:text="@string/emulation_slot4"
         style="@style/OverlayInGameMenuOption"/>
 
     <Button
         android:id="@+id/loadsave_state_button_5"
         android:layout_width="128dp"
-        android:layout_height="128dp"
+        android:layout_height="96dp"
         android:text="@string/emulation_slot5"
         style="@style/OverlayInGameMenuOption"/>
 
     <Button
         android:id="@+id/loadsave_state_button_6"
         android:layout_width="128dp"
-        android:layout_height="128dp"
+        android:layout_height="96dp"
         android:text="@string/emulation_slot6"
         style="@style/OverlayInGameMenuOption"/>
 
-</GridLayout>
\ No newline at end of file
+</GridLayout>
diff --git a/Source/Android/app/src/main/res/values-w540dp/integers.xml b/Source/Android/app/src/main/res/values-w540dp/integers.xml
new file mode 100644
index 0000000000..40860e6906
--- /dev/null
+++ b/Source/Android/app/src/main/res/values-w540dp/integers.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="loadsave_state_columns">2</integer>
+    <integer name="loadsave_state_rows">3</integer>
+</resources>
diff --git a/Source/Android/app/src/main/res/values-w660dp/integers.xml b/Source/Android/app/src/main/res/values-w660dp/integers.xml
new file mode 100644
index 0000000000..e4941c458e
--- /dev/null
+++ b/Source/Android/app/src/main/res/values-w660dp/integers.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="loadsave_state_columns">3</integer>
+    <integer name="loadsave_state_rows">2</integer>
+</resources>
diff --git a/Source/Android/app/src/main/res/values/integers.xml b/Source/Android/app/src/main/res/values/integers.xml
index 1585d38ff4..bbaed0f47a 100644
--- a/Source/Android/app/src/main/res/values/integers.xml
+++ b/Source/Android/app/src/main/res/values/integers.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <integer name="game_grid_columns">3</integer>
+    <integer name="loadsave_state_columns">1</integer>
+    <integer name="loadsave_state_rows">6</integer>
 
     <!-- Default GameCube landscape layout -->
     <integer name="BUTTON_A_X">865</integer>