From e96bfac4a9fa1aa178d1ec1dfa46c6db4045b28d Mon Sep 17 00:00:00 2001
From: Ethan Dalool <git@voussoir.net>
Date: Wed, 22 Mar 2023 17:23:20 -0700
Subject: [PATCH] checkpoint

---
 app/build.gradle                              |   2 +
 app/src/debug/res/values/strings.xml          |   5 +
 .../org/y20k/trackbook/SettingsFragment.kt    |   3 +-
 app/src/main/res/layout/fragment_track.xml    | 160 +++++++++---------
 4 files changed, 92 insertions(+), 78 deletions(-)
 create mode 100644 app/src/debug/res/values/strings.xml

diff --git a/app/build.gradle b/app/build.gradle
index 228a573..11e11ee 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,6 +39,8 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
+            applicationIdSuffix '.debug'
+
             // Comment out the below lines if you do not need to test resource shrinking
 //            minifyEnabled true
 //            shrinkResources true
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
new file mode 100644
index 0000000..ac78573
--- /dev/null
+++ b/app/src/debug/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- App Name -->
+    <string name="app_name">trkpt.debug</string>
+</resources>
diff --git a/app/src/main/java/org/y20k/trackbook/SettingsFragment.kt b/app/src/main/java/org/y20k/trackbook/SettingsFragment.kt
index 3e39b4d..cea0d3f 100644
--- a/app/src/main/java/org/y20k/trackbook/SettingsFragment.kt
+++ b/app/src/main/java/org/y20k/trackbook/SettingsFragment.kt
@@ -30,7 +30,6 @@ import android.provider.DocumentsContract
 import android.provider.Settings
 import android.util.Log
 import android.view.View
-import android.widget.Button
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.preference.EditTextPreference
@@ -190,7 +189,7 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
             {
                 val battery_optimization_button = Preference(context)
                 battery_optimization_button.title = "Disable battery optimization"
-                battery_optimization_button.summary = "If your device kills the app, you can give this a try"
+                battery_optimization_button.summary = "If your device kills the app, you can give this a try."
                 battery_optimization_button.setOnPreferenceClickListener {
                     val i: Intent = Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS).setData(Uri.parse("package:${context.packageName}"))
                     context.startActivity(i)
diff --git a/app/src/main/res/layout/fragment_track.xml b/app/src/main/res/layout/fragment_track.xml
index d7a6c6d..3ad0ac4 100755
--- a/app/src/main/res/layout/fragment_track.xml
+++ b/app/src/main/res/layout/fragment_track.xml
@@ -8,97 +8,105 @@
     tools:context=".MainActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/trackfragment_constraint_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         >
 
-        <TextView
-            android:id="@+id/selected_trkpt_info"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:gravity="right"
-            android:text="time\nlat\nlong"
-            app:fontFamily="monospace"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/trackfragment_tools_constraint_layout"
+            android:layout_width="match_parent"
+            android:layout_height="128dp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageButton
-            android:id="@+id/delete_selected_trkpt_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="Delete selected trackpoint"
-            android:src="@drawable/ic_delete_24dp"
-            android:visibility="gone"
-            app:backgroundTint="@color/default_transparent"
-            app:layout_constraintBottom_toTopOf="@+id/map"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:srcCompat="@drawable/ic_delete_24dp" />
-
-
-        <DatePicker
-            android:id="@+id/track_query_start_date"
-            android:layout_width="wrap_content"
-            android:layout_height="130dp"
-            android:calendarViewShown="false"
-            android:datePickerMode="spinner"
-            android:scaleX="0.6"
-            android:scaleY="0.6"
-            android:translationX="-45dp"
-            android:translationY="-30dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
 
-        <TimePicker
-            android:id="@+id/track_query_start_time"
-            android:layout_width="wrap_content"
-            android:layout_height="130dp"
-            android:translationX="-150dp"
-            android:translationY="-30dp"
-            android:timePickerMode="spinner"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/track_query_start_date"
-            android:scaleX="0.6"
-            android:scaleY="0.6"
-            />
+            <TextView
+                android:id="@+id/selected_trkpt_info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:gravity="right"
+                android:text="time\nlat\nlong"
+                app:fontFamily="monospace"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <DatePicker
-            android:id="@+id/track_query_end_date"
-            android:layout_width="wrap_content"
-            android:layout_height="130dp"
-            android:translationX="-45dp"
-            android:translationY="-100dp"
-            android:datePickerMode="spinner"
-            android:calendarViewShown="false"
-            app:layout_constraintTop_toBottomOf="@+id/track_query_start_date"
-            app:layout_constraintStart_toStartOf="parent"
-            android:scaleX="0.6"
-            android:scaleY="0.6"
-            />
+            <ImageButton
+                android:id="@+id/delete_selected_trkpt_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="Delete selected trackpoint"
+                android:src="@drawable/ic_delete_24dp"
+                android:visibility="gone"
+                app:backgroundTint="@color/default_transparent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:srcCompat="@drawable/ic_delete_24dp" />
 
-        <TimePicker
-            android:id="@+id/track_query_end_time"
-            android:layout_width="wrap_content"
-            android:layout_height="130dp"
-            android:translationX="-150dp"
-            android:translationY="-100dp"
-            android:timePickerMode="spinner"
-            app:layout_constraintTop_toBottomOf="@+id/track_query_start_time"
-            app:layout_constraintStart_toEndOf="@+id/track_query_start_date"
-            android:scaleX="0.6"
-            android:scaleY="0.6"
-            />
+
+            <DatePicker
+                android:id="@+id/track_query_start_date"
+                android:layout_width="wrap_content"
+                android:layout_height="130dp"
+                android:calendarViewShown="false"
+                android:datePickerMode="spinner"
+                android:scaleX="0.6"
+                android:scaleY="0.6"
+                android:translationX="-45dp"
+                android:translationY="-30dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TimePicker
+                android:id="@+id/track_query_start_time"
+                android:layout_width="wrap_content"
+                android:layout_height="130dp"
+                android:scaleX="0.6"
+                android:scaleY="0.6"
+                android:timePickerMode="spinner"
+                android:translationX="-150dp"
+                android:translationY="-30dp"
+                app:layout_constraintStart_toEndOf="@+id/track_query_start_date"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <DatePicker
+                android:id="@+id/track_query_end_date"
+                android:layout_width="wrap_content"
+                android:layout_height="130dp"
+                android:calendarViewShown="false"
+                android:datePickerMode="spinner"
+                android:scaleX="0.6"
+                android:scaleY="0.6"
+                android:translationX="-45dp"
+                android:translationY="-100dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/track_query_start_date" />
+
+            <TimePicker
+                android:id="@+id/track_query_end_time"
+                android:layout_width="wrap_content"
+                android:layout_height="130dp"
+                android:scaleX="0.6"
+                android:scaleY="0.6"
+                android:timePickerMode="spinner"
+                android:translationX="-150dp"
+                android:translationY="-100dp"
+                app:layout_constraintStart_toEndOf="@+id/track_query_start_date"
+                app:layout_constraintTop_toBottomOf="@+id/track_query_start_time" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <org.osmdroid.views.MapView
             android:id="@+id/map"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@+id/track_query_end_time"
+            android:layout_height="0dp"
+            android:layout_marginBottom="54dp"
+            android:contentDescription="@string/descr_map_last_track"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:contentDescription="@string/descr_map_last_track"
-            >
+            app:layout_constraintTop_toBottomOf="@+id/trackfragment_tools_constraint_layout">
 
         </org.osmdroid.views.MapView>