From 4e102a8855449fe9a27148f178899831f65d4e19 Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 18 Aug 2025 18:29:14 -0700
Subject: [PATCH 01/11] Upgrade AGP to 8.12.1

---
 app/build.gradle.kts                          |   8 +-
 .../djangofiles/widget/WidgetProvider.kt      |  12 +-
 .../main/res/layout/fragment_login_two.xml    | 148 +++++++++++-------
 gradle/libs.versions.toml                     |   2 +-
 4 files changed, 104 insertions(+), 66 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d668305..bdb584f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -60,15 +60,15 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     //kotlinOptions {
-    //    jvmTarget = "11"
+    //    jvmTarget = "17"
     //}
     tasks.withType<KotlinJvmCompile>().configureEach {
         compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_11)
+            jvmTarget.set(JvmTarget.JVM_17)
         }
     }
 
diff --git a/app/src/main/java/com/djangofiles/djangofiles/widget/WidgetProvider.kt b/app/src/main/java/com/djangofiles/djangofiles/widget/WidgetProvider.kt
index d07e49b..7242a15 100644
--- a/app/src/main/java/com/djangofiles/djangofiles/widget/WidgetProvider.kt
+++ b/app/src/main/java/com/djangofiles/djangofiles/widget/WidgetProvider.kt
@@ -17,15 +17,14 @@ import com.djangofiles.djangofiles.R
 import com.djangofiles.djangofiles.db.ServerDao
 import com.djangofiles.djangofiles.db.ServerDatabase
 import com.djangofiles.djangofiles.work.updateStats
-import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import java.util.Date
 
 class WidgetProvider : AppWidgetProvider() {
 
-    @OptIn(DelicateCoroutinesApi::class)
     override fun onReceive(context: Context, intent: Intent) {
         super.onReceive(context, intent)
         Log.i("Widget[onReceive]", "intent: $intent")
@@ -46,8 +45,8 @@ class WidgetProvider : AppWidgetProvider() {
             if (appWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
                 return
             }
-            Log.d("Widget[onReceive]", "GlobalScope.launch: START")
-            GlobalScope.launch(Dispatchers.IO) {
+            Log.d("Widget[onReceive]", "CoroutineScope.launch: START")
+            CoroutineScope(SupervisorJob() + Dispatchers.IO).launch {
                 context.updateStats()
                 val appWidgetManager = AppWidgetManager.getInstance(context)
                 onUpdate(context, appWidgetManager, intArrayOf(appWidgetId))
@@ -56,7 +55,6 @@ class WidgetProvider : AppWidgetProvider() {
         }
     }
 
-    @OptIn(DelicateCoroutinesApi::class)
     override fun onUpdate(
         context: Context,
         appWidgetManager: AppWidgetManager,
@@ -158,7 +156,7 @@ class WidgetProvider : AppWidgetProvider() {
             //views.setOnClickPendingIntent(R.id.file_list_button, pendingIntent3)
 
             // Room Data
-            GlobalScope.launch(Dispatchers.IO) {
+            CoroutineScope(SupervisorJob() + Dispatchers.IO).launch {
                 val dao: ServerDao = ServerDatabase.Companion.getInstance(context).serverDao()
                 Log.d("Widget[onUpdate]", "dao: $dao")
                 val server = dao.getByUrl(savedUrl)
diff --git a/app/src/main/res/layout/fragment_login_two.xml b/app/src/main/res/layout/fragment_login_two.xml
index 69b931f..4151759 100644
--- a/app/src/main/res/layout/fragment_login_two.xml
+++ b/app/src/main/res/layout/fragment_login_two.xml
@@ -11,72 +11,110 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical">
+<!-- NOTE: Insets are applied to the above layout as padding -->
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:gravity="center_horizontal"
+    android:padding="24dp"
+    tools:ignore="UselessParent">
+
+    <ImageView
+        android:id="@+id/app_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="8dp"
+        android:contentDescription="@string/app_name"
+        android:src="@mipmap/ic_launcher" />
+    <TextView
+        android:id="@+id/site_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="@string/app_name"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
-    <!-- NOTE: Insets are applied to the above layout as padding -->
     <LinearLayout
+        android:id="@+id/login_local"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
         android:orientation="vertical"
-        android:gravity="center_horizontal"
-        android:padding="24dp"
-        tools:ignore="UselessParent">
-
-        <ImageView
-            android:id="@+id/app_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="8dp"
-            android:contentDescription="@string/app_name"
-            android:src="@mipmap/ic_launcher" />
-        <TextView
-            android:id="@+id/site_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@string/app_name"
-            android:textAppearance="@style/TextAppearance.AppCompat.Large" />
-
-        <LinearLayout
-            android:id="@+id/login_local"
+        android:visibility="gone"
+        tools:visibility="visible">
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+        <LinearLayout
+            android:id="@+id/edit_text_layout"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
             android:layout_marginBottom="16dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/add_server_login"
+            app:layout_constraintWidth_max="488dp"
             android:orientation="vertical"
             android:visibility="gone"
             tools:visibility="visible">
-            <EditText
-                android:id="@+id/login_username"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:autofillHints="username"
-                android:hint="Username"
-                android:inputType="text"
-                android:padding="10dp"
-                android:drawableEnd="@drawable/md_account_circle_24px"
-                android:drawableTint="?android:attr/textColorTertiary" />
-            <EditText
-                android:id="@+id/login_password"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:padding="10dp"
-                android:autofillHints="password"
-                android:hint="Password"
-                android:inputType="textPassword"
-                android:drawableEnd="@drawable/md_key_24"
-                android:drawableTint="?android:attr/textColorTertiary" />
-            <Button
-                android:id="@+id/add_server_login"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:drawableEnd="@drawable/md_login_24px"
-                android:paddingEnd="36dp"
-                android:paddingStart="36dp"
-                android:text="Local Login"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+        <EditText
+            android:id="@+id/login_username"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:autofillHints="username"
+            android:hint="Username"
+            android:inputType="text"
+            android:padding="10dp"
+            android:drawableEnd="@drawable/md_account_circle_24px"
+            android:drawableTint="?android:attr/textColorTertiary" />
+        <EditText
+            android:id="@+id/login_password"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:padding="10dp"
+            android:autofillHints="password"
+            android:hint="Password"
+            android:inputType="textPassword"
+            android:drawableEnd="@drawable/md_key_24"
+            android:drawableTint="?android:attr/textColorTertiary" />
         </LinearLayout>
+        <Button
+            android:id="@+id/add_server_login"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            app:layout_constraintTop_toBottomOf="@+id/edit_text_layout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintWidth_max="320dp"
+            android:drawableEnd="@drawable/md_login_24px"
+            android:paddingEnd="36dp"
+            android:paddingStart="36dp"
+            android:text="Local Login"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        android:clipChildren="false">
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintWidth_max="320dp"
+        android:orientation="vertical">
 
         <Button
             android:id="@+id/login_discord"
@@ -146,6 +184,8 @@
             app:strokeWidth="2dp" />
 
     </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
+</LinearLayout>
 </LinearLayout>
 </ScrollView>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b4c83d8..dc4145b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.12.0"
+agp = "8.12.1"
 kotlin = "2.2.10"
 ksp = "2.2.10-2.0.2"
 coreKtx = "1.17.0"

From da7dc8fb970cd6479d9ec795822a8828d790eda0 Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 18 Aug 2025 19:16:04 -0700
Subject: [PATCH 02/11] Update Dialogs

---
 .../ui/settings/SettingsFragment.kt           | 82 ++++++++-----------
 app/src/main/res/drawable/fa_github.xml       |  2 +-
 app/src/main/res/layout/dialog_app_info.xml   | 38 ++++-----
 app/src/main/res/layout/dialog_feedback.xml   | 24 ++++--
 app/src/main/res/values/strings.xml           |  4 +
 5 files changed, 74 insertions(+), 76 deletions(-)

diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/settings/SettingsFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/settings/SettingsFragment.kt
index 89cd466..65c151f 100644
--- a/app/src/main/java/com/djangofiles/djangofiles/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/djangofiles/djangofiles/ui/settings/SettingsFragment.kt
@@ -385,10 +385,22 @@ class SettingsFragment : PreferenceFragmentCompat() {
             .show()
     }
 
-    fun Context.showFeedbackDialog() {
+    private fun Context.showFeedbackDialog() {
         val inflater = LayoutInflater.from(this)
         val view = inflater.inflate(R.layout.dialog_feedback, null)
+
         val input = view.findViewById<EditText>(R.id.feedback_input)
+        val websiteLink = view.findViewById<TextView>(R.id.website_link)
+        val githubLink = view.findViewById<TextView>(R.id.github_link)
+
+        websiteLink.paint?.isUnderlineText = true
+        websiteLink.setOnClickListener {
+            startActivity(Intent(Intent.ACTION_VIEW, websiteLink.tag.toString().toUri()))
+        }
+        githubLink.paint?.isUnderlineText = true
+        githubLink.setOnClickListener {
+            startActivity(Intent(Intent.ACTION_VIEW, githubLink.tag.toString().toUri()))
+        }
 
         val dialog = MaterialAlertDialogBuilder(this)
             .setView(view)
@@ -417,7 +429,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
                                 putString("message", response.message())
                                 putString("code", response.code().toString())
                             }
-                            Firebase.analytics.logEvent("send_feedback_failed", params)
+                            Firebase.analytics.logEvent("feedback_failed", params)
                             "Error: ${response.code()}"
                         }
                         Log.d("showFeedbackDialog", "msg: $msg")
@@ -428,67 +440,45 @@ class SettingsFragment : PreferenceFragmentCompat() {
                     input.error = "Feedback is Required"
                 }
             }
-
             input.requestFocus()
-
-            val link = view.findViewById<TextView>(R.id.github_link)
-            val linkText = getString(R.string.github_link, link.tag)
-            link.text = Html.fromHtml(linkText, Html.FROM_HTML_MODE_LEGACY)
-            link.movementMethod = LinkMovementMethod.getInstance()
-
-            //val imm = this.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-            //imm.showSoftInput(input, InputMethodManager.SHOW_IMPLICIT)
         }
-
-        dialog.setButton(AlertDialog.BUTTON_POSITIVE, "Send") { _, _ -> }
         dialog.show()
     }
 
-    fun Context.showAppInfoDialog() {
+    private fun Context.showAppInfoDialog() {
         val inflater = LayoutInflater.from(this)
         val view = inflater.inflate(R.layout.dialog_app_info, null)
+
         val appId = view.findViewById<TextView>(R.id.app_identifier)
-        val appVersion = view.findViewById<TextView>(R.id.app_version)
-        val sourceLink = view.findViewById<TextView>(R.id.source_link)
+        val versionName = view.findViewById<TextView>(R.id.version_name)
+        val githubLink = view.findViewById<TextView>(R.id.github_link)
         val websiteLink = view.findViewById<TextView>(R.id.website_link)
-        //val appInfo = view.findViewById<TextView>(R.id.open_app_info)
-
-        val sourceText = getString(R.string.github_link, sourceLink.tag)
-        Log.d("showAppInfoDialog", "sourceText: $sourceText")
 
-        val websiteText = getString(R.string.website_link, websiteLink.tag)
-        Log.d("showAppInfoDialog", "websiteText: $websiteText")
+        githubLink.paint?.isUnderlineText = true
+        githubLink.setOnClickListener {
+            startActivity(Intent(Intent.ACTION_VIEW, githubLink.tag.toString().toUri()))
+        }
+        websiteLink.paint?.isUnderlineText = true
+        websiteLink.setOnClickListener {
+            startActivity(Intent(Intent.ACTION_VIEW, websiteLink.tag.toString().toUri()))
+        }
 
         val packageInfo = this.packageManager.getPackageInfo(this.packageName, 0)
-        val versionName = packageInfo.versionName
-        Log.d("showAppInfoDialog", "versionName: $versionName")
-
-        val formattedVersion = getString(R.string.version_string, versionName)
+        val formattedVersion = getString(
+            R.string.version_code_string,
+            packageInfo.versionName,
+            packageInfo.versionCode.toString()
+        )
         Log.d("showAppInfoDialog", "formattedVersion: $formattedVersion")
 
-        val dialog = MaterialAlertDialogBuilder(this)
+        appId.text = this.packageName
+        versionName.text = formattedVersion
+
+        MaterialAlertDialogBuilder(this)
             .setView(view)
             .setNegativeButton("Close", null)
             .create()
-
-        dialog.setOnShowListener {
-            appId.text = this.packageName
-            appVersion.text = formattedVersion
-
-            sourceLink.text = Html.fromHtml(sourceText, Html.FROM_HTML_MODE_LEGACY)
-            sourceLink.movementMethod = LinkMovementMethod.getInstance()
-            websiteLink.text = Html.fromHtml(websiteText, Html.FROM_HTML_MODE_LEGACY)
-            websiteLink.movementMethod = LinkMovementMethod.getInstance()
-
-            //appInfo.setOnClickListener {
-            //    Log.d("appInfo", "setOnClickListener")
-            //    val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
-            //        data = Uri.fromParts("package", packageName, null)
-            //    }
-            //    startActivity(intent)
-            //}
-        }
-        dialog.show()
+            .show()
     }
 }
 
diff --git a/app/src/main/res/drawable/fa_github.xml b/app/src/main/res/drawable/fa_github.xml
index 4dac7a2..59bb846 100644
--- a/app/src/main/res/drawable/fa_github.xml
+++ b/app/src/main/res/drawable/fa_github.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="496"
     android:viewportHeight="512">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="?attr/colorControlNormal"
       android:pathData="M165.9,397.4c0,2 -2.3,3.6 -5.2,3.6 -3.3,0.3 -5.6,-1.3 -5.6,-3.6 0,-2 2.3,-3.6 5.2,-3.6 3,-0.3 5.6,1.3 5.6,3.6zM134.8,392.9c-0.7,2 1.3,4.3 4.3,4.9 2.6,1 5.6,0 6.2,-2s-1.3,-4.3 -4.3,-5.2c-2.6,-0.7 -5.5,0.3 -6.2,2.3zM179,391.2c-2.9,0.7 -4.9,2.6 -4.6,4.9 0.3,2 2.9,3.3 5.9,2.6 2.9,-0.7 4.9,-2.6 4.6,-4.6 -0.3,-1.9 -3,-3.2 -5.9,-2.9zM244.8,8C106.1,8 0,113.3 0,252c0,110.9 69.8,205.8 169.5,239.2 12.8,2.3 17.3,-5.6 17.3,-12.1 0,-6.2 -0.3,-40.4 -0.3,-61.4 0,0 -70,15 -84.7,-29.8 0,0 -11.4,-29.1 -27.8,-36.6 0,0 -22.9,-15.7 1.6,-15.4 0,0 24.9,2 38.6,25.8 21.9,38.6 58.6,27.5 72.9,20.9 2.3,-16 8.8,-27.1 16,-33.7 -55.9,-6.2 -112.3,-14.3 -112.3,-110.5 0,-27.5 7.6,-41.3 23.6,-58.9 -2.6,-6.5 -11.1,-33.3 2.6,-67.9 20.9,-6.5 69,27 69,27 20,-5.6 41.5,-8.5 62.8,-8.5s42.8,2.9 62.8,8.5c0,0 48.1,-33.6 69,-27 13.7,34.7 5.2,61.4 2.6,67.9 16,17.7 25.8,31.5 25.8,58.9 0,96.5 -58.9,104.2 -114.8,110.5 9.2,7.9 17,22.9 17,46.4 0,33.7 -0.3,75.4 -0.3,83.6 0,6.5 4.6,14.4 17.3,12.1C428.2,457.8 496,362.9 496,252 496,113.3 383.5,8 244.8,8zM97.2,352.9c-1.3,1 -1,3.3 0.7,5.2 1.6,1.6 3.9,2.3 5.2,1 1.3,-1 1,-3.3 -0.7,-5.2 -1.6,-1.6 -3.9,-2.3 -5.2,-1zM86.4,344.8c-0.7,1.3 0.3,2.9 2.3,3.9 1.6,1 3.6,0.7 4.3,-0.7 0.7,-1.3 -0.3,-2.9 -2.3,-3.9 -2,-0.6 -3.6,-0.3 -4.3,0.7zM118.8,380.4c-1.6,1.3 -1,4.3 1.3,6.2 2.3,2.3 5.2,2.6 6.5,1 1.3,-1.3 0.7,-4.3 -1.3,-6.2 -2.2,-2.3 -5.2,-2.6 -6.5,-1zM107.4,365.7c-1.6,1 -1.6,3.6 0,5.9 1.6,2.3 4.3,3.3 5.6,2.3 1.6,-1.3 1.6,-3.9 0,-6.2 -1.4,-2.3 -4,-3.3 -5.6,-2z"/>
 </vector>
diff --git a/app/src/main/res/layout/dialog_app_info.xml b/app/src/main/res/layout/dialog_app_info.xml
index 846e265..a7e565e 100644
--- a/app/src/main/res/layout/dialog_app_info.xml
+++ b/app/src/main/res/layout/dialog_app_info.xml
@@ -23,17 +23,17 @@
         android:gravity="center"
         tools:ignore="UseCompoundDrawables">
         <ImageView
-            android:layout_width="48dp"
-            android:layout_height="48dp"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
             android:contentDescription="@string/app_name"
-            android:src="@mipmap/ic_launcher_round"/>
+            android:src="@mipmap/ic_launcher_round" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
             android:text="@string/app_name"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
-            android:labelFor="@+id/feedback_input"/>
+            android:labelFor="@+id/feedback_input" />
     </LinearLayout>
 
     <LinearLayout
@@ -78,14 +78,14 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
             <TextView
-                android:id="@+id/app_version"
+                android:id="@+id/version_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingVertical="@dimen/dialog_vertical_margin"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body2"
                 android:maxLines="1"
                 android:ellipsize="end"
-                tools:text="v0.0.1" />
+                tools:text="0.0.1 (1)" />
             <TextView
                 android:id="@+id/app_identifier"
                 android:layout_width="wrap_content"
@@ -93,8 +93,8 @@
                 android:paddingVertical="@dimen/dialog_vertical_margin"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body2"
                 android:maxLines="1"
-                android:ellipsize="start"
-                tools:text="com.djangofiles.djangofiles.dev" />
+                android:ellipsize="end"
+                tools:text="org.cssnr.zipline" />
             <TextView
                 android:id="@+id/app_name"
                 android:layout_width="wrap_content"
@@ -105,14 +105,15 @@
                 android:ellipsize="end"
                 android:text="@string/app_name" />
             <TextView
-                android:id="@+id/source_link"
+                android:id="@+id/github_link"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingVertical="@dimen/dialog_vertical_margin"
                 android:maxLines="1"
                 android:ellipsize="end"
-                android:tag="django-files/android-client"
-                android:text="django-files/android-client" />
+                android:textColor="?attr/colorPrimary"
+                android:text="django-files/android-client"
+                android:tag="@string/github_url" />
             <TextView
                 android:id="@+id/website_link"
                 android:layout_width="wrap_content"
@@ -120,21 +121,12 @@
                 android:paddingVertical="@dimen/dialog_vertical_margin"
                 android:maxLines="1"
                 android:ellipsize="end"
-                android:tag="django-files.github.io"
-                android:text="django-files.github.io" />
+                android:textColor="?attr/colorPrimary"
+                android:text="django-files.github.io"
+                android:tag="@string/website_url" />
         </LinearLayout>
     </LinearLayout>
 
-    <!--<TextView-->
-    <!--    android:id="@+id/open_app_info"-->
-    <!--    android:layout_width="wrap_content"-->
-    <!--    android:layout_height="wrap_content"-->
-    <!--    android:layout_marginTop="16dp"-->
-    <!--    android:layout_gravity="center_horizontal"-->
-    <!--    android:textAppearance="@style/TextAppearance.AppCompat.Medium"-->
-    <!--    android:textColor="@android:color/holo_blue_light"-->
-    <!--    android:text="Open Android Settings" />-->
-
 </LinearLayout>
 </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/dialog_feedback.xml b/app/src/main/res/layout/dialog_feedback.xml
index 9025343..4fbe679 100644
--- a/app/src/main/res/layout/dialog_feedback.xml
+++ b/app/src/main/res/layout/dialog_feedback.xml
@@ -50,16 +50,28 @@
             android:hint="Provide Feedback to Developers." />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <TextView
+        android:id="@+id/website_link"
+        android:layout_width="wrap_content"
+        android:layout_height="48dp"
+        android:gravity="center_vertical"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        android:textColor="?attr/colorPrimary"
+        android:text="Developer Site"
+        android:tag="@string/website_url"
+        android:drawablePadding="8dp"
+        app:drawableStartCompat="@drawable/md_captive_portal_24px" />
     <TextView
         android:id="@+id/github_link"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:layout_gravity="center"
+        android:layout_height="48dp"
+        android:gravity="center_vertical"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        android:textColor="?attr/colorPrimary"
+        android:text="View Source Code"
+        android:tag="@string/github_url"
         android:drawablePadding="8dp"
-        app:drawableStartCompat="@drawable/fa_github"
-        android:text="More Info on GitHub"
-        android:tag="More Info on GitHub" />
+        app:drawableStartCompat="@drawable/fa_github" />
 
 </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2150e3c..305ebf0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,11 @@
 <resources>
     <string name="app_name">Django Files</string>
     <string name="version_string">v%s</string>
+    <string name="version_code_string">%s (%s)</string>
+
+    <string name="github_url">https://github.com/django-files/android-client</string>
     <string name="github_link"><![CDATA[<a href="https://github.com/django-files/android-client">%s</a>]]></string>
+    <string name="website_url">https://django-files.github.io/</string>
     <string name="website_link"><![CDATA[<a href="https://django-files.github.io/">%s</a>]]></string>
 
     <string name="setup_host_placeholder">your.django-files.com</string>

From d0737a64ae7f441168e2d6c2dbea576a3d369651 Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 18 Aug 2025 19:41:05 -0700
Subject: [PATCH 03/11] Update Badges

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3b95982..c36ef2a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 [![GitHub Downloads](https://img.shields.io/github/downloads/django-files/android-client/total?logo=android)](https://github.com/django-files/android-client/releases/latest/download/app-release.apk)
 [![GitHub Release Version](https://img.shields.io/github/v/release/django-files/android-client?logo=github)](https://github.com/django-files/android-client/releases/latest)
+[![GitHub Last Commit](https://img.shields.io/github/last-commit/django-files/android-client?logo=github&label=updated)](https://github.com/django-files/android-client/pulse)
 [![Lint](https://img.shields.io/github/actions/workflow/status/django-files/android-client/lint.yaml?logo=github&logoColor=white&label=lint)](https://github.com/django-files/android-client/actions/workflows/lint.yaml)
-[![GitHub Last Commit](https://img.shields.io/github/last-commit/django-files/android-client?logo=github&label=updated)](https://github.com/django-files/android-client/graphs/commit-activity)
+[![Release](https://img.shields.io/github/actions/workflow/status/django-files/android-client/lint.yaml?logo=github&logoColor=white&label=release)](https://github.com/django-files/android-client/actions/workflows/release.yaml)
 [![GitHub Repo Size](https://img.shields.io/github/repo-size/django-files/android-client?logo=bookstack&logoColor=white&label=repo%20size)](https://github.com/django-files/android-client)
 [![GitHub Top Language](https://img.shields.io/github/languages/top/django-files/android-client?logo=htmx)](https://github.com/django-files/android-client)
 [![GitHub Discussions](https://img.shields.io/github/discussions/django-files/android-client)](https://github.com/django-files/android-client/discussions)
@@ -51,7 +52,7 @@ _If you are unsure how to install, [Obtainium](https://github.com/ImranR98/Obtai
 [![Get on GitHub](https://raw.githubusercontent.com/smashedr/repo-images/refs/heads/master/android/get80/github.png)](https://github.com/django-files/android-client/releases/latest/download/app-release.apk)
 [![Get on Obtainium](https://raw.githubusercontent.com/smashedr/repo-images/refs/heads/master/android/get80/obtainium.png)](https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://github.com/django-files/android-client)
 
-<details><summary>📲 Click to View QR Codes 📸</summary>
+<details><summary>📲 Click to View QR Codes 📸 Supports Android 8 (API 26) 2017 +</summary>
 
 [![QR Code GitHub](https://raw.githubusercontent.com/smashedr/repo-images/refs/heads/master/django-files/android/qr-code-github.png)](https://github.com/django-files/android-client/releases/latest/download/app-release.apk)
 

From dcb375a1c548f1cfc68e4712acc6ad75c320d70b Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 18 Aug 2025 19:46:33 -0700
Subject: [PATCH 04/11] Update Badges

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c36ef2a..e269714 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 [![Release](https://img.shields.io/github/actions/workflow/status/django-files/android-client/lint.yaml?logo=github&logoColor=white&label=release)](https://github.com/django-files/android-client/actions/workflows/release.yaml)
 [![GitHub Repo Size](https://img.shields.io/github/repo-size/django-files/android-client?logo=bookstack&logoColor=white&label=repo%20size)](https://github.com/django-files/android-client)
 [![GitHub Top Language](https://img.shields.io/github/languages/top/django-files/android-client?logo=htmx)](https://github.com/django-files/android-client)
-[![GitHub Discussions](https://img.shields.io/github/discussions/django-files/android-client)](https://github.com/django-files/android-client/discussions)
+[![GitHub Discussions](https://img.shields.io/github/discussions/django-files/android-client?logo=github)](https://github.com/django-files/android-client/discussions)
 [![GitHub Forks](https://img.shields.io/github/forks/django-files/android-client?style=flat&logo=github)](https://github.com/django-files/android-client/forks)
 [![GitHub Repo Stars](https://img.shields.io/github/stars/django-files/android-client?style=flat&logo=github)](https://github.com/django-files/android-client/stargazers)
 [![GitHub Org Stars](https://img.shields.io/github/stars/django-files?style=flat&logo=github&label=org%20stars)](https://django-files.github.io/)

From 774070ef1362fa23d793cd635fa6c23ef22483f1 Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 18 Aug 2025 19:47:49 -0700
Subject: [PATCH 05/11] Update Badges

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e269714..70efd25 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 [![GitHub Release Version](https://img.shields.io/github/v/release/django-files/android-client?logo=github)](https://github.com/django-files/android-client/releases/latest)
 [![GitHub Last Commit](https://img.shields.io/github/last-commit/django-files/android-client?logo=github&label=updated)](https://github.com/django-files/android-client/pulse)
 [![Lint](https://img.shields.io/github/actions/workflow/status/django-files/android-client/lint.yaml?logo=github&logoColor=white&label=lint)](https://github.com/django-files/android-client/actions/workflows/lint.yaml)
-[![Release](https://img.shields.io/github/actions/workflow/status/django-files/android-client/lint.yaml?logo=github&logoColor=white&label=release)](https://github.com/django-files/android-client/actions/workflows/release.yaml)
+[![Release](https://img.shields.io/github/actions/workflow/status/django-files/android-client/release.yaml?logo=github&logoColor=white&label=release)](https://github.com/django-files/android-client/actions/workflows/release.yaml)
 [![GitHub Repo Size](https://img.shields.io/github/repo-size/django-files/android-client?logo=bookstack&logoColor=white&label=repo%20size)](https://github.com/django-files/android-client)
 [![GitHub Top Language](https://img.shields.io/github/languages/top/django-files/android-client?logo=htmx)](https://github.com/django-files/android-client)
 [![GitHub Discussions](https://img.shields.io/github/discussions/django-files/android-client?logo=github)](https://github.com/django-files/android-client/discussions)

From 8483e2f58f563d534e37af305361826e3b3c57d6 Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 18 Aug 2025 20:12:15 -0700
Subject: [PATCH 06/11] Update Badges

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 70efd25..c9561ed 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![GitHub Last Commit](https://img.shields.io/github/last-commit/django-files/android-client?logo=github&label=updated)](https://github.com/django-files/android-client/pulse)
 [![Lint](https://img.shields.io/github/actions/workflow/status/django-files/android-client/lint.yaml?logo=github&logoColor=white&label=lint)](https://github.com/django-files/android-client/actions/workflows/lint.yaml)
 [![Release](https://img.shields.io/github/actions/workflow/status/django-files/android-client/release.yaml?logo=github&logoColor=white&label=release)](https://github.com/django-files/android-client/actions/workflows/release.yaml)
+[![AGP Version](https://img.shields.io/badge/dynamic/toml?url=https%3A%2F%2Fraw.githubusercontent.com%2Fdjango-files%2Fandroid-client%2Frefs%2Fheads%2Fmaster%2Fgradle%2Flibs.versions.toml&query=%24.versions.agp&logo=gradle&label=AGP)](https://github.com/django-files/android-client/blob/master/gradle/libs.versions.toml#L2)
 [![GitHub Repo Size](https://img.shields.io/github/repo-size/django-files/android-client?logo=bookstack&logoColor=white&label=repo%20size)](https://github.com/django-files/android-client)
 [![GitHub Top Language](https://img.shields.io/github/languages/top/django-files/android-client?logo=htmx)](https://github.com/django-files/android-client)
 [![GitHub Discussions](https://img.shields.io/github/discussions/django-files/android-client?logo=github)](https://github.com/django-files/android-client/discussions)

From 6805b4cbc20bdd5419bae32e2fa32e562dae7f05 Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 18 Aug 2025 20:37:12 -0700
Subject: [PATCH 07/11] Update Badges

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c9561ed..5e22b11 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 
 # Django Files Android App
 
-[![GitHub Release](https://img.shields.io/github/v/release/django-files/android-client?style=for-the-badge&logo=android&label=Download%20Android%20APK&color=A4C639)](https://github.com/django-files/android-client/releases/latest/download/app-release.apk)
+[![GitHub Release](https://img.shields.io/github/v/release/django-files/android-client?style=for-the-badge&logo=android&label=Download%20Android%20APK&color=3ddc84)](https://github.com/django-files/android-client/releases/latest/download/app-release.apk)
 
 - [Install](#Install)
   - [Setup](#Setup)

From 1621e3147e98041116867b0f3782ba18730af61e Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 18 Aug 2025 22:34:36 -0700
Subject: [PATCH 08/11] Update Login Fragments Layout

---
 .../djangofiles/ui/login/LoginFragment.kt     |  38 +--
 app/src/main/res/layout/fragment_login.xml    | 101 +++----
 .../main/res/layout/fragment_login_two.xml    | 255 +++++++++---------
 3 files changed, 207 insertions(+), 187 deletions(-)

diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginFragment.kt
index 7044cf9..e31d45b 100644
--- a/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginFragment.kt
+++ b/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginFragment.kt
@@ -65,16 +65,25 @@ class LoginFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         Log.d("Login[onViewCreated]", "savedInstanceState: ${savedInstanceState?.size()}")
 
-        ViewCompat.setOnApplyWindowInsetsListener(binding.scrollViewLayout) { v, insets ->
-            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            v.updatePadding(top = bars.top, bottom = bars.bottom)
-            insets
-        }
+        //ViewCompat.setOnApplyWindowInsetsListener(binding.scrollViewLayout) { v, insets ->
+        //    val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        //    v.updatePadding(top = bars.top, bottom = bars.bottom)
+        //    insets
+        //}
+
+        val ctx = requireContext()
 
-        val packageInfo =
-            requireContext().packageManager.getPackageInfo(requireContext().packageName, 0)
-        val versionName = packageInfo.versionName
-        Log.d("Login[onViewCreated]", "versionName: $versionName")
+        //val packageInfo = ctx.packageManager.getPackageInfo(ctx.packageName, 0)
+        //val formattedVersion = getString(
+        //    R.string.version_code_string,
+        //    packageInfo.versionName,
+        //    packageInfo.versionCode.toString()
+        //)
+        //Log.d("showAppInfoDialog", "formattedVersion: $formattedVersion")
+        //binding.versionName.text = formattedVersion
+
+        val packageInfo = ctx.packageManager.getPackageInfo(ctx.packageName, 0)
+        binding.versionName.text = packageInfo.versionName
 
         val authUrl = arguments?.getString("authUrl")
         Log.d("Login[onViewCreated]", "authUrl: $authUrl")
@@ -107,7 +116,7 @@ class LoginFragment : Fragment() {
             //sharedPreferences?.edit { putString("saved_url", host) }
 
             Log.d("loginFunction", "Processing URL: $host")
-            val api = ServerApi(requireContext(), host)
+            val api = ServerApi(ctx, host)
             lifecycleScope.launch {
                 try {
                     // TODO: When a session expires the server will be a duplicate...
@@ -176,11 +185,10 @@ class LoginFragment : Fragment() {
                 requireActivity().finishAffinity()
             }
         }
-        binding.websiteLink.setOnClickListener {
-            val url = binding.websiteLink.text.toString()
-            Log.d("websiteLink", "url: $url")
-            val intent = Intent(Intent.ACTION_VIEW, url.toUri())
-            startActivity(intent)
+
+        binding.websiteLink.paint?.isUnderlineText = true
+        binding.websiteLink.setOnClickListener { v ->
+            startActivity(Intent(Intent.ACTION_VIEW, v.tag.toString().toUri()))
         }
 
         if (authUrl != null) {
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 799ae49..91e42ce 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -11,37 +11,43 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical">
+<!-- NOTE: Insets are applied to the above layout as padding -->
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:gravity="center_horizontal"
+    android:padding="24dp"
+    tools:ignore="UselessParent">
 
-    <!-- NOTE: Insets are applied to the above layout as padding -->
-    <LinearLayout
-        android:layout_width="match_parent"
+    <ImageView
+        android:id="@+id/app_icon"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:gravity="center_horizontal"
-        android:padding="24dp"
-        tools:ignore="UselessParent">
-
-        <ImageView
-            android:id="@+id/app_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="8dp"
-            android:contentDescription="@string/app_name"
-            android:src="@mipmap/ic_launcher" />
-        <TextView
-            android:id="@+id/site_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="24dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@string/app_name"
-            android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="8dp"
+        android:contentDescription="@string/app_name"
+        android:src="@mipmap/ic_launcher" />
+    <TextView
+        android:id="@+id/site_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="@string/app_name"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+    <TextView
+        android:id="@+id/version_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        tools:text="0.0.1" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
         <LinearLayout
             android:id="@+id/inputs_layout"
             android:layout_width="0dp"
@@ -55,9 +61,10 @@
             <EditText
                 android:id="@+id/hostname_text"
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
+                android:layout_height="wrap_content"
+                android:minHeight="48dp"
                 android:padding="10dp"
-                android:autofillHints="url"
+                android:autofillHints=""
                 android:hint="@string/setup_host_placeholder"
                 android:inputType="textUri"
                 android:drawableEnd="@drawable/md_http_24px"
@@ -77,7 +84,7 @@
                 android:id="@+id/continue_btn"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
-                android:layout_marginTop="16dp"
+                android:layout_marginVertical="8dp"
                 android:drawableEnd="@drawable/md_login_24px"
                 android:paddingEnd="36dp"
                 android:paddingStart="36dp"
@@ -87,7 +94,7 @@
                 android:id="@+id/go_back_btn"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
-                android:layout_marginTop="16dp"
+                android:layout_marginVertical="8dp"
                 android:paddingEnd="36dp"
                 android:paddingStart="36dp"
                 android:text="Go Back"
@@ -100,20 +107,24 @@
                 app:strokeColor="?android:attr/colorActivatedHighlight"
                 app:strokeWidth="2dp" />
         </LinearLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <TextView
-            android:id="@+id/website_link"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:text="https://django-files.github.io"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="@android:color/holo_blue_dark"
-            android:drawablePadding="8dp"
-            app:drawableStartCompat="@drawable/md_captive_portal_24px" />
-
-    </LinearLayout>
+    <TextView
+        android:id="@+id/website_link"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:minHeight="48dp"
+        android:gravity="center_vertical"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        android:textColor="@android:color/holo_blue_dark"
+        android:text="https://django-files.github.io"
+        android:tag="@string/website_url"
+        android:drawablePadding="8dp"
+        app:drawableStartCompat="@drawable/md_captive_portal_24px" />
 
+</LinearLayout>
 </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_login_two.xml b/app/src/main/res/layout/fragment_login_two.xml
index 4151759..317c612 100644
--- a/app/src/main/res/layout/fragment_login_two.xml
+++ b/app/src/main/res/layout/fragment_login_two.xml
@@ -32,7 +32,7 @@
         android:id="@+id/site_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="12dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:text="@string/app_name"
@@ -42,148 +42,149 @@
         android:id="@+id/login_local"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="12dp"
         android:orientation="vertical"
         android:visibility="gone"
         tools:visibility="visible">
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
+            <LinearLayout
+                android:id="@+id/edit_text_layout"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:layout_marginBottom="16dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/add_server_login"
+                app:layout_constraintWidth_max="488dp"
+                android:orientation="vertical"
+                android:visibility="gone"
+                tools:visibility="visible">
+                <EditText
+                    android:id="@+id/login_username"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="48dp"
+                    android:autofillHints="username"
+                    android:hint="Username"
+                    android:inputType="text"
+                    android:padding="10dp"
+                    android:drawableEnd="@drawable/md_account_circle_24px"
+                    android:drawableTint="?android:attr/textColorTertiary" />
+                <EditText
+                    android:id="@+id/login_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="48dp"
+                    android:padding="10dp"
+                    android:autofillHints="password"
+                    android:hint="Password"
+                    android:inputType="textPassword"
+                    android:drawableEnd="@drawable/md_key_24"
+                    android:drawableTint="?android:attr/textColorTertiary" />
+            </LinearLayout>
+            <Button
+                android:id="@+id/add_server_login"
+                android:layout_width="0dp"
+                android:layout_height="48dp"
+                app:layout_constraintTop_toBottomOf="@+id/edit_text_layout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintWidth_max="320dp"
+                android:drawableEnd="@drawable/md_login_24px"
+                android:paddingEnd="36dp"
+                android:paddingStart="36dp"
+                android:text="Local Login"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipChildren="false">
         <LinearLayout
-            android:id="@+id/edit_text_layout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:layout_marginBottom="16dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/add_server_login"
-            app:layout_constraintWidth_max="488dp"
-            android:orientation="vertical"
-            android:visibility="gone"
-            tools:visibility="visible">
-        <EditText
-            android:id="@+id/login_username"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:autofillHints="username"
-            android:hint="Username"
-            android:inputType="text"
-            android:padding="10dp"
-            android:drawableEnd="@drawable/md_account_circle_24px"
-            android:drawableTint="?android:attr/textColorTertiary" />
-        <EditText
-            android:id="@+id/login_password"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:padding="10dp"
-            android:autofillHints="password"
-            android:hint="Password"
-            android:inputType="textPassword"
-            android:drawableEnd="@drawable/md_key_24"
-            android:drawableTint="?android:attr/textColorTertiary" />
-        </LinearLayout>
-        <Button
-            android:id="@+id/add_server_login"
-            android:layout_width="0dp"
-            android:layout_height="48dp"
-            app:layout_constraintTop_toBottomOf="@+id/edit_text_layout"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintWidth_max="320dp"
-            android:drawableEnd="@drawable/md_login_24px"
-            android:paddingEnd="36dp"
-            android:paddingStart="36dp"
-            android:text="Local Login"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-    </LinearLayout>
+            android:orientation="vertical">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
-        android:clipChildren="false">
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintWidth_max="320dp"
-        android:orientation="vertical">
+            <Button
+                android:id="@+id/login_discord"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:drawableEnd="@drawable/fa_discord"
+                android:drawableTint="?attr/colorOnSurface"
+                android:paddingEnd="36dp"
+                android:paddingStart="36dp"
+                android:visibility="gone"
+                android:text="Discord Login"
+                android:tag="discord"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                android:textColor="?attr/colorOnSurface"
+                app:backgroundTint="#7785cc"
+                app:rippleColor="#40FFFFFF"
+                tools:visibility="visible" />
+            <Button
+                android:id="@+id/login_github"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:drawableEnd="@drawable/fa_github"
+                android:drawableTint="?attr/colorOnSurface"
+                android:paddingEnd="36dp"
+                android:paddingStart="36dp"
+                android:visibility="gone"
+                android:text="GitHub Login"
+                android:tag="github"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                android:textColor="?attr/colorOnSurface"
+                app:backgroundTint="@android:color/transparent"
+                app:rippleColor="@color/github_ripple"
+                app:strokeColor="?attr/colorOnSurface"
+                app:strokeWidth="2dp"
+                tools:visibility="visible" />
+            <Button
+                android:id="@+id/login_google"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:drawableEnd="@drawable/fa_google"
+                android:drawableTint="?attr/colorOnSurface"
+                android:paddingEnd="36dp"
+                android:paddingStart="36dp"
+                android:visibility="gone"
+                android:text="Google Login"
+                android:tag="google"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                android:textColor="?attr/colorOnSurface"
+                app:backgroundTint="#4285F4"
+                app:rippleColor="#40FFFFFF"
+                tools:visibility="visible" />
+            <Button
+                android:id="@+id/go_back"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:layout_marginTop="12dp"
+                android:paddingEnd="36dp"
+                android:paddingStart="36dp"
+                android:text="Go Back"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                android:textColor="?android:attr/colorActivatedHighlight"
+                android:drawableEnd="@drawable/md_undo_24px"
+                android:drawableTint="?android:attr/colorActivatedHighlight"
+                app:backgroundTint="@android:color/transparent"
+                app:rippleColor="#33FFFF00"
+                app:strokeColor="?android:attr/colorActivatedHighlight"
+                app:strokeWidth="2dp" />
 
-        <Button
-            android:id="@+id/login_discord"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:drawableEnd="@drawable/fa_discord"
-            android:drawableTint="?attr/colorOnSurface"
-            android:paddingEnd="36dp"
-            android:paddingStart="36dp"
-            android:visibility="gone"
-            android:text="Discord Login"
-            android:tag="discord"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="?attr/colorOnSurface"
-            app:backgroundTint="#7785cc"
-            app:rippleColor="#40FFFFFF"
-            tools:visibility="visible" />
-        <Button
-            android:id="@+id/login_github"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:drawableEnd="@drawable/fa_github"
-            android:drawableTint="?attr/colorOnSurface"
-            android:paddingEnd="36dp"
-            android:paddingStart="36dp"
-            android:visibility="gone"
-            android:text="GitHub Login"
-            android:tag="github"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="?attr/colorOnSurface"
-            app:backgroundTint="@android:color/transparent"
-            app:rippleColor="@color/github_ripple"
-            app:strokeColor="?attr/colorOnSurface"
-            app:strokeWidth="2dp"
-            tools:visibility="visible" />
-        <Button
-            android:id="@+id/login_google"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:drawableEnd="@drawable/fa_google"
-            android:drawableTint="?attr/colorOnSurface"
-            android:paddingEnd="36dp"
-            android:paddingStart="36dp"
-            android:visibility="gone"
-            android:text="Google Login"
-            android:tag="google"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="?attr/colorOnSurface"
-            app:backgroundTint="#4285F4"
-            app:rippleColor="#40FFFFFF"
-            tools:visibility="visible" />
-        <Button
-            android:id="@+id/go_back"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_marginTop="16dp"
-            android:paddingEnd="36dp"
-            android:paddingStart="36dp"
-            android:text="Go Back"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="?android:attr/colorActivatedHighlight"
-            android:drawableEnd="@drawable/md_undo_24px"
-            android:drawableTint="?android:attr/colorActivatedHighlight"
-            app:backgroundTint="@android:color/transparent"
-            app:rippleColor="#33FFFF00"
-            app:strokeColor="?android:attr/colorActivatedHighlight"
-            app:strokeWidth="2dp" />
-
-    </LinearLayout>
+        </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>

From 3f825863ba5298459972ec4859519df84e50b424 Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 18 Aug 2025 23:03:53 -0700
Subject: [PATCH 09/11] Fix Login Fragments

---
 .../djangofiles/ui/login/LoginFragment.kt     |  10 +-
 .../djangofiles/ui/login/LoginTwoFragment.kt  |   2 +-
 app/src/main/res/layout/fragment_login.xml    |  30 +--
 .../main/res/layout/fragment_login_two.xml    | 172 +++++++++---------
 4 files changed, 105 insertions(+), 109 deletions(-)

diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginFragment.kt
index e31d45b..2d147a0 100644
--- a/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginFragment.kt
+++ b/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginFragment.kt
@@ -65,11 +65,11 @@ class LoginFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         Log.d("Login[onViewCreated]", "savedInstanceState: ${savedInstanceState?.size()}")
 
-        //ViewCompat.setOnApplyWindowInsetsListener(binding.scrollViewLayout) { v, insets ->
-        //    val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-        //    v.updatePadding(top = bars.top, bottom = bars.bottom)
-        //    insets
-        //}
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
+            val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(top = bars.top, bottom = bars.bottom)
+            insets
+        }
 
         val ctx = requireContext()
 
diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginTwoFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginTwoFragment.kt
index 8777e43..b024ca2 100644
--- a/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginTwoFragment.kt
+++ b/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginTwoFragment.kt
@@ -79,7 +79,7 @@ class LoginTwoFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         Log.d("Login[onViewCreated]", "savedInstanceState: ${savedInstanceState?.size()}")
 
-        ViewCompat.setOnApplyWindowInsetsListener(binding.scrollViewLayout) { v, insets ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
             val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
             v.updatePadding(top = bars.top, bottom = bars.bottom)
             insets
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 91e42ce..24c07f6 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true"
     tools:ignore="HardcodedText">
-<LinearLayout
-    android:id="@+id/scroll_view_layout"
+<ScrollView
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical">
-<!-- NOTE: Insets are applied to the above layout as padding -->
+    android:layout_height="match_parent"
+    android:fillViewport="true">
 <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
     android:padding="24dp"
-    tools:ignore="UselessParent">
+    android:gravity="center_vertical"
+    android:orientation="vertical">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
     <ImageView
         android:id="@+id/app_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
         android:layout_marginBottom="8dp"
         android:contentDescription="@string/app_name"
         android:src="@mipmap/ic_launcher" />
@@ -40,10 +42,10 @@
         android:id="@+id/version_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="24dp"
         android:ellipsize="end"
         android:maxLines="1"
         tools:text="0.0.1" />
+    </LinearLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -52,6 +54,7 @@
             android:id="@+id/inputs_layout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="12dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -113,6 +116,7 @@
         android:id="@+id/website_link"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
         android:layout_marginTop="24dp"
         android:minHeight="48dp"
         android:gravity="center_vertical"
@@ -125,6 +129,6 @@
         android:drawablePadding="8dp"
         app:drawableStartCompat="@drawable/md_captive_portal_24px" />
 
-</LinearLayout>
 </LinearLayout>
 </ScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_login_two.xml b/app/src/main/res/layout/fragment_login_two.xml
index 317c612..02bcd9e 100644
--- a/app/src/main/res/layout/fragment_login_two.xml
+++ b/app/src/main/res/layout/fragment_login_two.xml
@@ -1,108 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true"
     tools:ignore="HardcodedText">
-<LinearLayout
-    android:id="@+id/scroll_view_layout"
+<ScrollView
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical">
-<!-- NOTE: Insets are applied to the above layout as padding -->
+    android:layout_height="match_parent"
+    android:fillViewport="true">
 <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
     android:padding="24dp"
-    tools:ignore="UselessParent">
-
-    <ImageView
-        android:id="@+id/app_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="8dp"
-        android:contentDescription="@string/app_name"
-        android:src="@mipmap/ic_launcher" />
-    <TextView
-        android:id="@+id/site_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:text="@string/app_name"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+    android:gravity="center_vertical"
+    android:orientation="vertical">
 
     <LinearLayout
-        android:id="@+id/login_local"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
+        android:layout_marginBottom="24dp"
+        android:gravity="center_horizontal"
         android:orientation="vertical"
-        android:visibility="gone"
-        tools:visibility="visible">
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <LinearLayout
-                android:id="@+id/edit_text_layout"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:layout_marginBottom="16dp"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/add_server_login"
-                app:layout_constraintWidth_max="488dp"
-                android:orientation="vertical"
-                android:visibility="gone"
-                tools:visibility="visible">
-                <EditText
-                    android:id="@+id/login_username"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:minHeight="48dp"
-                    android:autofillHints="username"
-                    android:hint="Username"
-                    android:inputType="text"
-                    android:padding="10dp"
-                    android:drawableEnd="@drawable/md_account_circle_24px"
-                    android:drawableTint="?android:attr/textColorTertiary" />
-                <EditText
-                    android:id="@+id/login_password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:minHeight="48dp"
-                    android:padding="10dp"
-                    android:autofillHints="password"
-                    android:hint="Password"
-                    android:inputType="textPassword"
-                    android:drawableEnd="@drawable/md_key_24"
-                    android:drawableTint="?android:attr/textColorTertiary" />
-            </LinearLayout>
-            <Button
-                android:id="@+id/add_server_login"
-                android:layout_width="0dp"
-                android:layout_height="48dp"
-                app:layout_constraintTop_toBottomOf="@+id/edit_text_layout"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintWidth_max="320dp"
-                android:drawableEnd="@drawable/md_login_24px"
-                android:paddingEnd="36dp"
-                android:paddingStart="36dp"
-                android:text="Local Login"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        tools:ignore="UseCompoundDrawables">
+        <ImageView
+            android:id="@+id/app_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:contentDescription="@string/app_name"
+            android:src="@mipmap/ic_launcher" />
+        <TextView
+            android:id="@+id/site_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="@string/app_name"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large" />
     </LinearLayout>
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/login_local"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:id="@+id/edit_text_layout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:layout_marginBottom="16dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/add_server_login"
+            app:layout_constraintWidth_max="488dp"
+            android:orientation="vertical"
+            tools:visibility="visible">
+            <EditText
+                android:id="@+id/login_username"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="48dp"
+                android:autofillHints="username"
+                android:hint="Username"
+                android:inputType="text"
+                android:padding="10dp"
+                android:drawableEnd="@drawable/md_account_circle_24px"
+                android:drawableTint="?android:attr/textColorTertiary" />
+            <EditText
+                android:id="@+id/login_password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="48dp"
+                android:padding="10dp"
+                android:autofillHints="password"
+                android:hint="Password"
+                android:inputType="textPassword"
+                android:drawableEnd="@drawable/md_key_24"
+                android:drawableTint="?android:attr/textColorTertiary" />
+        </LinearLayout>
+        <Button
+            android:id="@+id/add_server_login"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            app:layout_constraintTop_toBottomOf="@+id/edit_text_layout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintWidth_max="320dp"
+            android:drawableEnd="@drawable/md_login_24px"
+            android:paddingEnd="36dp"
+            android:paddingStart="36dp"
+            android:text="Local Login"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -116,7 +110,6 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintWidth_max="320dp"
             android:orientation="vertical">
-
             <Button
                 android:id="@+id/login_discord"
                 android:layout_width="match_parent"
@@ -183,10 +176,9 @@
                 app:rippleColor="#33FFFF00"
                 app:strokeColor="?android:attr/colorActivatedHighlight"
                 app:strokeWidth="2dp" />
-
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</LinearLayout>
 </LinearLayout>
 </ScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

From c6a836da1cba9c69d18b5290eb582e742ed9f0f5 Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 18 Aug 2025 23:10:27 -0700
Subject: [PATCH 10/11] Fix AuthorizeFragment.kt

---
 .../djangofiles/ui/login/AuthorizeFragment.kt |   2 +-
 .../main/res/layout/fragment_authorize.xml    | 105 +++++++++---------
 2 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/login/AuthorizeFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/login/AuthorizeFragment.kt
index 084ec8b..7a1b2d5 100644
--- a/app/src/main/java/com/djangofiles/djangofiles/ui/login/AuthorizeFragment.kt
+++ b/app/src/main/java/com/djangofiles/djangofiles/ui/login/AuthorizeFragment.kt
@@ -76,7 +76,7 @@ class AuthorizeFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         Log.d("Authorize[onViewCreated]", "savedInstanceState: ${savedInstanceState?.size()}")
 
-        ViewCompat.setOnApplyWindowInsetsListener(binding.scrollViewLayout) { v, insets ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
             val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
             v.updatePadding(top = bars.top, bottom = bars.bottom)
             insets
diff --git a/app/src/main/res/layout/fragment_authorize.xml b/app/src/main/res/layout/fragment_authorize.xml
index 01c32ca..c5b3cfd 100644
--- a/app/src/main/res/layout/fragment_authorize.xml
+++ b/app/src/main/res/layout/fragment_authorize.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true"
     tools:ignore="HardcodedText">
+<ScrollView
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
 <LinearLayout
-    android:id="@+id/scroll_view_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical">
+    android:padding="24dp"
+    android:gravity="center_vertical"
+    android:orientation="vertical">
 
-    <!-- NOTE: Insets are applied to the above layout as padding -->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
+        android:layout_marginBottom="24dp"
         android:gravity="center_horizontal"
-        android:padding="24dp"
-        tools:ignore="UselessParent">
-
+        android:orientation="vertical">
         <ImageView
             android:id="@+id/app_icon"
             android:layout_width="wrap_content"
@@ -47,53 +49,53 @@
             android:id="@+id/site_url"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="12dp"
             android:maxLines="1"
             android:ellipsize="end"
             tools:text="https://intranet.cssnr.com/" />
+    </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/loading_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:visibility="visible"
-            tools:visibility="visible">
-            <TextView
-                android:id="@+id/loading_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Loading..."
-                android:textColor="@android:color/holo_green_light"
-                android:textAppearance="@style/TextAppearance.AppCompat.Large" />
-            <ProgressBar
-                android:id="@+id/loading_spinner"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:indeterminate="true"
-                app:layout_constraintTop_toTopOf="@+id/refresh_layout"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent" />
-        </LinearLayout>
-
+    <LinearLayout
+        android:id="@+id/loading_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="visible"
+        tools:visibility="visible">
         <TextView
-            android:id="@+id/error_message"
-            android:layout_width="match_parent"
+            android:id="@+id/loading_text"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:text="Authentication Failed.\nTry a New Code."
-            android:textColor="@android:color/holo_red_light"
-            android:textAppearance="@style/TextAppearance.AppCompat.Large"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
+            android:text="Loading..."
+            android:textColor="@android:color/holo_green_light"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+        <ProgressBar
+            android:id="@+id/loading_spinner"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:clipChildren="false">
+            android:indeterminate="true"
+            app:layout_constraintTop_toTopOf="@+id/refresh_layout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/error_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:text="Authentication Failed.\nTry a New Code."
+        android:textColor="@android:color/holo_red_light"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipChildren="false">
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -133,9 +135,8 @@
                 tools:ignore="RtlSymmetry"
                 tools:visibility="visible" />
         </LinearLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>
 </ScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

From b3f14722820b9a40dc79065b9d55a3875aa7a507 Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 18 Aug 2025 23:15:57 -0700
Subject: [PATCH 11/11] Update Bindings

---
 .../djangofiles/ui/login/AuthorizeFragment.kt            | 9 +++++----
 .../djangofiles/djangofiles/ui/login/LoginFragment.kt    | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/login/AuthorizeFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/login/AuthorizeFragment.kt
index 7a1b2d5..954eb8d 100644
--- a/app/src/main/java/com/djangofiles/djangofiles/ui/login/AuthorizeFragment.kt
+++ b/app/src/main/java/com/djangofiles/djangofiles/ui/login/AuthorizeFragment.kt
@@ -107,6 +107,7 @@ class AuthorizeFragment : Fragment() {
 
         val api = ServerApi(ctx, authUrl)
 
+        // TODO: Cache methodsResponse in viewModel
         lifecycleScope.launch {
             val methodsResponse = api.methods()
             Log.d("Authorize[onViewCreated]", "methodsResponse: $methodsResponse")
@@ -115,10 +116,10 @@ class AuthorizeFragment : Fragment() {
                 Log.d("Authorize[onViewCreated]", "methodsData: $methodsData")
                 if (methodsData != null) {
                     Log.d("Authorize[onViewCreated]", "siteName: ${methodsData.siteName}")
-                    binding.siteName.text = methodsData.siteName
-                    binding.loadingLayout.visibility = View.GONE
-                    binding.gotoLoginBtn.visibility = View.VISIBLE
-                    binding.addServerBtn.visibility = View.VISIBLE
+                    _binding?.siteName?.text = methodsData.siteName
+                    _binding?.loadingLayout?.visibility = View.GONE
+                    _binding?.gotoLoginBtn?.visibility = View.VISIBLE
+                    _binding?.addServerBtn?.visibility = View.VISIBLE
                 }
             }
         }
diff --git a/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginFragment.kt b/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginFragment.kt
index 2d147a0..8d1f02c 100644
--- a/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginFragment.kt
+++ b/app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginFragment.kt
@@ -169,7 +169,7 @@ class LoginFragment : Fragment() {
                     e.printStackTrace()
                     val msg = e.message ?: "Unknown Error Validating Server."
                     Log.i("loginFunction", "msg: $msg")
-                    binding.hostnameText.error = "Validation Error"
+                    _binding?.hostnameText?.error = "Validation Error"
                     withContext(Dispatchers.Main) {
                         Toast.makeText(requireContext(), msg, Toast.LENGTH_LONG).show()
                     }