Convert core module to Kotlin Mutliplatform

.gitignore

@@ -15,3 +15,6 @@ build/
 
 #MacOS
 .DS_Store
+
+# Kotlin
+.kotlin

CHANGELOG.md

@@ -5,6 +5,7 @@ Maplibre welcomes participation and contributions from everyone.
 ### unreleased
 
 **BREAKING CHANGES:**
+- Convert module `libandroid-navigation` to Kotlin Multiplatform. See description of [#133](https://github.com/maplibre/maplibre-navigation-android/issues/133) to get informed about all breaking changes 
 - Convert module `libandroid-navigation` to Kotlin. See description of PR [#127](https://github.com/maplibre/maplibre-navigation-android/pull/127) to get informed about all breaking changes
 - Updated startNavigation() in NavigationLauncher to just use a context instead of an activity [#126](https://github.com/maplibre/maplibre-navigation-android/pull/126)
 

app/build.gradle

@@ -61,7 +61,7 @@ android {
 }
 
 dependencies {
-    implementation project(':libandroid-navigation')
+    implementation project(':maplibre-navigation-core')
     implementation project(':libandroid-navigation-ui')
     implementation dependenciesList.mapLibre
 

app/src/main/AndroidManifest.xml

@@ -42,6 +42,20 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".MainActivity" />
         </activity>
+        <activity
+            android:name=".NavigationWithForegroundNotificationActivity"
+            android:label="@string/title_foreground_notification">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainActivity" />
+        </activity>
+        <activity
+            android:name=".NavigationWithCustomForegroundNotificationActivity"
+            android:label="@string/title_custom_foreground_notification">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainActivity" />
+        </activity>
         <activity
             android:name=".MainActivity"
             android:exported="true">

app/src/main/java/org/maplibre/navigation/android/example/CustomNavigationNotification.java

@@ -1,5 +1,6 @@
 package org.maplibre.navigation.android.example;
 
+import android.annotation.SuppressLint;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -14,10 +15,10 @@
 import androidx.annotation.RequiresApi;
 import androidx.core.app.NotificationCompat;
 
-import org.maplibre.navigation.android.navigation.v5.navigation.notification.NavigationNotification;
-import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress;
+import org.maplibre.navigation.android.navigation.ui.v5.notification.NavigationNotification;
+import org.maplibre.navigation.core.routeprogress.RouteProgress;
 
-import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_NOTIFICATION_CHANNEL;
+import static org.maplibre.navigation.android.navigation.ui.v5.notification.MapLibreNavigationNotification.NAVIGATION_NOTIFICATION_CHANNEL;
 
 public class CustomNavigationNotification implements NavigationNotification {
 
@@ -66,6 +67,7 @@ public void onNavigationStopped(Context context) {
         notificationManager.cancel(CUSTOM_NOTIFICATION_ID);
     }
 
+    @SuppressLint("UnspecifiedRegisterReceiverFlag")
     public void register(BroadcastReceiver stopNavigationReceiver, Context applicationContext) {
         this.stopNavigationReceiver = stopNavigationReceiver;
 

app/src/main/java/org/maplibre/navigation/android/example/MainActivity.java

@@ -58,6 +58,16 @@ protected void onCreate(Bundle savedInstanceState) {
             getString(R.string.description_snap_to_route),
             SnapToRouteNavigationActivity.class
         ));
+        list.add(new SampleItem(
+            getString(R.string.title_foreground_notification),
+            getString(R.string.description_foreground_notification),
+            NavigationWithForegroundNotificationActivity.class
+        ));
+        list.add(new SampleItem(
+            getString(R.string.title_custom_foreground_notification),
+            getString(R.string.description_custom_foreground_notification),
+            NavigationWithForegroundNotificationActivity.class
+        ));
         RecyclerView.Adapter adapter = new MainAdapter(list);
         recyclerView.setAdapter(adapter);
 

app/src/main/java/org/maplibre/navigation/android/example/MockNavigationActivity.kt

@@ -4,15 +4,13 @@ import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.location.Location
 import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.snackbar.Snackbar
-import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse
-import org.maplibre.geojson.Point
+import org.maplibre.navigation.core.models.DirectionsResponse
 import org.maplibre.android.annotations.MarkerOptions
 import org.maplibre.android.camera.CameraUpdateFactory
 import org.maplibre.android.geometry.LatLng
@@ -24,26 +22,30 @@ import org.maplibre.android.maps.MapLibreMap
 import org.maplibre.android.maps.OnMapReadyCallback
 import org.maplibre.android.maps.Style
 import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationRoute
-import org.maplibre.navigation.android.navigation.v5.location.replay.ReplayRouteLocationEngine
-import org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria
-import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute
-import org.maplibre.navigation.android.navigation.v5.offroute.OffRouteListener
-import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener
-import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress
+import org.maplibre.navigation.core.location.replay.ReplayRouteLocationEngine
+import org.maplibre.navigation.core.models.DirectionsRoute
+import org.maplibre.navigation.core.offroute.OffRouteListener
+import org.maplibre.navigation.core.routeprogress.ProgressChangeListener
+import org.maplibre.navigation.core.routeprogress.RouteProgress
 import org.maplibre.turf.TurfConstants
 import org.maplibre.turf.TurfMeasurement
 import okhttp3.Request
 import org.maplibre.navigation.android.example.databinding.ActivityMockNavigationBinding
 import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationMapRoute
-import org.maplibre.navigation.android.navigation.v5.instruction.Instruction
-import org.maplibre.navigation.android.navigation.v5.milestone.Milestone
-import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener
-import org.maplibre.navigation.android.navigation.v5.milestone.RouteMilestone
-import org.maplibre.navigation.android.navigation.v5.milestone.Trigger
-import org.maplibre.navigation.android.navigation.v5.milestone.TriggerProperty
-import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation
-import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigationOptions
-import org.maplibre.navigation.android.navigation.v5.navigation.NavigationEventListener
+import org.maplibre.navigation.core.instruction.Instruction
+import org.maplibre.navigation.core.location.Location
+import org.maplibre.navigation.core.milestone.Milestone
+import org.maplibre.navigation.core.milestone.MilestoneEventListener
+import org.maplibre.navigation.core.milestone.RouteMilestone
+import org.maplibre.navigation.core.milestone.Trigger
+import org.maplibre.navigation.core.milestone.TriggerProperty
+import org.maplibre.navigation.core.models.UnitType
+import org.maplibre.navigation.core.navigation.AndroidMapLibreNavigation
+import org.maplibre.navigation.core.navigation.MapLibreNavigation
+import org.maplibre.navigation.core.navigation.MapLibreNavigationOptions
+import org.maplibre.navigation.core.navigation.NavigationEventListener
+import org.maplibre.navigation.geo.Point
+import org.maplibre.navigation.geo.toMapLibrePoint
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -83,22 +85,7 @@ class MockNavigationActivity :
             getMapAsync(this@MockNavigationActivity)
         }
 
-        val context = applicationContext
-        val customNotification =
-            CustomNavigationNotification(
-                context
-            )
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            customNotification.createNotificationChannel(this)
-        }
-        val options = MapLibreNavigationOptions(navigationNotification = customNotification)
-
-        navigation =
-            MapLibreNavigation(
-                this,
-                options
-            )
-
+        navigation = AndroidMapLibreNavigation(applicationContext)
         navigation.addMilestone(
             RouteMilestone(
                 identifier = BEGIN_ROUTE_MILESTONE,
@@ -116,7 +103,6 @@ class MockNavigationActivity :
                 ),
             )
         )
-        customNotification.register(MyBroadcastReceiver(navigation), context)
 
         binding.startRouteButton.setOnClickListener {
             route?.let { route ->
@@ -198,15 +184,15 @@ class MockNavigationActivity :
             // Set the component's render mode
             it.renderMode = RenderMode.GPS
 
-            it.locationEngine = locationEngine
+//            it.locationEngine = locationEngine
         }
     }
 
     override fun onMapClick(point: LatLng): Boolean {
         var addMarker = true
         when {
-            destination == null -> destination = Point.fromLngLat(point.longitude, point.latitude)
-            waypoint == null -> waypoint = Point.fromLngLat(point.longitude, point.latitude)
+            destination == null -> destination = Point(point.longitude, point.latitude)
+            waypoint == null -> waypoint = Point(point.longitude, point.latitude)
             else -> {
                 Toast.makeText(this, "Only 2 waypoints supported", Toast.LENGTH_LONG).show()
                 addMarker = false
@@ -235,17 +221,17 @@ class MockNavigationActivity :
             return
         }
 
-        val origin = Point.fromLngLat(userLocation.longitude, userLocation.latitude)
-        if (TurfMeasurement.distance(origin, destination, TurfConstants.UNIT_METERS) < 50) {
+        val origin = Point(userLocation.longitude, userLocation.latitude)
+        if (TurfMeasurement.distance(origin.toMapLibrePoint(), destination.toMapLibrePoint(), TurfConstants.UNIT_METERS) < 50) {
             binding.startRouteButton.visibility = View.GONE
             return
         }
 
         val navigationRouteBuilder = NavigationRoute.builder(this).apply {
             this.accessToken(getString(R.string.mapbox_access_token))
-            this.origin(origin)
-            this.destination(destination)
-            this.voiceUnits(DirectionsCriteria.METRIC)
+            this.origin(origin.toMapLibrePoint())
+            this.destination(destination.toMapLibrePoint())
+            this.voiceUnits(UnitType.METRIC)
             this.alternatives(true)
             this.baseUrl(getString(R.string.base_url))
         }
@@ -347,7 +333,7 @@ class MockNavigationActivity :
         mapLibreMap.let {
             val latLng = LatLng(52.039176, 5.550339)
             locationEngine.assignLastLocation(
-                Point.fromLngLat(latLng.longitude, latLng.latitude),
+                Point(latLng.longitude, latLng.latitude),
             )
             it.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 12.0))
         }

app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt

@@ -6,7 +6,7 @@ import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.snackbar.Snackbar
-import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse
+import org.maplibre.navigation.core.models.DirectionsResponse
 import org.maplibre.geojson.Point
 import org.maplibre.android.annotations.MarkerOptions
 import org.maplibre.android.camera.CameraPosition
@@ -21,13 +21,13 @@ import org.maplibre.android.maps.Style
 import org.maplibre.navigation.android.navigation.ui.v5.NavigationLauncher
 import org.maplibre.navigation.android.navigation.ui.v5.NavigationLauncherOptions
 import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationRoute
-import org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria
-import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute
+import org.maplibre.navigation.core.models.DirectionsRoute
 import org.maplibre.turf.TurfConstants
 import org.maplibre.turf.TurfMeasurement
 import okhttp3.Request
 import org.maplibre.navigation.android.example.databinding.ActivityNavigationUiBinding
 import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationMapRoute
+import org.maplibre.navigation.core.models.UnitType
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -185,7 +185,7 @@ class NavigationUIActivity :
             this.accessToken(getString(R.string.mapbox_access_token))
             this.origin(origin)
             this.destination(destination)
-            this.voiceUnits(DirectionsCriteria.METRIC)
+            this.voiceUnits(UnitType.METRIC)
             this.alternatives(true)
             // If you are using this with the GraphHopper Directions API, you need to uncomment user and profile here.
             //this.user("gh")