sparkling-navigation 2.1.0-rc.3 → 2.1.0-rc.31

package/android/build.gradle.kts

@@ -21,7 +21,7 @@ android {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
         }
     }
@@ -32,6 +32,15 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
+
+    testOptions {
+        unitTests.all {
+            it.extensions.configure(org.gradle.testing.jacoco.plugins.JacocoTaskExtension::class.java) {
+                isIncludeNoLocationClasses = true
+                excludes = listOf("jdk.internal.*")
+            }
+        }
+    }
 }
 
 dependencies {
@@ -39,12 +48,20 @@ dependencies {
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     testImplementation(libs.junit)
+    testImplementation("io.mockk:mockk:1.13.8")
+    testImplementation("org.robolectric:robolectric:4.11.1")
+    testImplementation("androidx.test:core:1.5.0")
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
-    val sparklingVersion = (findProperty("SPARKLING_ANDROID_SDK_VERSION") as? String)
-        ?: System.getenv("SPARKLING_ANDROID_SDK_VERSION")
-        ?: "2.0.0-rc.5"
-    api("com.tiktok.sparkling:sparkling-method:$sparklingVersion")
+    val sparklingVersion =
+        (findProperty("SPARKLING_ANDROID_SDK_VERSION") as? String)
+            ?: System.getenv("SPARKLING_ANDROID_SDK_VERSION")
+            ?: "2.1.0-rc.31"
+    if (rootProject.findProject(":sparkling-method") != null) {
+        api(project(":sparkling-method"))
+    } else {
+        api("com.tiktok.sparkling:sparkling-method:$sparklingVersion")
+    }
 }
 
 tasks.register<JacocoReport>("jacocoTestReport") {
@@ -55,28 +72,31 @@ tasks.register<JacocoReport>("jacocoTestReport") {
         html.required.set(true)
     }
 
-    val fileFilter = listOf(
-        "**/R.class",
-        "**/R$*.class",
-        "**/BuildConfig.*",
-        "**/Manifest*.*",
-        "**/*Test*.*",
-        "android/**/*.*"
-    )
+    val fileFilter =
+        listOf(
+            "**/R.class",
+            "**/R$*.class",
+            "**/BuildConfig.*",
+            "**/Manifest*.*",
+            "**/*Test*.*",
+            "android/**/*.*",
+        )
 
     val mainSrc = "${project.projectDir}/src/main/java"
     sourceDirectories.setFrom(files(mainSrc))
 
-    val debugJavaTree = layout.buildDirectory.dir("intermediates/javac/debug").map { dir ->
-        dir.asFileTree.matching {
-            exclude(fileFilter)
+    val debugJavaTree =
+        layout.buildDirectory.dir("intermediates/javac/debug").map { dir ->
+            dir.asFileTree.matching {
+                exclude(fileFilter)
+            }
         }
-    }
-    val debugKotlinTree = layout.buildDirectory.dir("tmp/kotlin-classes/debug").map { dir ->
-        dir.asFileTree.matching {
-            exclude(fileFilter)
+    val debugKotlinTree =
+        layout.buildDirectory.dir("tmp/kotlin-classes/debug").map { dir ->
+            dir.asFileTree.matching {
+                exclude(fileFilter)
+            }
         }
-    }
     classDirectories.setFrom(debugJavaTree, debugKotlinTree)
 
     val unitTestCoverageExec = layout.buildDirectory.file("outputs/unit_test_code_coverage/debugUnitTest/testDebugUnitTest.exec")

package/android/src/androidTest/java/com/tiktok/sparkling/method/router/ExampleInstrumentedTest.kt

@@ -24,4 +24,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.tiktok.sparkling.methods.route.test", appContext.packageName)
     }
-}
+}

package/android/src/main/java/com/tiktok/sparkling/method/router/close/AbsRouterCloseMethodIDL.kt

@@ -11,29 +11,19 @@ import com.tiktok.sparkling.method.registry.core.base.AbsSparklingIDLMethod
 import com.tiktok.sparkling.method.registry.core.model.idl.IDLMethodBaseParamModel
 import com.tiktok.sparkling.method.registry.core.model.idl.IDLMethodBaseResultModel
 
-
 abstract class AbsRouterCloseMethodIDL : AbsSparklingIDLMethod<AbsRouterCloseMethodIDL.IDLMethodCloseParamModel, AbsRouterCloseMethodIDL.IDLMethodCloseResultModel>() {
-
     @IDLMethodName(name = "router.close", params = ["containerID", "animated"])
     final override val name: String = "router.close"
 
-
     @IDLMethodParamModel
     interface IDLMethodCloseParamModel : IDLMethodBaseParamModel {
-
         @get:IDLMethodParamField(required = false, isGetter = true, keyPath = "containerID")
         val containerID: String
 
-
         @get:IDLMethodParamField(required = false, isGetter = true, keyPath = "animated")
         val animated: Boolean?
-
-
     }
 
     @IDLMethodResultModel
-    interface IDLMethodCloseResultModel: IDLMethodBaseResultModel {
-    }
-
-
-}
+    interface IDLMethodCloseResultModel : IDLMethodBaseResultModel
+}

package/android/src/main/java/com/tiktok/sparkling/method/router/close/RouterCloseMethod.kt

@@ -16,19 +16,16 @@ import com.tiktok.sparkling.method.router.utils.RouterProvider
  * Handles closing pages/containers.
  */
 class RouterCloseMethod : AbsRouterCloseMethodIDL() {
-
     companion object {
         private const val TAG = "RouterCloseMethod"
     }
 
-    private fun getRouterDependInstance(): IHostRouterDepend? {
-        return RouterProvider.hostRouterDepend
-    }
+    private fun getRouterDependInstance(): IHostRouterDepend? = RouterProvider.hostRouterDepend
 
     override fun handle(
         params: IDLMethodCloseParamModel,
         callback: CompletionBlock<IDLMethodCloseResultModel>,
-        type: BridgePlatformType
+        type: BridgePlatformType,
     ) {
         // Check if router dependency is available
         val routerDepend = getRouterDependInstance()
@@ -41,22 +38,24 @@ class RouterCloseMethod : AbsRouterCloseMethodIDL() {
         val containerID = params.containerID
         val animated = params.animated ?: true // Default to animated close
 
-        val success = try {
-            routerDepend.closeView(getSDKContext(), type, containerID, animated)
-        } catch (e: Exception) {
-            Log.e(TAG, "Exception while closing container: ${e.message}")
-            false
-        }
+        val success =
+            try {
+                routerDepend.closeView(getSDKContext(), type, containerID, animated)
+            } catch (e: Exception) {
+                Log.e(TAG, "Exception while closing container: ${e.message}")
+                false
+            }
 
         if (success) {
             callback.onSuccess(IDLMethodCloseResultModel::class.java.createXModel())
         } else {
-            val errorMsg = if (containerID.isNullOrBlank()) {
-                "Failed to close current container"
-            } else {
-                "Failed to close container: $containerID"
-            }
+            val errorMsg =
+                if (containerID.isNullOrBlank()) {
+                    "Failed to close current container"
+                } else {
+                    "Failed to close container: $containerID"
+                }
             callback.onFailure(IDLBridgeMethod.FAIL, errorMsg, null)
         }
     }
-}
+}

package/android/src/main/java/com/tiktok/sparkling/method/router/open/AbsRouterOpenMethodIDL.kt

@@ -2,7 +2,7 @@
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
 
-/** anycode-lint-ignore */
+// anycode-lint-ignore
 package com.tiktok.sparkling.method.router.open
 
 import com.tiktok.sparkling.method.registry.core.annotation.IDLMethodName
@@ -14,21 +14,16 @@ import com.tiktok.sparkling.method.registry.core.model.idl.IDLMethodBaseModel
 import com.tiktok.sparkling.method.registry.core.model.idl.IDLMethodBaseParamModel
 import com.tiktok.sparkling.method.registry.core.model.idl.IDLMethodBaseResultModel
 
-/** anycode-lint-ignore */
-
 /**
  * GENERATED BY ANYCODE.
  * DO NOT MODIFY!!!
  */
 abstract class AbsRouterOpenMethodIDL : AbsSparklingIDLMethod<AbsRouterOpenMethodIDL.IDLMethodOpenParamModel, AbsRouterOpenMethodIDL.IDLMethodOpenResultModel>() {
-
     @IDLMethodName(name = "router.open", params = ["scheme", "replace", "replaceType", "useSysBrowser", "animated", "interceptor", "extra"])
     final override val name: String = "router.open"
 
-
     @IDLMethodParamModel
     interface IDLMethodOpenParamModel : IDLMethodBaseParamModel {
-
         @get:IDLMethodParamField(required = true, isGetter = true, keyPath = "scheme")
         val scheme: String
 
@@ -52,9 +47,7 @@ abstract class AbsRouterOpenMethodIDL : AbsSparklingIDLMethod<AbsRouterOpenMetho
     }
 
     @IDLMethodResultModel
-    interface IDLMethodOpenResultModel: IDLMethodBaseResultModel {
-    }
+    interface IDLMethodOpenResultModel : IDLMethodBaseResultModel
 
-    interface IDLMethodOpenExtra : IDLMethodBaseModel {
-    }
-}
+    interface IDLMethodOpenExtra : IDLMethodBaseModel
+}

package/android/src/main/java/com/tiktok/sparkling/method/router/open/RouterOpenMethod.kt

@@ -2,10 +2,8 @@
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
 
-
 package com.tiktok.sparkling.method.router.open
 
-
 import android.util.Log
 import com.tiktok.sparkling.method.registry.core.IDLBridgeMethod
 import com.tiktok.sparkling.method.registry.core.BridgePlatformType
@@ -14,25 +12,21 @@ import com.tiktok.sparkling.method.registry.core.utils.createXModel
 import com.tiktok.sparkling.method.router.utils.IHostRouterDepend
 import com.tiktok.sparkling.method.router.utils.RouterProvider
 
-
 /**
  * Router open method implementation.
  * Handles opening new pages/routes with various configuration options.
  */
 class RouterOpenMethod : AbsRouterOpenMethodIDL() {
-
     companion object {
         private const val TAG = "RouterOpenMethod"
     }
 
-    private fun getRouterDependInstance(): IHostRouterDepend? {
-        return RouterProvider.hostRouterDepend
-    }
+    private fun getRouterDependInstance(): IHostRouterDepend? = RouterProvider.hostRouterDepend
 
     override fun handle(
         params: IDLMethodOpenParamModel,
         callback: CompletionBlock<IDLMethodOpenResultModel>,
-        type: BridgePlatformType
+        type: BridgePlatformType,
     ) {
         // Validate scheme is not null or empty
         val scheme = params.scheme
@@ -43,21 +37,22 @@ class RouterOpenMethod : AbsRouterOpenMethodIDL() {
         }
 
         // Validate replaceType if provided
-        val replaceType: ReplaceType? = if (!params.replaceType.isNullOrBlank()) {
-            try {
-                ReplaceType.valueOf(params.replaceType!!)
-            } catch (e: IllegalArgumentException) {
-                Log.w(TAG, "Invalid replaceType: ${params.replaceType}")
-                callback.onFailure(
-                    IDLBridgeMethod.INVALID_PARAM,
-                    "Invalid replaceType: ${params.replaceType}. Valid values are: ${ReplaceType.values().joinToString()}",
-                    null
-                )
-                return
+        val replaceType: ReplaceType? =
+            if (!params.replaceType.isNullOrBlank()) {
+                try {
+                    ReplaceType.valueOf(params.replaceType!!)
+                } catch (e: IllegalArgumentException) {
+                    Log.w(TAG, "Invalid replaceType: ${params.replaceType}")
+                    callback.onFailure(
+                        IDLBridgeMethod.INVALID_PARAM,
+                        "Invalid replaceType: ${params.replaceType}. Valid values are: ${ReplaceType.values().joinToString()}",
+                        null,
+                    )
+                    return
+                }
+            } else {
+                ReplaceType.onlyCloseAfterOpenSucceed
             }
-        } else {
-            ReplaceType.onlyCloseAfterOpenSucceed
-        }
 
         // Get and validate context
         val context = getSDKContext()?.context
@@ -79,19 +74,21 @@ class RouterOpenMethod : AbsRouterOpenMethodIDL() {
         val useSysBrowser = params.useSysBrowser ?: false
         val extra = params.extra
 
-        val extraInfo = mutableMapOf<String, Any>(
-            "useSysBrowser" to useSysBrowser,
-            "extra" to (extra ?: emptyMap<Any, Any>())
-        )
+        val extraInfo =
+            mutableMapOf<String, Any>(
+                "useSysBrowser" to useSysBrowser,
+                "extra" to (extra ?: emptyMap<Any, Any>()),
+            )
 
         // Handle non-replace open
         if (!replace) {
-            val success = try {
-                routerDepend.openScheme(getSDKContext(), scheme, extraInfo, type, context = context)
-            } catch (e: Exception) {
-                Log.e(TAG, "Exception while opening scheme: ${e.message}")
-                false
-            }
+            val success =
+                try {
+                    routerDepend.openScheme(getSDKContext(), scheme, extraInfo, type, context = context)
+                } catch (e: Exception) {
+                    Log.e(TAG, "Exception while opening scheme: ${e.message}")
+                    false
+                }
 
             if (success) {
                 callback.onSuccess(IDLMethodOpenResultModel::class.java.createXModel())
@@ -102,30 +99,36 @@ class RouterOpenMethod : AbsRouterOpenMethodIDL() {
         }
 
         // Handle replace open with different replace types
-        val success: Boolean = try {
-            when (replaceType) {
-                ReplaceType.alwaysCloseBeforeOpen -> {
-                    routerDepend.closeView(getSDKContext(), type)
-                    routerDepend.openScheme(getSDKContext(), scheme, extraInfo, type, context = context)
-                }
-                ReplaceType.alwaysCloseAfterOpen -> {
-                    val opened = routerDepend.openScheme(getSDKContext(), scheme, extraInfo, type, context = context)
-                    routerDepend.closeView(getSDKContext(), type)
-                    opened
-                }
-                ReplaceType.onlyCloseAfterOpenSucceed -> {
-                    val opened = routerDepend.openScheme(getSDKContext(), scheme, extraInfo, type, context = context)
-                    if (opened) {
+        val success: Boolean =
+            try {
+                when (replaceType) {
+                    ReplaceType.alwaysCloseBeforeOpen -> {
                         routerDepend.closeView(getSDKContext(), type)
+                        routerDepend.openScheme(getSDKContext(), scheme, extraInfo, type, context = context)
+                    }
+
+                    ReplaceType.alwaysCloseAfterOpen -> {
+                        val opened = routerDepend.openScheme(getSDKContext(), scheme, extraInfo, type, context = context)
+                        routerDepend.closeView(getSDKContext(), type)
+                        opened
+                    }
+
+                    ReplaceType.onlyCloseAfterOpenSucceed -> {
+                        val opened = routerDepend.openScheme(getSDKContext(), scheme, extraInfo, type, context = context)
+                        if (opened) {
+                            routerDepend.closeView(getSDKContext(), type)
+                        }
+                        opened
+                    }
+
+                    null -> {
+                        false
                     }
-                    opened
                 }
-                null -> false
+            } catch (e: Exception) {
+                Log.e(TAG, "Exception during replace open: ${e.message}")
+                false
             }
-        } catch (e: Exception) {
-            Log.e(TAG, "Exception during replace open: ${e.message}")
-            false
-        }
 
         if (success) {
             callback.onSuccess(IDLMethodOpenResultModel::class.java.createXModel())
@@ -134,8 +137,10 @@ class RouterOpenMethod : AbsRouterOpenMethodIDL() {
         }
     }
 }
+
+@Suppress("ktlint:standard:enum-entry-name-case")
 enum class ReplaceType {
     alwaysCloseAfterOpen,
     alwaysCloseBeforeOpen,
-    onlyCloseAfterOpenSucceed
+    onlyCloseAfterOpenSucceed,
 }

package/android/src/main/java/com/tiktok/sparkling/method/router/utils/AbsRouteOpenHandler.kt

@@ -23,6 +23,11 @@ abstract class AbsRouteOpenHandler {
         this.exceptionHandler = handler
     }
 
-    abstract fun openScheme(scheme: String, extraInfo: Map<String, Any>, context: Context?): Boolean
+    abstract fun openScheme(
+        scheme: String,
+        extraInfo: Map<String, Any>,
+        context: Context?,
+    ): Boolean
+
     abstract fun getSupportPlatformTypeList(): List<BridgePlatformType>
-}
+}

package/android/src/main/java/com/tiktok/sparkling/method/router/utils/IHostRouterDepend.kt

@@ -9,7 +9,13 @@ import com.tiktok.sparkling.method.registry.core.BridgePlatformType
 import com.tiktok.sparkling.method.registry.core.model.context.ContextProviderFactory
 
 interface IHostRouterDepend {
-    fun openScheme(bridgeContext: IBridgeContext?, scheme: String, extraParams: Map<String, Any>, platformType: BridgePlatformType, context: Context?): Boolean {
+    fun openScheme(
+        bridgeContext: IBridgeContext?,
+        scheme: String,
+        extraParams: Map<String, Any>,
+        platformType: BridgePlatformType,
+        context: Context?,
+    ): Boolean {
         var handled = false
         val contextProviderFactory = ContextProviderFactory()
         val headHandlerNode = assembleHandlerChain(contextProviderFactory) ?: return false
@@ -30,11 +36,20 @@ interface IHostRouterDepend {
             }
         }
 
-        return  handled
+        return handled
     }
-    fun closeView(bridgeContext: IBridgeContext?, type: BridgePlatformType, containerID: String? = null, animated: Boolean? = false): Boolean
+
+    fun closeView(
+        bridgeContext: IBridgeContext?,
+        type: BridgePlatformType,
+        containerID: String? = null,
+        animated: Boolean? = false,
+    ): Boolean
+
     fun provideRouteOpenHandlerList(contextProviderFactory: ContextProviderFactory?): List<AbsRouteOpenHandler> = listOf()
+
     fun provideRouteOpenExceptionHandler(contextProviderFactory: ContextProviderFactory?): AbsRouteOpenHandler? = null
+
     private fun assembleHandlerChain(contextProviderFactory: ContextProviderFactory?): AbsRouteOpenHandler? {
         val chainHandlerList = provideRouteOpenHandlerList(contextProviderFactory)
         val exceptionHandlerNode = provideRouteOpenExceptionHandler(contextProviderFactory)
@@ -51,4 +66,4 @@ interface IHostRouterDepend {
         }
         return headChainNode
     }
-}
+}

package/android/src/main/java/com/tiktok/sparkling/method/router/utils/RouterProvider.kt

@@ -3,7 +3,6 @@
 // LICENSE file in the root directory of this source tree.
 package com.tiktok.sparkling.method.router.utils
 
-
 object RouterProvider {
     var hostRouterDepend: IHostRouterDepend? = null
-}
+}