From 47f48a6a8c9fedc8d269e272df265b34ee601387 Mon Sep 17 00:00:00 2001
From: Nicholas Tinsley <nicholas@signal.org>
Date: Tue, 27 Jun 2023 17:36:22 -0400
Subject: [PATCH] Put backup enable dialog into ScrollView for smaller screens.

Addresses #13033.
---
 .../res/layout/backup_enable_dialog_v29.xml   | 240 +++++++++---------
 1 file changed, 123 insertions(+), 117 deletions(-)

diff --git a/app/src/main/res/layout/backup_enable_dialog_v29.xml b/app/src/main/res/layout/backup_enable_dialog_v29.xml
index 5fb8e63792..3fb073f9ad 100644
--- a/app/src/main/res/layout/backup_enable_dialog_v29.xml
+++ b/app/src/main/res/layout/backup_enable_dialog_v29.xml
@@ -1,130 +1,136 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:viewBindingIgnore="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingStart="23dp"
-    android:paddingTop="12dp"
-    android:paddingEnd="23dp">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/backup_enable_dialog__folder"
-        android:textAppearance="@style/Signal.Text.Caption"
-        android:textColor="@color/signal_text_primary_dialog"
-        android:textStyle="bold" />
-
-    <TextView
-        android:id="@+id/backup_enable_dialog_folder_name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="22dp"
-        android:textAppearance="@style/Signal.Text.Body"
-        tools:text="Documents" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="24dp"
-        android:background="@color/signal_divider_major" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/backup_enable_dialog__you_must_have_this_passphrase"
-        android:textAppearance="@style/Signal.Text.Body" />
-
-    <TableLayout
-        android:id="@+id/number_table"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="16dp"
-        android:clickable="true"
-        android:focusable="true">
-
-        <TableRow
-            android:clickable="false"
-            android:focusable="false"
-            android:layoutDirection="ltr"
-            android:gravity="center_horizontal">
-
-            <TextView
-                android:id="@+id/code_first"
-                style="@style/BackupPassphrase"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:text="22934" />
-
-            <TextView
-                android:id="@+id/code_second"
-                style="@style/BackupPassphrase"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                tools:text="56944" />
-
-            <TextView
-                android:id="@+id/code_third"
-                style="@style/BackupPassphrase"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                tools:text="42738" />
-        </TableRow>
-
-        <TableRow android:gravity="center_horizontal"
-                  android:layoutDirection="ltr"
-                  android:layout_marginTop="4dp">
-
-            <TextView
-                android:id="@+id/code_fourth"
-                style="@style/BackupPassphrase"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:text="34431" />
-
-            <TextView
-                android:id="@+id/code_fifth"
-                style="@style/BackupPassphrase"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                tools:text="24922" />
-
-            <TextView
-                android:id="@+id/code_sixth"
-                style="@style/BackupPassphrase"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                tools:text="58594" />
-        </TableRow>
-    </TableLayout>
+    tools:viewBindingIgnore="true">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <CheckBox
-            android:id="@+id/confirmation_check"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp" />
+        android:orientation="vertical"
+        android:paddingStart="23dp"
+        android:paddingTop="12dp"
+        android:paddingEnd="23dp">
 
         <TextView
-            android:id="@+id/confirmation_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/backup_enable_dialog__folder"
+            android:textAppearance="@style/Signal.Text.Caption"
+            android:textColor="@color/signal_text_primary_dialog"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/backup_enable_dialog_folder_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="22dp"
+            android:textAppearance="@style/Signal.Text.Body"
+            tools:text="Documents" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="24dp"
+            android:background="@color/signal_divider_major" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/backup_enable_dialog__you_must_have_this_passphrase"
+            android:textAppearance="@style/Signal.Text.Body" />
+
+        <TableLayout
+            android:id="@+id/number_table"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/backup_enable_dialog__i_have_written_down_this_passphrase"
-            android:textSize="12sp" />
-    </LinearLayout>
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="16dp"
+            android:clickable="true"
+            android:focusable="true">
 
-</LinearLayout>
\ No newline at end of file
+            <TableRow
+                android:clickable="false"
+                android:focusable="false"
+                android:gravity="center_horizontal"
+                android:layoutDirection="ltr">
+
+                <TextView
+                    android:id="@+id/code_first"
+                    style="@style/BackupPassphrase"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="22934" />
+
+                <TextView
+                    android:id="@+id/code_second"
+                    style="@style/BackupPassphrase"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    tools:text="56944" />
+
+                <TextView
+                    android:id="@+id/code_third"
+                    style="@style/BackupPassphrase"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    tools:text="42738" />
+            </TableRow>
+
+            <TableRow
+                android:layout_marginTop="4dp"
+                android:gravity="center_horizontal"
+                android:layoutDirection="ltr">
+
+                <TextView
+                    android:id="@+id/code_fourth"
+                    style="@style/BackupPassphrase"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="34431" />
+
+                <TextView
+                    android:id="@+id/code_fifth"
+                    style="@style/BackupPassphrase"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    tools:text="24922" />
+
+                <TextView
+                    android:id="@+id/code_sixth"
+                    style="@style/BackupPassphrase"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    tools:text="58594" />
+            </TableRow>
+        </TableLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <CheckBox
+                android:id="@+id/confirmation_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="10dp" />
+
+            <TextView
+                android:id="@+id/confirmation_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/backup_enable_dialog__i_have_written_down_this_passphrase"
+                android:textSize="12sp" />
+        </LinearLayout>
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file