Feature custom style

android/src/main/kotlin/dev/note11/flutter_naver_map/flutter_naver_map/applier/ApplyUtil.kt

@@ -4,12 +4,24 @@ import dev.note11.flutter_naver_map.flutter_naver_map.applier.option.NaverMapOpt
 import dev.note11.flutter_naver_map.flutter_naver_map.view.NaverMapView
 
 internal object ApplyUtil {
-    internal fun <A : NaverMapOptionApplier> A.applyOptions(args: Map<String, Any>): A {
+    internal fun <A : NaverMapOptionApplier> A.applyOptions(args: Map<String, Any?>): A {
         for ((funcName, arg) in args) {
-            try {
-                val func = optionApplyFuncMap[funcName]?.invoke(this)
-                func?.invoke(arg)
-            } catch (e: NullPointerException) {
+            val func = optionApplyFuncMap[funcName]?.invoke(this)
+            if (func != null) {
+                try {
+                    func.invoke(arg)
+                } catch (e: NullPointerException) {
+                    throw IllegalArgumentException(
+                        "Invalid argument for \"$funcName\". " +
+                                "Please check the type of the argument: $arg. this option really can be null?"
+                    )
+                } catch (e: Exception) {
+                    throw RuntimeException(
+                        "Failed to apply option \"$funcName\" with argument: $arg",
+                        e
+                    )
+                }
+            } else {
                 throw NoSuchMethodException(
                     "No such method \"$funcName\". " +
                             "Please check the handling of this method."
@@ -19,40 +31,50 @@ internal object ApplyUtil {
         return this
     }
 
-    private val optionApplyFuncMap: Map<String, ((NaverMapOptionApplier) -> ((Any) -> Unit))> =
+    private val optionApplyFuncMap: Map<String, ((NaverMapOptionApplier) -> ((Any?) -> Unit))> =
         mapOf(
-            "initialCameraPosition" to { it::setInitialCameraPosition },
+            "initialCameraPosition" to nonNullFunc { it::setInitialCameraPosition },
             "extent" to { it::setExtent },
-            "mapType" to { it::setMapType },
-            "liteModeEnable" to { it::setLiteModeEnable },
-            "nightModeEnable" to { it::setNightModeEnable },
-            "indoorEnable" to { it::setIndoorEnable },
-            "activeLayerGroups" to { it::setActiveLayerGroups },
-            "buildingHeight" to { it::setBuildingHeight },
-            "lightness" to { it::setLightness },
-            "symbolScale" to { it::setSymbolScale },
-            "symbolPerspectiveRatio" to { it::setSymbolPerspectiveRatio },
-            "indoorFocusRadius" to { it::setIndoorFocusRadius },
-            "pickTolerance" to { it::setPickTolerance },
-            "rotationGesturesEnable" to { it::setRotationGesturesEnable },
-            "scrollGesturesEnable" to { it::setScrollGesturesEnable },
-            "tiltGesturesEnable" to { it::setTiltGesturesEnable },
-            "zoomGesturesEnable" to { it::setZoomGesturesEnable },
-            "stopGesturesEnable" to { it::setStopGesturesEnable },
-            "scrollGesturesFriction" to { it::setScrollGesturesFriction },
-            "zoomGesturesFriction" to { it::setZoomGesturesFriction },
-            "rotationGesturesFriction" to { it::setRotationGesturesFriction },
+            "mapType" to nonNullFunc { it::setMapType },
+            "liteModeEnable" to nonNullFunc { it::setLiteModeEnable },
+            "nightModeEnable" to nonNullFunc { it::setNightModeEnable },
+            "indoorEnable" to nonNullFunc { it::setIndoorEnable },
+            "activeLayerGroups" to nonNullFunc { it::setActiveLayerGroups },
+            "buildingHeight" to nonNullFunc { it::setBuildingHeight },
+            "lightness" to nonNullFunc { it::setLightness },
+            "symbolScale" to nonNullFunc { it::setSymbolScale },
+            "symbolPerspectiveRatio" to nonNullFunc { it::setSymbolPerspectiveRatio },
+            "indoorFocusRadius" to nonNullFunc { it::setIndoorFocusRadius },
+            "pickTolerance" to nonNullFunc { it::setPickTolerance },
+            "rotationGesturesEnable" to nonNullFunc { it::setRotationGesturesEnable },
+            "scrollGesturesEnable" to nonNullFunc { it::setScrollGesturesEnable },
+            "tiltGesturesEnable" to nonNullFunc { it::setTiltGesturesEnable },
+            "zoomGesturesEnable" to nonNullFunc { it::setZoomGesturesEnable },
+            "stopGesturesEnable" to nonNullFunc { it::setStopGesturesEnable },
+            "scrollGesturesFriction" to nonNullFunc { it::setScrollGesturesFriction },
+            "zoomGesturesFriction" to nonNullFunc { it::setZoomGesturesFriction },
+            "rotationGesturesFriction" to nonNullFunc { it::setRotationGesturesFriction },
             "consumeSymbolTapEvents" to { { /** @see NaverMapView.setMapTapListener method */ } },
-            "scaleBarEnable" to { it::setScaleBarEnable },
-            "indoorLevelPickerEnable" to { it::setIndoorLevelPickerEnable },
-            "locationButtonEnable" to { it::setLocationButtonEnable },
-            "logoClickEnable" to { it::setLogoClickEnable },
-            "logoAlign" to { it::setLogoAlign },
-            "logoMargin" to { it::setLogoMargin },
-            "contentPadding" to { it::setContentPadding },
-            "minZoom" to { it::setMinZoom },
-            "maxZoom" to { it::setMaxZoom },
-            "maxTilt" to { it::setMaxTilt },
-            "locale" to { it::setLocale },
+            "scaleBarEnable" to nonNullFunc { it::setScaleBarEnable },
+            "indoorLevelPickerEnable" to nonNullFunc { it::setIndoorLevelPickerEnable },
+            "locationButtonEnable" to nonNullFunc { it::setLocationButtonEnable },
+            "logoClickEnable" to nonNullFunc { it::setLogoClickEnable },
+            "logoAlign" to nonNullFunc { it::setLogoAlign },
+            "logoMargin" to nonNullFunc { it::setLogoMargin },
+            "contentPadding" to nonNullFunc { it::setContentPadding },
+            "minZoom" to nonNullFunc { it::setMinZoom },
+            "maxZoom" to nonNullFunc { it::setMaxZoom },
+            "maxTilt" to nonNullFunc { it::setMaxTilt },
+            "locale" to nonNullFunc { it::setLocale },
+            "customStyleId" to { it::setCustomStyleId },
         )
+
+    private fun nonNullFunc(ev: ((NaverMapOptionApplier) -> ((Any) -> Unit))): ((NaverMapOptionApplier) -> ((Any?) -> Unit)) {
+        return { applier ->
+            { arg ->
+                if (arg == null) throw NullPointerException("Argument cannot be null for this option.")
+                ev.invoke(applier).invoke(arg)
+            }
+        }
+    }
 }

android/src/main/kotlin/dev/note11/flutter_naver_map/flutter_naver_map/applier/option/NaverMapApplierImpl.kt

@@ -15,12 +15,13 @@ import dev.note11.flutter_naver_map.flutter_naver_map.util.DisplayUtil
 
 class NaverMapApplierImpl(
     private val naverMap: NaverMap,
+    private val customStyleCallback: NaverMap.OnCustomStyleLoadCallback? = null,
 ) : NaverMapOptionApplier {
 
     override fun setInitialCameraPosition(rawPosition: Any) = Unit
 
-    override fun setExtent(rawLatLngBounds: Any) {
-        naverMap.extent = rawLatLngBounds.asLatLngBounds()
+    override fun setExtent(rawLatLngBounds: Any?) {
+        naverMap.extent = rawLatLngBounds?.asLatLngBounds()
     }
 
     override fun setMapType(rawMapType: Any) {
@@ -154,4 +155,8 @@ class NaverMapApplierImpl(
         val nLocale = NLocale.fromMessageable(rawLocale)
         naverMap.locale = nLocale?.toLocale()
     }
+
+    override fun setCustomStyleId(rawCustomStyleId: Any?) {
+        naverMap.setCustomStyleId(rawCustomStyleId?.toString(), customStyleCallback)
+    }
 }

android/src/main/kotlin/dev/note11/flutter_naver_map/flutter_naver_map/applier/option/NaverMapOptionApplier.kt

@@ -2,7 +2,7 @@ package dev.note11.flutter_naver_map.flutter_naver_map.applier.option
 
 internal interface NaverMapOptionApplier {
     fun setInitialCameraPosition(rawPosition: Any)
-    fun setExtent(rawLatLngBounds: Any)
+    fun setExtent(rawLatLngBounds: Any?)
     fun setMapType(rawMapType: Any)
     fun setLiteModeEnable(rawEnable: Any)
     fun setNightModeEnable(rawEnable: Any)
@@ -33,4 +33,5 @@ internal interface NaverMapOptionApplier {
     fun setMaxZoom(rawLevel: Any)
     fun setMaxTilt(rawTilt: Any)
     fun setLocale(rawLocale: Any)
+    fun setCustomStyleId(rawCustomStyleId: Any?)
 }

android/src/main/kotlin/dev/note11/flutter_naver_map/flutter_naver_map/applier/option/NaverMapOptionApplierImpl.kt

@@ -22,8 +22,8 @@ class NaverMapOptionApplierImpl(
         options.camera(cameraPosition)
     }
 
-    override fun setExtent(rawLatLngBounds: Any) {
-        options.extent(rawLatLngBounds.asLatLngBounds())
+    override fun setExtent(rawLatLngBounds: Any?) {
+        options.extent(rawLatLngBounds?.asLatLngBounds())
     }
 
     override fun setMapType(rawMapType: Any) {
@@ -155,4 +155,8 @@ class NaverMapOptionApplierImpl(
         val nLocale = NLocale.fromMessageable(rawLocale)
         options.locale(nLocale?.toLocale())
     }
+
+    override fun setCustomStyleId(rawCustomStyleId: Any?) {
+        options.customStyleId(rawCustomStyleId?.toString())
+    }
 }

android/src/main/kotlin/dev/note11/flutter_naver_map/flutter_naver_map/controller/NaverMapControlHandler.kt

@@ -159,7 +159,7 @@ internal interface NaverMapControlHandler {
 
     fun forceRefresh(onSuccess: () -> Unit)
 
-    fun updateOptions(rawOptions: Map<String, Any>, onSuccess: () -> Unit)
+    fun updateOptions(rawOptions: Map<String, Any?>, onSuccess: () -> Unit)
 
     fun updateClusteringOptions(rawOptions: Map<String, Any>, onSuccess: () -> Unit)
 

android/src/main/kotlin/dev/note11/flutter_naver_map/flutter_naver_map/controller/NaverMapControlSender.kt

@@ -17,4 +17,10 @@ internal interface NaverMapControlSender {
     fun onCameraIdle()
 
     fun onSelectedIndoorChanged(selectedIndoor: IndoorSelection?)
+
+    fun onCustomStyleLoaded()
+
+    fun onCustomStyleLoadFailed(exception: Exception)
+
+    fun dispose()
 }

android/src/main/kotlin/dev/note11/flutter_naver_map/flutter_naver_map/controller/NaverMapController.kt

@@ -7,6 +7,7 @@ import com.naver.maps.geometry.LatLng
 import com.naver.maps.map.CameraUpdate
 import com.naver.maps.map.LocationTrackingMode
 import com.naver.maps.map.NaverMap
+import com.naver.maps.map.NaverMapSdk
 import com.naver.maps.map.Projection
 import com.naver.maps.map.Symbol
 import com.naver.maps.map.app.LegalNoticeActivity
@@ -20,8 +21,8 @@ import dev.note11.flutter_naver_map.flutter_naver_map.converter.MapTypeConverter
 import dev.note11.flutter_naver_map.flutter_naver_map.converter.MapTypeConverter.toMessageableString
 import dev.note11.flutter_naver_map.flutter_naver_map.model.enum.NOverlayType
 import dev.note11.flutter_naver_map.flutter_naver_map.model.base.NPoint
+import dev.note11.flutter_naver_map.flutter_naver_map.model.exception.NFlutterException
 import dev.note11.flutter_naver_map.flutter_naver_map.model.map.NaverMapViewOptions
-import dev.note11.flutter_naver_map.flutter_naver_map.model.map.info.NClusterableMarkerInfo
 import dev.note11.flutter_naver_map.flutter_naver_map.model.map.info.NOverlayInfo
 import dev.note11.flutter_naver_map.flutter_naver_map.model.map.info.NPickableInfo
 import dev.note11.flutter_naver_map.flutter_naver_map.model.map.info.NSymbolInfo
@@ -230,9 +231,10 @@ internal class NaverMapController(
         onSuccess()
     }
 
-    override fun updateOptions(rawOptions: Map<String, Any>, onSuccess: () -> Unit) {
-        naverMapViewOptions =
-            NaverMapViewOptions.updateNaverMapFromMessageable(naverMap, rawOptions)
+    override fun updateOptions(rawOptions: Map<String, Any?>, onSuccess: () -> Unit) {
+        naverMapViewOptions = NaverMapViewOptions.updateNaverMapFromMessageable(
+            naverMap, rawOptions, getCustomStyleCallback()
+        )
         onSuccess()
     }
 
@@ -307,11 +309,32 @@ internal class NaverMapController(
         channel.invokeMethod("onSelectedIndoorChanged", selectedIndoor?.toMessageable())
     }
 
+    override fun onCustomStyleLoaded() {
+        channel.invokeMethod("onCustomStyleLoaded", null)
+    }
+
+    override fun onCustomStyleLoadFailed(exception: Exception) {
+        val flutterError = when (exception) {
+            is NaverMapSdk.AuthFailedException ->
+                if (exception.errorCode == "400") NFlutterException(
+                    code = "400",
+                    message = "Invalid custom style ID: ${exception.message}"
+                )
+                else NFlutterException(
+                    code = exception.errorCode,
+                    message = "Custom style load failed: ${exception.message}"
+                )
+            /// in iOS, 900 is no handling error code, so we use 900 here too
+            else -> NFlutterException(code = "900", message = exception.message)
+        }
+        channel.invokeMethod("onCustomStyleLoadFailed", flutterError.toMessageable())
+    }
+
     /*
       --- remove ---
     */
 
-    fun remove() {
+    override fun dispose() {
         channel.setMethodCallHandler(null)
         clusteringController.dispose()
         overlayController.remove()

android/src/main/kotlin/dev/note11/flutter_naver_map/flutter_naver_map/controller/NaverMapSenderExtensions.kt

@@ -0,0 +1,11 @@
+package dev.note11.flutter_naver_map.flutter_naver_map.controller
+
+import com.naver.maps.map.NaverMap.OnCustomStyleLoadCallback
+
+internal fun NaverMapControlSender.getCustomStyleCallback(): OnCustomStyleLoadCallback =
+    object : OnCustomStyleLoadCallback {
+        override fun onCustomStyleLoaded() = this@getCustomStyleCallback.onCustomStyleLoaded()
+
+        override fun onCustomStyleLoadFailed(exception: Exception) =
+            this@getCustomStyleCallback.onCustomStyleLoadFailed(exception)
+    }

android/src/main/kotlin/dev/note11/flutter_naver_map/flutter_naver_map/converter/DefaultTypeConverter.kt

@@ -6,9 +6,13 @@ internal object DefaultTypeConverter {
     fun Any.asFloat(): Float = if (this is Double) toFloat() else this as Float
     fun Any.asInt(): Int = if (this is Long) toInt() else this as Int
     fun Any.asLong(): Long = if (this is Int) toLong() else this as Long
+
     @Suppress("UNCHECKED_CAST")
     fun Any.asMap(): Map<String, Any> = this as Map<String, Any>
 
+    @Suppress("UNCHECKED_CAST")
+    fun Any.asNullableMap(): Map<String, Any?> = this as Map<String, Any?>
+
     @Suppress("UNCHECKED_CAST")
     fun Any.asStringMap(): Map<String, String> = this as Map<String, String>
 

android/src/main/kotlin/dev/note11/flutter_naver_map/flutter_naver_map/model/exception/NFlutterException.kt

@@ -0,0 +1,13 @@
+package dev.note11.flutter_naver_map.flutter_naver_map.model.exception
+
+data class NFlutterException(
+    val code: String,
+    val message: String?,
+) {
+    fun toMessageable(): Map<String, Any?> {
+        return mapOf(
+            "code" to code,
+            "message" to message,
+        )
+    }
+}

android/src/main/kotlin/dev/note11/flutter_naver_map/flutter_naver_map/model/map/NaverMapViewOptions.kt

@@ -29,7 +29,7 @@ internal data class NaverMapViewOptions(
     companion object {
         // factory constructor
         fun fromMessageable(
-            args: Map<String, Any>,
+            args: Map<String, Any?>,
             convertNaverMapOptions: Boolean = true,
         ): NaverMapViewOptions {
             val options = if (convertNaverMapOptions) naverMapOptionFromMessageable(args) else null
@@ -40,15 +40,16 @@ internal data class NaverMapViewOptions(
 
         fun updateNaverMapFromMessageable(
             naverMap: NaverMap,
-            args: Map<String, Any>,
+            args: Map<String, Any?>,
+            customStyleCallback: NaverMap.OnCustomStyleLoadCallback? = null,
         ): NaverMapViewOptions {
-            val applier = NaverMapApplierImpl(naverMap)
+            val applier = NaverMapApplierImpl(naverMap, customStyleCallback)
             applier.applyOptions(args)
             return fromMessageable(args, false)
         }
 
         private fun naverMapOptionFromMessageable(
-            args: Map<String, Any>,
+            args: Map<String, Any?>,
         ): NaverMapOptions {
             val options = NaverMapOptions().apply {
                 compassEnabled(false)

android/src/main/kotlin/dev/note11/flutter_naver_map/flutter_naver_map/sdk/SdkInitializer.kt

@@ -7,6 +7,7 @@ import com.naver.maps.map.NaverMapSdk.NcpKeyClient
 import com.naver.maps.map.NaverMapSdk.OnAuthFailedListener
 import dev.note11.flutter_naver_map.flutter_naver_map.converter.DefaultTypeConverter.asBoolean
 import dev.note11.flutter_naver_map.flutter_naver_map.converter.DefaultTypeConverter.asMap
+import dev.note11.flutter_naver_map.flutter_naver_map.model.exception.NFlutterException
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 
@@ -21,9 +22,7 @@ internal class SdkInitializer(
     private fun handle(call: MethodCall, result: MethodChannel.Result) {
         if (call.method == "initializeNcp") {
             initializeWithNcp(
-                call.arguments.asMap(),
-                onSuccess = result::success,
-                onFailure = {
+                call.arguments.asMap(), onSuccess = result::success, onFailure = {
                     result.error(
                         if (it is NaverMapSdk.AuthFailedException) it.errorCode else it.javaClass.name,
                         it.message,
@@ -39,9 +38,7 @@ internal class SdkInitializer(
     }
 
     private fun initializeWithNcp(
-        args: Map<String, Any>,
-        onSuccess: (Any?) -> Unit,
-        onFailure: (Exception) -> Unit
+        args: Map<String, Any>, onSuccess: (Any?) -> Unit, onFailure: (Exception) -> Unit
     ) {
         val clientId = args["clientId"]?.toString()
         val hasAuthFailedListener = args["setAuthFailedListener"]?.asBoolean() ?: false
@@ -96,10 +93,8 @@ internal class SdkInitializer(
 
     private fun onAuthFailedListener(ex: NaverMapSdk.AuthFailedException) {
         channel.invokeMethod(
-            "onAuthFailed", mapOf(
-                "code" to ex.errorCode,
-                "message" to ex.message,
-            )
+            "onAuthFailed",
+            NFlutterException(code = ex.errorCode, message = ex.message).toMessageable()
         )
     }
 }