Prep for release 1.4.1

theengs · Sep 3, 2024 · 8452ae2 · 8452ae2
1 parent db2318e
commit 8452ae2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/Theengs.pro b/Theengs.pro
@@ -1,6 +1,6 @@
 TARGET  = Theengs
 
-VERSION = 1.4.0
+VERSION = 1.4.1
 DEFINES+= APP_NAME=\\\"$$TARGET\\\"
 DEFINES+= APP_VERSION=\\\"$$VERSION\\\"
 
@@ -277,6 +277,7 @@ android {
     OTHER_FILES += $${PWD}/assets/android/src/com/theengs/app/TheengsBootServiceBroadcastReceiver.java \
                    $${PWD}/assets/android/src/com/theengs/app/TheengsAndroidService.java \
                    $${PWD}/assets/android/src/com/theengs/app/TheengsAndroidNotifier.java \
+                   $${PWD}/assets/android/src/com/theengs/utils/QGpsUtils.java \
                    $${PWD}/assets/android/src/com/theengs/utils/QShareUtils.java \
                    $${PWD}/assets/android/src/com/theengs/utils/QSharePathResolver.java
 

diff --git a/assets/android/AndroidManifest.xml b/assets/android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto"
-          package="com.theengs.app" android:versionName="1.4.0" android:versionCode="01040006">
+          package="com.theengs.app" android:versionName="1.4.1" android:versionCode="01040108">
 
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true" />
 
@@ -34,8 +34,9 @@
 
     <!-- Application -->
     <application android:name="org.qtproject.qt.android.bindings.QtApplication"
-                 android:label="Theengs BLE" android:hardwareAccelerated="true" android:allowNativeHeapPointerTagging="false"
-                 android:theme="@style/AppTheme" android:roundIcon="@mipmap/ic_launcher_round" android:icon="@mipmap/ic_launcher">
+                 android:hardwareAccelerated="true" android:allowNativeHeapPointerTagging="false"
+                 android:theme="@style/AppTheme" android:roundIcon="@mipmap/ic_launcher_round" android:icon="@mipmap/ic_launcher"
+                 android:label="Theengs BLE">
 
         <!-- Activity -->
         <activity android:name="org.qtproject.qt.android.bindings.QtActivity"

diff --git a/assets/android/res/values/apptheme.xml b/assets/android/res/values/apptheme.xml
@@ -2,7 +2,7 @@
 <resources>
   <style name="AppTheme">
     <item name="android:windowFullscreen">true</item>
-    <item name="android:windowBackground">@android:color/white</item>
+    <item name="android:windowBackground">@drawable/splash</item>
     <item name="android:statusBarColor">@android:color/white</item>
     <item name="android:navigationBarColor">@android:color/white</item>
   </style>

diff --git a/src/thirdparty/AppUtils/utils_os_android_qt6.cpp b/src/thirdparty/AppUtils/utils_os_android_qt6.cpp
@@ -461,7 +461,7 @@ bool UtilsAndroid::gpsutils_isGpsEnabled()
     bool status = false;
 
     jboolean verified = QJniObject::callStaticMethod<jboolean>(
-        "io/emeric/utils/QGpsUtils",
+        "com/emeric/utils/QGpsUtils",
         "checkGpsEnabled",
         "(Landroid/content/Context;)Z",
         QNativeInterface::QAndroidApplication::context());
@@ -479,7 +479,7 @@ bool UtilsAndroid::gpsutils_forceGpsEnabled()
     bool status = false;
 
     jboolean verified = QJniObject::callStaticMethod<jboolean>(
-        "io/emeric/utils/QGpsUtils",
+        "com/emeric/utils/QGpsUtils",
         "forceGpsEnabled",
         "(Landroid/content/Context;)Z",
         QNativeInterface::QAndroidApplication::context());