Merge branch 'main' of https://github.com/VanceVagell/kv4p-ht

VanceVagell · Dec 23, 2024 · d5f9a0d · d5f9a0d
2 parents 307a40e + 75a48a2
commit d5f9a0d
Show file tree

Hide file tree

Showing 14 changed files with 1,204 additions and 450 deletions.
diff --git a/android-src/KV4PHT/.idea/deploymentTargetSelector.xml b/android-src/KV4PHT/.idea/deploymentTargetSelector.xml
diff --git a/android-src/KV4PHT/app/build.gradle b/android-src/KV4PHT/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.vagell.kv4pht"
         minSdk 26
         targetSdk 34
-        versionCode 21
-        versionName "1.3.1"
+        versionCode 22
+        versionName "1.4.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/android-src/KV4PHT/app/src/main/AndroidManifest.xml b/android-src/KV4PHT/app/src/main/AndroidManifest.xml
@@ -35,7 +35,7 @@
             android:name=".ui.SettingsActivity"
             android:exported="true"
             android:theme="@style/Theme.KV4PHT"
-            android:windowSoftInputMode="stateVisible">
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="com.vagell.kv4pht.SETTINGS_ACTION" />
 
@@ -46,7 +46,7 @@
             android:name=".ui.AddEditMemoryActivity"
             android:exported="true"
             android:theme="@style/Theme.KV4PHT"
-            android:windowSoftInputMode="stateVisible|adjustResize"> <!-- There's an issue where fields are not scrollable, likely caused by an Android bug not honoring adjustResize on fullscreen apps, see similar bug in another project: https://github.com/dotnet/maui/issues/14281 -->
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="com.vagell.kv4pht.ADD_MEMORY_ACTION" />
                 <action android:name="com.vagell.kv4pht.EDIT_MEMORY_ACTION" />

diff --git a/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/aprs/parser/APRSPacket.java b/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/aprs/parser/APRSPacket.java
@@ -58,8 +58,7 @@ public APRSPacket( String source, String destination, ArrayList<Digipeater> digi
 		this.dti = (char)body[0];
         this.aprsInformation = new InformationField(body);
     }
-
-
+
 	/** 
 	 * @param callsign
 	 * @return String

diff --git a/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/firmware/FirmwareUtils.java b/android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/firmware/FirmwareUtils.java
@@ -18,11 +18,11 @@ public class FirmwareUtils {
     private static int progressPercent = 0;
 
     // Whenever there is new firmware, put the files in res/raw, and update these constants.
-    public static final int PACKAGED_FIRMWARE_VER = 2;
-    private static final int FIRMWARE_FILE_1_ID = R.raw.v2_kv4p_ht_esp32_wroom_32_ino_bootloader;
-    private static final int FIRMWARE_FILE_2_ID = R.raw.v2_kv4p_ht_esp32_wroom_32_ino_partitions;
+    public static final int PACKAGED_FIRMWARE_VER = 3;
+    private static final int FIRMWARE_FILE_1_ID = R.raw.v3_kv4p_ht_esp32_wroom_32_ino_bootloader;
+    private static final int FIRMWARE_FILE_2_ID = R.raw.v3_kv4p_ht_esp32_wroom_32_ino_partitions;
     private static final int FIRMWARE_FILE_3_ID = R.raw.boot_app0; // This one never changes, it's the Arduino ESP32 bootloader
-    private static final int FIRMWARE_FILE_4_ID = R.raw.v2_kv4p_ht_esp32_wroom_32_ino;
+    private static final int FIRMWARE_FILE_4_ID = R.raw.v3_kv4p_ht_esp32_wroom_32_ino;
 
     public FirmwareUtils() {
     }