move as much DeepLink code as possible to common

freeletics · Oct 6, 2023 · 3df5ca5 · 3df5ca5
1 parent 626766c
commit 3df5ca5
Show file tree

Hide file tree

Showing 25 changed files with 398 additions and 300 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,6 +17,14 @@ plugins {
 dependencyAnalysis {
     issues {
         all {
+            onAny {
+                // issue with Kotlin multiplatform artifacts
+                exclude(
+                    "com.eygraber:uri-kmp",
+                    "com.eygraber:uri-kmp-android",
+                    "com.eygraber:uri-kmp-android-debug",
+                )
+            }
             onUsedTransitiveDependencies {
                 exclude("dev.drewhamilton.poko:poko-annotations")
             }

diff --git a/...rc/test/kotlin/com/freeletics/khonshu/codegen/codegen/FileGeneratorTestNavHostActivity.kt b/...rc/test/kotlin/com/freeletics/khonshu/codegen/codegen/FileGeneratorTestNavHostActivity.kt
@@ -59,9 +59,9 @@ internal class FileGeneratorTestNavHostActivity {
             import androidx.compose.runtime.Composable
             import com.freeletics.khonshu.codegen.compose.NavHostActivity
             import com.freeletics.khonshu.navigation.BaseRoute
-            import com.freeletics.khonshu.navigation.DeepLinkHandler
             import com.freeletics.khonshu.navigation.NavRoot
             import com.freeletics.khonshu.navigation.compose.NavDestination
+            import com.freeletics.khonshu.navigation.deeplinks.DeepLinkHandler
             import com.test.parent.TestParentScope
 
             @NavHostActivity(
@@ -96,10 +96,10 @@ internal class FileGeneratorTestNavHostActivity {
             import com.freeletics.khonshu.codegen.`internal`.asComposeState
             import com.freeletics.khonshu.codegen.`internal`.component
             import com.freeletics.khonshu.navigation.BaseRoute
-            import com.freeletics.khonshu.navigation.DeepLinkHandler
             import com.freeletics.khonshu.navigation.NavRoot
             import com.freeletics.khonshu.navigation.compose.NavDestination
             import com.freeletics.khonshu.navigation.compose.NavHost
+            import com.freeletics.khonshu.navigation.deeplinks.DeepLinkHandler
             import com.squareup.anvil.annotations.ContributesSubcomponent
             import com.squareup.anvil.annotations.ContributesTo
             import com.squareup.anvil.annotations.optional.ForScope
@@ -234,7 +234,7 @@ internal class FileGeneratorTestNavHostActivity {
             import com.freeletics.khonshu.codegen.ActivityScope
             import com.freeletics.khonshu.codegen.compose.NavHostActivity
             import com.freeletics.khonshu.navigation.BaseRoute
-            import com.freeletics.khonshu.navigation.DeepLinkHandler
+            import com.freeletics.khonshu.navigation.deeplinks.DeepLinkHandler
             import com.freeletics.khonshu.navigation.NavRoot
 
             @NavHostActivity(
@@ -269,10 +269,10 @@ internal class FileGeneratorTestNavHostActivity {
             import com.freeletics.khonshu.codegen.`internal`.asComposeState
             import com.freeletics.khonshu.codegen.`internal`.component
             import com.freeletics.khonshu.navigation.BaseRoute
-            import com.freeletics.khonshu.navigation.DeepLinkHandler
             import com.freeletics.khonshu.navigation.NavRoot
             import com.freeletics.khonshu.navigation.compose.NavDestination
             import com.freeletics.khonshu.navigation.compose.NavHost
+            import com.freeletics.khonshu.navigation.deeplinks.DeepLinkHandler
             import com.squareup.anvil.annotations.ContributesSubcomponent
             import com.squareup.anvil.annotations.ContributesTo
             import com.squareup.anvil.annotations.optional.ForScope
@@ -422,9 +422,9 @@ internal class FileGeneratorTestNavHostActivity {
             import androidx.compose.runtime.Composable
             import com.freeletics.khonshu.codegen.compose.NavHostActivity
             import com.freeletics.khonshu.navigation.BaseRoute
-            import com.freeletics.khonshu.navigation.DeepLinkHandler
             import com.freeletics.khonshu.navigation.NavRoot
             import com.freeletics.khonshu.navigation.compose.NavDestination
+            import com.freeletics.khonshu.navigation.deeplinks.DeepLinkHandler
             import com.test.other.TestClass2
             import com.test.parent.TestParentScope
 
@@ -464,10 +464,10 @@ internal class FileGeneratorTestNavHostActivity {
             import com.freeletics.khonshu.codegen.`internal`.asComposeState
             import com.freeletics.khonshu.codegen.`internal`.component
             import com.freeletics.khonshu.navigation.BaseRoute
-            import com.freeletics.khonshu.navigation.DeepLinkHandler
             import com.freeletics.khonshu.navigation.NavRoot
             import com.freeletics.khonshu.navigation.compose.NavDestination
             import com.freeletics.khonshu.navigation.compose.NavHost
+            import com.freeletics.khonshu.navigation.deeplinks.DeepLinkHandler
             import com.squareup.anvil.annotations.ContributesSubcomponent
             import com.squareup.anvil.annotations.ContributesTo
             import com.squareup.anvil.annotations.optional.ForScope
@@ -620,9 +620,9 @@ internal class FileGeneratorTestNavHostActivity {
             import androidx.compose.runtime.Composable
             import com.freeletics.khonshu.codegen.compose.NavHostActivity
             import com.freeletics.khonshu.navigation.BaseRoute
-            import com.freeletics.khonshu.navigation.DeepLinkHandler
             import com.freeletics.khonshu.navigation.NavRoot
             import com.freeletics.khonshu.navigation.compose.NavDestination
+            import com.freeletics.khonshu.navigation.deeplinks.DeepLinkHandler
             import com.test.parent.TestParentScope
 
             @NavHostActivity(
@@ -655,10 +655,10 @@ internal class FileGeneratorTestNavHostActivity {
             import com.freeletics.khonshu.codegen.`internal`.asComposeState
             import com.freeletics.khonshu.codegen.`internal`.component
             import com.freeletics.khonshu.navigation.BaseRoute
-            import com.freeletics.khonshu.navigation.DeepLinkHandler
             import com.freeletics.khonshu.navigation.NavRoot
             import com.freeletics.khonshu.navigation.compose.NavDestination
             import com.freeletics.khonshu.navigation.compose.NavHost
+            import com.freeletics.khonshu.navigation.deeplinks.DeepLinkHandler
             import com.squareup.anvil.annotations.ContributesSubcomponent
             import com.squareup.anvil.annotations.ContributesTo
             import com.squareup.anvil.annotations.optional.ForScope
@@ -788,9 +788,9 @@ internal class FileGeneratorTestNavHostActivity {
             import androidx.compose.runtime.Composable
             import com.freeletics.khonshu.codegen.compose.NavHostActivity
             import com.freeletics.khonshu.navigation.BaseRoute
-            import com.freeletics.khonshu.navigation.DeepLinkHandler
             import com.freeletics.khonshu.navigation.NavRoot
             import com.freeletics.khonshu.navigation.compose.NavDestination
+            import com.freeletics.khonshu.navigation.deeplinks.DeepLinkHandler
             import com.test.parent.TestParentScope
 
             @NavHostActivity(
@@ -824,10 +824,10 @@ internal class FileGeneratorTestNavHostActivity {
             import com.freeletics.khonshu.codegen.`internal`.asComposeState
             import com.freeletics.khonshu.codegen.`internal`.component
             import com.freeletics.khonshu.navigation.BaseRoute
-            import com.freeletics.khonshu.navigation.DeepLinkHandler
             import com.freeletics.khonshu.navigation.NavRoot
             import com.freeletics.khonshu.navigation.compose.NavDestination
             import com.freeletics.khonshu.navigation.compose.NavHost
+            import com.freeletics.khonshu.navigation.deeplinks.DeepLinkHandler
             import com.squareup.anvil.annotations.ContributesSubcomponent
             import com.squareup.anvil.annotations.ContributesTo
             import com.squareup.anvil.annotations.optional.ForScope

diff --git a/codegen-compiler/src/main/kotlin/com/freeletics/khonshu/codegen/codegen/util/External.kt b/codegen-compiler/src/main/kotlin/com/freeletics/khonshu/codegen/codegen/util/External.kt
@@ -41,7 +41,7 @@ internal val composeLocalNavigationExecutor =
     MemberName("com.freeletics.khonshu.navigation.compose", "LocalNavigationExecutor")
 internal val fragmentFindNavigationExecutor =
     MemberName("com.freeletics.khonshu.navigation.fragment", "findNavigationExecutor")
-internal val deepLinkHandler = ClassName("com.freeletics.khonshu.navigation", "DeepLinkHandler")
+internal val deepLinkHandler = ClassName("com.freeletics.khonshu.navigation.deeplinks", "DeepLinkHandler")
 internal val deepLinkPrefix = deepLinkHandler.nestedClass("Prefix")
 internal val fragmentNavigationHandler = MemberName("com.freeletics.khonshu.navigation.fragment", "handleNavigation")
 internal val fragmentDestination = ClassName("com.freeletics.khonshu.navigation.fragment", "NavDestination")

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -85,7 +85,7 @@ androidx-fragment = { module = "androidx.fragment:fragment", version.ref = "andr
 androidx-savedstate = { module = "androidx.savedstate:savedstate", version.ref = "androidx-savedstate" }
 androidx-viewbinding = { module = "androidx.databinding:viewbinding", version.ref = "android-gradle" }
 
-uri = { module = "com.eygraber:uri-kmp-android", version.ref = "uri" }
+uri = { module = "com.eygraber:uri-kmp", version.ref = "uri" }
 
 inject = { module = "javax.inject:javax.inject", version.ref = "inject" }
 dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }

diff --git a/...idx/src/main/kotlin/com/freeletics/khonshu/navigation/internal/AndroidXDeepLinkHandler.kt b/...idx/src/main/kotlin/com/freeletics/khonshu/navigation/internal/AndroidXDeepLinkHandler.kt
@@ -9,9 +9,11 @@ import androidx.navigation.NavController.Companion.KEY_DEEP_LINK_IDS
 import com.eygraber.uri.Uri
 import com.freeletics.khonshu.navigation.ActivityRoute
 import com.freeletics.khonshu.navigation.BaseRoute
-import com.freeletics.khonshu.navigation.DeepLink
-import com.freeletics.khonshu.navigation.DeepLink.Companion.EXTRA_DEEPLINK_ROUTES
-import com.freeletics.khonshu.navigation.DeepLinkHandler
+import com.freeletics.khonshu.navigation.deeplinks.DeepLink
+import com.freeletics.khonshu.navigation.deeplinks.DeepLinkHandler
+import com.freeletics.khonshu.navigation.deeplinks.EXTRA_DEEPLINK_ROUTES
+import com.freeletics.khonshu.navigation.deeplinks.buildIntent
+import com.freeletics.khonshu.navigation.deeplinks.createDeepLinkIfMatching
 
 /**
  * Handles 2 different kind of deep links:

diff --git a/navigation-compose/src/main/kotlin/com/freeletics/khonshu/navigation/compose/NavHost.kt b/navigation-compose/src/main/kotlin/com/freeletics/khonshu/navigation/compose/NavHost.kt
@@ -18,11 +18,11 @@ import androidx.navigation.compose.rememberNavController
 import androidx.navigation.createGraph
 import androidx.navigation.get
 import com.freeletics.khonshu.navigation.BaseRoute
-import com.freeletics.khonshu.navigation.DeepLinkHandler
 import com.freeletics.khonshu.navigation.NavRoot
 import com.freeletics.khonshu.navigation.NavRoute
 import com.freeletics.khonshu.navigation.compose.internal.OverlayHost
 import com.freeletics.khonshu.navigation.compose.internal.OverlayNavigator
+import com.freeletics.khonshu.navigation.deeplinks.DeepLinkHandler
 import com.freeletics.khonshu.navigation.internal.AndroidXNavigationExecutor
 import com.freeletics.khonshu.navigation.internal.CustomActivityNavigator
 import com.freeletics.khonshu.navigation.internal.InternalNavigationApi

diff --git a/navigation-experimental/src/main/kotlin/com/freeletics/khonshu/navigation/compose/NavHost.kt b/navigation-experimental/src/main/kotlin/com/freeletics/khonshu/navigation/compose/NavHost.kt
@@ -13,11 +13,11 @@ import androidx.compose.runtime.saveable.rememberSaveableStateHolder
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.runtime.staticCompositionLocalOf
 import com.freeletics.khonshu.navigation.BaseRoute
-import com.freeletics.khonshu.navigation.DeepLinkHandler
 import com.freeletics.khonshu.navigation.NavRoot
 import com.freeletics.khonshu.navigation.compose.internal.MultiStackNavigationExecutor
 import com.freeletics.khonshu.navigation.compose.internal.StackEntry
 import com.freeletics.khonshu.navigation.compose.internal.rememberNavigationExecutor
+import com.freeletics.khonshu.navigation.deeplinks.DeepLinkHandler
 import com.freeletics.khonshu.navigation.internal.InternalNavigationApi
 import com.freeletics.khonshu.navigation.internal.NavigationExecutor
 import java.io.Closeable

diff --git a/...com/freeletics/khonshu/navigation/compose/internal/MultiStackNavigationExecutorBuilder.kt b/...com/freeletics/khonshu/navigation/compose/internal/MultiStackNavigationExecutorBuilder.kt
@@ -9,15 +9,16 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.SavedStateViewModelFactory
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.eygraber.uri.Uri
-import com.freeletics.khonshu.navigation.DeepLink.Companion.EXTRA_DEEPLINK_ROUTES
-import com.freeletics.khonshu.navigation.DeepLinkHandler
 import com.freeletics.khonshu.navigation.NavRoot
 import com.freeletics.khonshu.navigation.compose.ActivityDestination
 import com.freeletics.khonshu.navigation.compose.ContentDestination
 import com.freeletics.khonshu.navigation.compose.NavDestination
 import com.freeletics.khonshu.navigation.compose.findActivity
 import com.freeletics.khonshu.navigation.compose.internal.MultiStackNavigationExecutor.Companion.SAVED_STATE_STACK
-import com.freeletics.khonshu.navigation.internal.createDeepLinkIfMatching
+import com.freeletics.khonshu.navigation.deeplinks.DeepLinkHandler
+import com.freeletics.khonshu.navigation.deeplinks.EXTRA_DEEPLINK_ROUTES
+import com.freeletics.khonshu.navigation.deeplinks.buildIntent
+import com.freeletics.khonshu.navigation.deeplinks.createDeepLinkIfMatching
 
 @Composable
 internal fun rememberNavigationExecutor(

diff --git a/...on-fragment/src/main/kotlin/com/freeletics/khonshu/navigation/fragment/NavHostFragment.kt b/...on-fragment/src/main/kotlin/com/freeletics/khonshu/navigation/fragment/NavHostFragment.kt
@@ -10,7 +10,7 @@ import androidx.navigation.fragment.FragmentNavigator
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.get
 import com.freeletics.khonshu.navigation.BaseRoute
-import com.freeletics.khonshu.navigation.DeepLinkHandler
+import com.freeletics.khonshu.navigation.deeplinks.DeepLinkHandler
 import com.freeletics.khonshu.navigation.internal.CustomActivityNavigator
 import com.freeletics.khonshu.navigation.internal.destinationId
 import com.freeletics.khonshu.navigation.internal.getArguments