diff --git a/CHANGELOG.md b/CHANGELOG.md index 8db8f8f..712c6f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ OpenSeizureDetector Android App - Change Log ============================================ - V4.3.0a - 2024-10-01 - - Added support for Android 14 (API 34) to allow publishing on Play Store. + V4.3.0 - 2024-10-01 + - Added support for Android 15 (API 35) to allow publishing on Play Store. - Improved the data sharing screen to show grouped events to reduce the number of events that need to be edited. V4.2.12 - Fixed crash when pressing 'Install Watch App' button by hiding the button if the Pebble data source is not selected - Added a 'Help' and 'Troubleshooting' button and menu item to draw users' attention to the web site instructions. diff --git a/app/build.gradle b/app/build.gradle index 1b6f2a2..ebb249d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,14 @@ apply plugin: 'com.android.application' apply plugin: 'com.google.gms.google-services' android { - compileSdk 34 // Android 14 + compileSdk 36 +// Android 14 useLibrary 'org.apache.http.legacy' defaultConfig { applicationId "uk.org.openseizuredetector" minSdkVersion 23 // Android 6 - targetSdkVersion 34 // Android 14 = 34 + targetSdkVersion 35 // Android 15 = 35 multiDexEnabled true } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6c6554e..e872b83 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="153" + android:versionName="4.3.0"> diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity2.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity2.java index 9e9bdae..d6a2d47 100644 --- a/app/src/main/java/uk/org/openseizuredetector/MainActivity2.java +++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity2.java @@ -2,7 +2,9 @@ package uk.org.openseizuredetector; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.view.WindowInsetsCompat; import androidx.core.view.MenuCompat; +import androidx.core.view.ViewCompat; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; @@ -18,6 +20,7 @@ import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; import android.util.Log; +import android.util.TypedValue; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -53,6 +56,26 @@ public class MainActivity2 extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main2); + View root = findViewById(R.id.activity_main2_root_layout); + ViewCompat.setOnApplyWindowInsetsListener(root, (v, insets) -> { + int topInset = 0; + //int topInset = insets.getInsets(WindowInsetsCompat.Type.systemBars()).top; + int actionBarHeight = 0; + TypedValue tv = new TypedValue(); + if (getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) { + actionBarHeight = TypedValue.complexToDimensionPixelSize(tv.data,getResources().getDisplayMetrics()); + } + Log.i(TAG, "onCreate() - topInset = " + topInset + ", actionBarHeight = " + actionBarHeight); + v.setPadding( + v.getPaddingLeft(), + actionBarHeight, + v.getPaddingRight(), + v.getPaddingBottom() + ); + return insets; + }); + + Log.i(TAG, "onCreate()"); // Set our custom uncaught exception handler to report issues. diff --git a/app/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml index a00ae34..6d66a45 100644 --- a/app/src/main/res/layout/activity_main2.xml +++ b/app/src/main/res/layout/activity_main2.xml @@ -2,9 +2,11 @@ + android:orientation="vertical" + > OpenSeizureDetector "\n - \nV4.3.0a - Added support for Android 14 (API 34) and above. + \nV4.3.0 - Added support for Android 15 (API 35) and above. \n - Simplified data sharing editor by grouping events for editing. \nV4.2.12 - Added butons and menu items for 'Help' and 'Troubleshooting' to point users to the web page instructoins. \nV4.2 - Added support for PineTime and BangleJS Watches using Bluetooth data source. diff --git a/build.gradle b/build.gradle index 8611b29..e82e451 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.4.1' + classpath 'com.android.tools.build:gradle:8.8.0' classpath 'com.google.gms:google-services:4.3.15' } } diff --git a/doc/Data_Sharing_Grouping.png b/doc/Data_Sharing_Grouping.png new file mode 100644 index 0000000..322ea70 Binary files /dev/null and b/doc/Data_Sharing_Grouping.png differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b1e1371..6532817 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Oct 10 20:04:34 BST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/releases/app-release-4.3.0.apk b/releases/app-release-4.3.0.apk new file mode 100644 index 0000000..7fc4055 Binary files /dev/null and b/releases/app-release-4.3.0.apk differ