Merge pull request #140 from Omega-R/feature/map_make_route

Driving mode flag and any map service choice added

Author: anton-knyazev

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/MapIntentBuilder.kt

@@ -15,10 +15,8 @@ import android.app.Fragment
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.os.Bundle
 import com.omega_r.libs.omegaintentbuilder.IntentBuilderLauncher
 import com.omega_r.libs.omegaintentbuilder.OmegaIntentBuilder
-import com.omega_r.libs.omegaintentbuilder.handlers.ActivityResultCallback
 import com.omega_r.libs.omegaintentbuilder.handlers.ContextIntentHandler
 import com.omega_r.libs.omegaintentbuilder.handlers.FailCallback
 import com.omega_r.libs.omegaintentbuilder.interfaces.IntentHandler
@@ -40,10 +38,7 @@ class MapIntentBuilder(private vararg var types: MapTypes) : BaseActivityBuilder
     private var zoom: Int? = null
     private var startLatitude: Double? = null
     private var startLongitude: Double? = null
-
-    init {
-        if (types.isEmpty()) types = MapTypes.values()
-    }
+    private var isDrivingModeEnabled: Boolean = false
 
     /**
      * Set a latitude.
@@ -120,25 +115,50 @@ class MapIntentBuilder(private vararg var types: MapTypes) : BaseActivityBuilder
         return this
     }
 
-    override fun createIntent(context: Context): Intent {
-        // We take first because next type will be handled in WrapperIntentHandler
-        val mapType = types.first()
-        val uri: Uri = getFormattedUri(mapType)
-        val intent = Intent(Intent.ACTION_VIEW, uri)
+    fun enableDrivingMode() {
+        isDrivingModeEnabled = true
+    }
 
-        when (mapType) {
-            GOOGLE_MAP -> GOOGLE_MAP.packageName
-            YANDEX_MAP -> YANDEX_MAP.packageName
-            KAKAO_MAP -> KAKAO_MAP.packageName
-            NAVER_MAP -> NAVER_MAP.packageName
-        }.also { intent.setPackage(it) }
+    override fun createIntent(context: Context) =
+        if (types.isEmpty()) {
+            Intent(Intent.ACTION_VIEW, undefinedMapUri())
+        } else {
+            // We take first because next type will be handled in WrapperIntentHandler
+            val mapType = types.first()
+            val uri = getFormattedUri(mapType)
+            val intent = Intent(Intent.ACTION_VIEW, uri)
+
+            when (mapType) {
+                GOOGLE_MAP -> GOOGLE_MAP.packageName
+                YANDEX_MAP -> YANDEX_MAP.packageName
+                KAKAO_MAP -> KAKAO_MAP.packageName
+                NAVER_MAP -> NAVER_MAP.packageName
+            }.also { intent.setPackage(it) }
+            intent
+        }
 
-        return intent
+    private fun undefinedMapUri(): Uri {
+        val sb = StringBuilder()
+        if (startLatitude != null && startLongitude != null) {
+            sb.append("geo:${startLatitude},${startLongitude}")
+            if (latitude != null && longitude != null) {
+                sb.append("?q=${latitude},${longitude}")
+            }
+            address?.let {
+                sb.append(" (${Uri.encode(it)})")
+            }
+        } else if (latitude != null && longitude != null) {
+            sb.append("geo:${latitude},${longitude}")
+            address?.let {
+                sb.append("?q=${Uri.encode(it)}")
+            }
+        }
+        return Uri.parse(sb.toString())
     }
 
     private fun getFormattedUri(mapType: MapTypes): Uri {
         val sb = StringBuilder()
-        when(mapType) {
+        when (mapType) {
             GOOGLE_MAP -> formulateGoogleUri(sb)
             YANDEX_MAP -> formulateYandexMapUri(sb)
             KAKAO_MAP -> formulateKakaoMapUri(sb)
@@ -157,8 +177,9 @@ class MapIntentBuilder(private vararg var types: MapTypes) : BaseActivityBuilder
             else -> null
         }
 
-        if(startLatitude != null && startLongitude != null) {
-            sb.append("google.navigation:q=", latitude, ",", longitude)
+        if (startLatitude != null && startLongitude != null) {
+            if (isDrivingModeEnabled) sb.append("google.navigation:q=", latitude, ",", longitude)
+            else sb.append("/saddr=${startLatitude},${startLongitude}&addr=${latitude},${longitude}")
         } else {
             if (viewType == null) {
                 sb.append("geo:")
@@ -178,18 +199,14 @@ class MapIntentBuilder(private vararg var types: MapTypes) : BaseActivityBuilder
                 } ?: if (latitude != null && longitude != null) {
                     sb.append("?q=", latitude, ",", longitude)
                 }
-                if (latitude != null && longitude != null) {
-                    sb.append("&loc:")
-                        .append(latitude, "+", longitude)
-                }
             }
         }
     }
 
     private fun formulateYandexMapUri(sb: StringBuilder) {
         sb.append("yandexmaps://", "maps.yandex.ru/?")
-        if(startLongitude != null && startLatitude != null) {
-            sb.append("rtext=", startLatitude, ",", startLongitude, "~",latitude, ",", longitude)
+        if (startLongitude != null && startLatitude != null) {
+            sb.append("rtext=", startLatitude, ",", startLongitude, "~", latitude, ",", longitude)
         } else {
             if (latitude != null && longitude != null) {
                 sb.append("pt=")
@@ -223,11 +240,11 @@ class MapIntentBuilder(private vararg var types: MapTypes) : BaseActivityBuilder
             sb.append("look?")
         } else {
             sb.append("search?")
-                    .append("q=", address, "&")
+                .append("q=", address, "&")
         }
         if (latitude != null && longitude != null) {
             sb.append("p=")
-                    .append(latitude, ",", longitude)
+                .append(latitude, ",", longitude)
         }
     }
 
@@ -244,7 +261,9 @@ class MapIntentBuilder(private vararg var types: MapTypes) : BaseActivityBuilder
     }
 
     override fun createIntentHandler(fragment: androidx.fragment.app.Fragment): IntentHandler {
-        return fragment.context?.let { createFailIntentHandler(it) } ?: super.createIntentHandler(fragment)
+        return fragment.context?.let { createFailIntentHandler(it) } ?: super.createIntentHandler(
+            fragment
+        )
     }
 
     override fun createIntentHandler(context: Context): IntentHandler {
@@ -253,7 +272,12 @@ class MapIntentBuilder(private vararg var types: MapTypes) : BaseActivityBuilder
 
     private fun createFailIntentHandler(context: Context): WrapperIntentHandler? {
         val list = createFailIntentHandlers(context)
-        return if (list.isEmpty()) null else WrapperIntentHandler(context, createIntent(context), list.last(), list.first())
+        return if (list.isEmpty()) null else WrapperIntentHandler(
+            context,
+            createIntent(context),
+            list.last(),
+            list.first()
+        )
     }
 
     private fun createFailIntentHandlers(context: Context): List<IntentHandler> {
@@ -263,25 +287,25 @@ class MapIntentBuilder(private vararg var types: MapTypes) : BaseActivityBuilder
 
         for (index in 1 until types.size) {
             val intentHandler = OmegaIntentBuilder
-                    .map(types[index])
-                    .also {
-                        it.address = address
-                        it.latitude = latitude
-                        it.longitude = longitude
-                        it.zoom = zoom
-                        it.viewType = viewType
-                    }
-                    .createIntentHandler(context)
+                .map(types[index])
+                .also {
+                    it.address = address
+                    it.latitude = latitude
+                    it.longitude = longitude
+                    it.zoom = zoom
+                    it.viewType = viewType
+                }
+                .createIntentHandler(context)
             result += intentHandler
             prevIntentHandler?.failIntentHandler(intentHandler)
             prevIntentHandler = intentHandler
         }
 
         if (failtype != null) {
             val lastHandler = OmegaIntentBuilder
-                    .playStore()
-                    .packageName(failtype!!.packageName)
-                    .createIntentHandler(context)
+                .playStore()
+                .packageName(failtype!!.packageName)
+                .createIntentHandler(context)
             result += lastHandler
             prevIntentHandler?.failIntentHandler(lastHandler)
 
@@ -291,13 +315,13 @@ class MapIntentBuilder(private vararg var types: MapTypes) : BaseActivityBuilder
     }
 
     private class WrapperIntentHandler(
-            context: Context,
-            createdIntent: Intent,
-            private val handler: IntentHandler,
-            failIntentHandler: IntentHandler?
+        context: Context,
+        createdIntent: Intent,
+        private val handler: IntentHandler,
+        failIntentHandler: IntentHandler?
     ) : ContextIntentHandler(
-            context,
-            createdIntent
+        context,
+        createdIntent
     ) {
 
         init {