Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'

android {
compileSdk 36
compileSdk = 36
defaultConfig {
applicationId "com.blackboxembedded.WunderLINQ"
minSdkVersion 26
Expand Down Expand Up @@ -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'
Expand Down
13 changes: 9 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,20 @@
android:launchMode="singleTask"
android:resizeableActivity="true"
android:supportsPictureInPicture="true">
<!-- Bare scheme: wunderlinq:// -->
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="wunderlinq" />
</intent-filter>

<data
android:host="datagrid"
android:scheme="wunderlinq" />
<!-- Specific host: wunderlinq://datagrid -->
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="wunderlinq" android:host="datagrid" />
</intent-filter>
</activity>
<activity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -649,7 +669,7 @@ static private boolean isCallable(Activity activity, Intent intent) {

List<ResolveInfo> 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
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,7 @@
<string name="nav_app_here">HERE WeGo</string>
<string name="nav_app_tourstart">Tourstart</string>
<string name="nav_app_dmd2">DMD2</string>
<string name="nav_app_bmaps">Bmaps</string>
<string-array name="nav_apps_array" translatable="false">
<item name="1">@string/nav_app_default</item>
<item name="2">@string/nav_app_google</item>
Expand All @@ -753,6 +754,7 @@
<item name="24">@string/nav_app_here</item>
<item name="25">@string/nav_app_tourstart</item>
<item name="26">@string/nav_app_dmd2</item>
<item name="27">@string/nav_app_bmaps</item>
</string-array>
<string-array name="nav_apps_arrayValues" translatable="false">
<item name="1">1</item>
Expand Down Expand Up @@ -780,6 +782,7 @@
<item name="24">24</item>
<item name="25">25</item>
<item name="26">26</item>
<item name="27">27</item>
</string-array>
<string name="pref_roadbook_app_title">Roadbook App</string>
<string name="roadbook_app_rabbitrally">Rabbit Rally</string>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading