From add30735aef1ae92dec59f4bf39348564f68994e Mon Sep 17 00:00:00 2001 From: Keith Conger Date: Thu, 28 Aug 2025 15:08:05 -0600 Subject: [PATCH 1/2] Added Bmaps Nav App support Gradle update Dependency update Signed-off-by: Keith Conger --- app/build.gradle | 8 +++---- .../WunderLINQ/NavAppHelper.java | 22 ++++++++++++++++++- app/src/main/res/values/strings.xml | 3 +++ build.gradle | 2 +- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c5d2c31..76dfa44 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdk 36 + compileSdk = 36 defaultConfig { applicationId "com.blackboxembedded.WunderLINQ" minSdkVersion 26 @@ -58,14 +58,14 @@ dependencies { implementation 'androidx.preference:preference:1.2.1' implementation 'androidx.gridlayout:gridlayout:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:2.2.1' - implementation "androidx.lifecycle:lifecycle-viewmodel:2.9.2" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2" + implementation "androidx.lifecycle:lifecycle-viewmodel:2.9.3" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.3" implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'com.google.android.material:material:1.12.0' implementation 'com.google.android.gms:play-services-location:21.3.0' implementation 'com.google.android.gms:play-services-maps:19.2.0' implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1' - implementation 'com.opencsv:opencsv:5.11.2' + implementation 'com.opencsv:opencsv:5.12.0' implementation 'ca.rmen:lib-sunrise-sunset:1.1.2' implementation 'com.github.martin-stone:hsv-alpha-color-picker-android:3.1.0' implementation 'io.jenetics:jpx:3.2.1' diff --git a/app/src/main/java/com/blackboxembedded/WunderLINQ/NavAppHelper.java b/app/src/main/java/com/blackboxembedded/WunderLINQ/NavAppHelper.java index 57936ae..88fbe18 100644 --- a/app/src/main/java/com/blackboxembedded/WunderLINQ/NavAppHelper.java +++ b/app/src/main/java/com/blackboxembedded/WunderLINQ/NavAppHelper.java @@ -159,6 +159,11 @@ static public void open(Activity activity){ case "26": //DMD2 navIntent = activity.getPackageManager().getLaunchIntentForPackage("com.thorkracing.dmd2launcher"); break; + case "27": //Bmaps + navIntent = new Intent(android.content.Intent.ACTION_VIEW); + url = "bmaps://"; + navIntent.setData(Uri.parse(url)); + break; } try { if (navIntent != null) { @@ -288,6 +293,11 @@ static public boolean navigateToFuel(Activity activity, Location current){ case "26": //DMD2 // Not Supported break; + case "27": //Bmaps + supported = true; + url = "bmaps://search?fuel"; + navIntent.setData(Uri.parse(url)); + break; } if (supported) { if (!navApp.equals("6")) { // If NOT OsmAnd @@ -447,6 +457,11 @@ static public boolean navigateTo(Activity activity, Location start, Location end case "26" : //DMD2 // Not Supported break; + case "27": //Bmaps + supported = true; + navUrl = "bmaps://route?geo=" + end.getLatitude() + "," + end.getLongitude(); + homeNavIntent.setData(Uri.parse(navUrl)); + break; } if (supported) { if (!navApp.equals("6")) { // If NOT OsmAnd @@ -604,6 +619,11 @@ static public boolean viewWaypoint(Activity activity, Location waypoint, String case "26" : //DMD2 // Not Supported break; + case "27": //Bmaps + supported = true; + navUrl = "bmaps://view?geo=" + waypoint.getLatitude() + "," + waypoint.getLongitude() ; + navIntent.setData(Uri.parse(navUrl)); + break; } if (supported) { if (!navApp.equals("6")) { // If NOT OsmAnd @@ -649,7 +669,7 @@ static private boolean isCallable(Activity activity, Intent intent) { List list = activity.getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY); - return list.size() > 0; + return !list.isEmpty(); } //Looks for a partial string and returns the first package name that matches diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6f5e816..b1823ad 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -727,6 +727,7 @@ HERE WeGo Tourstart DMD2 + Bmaps @string/nav_app_default @string/nav_app_google @@ -753,6 +754,7 @@ @string/nav_app_here @string/nav_app_tourstart @string/nav_app_dmd2 + @string/nav_app_bmaps 1 @@ -780,6 +782,7 @@ 24 25 26 + 27 Roadbook App Rabbit Rally diff --git a/build.gradle b/build.gradle index c75aae7..0fedc32 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url 'https://jitpack.io' } } dependencies { - classpath 'com.android.tools.build:gradle:8.12.0' + classpath 'com.android.tools.build:gradle:8.12.2' classpath 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From c8a9bb18d510acc58e01aeced4b1fd1036b1596c Mon Sep 17 00:00:00 2001 From: Keith Conger Date: Thu, 28 Aug 2025 16:14:26 -0600 Subject: [PATCH 2/2] Fix launch via just 'wunderlinq://' Signed-off-by: Keith Conger --- app/src/main/AndroidManifest.xml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9b9a564..1fbd60e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -134,15 +134,20 @@ android:launchMode="singleTask" android:resizeableActivity="true" android:supportsPictureInPicture="true"> + - + + - + + + + + +