From 236cf49f7ab728f2028ff883914575fded238cda Mon Sep 17 00:00:00 2001
From: Vance Vagell <vance@vagell.com>
Date: Tue, 3 Dec 2024 12:56:19 -0500
Subject: [PATCH] Fix bug #125 by making the Add/Edit Memory screen scrollable
 so the buttons can always be reached.

---
 .../KV4PHT/.idea/deploymentTargetDropDown.xml |  15 +-
 .../com/vagell/kv4pht/ui/MainActivity.java    |   1 +
 .../res/layout/activity_add_edit_memory.xml   | 288 +++++++++---------
 3 files changed, 161 insertions(+), 143 deletions(-)

diff --git a/android-src/KV4PHT/.idea/deploymentTargetDropDown.xml b/android-src/KV4PHT/.idea/deploymentTargetDropDown.xml
index 9a986ae3..1fbd213c 100644
--- a/android-src/KV4PHT/.idea/deploymentTargetDropDown.xml
+++ b/android-src/KV4PHT/.idea/deploymentTargetDropDown.xml
@@ -3,7 +3,20 @@
   <component name="deploymentTargetDropDown">
     <value>
       <entry key="app">
-        <State />
+        <State>
+          <runningDeviceTargetSelectedWithDropDown>
+            <Target>
+              <type value="RUNNING_DEVICE_TARGET" />
+              <deviceKey>
+                <Key>
+                  <type value="SERIAL_NUMBER" />
+                  <value value="adb-46161FDKD001P2-SRAMcj._adb-tls-connect._tcp" />
+                </Key>
+              </deviceKey>
+            </Target>
+          </runningDeviceTargetSelectedWithDropDown>
+          <timeTargetWasSelectedWithDropDown value="2024-12-03T17:49:11.559650800Z" />
+        </State>
       </entry>
     </value>
   </component>
diff --git a/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/MainActivity.java b/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/MainActivity.java
index 6b59f0db..9d9d07e9 100644
--- a/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/MainActivity.java
+++ b/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/MainActivity.java
@@ -614,6 +614,7 @@ private void showScreen(ScreenType screenType) {
         } else if (screenType == ScreenType.SCREEN_VOICE){
             hideKeyboard();
             findViewById(R.id.frequencyContainer).setVisibility(View.VISIBLE);
+            findViewById(R.id.rxAudioCircle).setVisibility(View.VISIBLE);
 
             if (callsignSnackbar != null) {
                 callsignSnackbar.dismiss();
diff --git a/android-src/KV4PHT/app/src/main/res/layout/activity_add_edit_memory.xml b/android-src/KV4PHT/app/src/main/res/layout/activity_add_edit_memory.xml
index cc8a4c14..960932f6 100644
--- a/android-src/KV4PHT/app/src/main/res/layout/activity_add_edit_memory.xml
+++ b/android-src/KV4PHT/app/src/main/res/layout/activity_add_edit_memory.xml
@@ -35,157 +35,161 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <com.google.android.material.textfield.TextInputLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="0"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:hint="Memory name"
-                app:hintTextColor="@color/primary_deselected"
-                app:boxStrokeColor="@color/primary"
-                android:textColorHint="@color/primary_deselected"
-                android:paddingBottom="16dp">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/editNameTextInputEditText"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:textSize="20dp"
-                    android:textColor="@color/primary"
-                    android:inputType="text">
-                </com.google.android.material.textfield.TextInputEditText>
-            </com.google.android.material.textfield.TextInputLayout>
+                android:orientation="vertical">
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:layout_marginTop="8dp"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                android:hint="Memory group (optional)"
-                app:hintTextColor="@color/primary_deselected"
-                app:boxStrokeColor="@color/primary"
-                android:textColorHint="@color/primary_deselected"
-                android:paddingBottom="16dp">
-
-                <AutoCompleteTextView
-                    android:id="@+id/editMemoryGroupTextInputEditText"
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:textSize="20dp"
-                    android:textColor="@color/primary"
-                    android:inputType="text"/>
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:layout_marginTop="8dp"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:hint="Frequency"
-                app:hintTextColor="@color/primary_deselected"
-                app:boxStrokeColor="@color/primary"
-                android:textColorHint="@color/primary_deselected"
-                android:paddingBottom="16dp">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/editFrequencyTextInputEditText"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                    android:hint="Memory name"
+                    app:hintTextColor="@color/primary_deselected"
+                    app:boxStrokeColor="@color/primary"
+                    android:textColorHint="@color/primary_deselected"
+                    android:paddingBottom="16dp">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/editNameTextInputEditText"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:textSize="20dp"
+                        android:textColor="@color/primary"
+                        android:inputType="text">
+                    </com.google.android.material.textfield.TextInputEditText>
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:textSize="20dp"
-                    android:inputType="numberDecimal"
-                    android:textColor="@color/primary">
-                </com.google.android.material.textfield.TextInputEditText>
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:layout_marginTop="8dp"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                android:hint="Offset"
-                app:hintTextColor="@color/primary_deselected"
-                app:boxStrokeColor="@color/primary"
-                android:textColorHint="@color/primary_deselected"
-                android:paddingBottom="16dp">
-
-                <AutoCompleteTextView
-                    android:id="@+id/editOffsetTextView"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:layout_marginTop="8dp"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:hint="Memory group (optional)"
+                    app:hintTextColor="@color/primary_deselected"
+                    app:boxStrokeColor="@color/primary"
+                    android:textColorHint="@color/primary_deselected"
+                    android:paddingBottom="16dp">
+
+                    <AutoCompleteTextView
+                        android:id="@+id/editMemoryGroupTextInputEditText"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:textSize="20dp"
+                        android:textColor="@color/primary"
+                        android:inputType="text"/>
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:inputType="none"
-                    android:text="None"
-                    android:textSize="20dp"
-                    android:textColor="@color/primary"/>
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:layout_marginTop="8dp"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                    android:hint="Frequency"
+                    app:hintTextColor="@color/primary_deselected"
+                    app:boxStrokeColor="@color/primary"
+                    android:textColorHint="@color/primary_deselected"
+                    android:paddingBottom="16dp">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/editFrequencyTextInputEditText"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:textSize="20dp"
+                        android:inputType="numberDecimal"
+                        android:textColor="@color/primary">
+                    </com.google.android.material.textfield.TextInputEditText>
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:layout_marginTop="8dp"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:hint="Offset"
+                    app:hintTextColor="@color/primary_deselected"
+                    app:boxStrokeColor="@color/primary"
+                    android:textColorHint="@color/primary_deselected"
+                    android:paddingBottom="16dp">
+
+                    <AutoCompleteTextView
+                        android:id="@+id/editOffsetTextView"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:inputType="none"
+                        android:text="None"
+                        android:textSize="20dp"
+                        android:textColor="@color/primary"/>
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:layout_marginTop="8dp"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                    android:hint="Tone"
+                    app:hintTextColor="@color/primary_deselected"
+                    app:boxStrokeColor="@color/primary"
+                    android:textColorHint="@color/primary_deselected"
+                    android:paddingBottom="16dp">
+
+                    <AutoCompleteTextView
+                        android:id="@+id/editToneTextView"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:inputType="none"
+                        android:text="None"
+                        android:textSize="20dp"
+                        android:textColor="@color/primary"/>
+                </com.google.android.material.textfield.TextInputLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:layout_marginTop="8dp"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                android:hint="Tone"
-                app:hintTextColor="@color/primary_deselected"
-                app:boxStrokeColor="@color/primary"
-                android:textColorHint="@color/primary_deselected"
-                android:paddingBottom="16dp">
-
-                <AutoCompleteTextView
-                    android:id="@+id/editToneTextView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:inputType="none"
-                    android:text="None"
+                android:orientation="horizontal"
+                android:layout_marginTop="12dp"
+                android:gravity="right"
+                android:layout_weight="0">
+
+                <Button
+                    android:id="@+id/cancelButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="56dp"
+                    android:layout_weight="0"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:text="Cancel"
                     android:textSize="20dp"
-                    android:textColor="@color/primary"/>
-            </com.google.android.material.textfield.TextInputLayout>
-
+                    android:textFontWeight="500"
+                    android:textColor="@color/primary"
+                    android:textAllCaps="false"
+                    android:enabled="true"
+                    android:onClick="cancelButtonClicked" />
+
+                <Button
+                    android:id="@+id/saveButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="56dp"
+                    android:layout_weight="0"
+                    android:text="Save"
+                    android:textSize="20dp"
+                    android:textFontWeight="500"
+                    android:textColor="@color/black"
+                    android:textAllCaps="false"
+                    android:enabled="true"
+                    android:onClick="saveButtonClicked"/>
+            </LinearLayout>
         </LinearLayout>
-
     </ScrollView>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="12dp"
-        android:gravity="right"
-        android:layout_weight="0">
-
-        <Button
-            android:id="@+id/cancelButton"
-            android:layout_width="wrap_content"
-            android:layout_height="56dp"
-            android:layout_weight="0"
-            android:background="?android:attr/selectableItemBackground"
-            android:text="Cancel"
-            android:textSize="20dp"
-            android:textFontWeight="500"
-            android:textColor="@color/primary"
-            android:textAllCaps="false"
-            android:enabled="true"
-            android:onClick="cancelButtonClicked" />
-
-        <Button
-            android:id="@+id/saveButton"
-            android:layout_width="wrap_content"
-            android:layout_height="56dp"
-            android:layout_weight="0"
-            android:text="Save"
-            android:textSize="20dp"
-            android:textFontWeight="500"
-            android:textColor="@color/black"
-            android:textAllCaps="false"
-            android:enabled="true"
-            android:onClick="saveButtonClicked"/>
-    </LinearLayout>
-
 </LinearLayout>
\ No newline at end of file