From 88adf738e0175b7bb29d9b9997d5fa98c619b31b Mon Sep 17 00:00:00 2001
From: Luis Guzman <luisguzman@appdevforall.org>
Date: Sat, 1 Aug 2026 22:51:42 -0600
Subject: [PATCH] ADFA-4910: pin Maps 'choose layers' CTA + free-space guard to
 the bottom

---
 .../res/layout/fragment_k2go_maps_choose.xml  | 111 ++++++++++--------
 1 file changed, 65 insertions(+), 46 deletions(-)

diff --git a/controller/app/src/main/res/layout/fragment_k2go_maps_choose.xml b/controller/app/src/main/res/layout/fragment_k2go_maps_choose.xml
index 94bf5941..34808a41 100644
--- a/controller/app/src/main/res/layout/fragment_k2go_maps_choose.xml
+++ b/controller/app/src/main/res/layout/fragment_k2go_maps_choose.xml
@@ -1,64 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- ADFA-4848 (slice 2): Maps "Choose layers & quality" (Option B). Groups are built
-     programmatically into k2go_maps_groups; the total + free-space guard drive the CTA. -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+     programmatically into k2go_maps_groups; the total + free-space guard drive the CTA.
+     ADFA-4910: the free-space guard + Download CTA are pinned to the bottom (outside the
+     ScrollView) so they never scroll away under the layer groups, like the other wizard steps. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true">
+    android:orientation="vertical">
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="20dp"
-        android:paddingRight="20dp"
-        android:paddingTop="20dp"
-        android:paddingBottom="24dp">
-
-        <TextView
-            android:id="@+id/k2go_choose_back"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="4dp"
-            android:textAppearance="?attr/textAppearanceBodyMedium"
-            android:textColor="@color/k2go_teal" />
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
 
-        <TextView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:text="@string/k2go_maps_scr_title"
-            android:textAppearance="?attr/textAppearanceHeadlineMedium"
-            android:textColor="@color/k2go_ink" />
+            android:orientation="vertical"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:paddingTop="20dp"
+            android:paddingBottom="8dp">
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:text="@string/k2go_maps_choose_title"
-            android:textAppearance="?attr/textAppearanceTitleMedium"
-            android:textColor="@color/k2go_ink" />
+            <TextView
+                android:id="@+id/k2go_choose_back"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="4dp"
+                android:textAppearance="?attr/textAppearanceBodyMedium"
+                android:textColor="@color/k2go_teal" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:text="@string/k2go_maps_choose_sub"
-            android:textAppearance="?attr/textAppearanceBodySmall"
-            android:textColor="@color/k2go_muted" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:text="@string/k2go_maps_scr_title"
+                android:textAppearance="?attr/textAppearanceHeadlineMedium"
+                android:textColor="@color/k2go_ink" />
 
-        <LinearLayout
-            android:id="@+id/k2go_maps_groups"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:orientation="vertical" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:text="@string/k2go_maps_choose_title"
+                android:textAppearance="?attr/textAppearanceTitleMedium"
+                android:textColor="@color/k2go_ink" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:text="@string/k2go_maps_choose_sub"
+                android:textAppearance="?attr/textAppearanceBodySmall"
+                android:textColor="@color/k2go_muted" />
+
+            <LinearLayout
+                android:id="@+id/k2go_maps_groups"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="vertical" />
+        </LinearLayout>
+    </ScrollView>
+
+    <!-- ADFA-4910: pinned bottom action bar — free-space guard + Download CTA stay visible over the scroll. -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="16dp">
 
         <TextView
             android:id="@+id/k2go_free_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
             android:textAppearance="?attr/textAppearanceBodySmall"
             android:textColor="@color/k2go_muted" />
 
@@ -84,9 +103,9 @@
             android:id="@+id/k2go_download_btn"
             android:layout_width="match_parent"
             android:layout_height="52dp"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="12dp"
             android:textColor="@android:color/white"
             android:textAllCaps="false"
             android:backgroundTint="@color/k2go_teal" />
     </LinearLayout>
-</ScrollView>
+</LinearLayout>