From d0aa5190f9af7999f336f9ed9bde8b4695e6cab3 Mon Sep 17 00:00:00 2001
From: Page Asgardius <asgardius@asgardius.company>
Date: Mon, 26 Dec 2022 11:28:01 -0700
Subject: [PATCH] fix freeform

---
 .../main/res/layout/activity_cors_config.xml  |  70 +++---
 .../res/layout/activity_create_bucket.xml     |  94 ++++----
 app/src/main/res/layout/activity_main.xml     |  85 ++++---
 app/src/main/res/layout/activity_share.xml    | 226 +++++++++---------
 app/src/main/res/layout/activity_uploader.xml |  96 ++++----
 5 files changed, 315 insertions(+), 256 deletions(-)

diff --git a/app/src/main/res/layout/activity_cors_config.xml b/app/src/main/res/layout/activity_cors_config.xml
index f7c4f2f..001fe96 100644
--- a/app/src/main/res/layout/activity_cors_config.xml
+++ b/app/src/main/res/layout/activity_cors_config.xml
@@ -7,38 +7,50 @@
     android:orientation="vertical"
     tools:context=".CorsConfig">
 
-    <TextView
-        android:id="@+id/origins"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAlignment="center"
-        android:textSize="25sp" />
+        android:layout_height="wrap_content">
 
-    <Button
-        android:id="@+id/allow_all"
-        android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:text="@string/allow_all"
-        android:textColor="?android:attr/colorBackground"
-        android:textSize="24sp"
-        android:visibility="gone" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-    <Button
-        android:id="@+id/allow_pdf"
-        android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:text="@string/allow_pdf"
-        android:textColor="?android:attr/colorBackground"
-        android:textSize="24sp"
-        android:visibility="gone" />
+            <TextView
+                android:id="@+id/origins"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                android:textSize="25sp"/>
 
-    <Button
-        android:id="@+id/delete_cors"
-        android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:text="@string/delete_cors"
-        android:textColor="?android:attr/colorBackground"
-        android:textSize="24sp"
-        android:visibility="gone" />
+            <Button
+                android:id="@+id/allow_all"
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:text="@string/allow_all"
+                android:textColor="?android:attr/colorBackground"
+                android:textSize="24sp"
+                android:visibility="gone" />
+
+            <Button
+                android:id="@+id/allow_pdf"
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:text="@string/allow_pdf"
+                android:textColor="?android:attr/colorBackground"
+                android:textSize="24sp"
+                android:visibility="gone" />
+
+            <Button
+                android:id="@+id/delete_cors"
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:text="@string/delete_cors"
+                android:textColor="?android:attr/colorBackground"
+                android:textSize="24sp"
+                android:visibility="gone" />
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_create_bucket.xml b/app/src/main/res/layout/activity_create_bucket.xml
index 6152397..7c7843b 100644
--- a/app/src/main/res/layout/activity_create_bucket.xml
+++ b/app/src/main/res/layout/activity_create_bucket.xml
@@ -7,52 +7,64 @@
     android:orientation="vertical"
     tools:context=".CreateBucket">
 
-    <TextView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/set_bucket_name"
-        android:textAlignment="center"
-        android:textSize="30sp" />
+        android:layout_height="wrap_content">
 
-    <EditText
-        android:id="@+id/bname"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:focusable="true"
-        android:hint="@string/bucket_name"
-        android:importantForAutofill="no"
-        android:inputType="text"
-        android:textColorHint="?attr/colorOnSecondary"
-        tools:ignore="MissingConstraints" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-    <LinearLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:orientation="horizontal"
-        android:padding="10dp"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="20dp">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/set_bucket_name"
+                android:textAlignment="center"
+                android:textSize="30sp" />
 
-        <Button
-            android:id="@+id/cbucket"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/create_bucket"
-            tools:ignore="MissingConstraints" />
+            <EditText
+                android:id="@+id/bname"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:focusable="true"
+                android:hint="@string/bucket_name"
+                android:importantForAutofill="no"
+                android:inputType="text"
+                android:textColorHint="?attr/colorOnSecondary"
+                tools:ignore="MissingConstraints" />
 
-    </LinearLayout>
+            <LinearLayout
+                android:id="@+id/linearLayout"
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:orientation="horizontal"
+                android:padding="10dp"
+                tools:ignore="MissingConstraints"
+                tools:layout_editor_absoluteX="20dp">
 
-    <ProgressBar
-        android:id="@+id/simpleProgressBar"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:indeterminate="true"
-        android:max="100"
-        android:padding="20dp"
-        android:progress="50"
-        android:visibility="invisible"
-        tools:ignore="MissingConstraints" />
+                <Button
+                    android:id="@+id/cbucket"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:text="@string/create_bucket"
+                    tools:ignore="MissingConstraints" />
+
+            </LinearLayout>
+
+            <ProgressBar
+                android:id="@+id/simpleProgressBar"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:indeterminate="true"
+                android:max="100"
+                android:padding="20dp"
+                android:progress="50"
+                android:visibility="invisible"
+                tools:ignore="MissingConstraints" />
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1766de0..2987c2d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,48 +7,59 @@
     android:orientation="vertical"
     tools:context=".MainActivity">
 
-
-    <LinearLayout
-        android:id="@+id/linearLayout"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:layout_margin="20dp"
-        android:orientation="horizontal"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="20dp">
+        android:layout_height="wrap_content">
 
-        <Button
-            android:id="@+id/addaccount"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/accountadd_button"
-            tools:ignore="MissingConstraints"
-            style="?android:attr/buttonStyle" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-        <Button
-            android:id="@+id/settings_button"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/settings"
-            tools:ignore="MissingConstraints"
-            style="?android:attr/buttonStyle" />
+            <LinearLayout
+                android:id="@+id/linearLayout"
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:layout_margin="20dp"
+                android:orientation="horizontal"
+                tools:ignore="MissingConstraints"
+                tools:layout_editor_absoluteX="20dp">
 
-    </LinearLayout>
+                <Button
+                    android:id="@+id/addaccount"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:text="@string/accountadd_button"
+                    tools:ignore="MissingConstraints"
+                    style="?android:attr/buttonStyle" />
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/accountselect"
-        android:textAlignment="center"
-        android:textSize="25sp" />
+                <Button
+                    android:id="@+id/settings_button"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:text="@string/settings"
+                    tools:ignore="MissingConstraints"
+                    style="?android:attr/buttonStyle" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/alist"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:contentDescription="@string/account_list"
-        tools:layout_editor_absoluteX="27dp" />
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/accountselect"
+                android:textAlignment="center"
+                android:textSize="25sp" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/alist"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@string/account_list"
+                tools:layout_editor_absoluteX="27dp" />
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
index e8a8220..85f8a5d 100644
--- a/app/src/main/res/layout/activity_share.xml
+++ b/app/src/main/res/layout/activity_share.xml
@@ -7,127 +7,139 @@
     android:orientation="vertical"
     tools:context=".Share">
 
-    <TextView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/expiration_date"
-        android:textAlignment="center"
-        android:textSize="25sp" />
+        android:layout_height="wrap_content">
 
-    <LinearLayout
-        android:id="@+id/linearLayoutDate"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:padding="10dp"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="20dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-        <EditText
-            android:id="@+id/Date"
-            android:layout_width="0dp"
-            android:layout_height="48dp"
-            android:layout_weight="1"
-            android:focusable="true"
-            android:hint="@string/share_date"
-            android:maxLength="2"
-            android:inputType="date"
-            android:textColorHint="?attr/colorOnSecondary"
-            tools:ignore="MissingConstraints" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/expiration_date"
+                android:textAlignment="center"
+                android:textSize="25sp" />
 
-        <EditText
-            android:id="@+id/Month"
-            android:layout_width="0dp"
-            android:layout_height="48dp"
-            android:layout_weight="1"
-            android:focusable="true"
-            android:hint="@string/share_month"
-            android:maxLength="2"
-            android:inputType="date"
-            android:textColorHint="?attr/colorOnSecondary"
-            tools:ignore="MissingConstraints" />
+            <LinearLayout
+                android:id="@+id/linearLayoutDate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="10dp"
+                tools:ignore="MissingConstraints"
+                tools:layout_editor_absoluteX="20dp">
 
-        <EditText
-            android:id="@+id/Year"
-            android:layout_width="0dp"
-            android:layout_height="48dp"
-            android:layout_weight="1"
-            android:focusable="true"
-            android:hint="@string/share_year"
-            android:maxLength="4"
-            android:inputType="date"
-            android:textColorHint="?attr/colorOnSecondary"
-            tools:ignore="MissingConstraints" />
+                <EditText
+                    android:id="@+id/Date"
+                    android:layout_width="0dp"
+                    android:layout_height="48dp"
+                    android:layout_weight="1"
+                    android:focusable="true"
+                    android:hint="@string/share_date"
+                    android:maxLength="2"
+                    android:inputType="date"
+                    android:textColorHint="?attr/colorOnSecondary"
+                    tools:ignore="MissingConstraints" />
 
-    </LinearLayout>
+                <EditText
+                    android:id="@+id/Month"
+                    android:layout_width="0dp"
+                    android:layout_height="48dp"
+                    android:layout_weight="1"
+                    android:focusable="true"
+                    android:hint="@string/share_month"
+                    android:maxLength="2"
+                    android:inputType="date"
+                    android:textColorHint="?attr/colorOnSecondary"
+                    tools:ignore="MissingConstraints" />
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/expiration_time"
-        android:textAlignment="center"
-        android:textSize="25sp" />
+                <EditText
+                    android:id="@+id/Year"
+                    android:layout_width="0dp"
+                    android:layout_height="48dp"
+                    android:layout_weight="1"
+                    android:focusable="true"
+                    android:hint="@string/share_year"
+                    android:maxLength="4"
+                    android:inputType="date"
+                    android:textColorHint="?attr/colorOnSecondary"
+                    tools:ignore="MissingConstraints" />
 
-    <LinearLayout
-        android:id="@+id/linearLayoutTime"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:padding="10dp"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="20dp">
+            </LinearLayout>
 
-        <EditText
-            android:id="@+id/Hour"
-            android:layout_width="0dp"
-            android:layout_height="48dp"
-            android:layout_weight="1"
-            android:focusable="true"
-            android:hint="@string/share_hour"
-            android:maxLength="2"
-            android:inputType="date"
-            android:textColorHint="?attr/colorOnSecondary"
-            tools:ignore="MissingConstraints" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/expiration_time"
+                android:textAlignment="center"
+                android:textSize="25sp" />
 
-        <EditText
-            android:id="@+id/Minute"
-            android:layout_width="0dp"
-            android:layout_height="48dp"
-            android:layout_weight="1"
-            android:focusable="true"
-            android:hint="@string/share_minute"
-            android:maxLength="2"
-            android:inputType="date"
-            android:textColorHint="?attr/colorOnSecondary"
-            tools:ignore="MissingConstraints" />
+            <LinearLayout
+                android:id="@+id/linearLayoutTime"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="10dp"
+                tools:ignore="MissingConstraints"
+                tools:layout_editor_absoluteX="20dp">
 
-    </LinearLayout>
+                <EditText
+                    android:id="@+id/Hour"
+                    android:layout_width="0dp"
+                    android:layout_height="48dp"
+                    android:layout_weight="1"
+                    android:focusable="true"
+                    android:hint="@string/share_hour"
+                    android:maxLength="2"
+                    android:inputType="date"
+                    android:textColorHint="?attr/colorOnSecondary"
+                    tools:ignore="MissingConstraints" />
 
-    <LinearLayout
-        android:id="@+id/linearLayoutSubmit"
-        android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:layout_margin="20dp"
-        android:orientation="horizontal"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="20dp">
+                <EditText
+                    android:id="@+id/Minute"
+                    android:layout_width="0dp"
+                    android:layout_height="48dp"
+                    android:layout_weight="1"
+                    android:focusable="true"
+                    android:hint="@string/share_minute"
+                    android:maxLength="2"
+                    android:inputType="date"
+                    android:textColorHint="?attr/colorOnSecondary"
+                    tools:ignore="MissingConstraints" />
 
-        <Button
-            android:id="@+id/share"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/file_share"
-            tools:ignore="MissingConstraints" />
+            </LinearLayout>
 
-        <Button
-            android:id="@+id/open_in"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/file_external"
-            tools:ignore="MissingConstraints" />
+            <LinearLayout
+                android:id="@+id/linearLayoutSubmit"
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:layout_margin="20dp"
+                android:orientation="horizontal"
+                tools:ignore="MissingConstraints"
+                tools:layout_editor_absoluteX="20dp">
 
-    </LinearLayout>
+                <Button
+                    android:id="@+id/share"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:text="@string/file_share"
+                    tools:ignore="MissingConstraints" />
+
+                <Button
+                    android:id="@+id/open_in"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:text="@string/file_external"
+                    tools:ignore="MissingConstraints" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_uploader.xml b/app/src/main/res/layout/activity_uploader.xml
index 87e251f..6a36998 100644
--- a/app/src/main/res/layout/activity_uploader.xml
+++ b/app/src/main/res/layout/activity_uploader.xml
@@ -7,53 +7,65 @@
     android:orientation="vertical"
     tools:context=".Uploader">
 
-    <TextView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/upload_key"
-        android:textAlignment="center"
-        android:textSize="30sp" />
+        android:layout_height="wrap_content">
 
-    <EditText
-        android:id="@+id/fprefix"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:focusable="true"
-        android:hint="@string/upload_key"
-        android:importantForAutofill="no"
-        android:inputType="text"
-        android:textColorHint="?attr/colorOnSecondary"
-        tools:ignore="MissingConstraints" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-    <LinearLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:orientation="horizontal"
-        android:padding="10dp"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="20dp">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/upload_key"
+                android:textAlignment="center"
+                android:textSize="30sp" />
 
-        <Button
-            android:id="@+id/fileupload"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/upload_button"
-            tools:ignore="MissingConstraints" />
+            <EditText
+                android:id="@+id/fprefix"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:focusable="true"
+                android:hint="@string/upload_key"
+                android:importantForAutofill="no"
+                android:inputType="text"
+                android:textColorHint="?attr/colorOnSecondary"
+                tools:ignore="MissingConstraints" />
 
-    </LinearLayout>
+            <LinearLayout
+                android:id="@+id/linearLayout"
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:orientation="horizontal"
+                android:padding="10dp"
+                tools:ignore="MissingConstraints"
+                tools:layout_editor_absoluteX="20dp">
 
-    <ProgressBar
-        android:id="@+id/simpleProgressBar"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:indeterminate="false"
-        android:max="100"
-        android:padding="20dp"
-        android:progress="0"
-        android:visibility="invisible"
-        tools:ignore="MissingConstraints" />
+                <Button
+                    android:id="@+id/fileupload"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:text="@string/upload_button"
+                    tools:ignore="MissingConstraints" />
+
+            </LinearLayout>
+
+            <ProgressBar
+                android:id="@+id/simpleProgressBar"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:indeterminate="false"
+                android:max="100"
+                android:padding="20dp"
+                android:progress="0"
+                android:visibility="invisible"
+                tools:ignore="MissingConstraints" />
+
+</LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>
\ No newline at end of file