repackaged code from platform-specific navigation modules to within c…

…ommon navigation module, simplifying the dependency situation
bumble-tech · Aug 14, 2023 · 938bd67 · 938bd67
1 parent d939568
commit 938bd67
Show file tree

Hide file tree

Showing 35 changed files with 79 additions and 111 deletions.
diff --git a/appyx-navigation/android/build.gradle.kts b/appyx-navigation/android/build.gradle.kts
@@ -2,7 +2,6 @@ plugins {
     id("org.jetbrains.compose")
     id("com.android.library")
     kotlin("android")
-    id("appyx-publish-android")
     id("appyx-lint")
     id("kotlin-parcelize")
     id("appyx-detekt")

diff --git a/appyx-navigation/common/build.gradle.kts b/appyx-navigation/common/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     id("org.jetbrains.compose")
     id("com.android.library")
     id("appyx-publish-multiplatform")
+    id("appyx-detekt")
 }
 
 kotlin {
@@ -40,7 +41,12 @@ kotlin {
             dependencies {
                 api(libs.androidx.appcompat)
                 api(libs.androidx.core)
+                api(libs.compose.runtime)
+                api(libs.compose.ui.tooling)
+
                 implementation(libs.androidx.activity.compose)
+                implementation(libs.androidx.lifecycle.java8)
+
             }
         }
         val desktopMain by getting {
@@ -70,4 +76,19 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
     }
+    testOptions {
+    }
+
+    dependencies {
+        val composeBom = platform(libs.compose.bom)
+
+        api(composeBom)
+
+        androidTestImplementation(composeBom)
+        androidTestImplementation(libs.androidx.test.espresso.core)
+        androidTestImplementation(libs.androidx.test.junit)
+        androidTestImplementation(libs.compose.ui.test.junit4)
+        androidTestImplementation(libs.compose.foundation)
+        androidTestImplementation(project(":utils:testing-ui"))
+    }
 }
diff --git a/...egrationpoint/ActivityIntegrationPoint.kt → ...n/integration/ActivityIntegrationPoint.kt b/...egrationpoint/ActivityIntegrationPoint.kt → ...n/integration/ActivityIntegrationPoint.kt
@@ -1,14 +1,15 @@
-package com.bumble.appyx.navigation.integrationpoint
+package com.bumble.appyx.navigation.integration
 
 import android.app.Activity
 import android.content.Context
 import android.content.ContextWrapper
 import android.content.Intent
 import android.os.Bundle
-import com.bumble.appyx.navigation.integrationpoint.activitystarter.ActivityBoundary
-import com.bumble.appyx.navigation.integrationpoint.activitystarter.ActivityStarter
-import com.bumble.appyx.navigation.integrationpoint.permissionrequester.PermissionRequestBoundary
-import com.bumble.appyx.navigation.integrationpoint.permissionrequester.PermissionRequester
+import com.bumble.appyx.navigation.integration.activitystarter.ActivityBoundary
+import com.bumble.appyx.navigation.integration.activitystarter.ActivityStarter
+import com.bumble.appyx.navigation.integration.permissionrequester.PermissionRequestBoundary
+import com.bumble.appyx.navigation.integration.permissionrequester.PermissionRequester
+import com.bumble.appyx.navigation.integrationpoint.IntegrationPointProvider
 
 open class ActivityIntegrationPoint(
     private val activity: Activity,

diff --git a/...tegrationpoint/AndroidIntegrationPoint.kt → ...on/integration/AndroidIntegrationPoint.kt b/...tegrationpoint/AndroidIntegrationPoint.kt → ...on/integration/AndroidIntegrationPoint.kt
@@ -1,10 +1,11 @@
-package com.bumble.appyx.navigation.integrationpoint
+package com.bumble.appyx.navigation.integration
 
 import android.os.Bundle
 import androidx.compose.runtime.Stable
-import com.bumble.appyx.navigation.integrationpoint.activitystarter.ActivityStarter
-import com.bumble.appyx.navigation.integrationpoint.permissionrequester.PermissionRequester
-import com.bumble.appyx.navigation.integrationpoint.requestcode.RequestCodeRegistry
+import com.bumble.appyx.navigation.integration.activitystarter.ActivityStarter
+import com.bumble.appyx.navigation.integration.permissionrequester.PermissionRequester
+import com.bumble.appyx.navigation.integration.requestcode.RequestCodeRegistry
+import com.bumble.appyx.navigation.integrationpoint.IntegrationPoint
 
 @Stable
 abstract class AndroidIntegrationPoint(

diff --git a/...integrationpoint/LocalIntegrationPoint.kt → ...tion/integration/LocalIntegrationPoint.kt b/...integrationpoint/LocalIntegrationPoint.kt → ...tion/integration/LocalIntegrationPoint.kt
@@ -1,6 +1,7 @@
-package com.bumble.appyx.navigation.integrationpoint
+package com.bumble.appyx.navigation.integration
 
 import androidx.compose.runtime.staticCompositionLocalOf
+import com.bumble.appyx.navigation.integrationpoint.IntegrationPoint
 
 val LocalIntegrationPoint = staticCompositionLocalOf<IntegrationPoint> {
     error("CompositionLocal LocalIntegrationPoint not present")

diff --git a/...vigation/integrationpoint/NodeActivity.kt → ...yx/navigation/integration/NodeActivity.kt b/...vigation/integrationpoint/NodeActivity.kt → ...yx/navigation/integration/NodeActivity.kt
@@ -1,8 +1,9 @@
-package com.bumble.appyx.navigation.integrationpoint
+package com.bumble.appyx.navigation.integration
 
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import com.bumble.appyx.navigation.integrationpoint.IntegrationPointProvider
 
 /**
  * Helper class for root [Node] integration into projects using [AppCompatActivity].

diff --git a/...integrationpoint/NodeComponentActivity.kt → ...tion/integration/NodeComponentActivity.kt b/...integrationpoint/NodeComponentActivity.kt → ...tion/integration/NodeComponentActivity.kt
@@ -1,8 +1,9 @@
-package com.bumble.appyx.navigation.integrationpoint
+package com.bumble.appyx.navigation.integration
 
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import com.bumble.appyx.navigation.integrationpoint.IntegrationPointProvider
 
 /**
  * Helper class for root [Node] integration into projects using [ComponentActivity].

diff --git a/...point/activitystarter/ActivityBoundary.kt → ...ation/activitystarter/ActivityBoundary.kt b/...point/activitystarter/ActivityBoundary.kt → ...ation/activitystarter/ActivityBoundary.kt
@@ -1,13 +1,13 @@
-package com.bumble.appyx.navigation.integrationpoint.activitystarter
+package com.bumble.appyx.navigation.integration.activitystarter
 
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import androidx.fragment.app.Fragment
-import com.bumble.appyx.navigation.integrationpoint.activitystarter.ActivityStarter.ActivityResultEvent
-import com.bumble.appyx.navigation.integrationpoint.requestcode.RequestCodeBasedEventStreamImpl
-import com.bumble.appyx.navigation.integrationpoint.requestcode.RequestCodeClient
-import com.bumble.appyx.navigation.integrationpoint.requestcode.RequestCodeRegistry
+import com.bumble.appyx.navigation.integration.activitystarter.ActivityStarter.ActivityResultEvent
+import com.bumble.appyx.navigation.integration.requestcode.RequestCodeBasedEventStreamImpl
+import com.bumble.appyx.navigation.integration.requestcode.RequestCodeClient
+import com.bumble.appyx.navigation.integration.requestcode.RequestCodeRegistry
 
 class ActivityBoundary(
     private val activityStarterHost: ActivityStarterHost,

diff --git a/.../activitystarter/ActivityResultHandler.kt → .../activitystarter/ActivityResultHandler.kt b/.../activitystarter/ActivityResultHandler.kt → .../activitystarter/ActivityResultHandler.kt
@@ -1,4 +1,4 @@
-package com.bumble.appyx.navigation.integrationpoint.activitystarter
+package com.bumble.appyx.navigation.integration.activitystarter
 
 import android.content.Intent
 

diff --git a/...npoint/activitystarter/ActivityStarter.kt → ...ration/activitystarter/ActivityStarter.kt b/...npoint/activitystarter/ActivityStarter.kt → ...ration/activitystarter/ActivityStarter.kt
@@ -1,11 +1,11 @@
-package com.bumble.appyx.navigation.integrationpoint.activitystarter
+package com.bumble.appyx.navigation.integration.activitystarter
 
 import android.content.Context
 import android.content.Intent
-import com.bumble.appyx.navigation.integrationpoint.activitystarter.ActivityStarter.ActivityResultEvent
-import com.bumble.appyx.navigation.integrationpoint.requestcode.RequestCodeBasedEventStream
-import com.bumble.appyx.navigation.integrationpoint.requestcode.RequestCodeBasedEventStream.RequestCodeBasedEvent
-import com.bumble.appyx.navigation.integrationpoint.requestcode.RequestCodeClient
+import com.bumble.appyx.navigation.integration.activitystarter.ActivityStarter.ActivityResultEvent
+import com.bumble.appyx.navigation.integration.requestcode.RequestCodeBasedEventStream
+import com.bumble.appyx.navigation.integration.requestcode.RequestCodeBasedEventStream.RequestCodeBasedEvent
+import com.bumble.appyx.navigation.integration.requestcode.RequestCodeClient
 
 /**
  * Start Activities.

diff --git a/...nt/activitystarter/ActivityStarterHost.kt → ...on/activitystarter/ActivityStarterHost.kt b/...nt/activitystarter/ActivityStarterHost.kt → ...on/activitystarter/ActivityStarterHost.kt
@@ -1,4 +1,4 @@
-package com.bumble.appyx.navigation.integrationpoint.activitystarter
+package com.bumble.appyx.navigation.integration.activitystarter
 
 import android.app.Activity
 import android.content.Context

diff --git a/...ivitystarter/CanProvideActivityStarter.kt → ...ivitystarter/CanProvideActivityStarter.kt b/...ivitystarter/CanProvideActivityStarter.kt → ...ivitystarter/CanProvideActivityStarter.kt
@@ -1,4 +1,4 @@
-package com.bumble.appyx.navigation.integrationpoint.activitystarter
+package com.bumble.appyx.navigation.integration.activitystarter
 
 interface CanProvideActivityStarter {
     val activityStarter: ActivityStarter

diff --git a/...ionrequester/PermissionRequestBoundary.kt → ...ionrequester/PermissionRequestBoundary.kt b/...ionrequester/PermissionRequestBoundary.kt → ...ionrequester/PermissionRequestBoundary.kt
@@ -1,14 +1,14 @@
-package com.bumble.appyx.navigation.integrationpoint.permissionrequester
+package com.bumble.appyx.navigation.integration.permissionrequester
 
 import android.app.Activity
 import android.content.pm.PackageManager
 import androidx.fragment.app.Fragment
-import com.bumble.appyx.navigation.integrationpoint.permissionrequester.PermissionRequester.CheckPermissionsResult
-import com.bumble.appyx.navigation.integrationpoint.permissionrequester.PermissionRequester.RequestPermissionsEvent.Cancelled
-import com.bumble.appyx.navigation.integrationpoint.permissionrequester.PermissionRequester.RequestPermissionsEvent.RequestPermissionsResult
-import com.bumble.appyx.navigation.integrationpoint.requestcode.RequestCodeBasedEventStreamImpl
-import com.bumble.appyx.navigation.integrationpoint.requestcode.RequestCodeClient
-import com.bumble.appyx.navigation.integrationpoint.requestcode.RequestCodeRegistry
+import com.bumble.appyx.navigation.integration.permissionrequester.PermissionRequester.CheckPermissionsResult
+import com.bumble.appyx.navigation.integration.permissionrequester.PermissionRequester.RequestPermissionsEvent.Cancelled
+import com.bumble.appyx.navigation.integration.permissionrequester.PermissionRequester.RequestPermissionsEvent.RequestPermissionsResult
+import com.bumble.appyx.navigation.integration.requestcode.RequestCodeBasedEventStreamImpl
+import com.bumble.appyx.navigation.integration.requestcode.RequestCodeClient
+import com.bumble.appyx.navigation.integration.requestcode.RequestCodeRegistry
 
 class PermissionRequestBoundary(
     private val permissionRequesterHost: PermissionRequesterHost,

diff --git a/...quester/PermissionRequestResultHandler.kt → ...quester/PermissionRequestResultHandler.kt b/...quester/PermissionRequestResultHandler.kt → ...quester/PermissionRequestResultHandler.kt
@@ -1,4 +1,4 @@
-package com.bumble.appyx.navigation.integrationpoint.permissionrequester
+package com.bumble.appyx.navigation.integration.permissionrequester
 
 interface PermissionRequestResultHandler {
 

diff --git a/...ermissionrequester/PermissionRequester.kt → ...ermissionrequester/PermissionRequester.kt b/...ermissionrequester/PermissionRequester.kt → ...ermissionrequester/PermissionRequester.kt
@@ -1,8 +1,8 @@
-package com.bumble.appyx.navigation.integrationpoint.permissionrequester
+package com.bumble.appyx.navigation.integration.permissionrequester
 
-import com.bumble.appyx.navigation.integrationpoint.requestcode.RequestCodeBasedEventStream
-import com.bumble.appyx.navigation.integrationpoint.requestcode.RequestCodeBasedEventStream.RequestCodeBasedEvent
-import com.bumble.appyx.navigation.integrationpoint.requestcode.RequestCodeClient
+import com.bumble.appyx.navigation.integration.requestcode.RequestCodeBasedEventStream
+import com.bumble.appyx.navigation.integration.requestcode.RequestCodeBasedEventStream.RequestCodeBasedEvent
+import com.bumble.appyx.navigation.integration.requestcode.RequestCodeClient
 
 interface PermissionRequester :
     RequestCodeBasedEventStream<PermissionRequester.RequestPermissionsEvent> {

diff --git a/...ssionrequester/PermissionRequesterHost.kt → ...ssionrequester/PermissionRequesterHost.kt b/...ssionrequester/PermissionRequesterHost.kt → ...ssionrequester/PermissionRequesterHost.kt
@@ -1,4 +1,4 @@
-package com.bumble.appyx.navigation.integrationpoint.permissionrequester
+package com.bumble.appyx.navigation.integration.permissionrequester
 
 import android.app.Activity
 import android.content.pm.PackageManager

diff --git a/...equestcode/RequestCodeBasedEventStream.kt → ...equestcode/RequestCodeBasedEventStream.kt b/...equestcode/RequestCodeBasedEventStream.kt → ...equestcode/RequestCodeBasedEventStream.kt
@@ -1,4 +1,4 @@
-package com.bumble.appyx.navigation.integrationpoint.requestcode
+package com.bumble.appyx.navigation.integration.requestcode
 
 import kotlinx.coroutines.flow.Flow
 

diff --git a/...stcode/RequestCodeBasedEventStreamImpl.kt → ...stcode/RequestCodeBasedEventStreamImpl.kt b/...stcode/RequestCodeBasedEventStreamImpl.kt → ...stcode/RequestCodeBasedEventStreamImpl.kt
@@ -1,6 +1,6 @@
-package com.bumble.appyx.navigation.integrationpoint.requestcode
+package com.bumble.appyx.navigation.integration.requestcode
 
-import com.bumble.appyx.navigation.integrationpoint.requestcode.RequestCodeBasedEventStream.RequestCodeBasedEvent
+import com.bumble.appyx.navigation.integration.requestcode.RequestCodeBasedEventStream.RequestCodeBasedEvent
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel

diff --git a/...ionpoint/requestcode/RequestCodeClient.kt → ...egration/requestcode/RequestCodeClient.kt b/...ionpoint/requestcode/RequestCodeClient.kt → ...egration/requestcode/RequestCodeClient.kt
@@ -1,4 +1,4 @@
-package com.bumble.appyx.navigation.integrationpoint.requestcode
+package com.bumble.appyx.navigation.integration.requestcode
 
 interface RequestCodeClient {
 

diff --git a/...requestcode/RequestCodeDoesntFitInMask.kt → ...requestcode/RequestCodeDoesntFitInMask.kt b/...requestcode/RequestCodeDoesntFitInMask.kt → ...requestcode/RequestCodeDoesntFitInMask.kt
@@ -1,3 +1,3 @@
-package com.bumble.appyx.navigation.integrationpoint.requestcode
+package com.bumble.appyx.navigation.integration.requestcode
 
 class RequestCodeDoesntFitInMask(override val message: String?) : RuntimeException(message)
diff --git a/...npoint/requestcode/RequestCodeRegistry.kt → ...ration/requestcode/RequestCodeRegistry.kt b/...npoint/requestcode/RequestCodeRegistry.kt → ...ration/requestcode/RequestCodeRegistry.kt
@@ -1,4 +1,4 @@
-package com.bumble.appyx.navigation.integrationpoint.requestcode
+package com.bumble.appyx.navigation.integration.requestcode
 
 import android.os.Bundle
 import kotlin.math.pow

diff --git a/...ation/integrationpoint/DesktopNodeHost.kt → ...navigation/integration/DesktopNodeHost.kt b/...ation/integrationpoint/DesktopNodeHost.kt → ...navigation/integration/DesktopNodeHost.kt
@@ -1,4 +1,4 @@
-package com.bumble.appyx.navigation.integrationpoint
+package com.bumble.appyx.navigation.integration
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -8,9 +8,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.window.WindowState
-import com.bumble.appyx.navigation.integration.NodeFactory
-import com.bumble.appyx.navigation.integration.NodeHost
-import com.bumble.appyx.navigation.integration.ScreenSize
+import com.bumble.appyx.navigation.integrationpoint.IntegrationPoint
 import com.bumble.appyx.navigation.node.Node
 import com.bumble.appyx.navigation.platform.LocalOnBackPressedDispatcherOwner
 import com.bumble.appyx.navigation.platform.OnBackPressedDispatcher

diff --git a/.../integrationpoint/MainIntegrationPoint.kt → ...ation/integration/MainIntegrationPoint.kt b/.../integrationpoint/MainIntegrationPoint.kt → ...ation/integration/MainIntegrationPoint.kt
@@ -1,4 +1,4 @@
-package com.bumble.appyx.navigation.integrationpoint
+package com.bumble.appyx.navigation.integration
 
 import com.bumble.appyx.navigation.integrationpoint.IntegrationPoint
 import kotlin.system.exitProcess

diff --git a/...integrationpoint/BrowserViewportWindow.kt → ...tion/integration/BrowserViewportWindow.kt b/...integrationpoint/BrowserViewportWindow.kt → ...tion/integration/BrowserViewportWindow.kt
diff --git a/.../integrationpoint/MainIntegrationPoint.kt → ...ation/integration/MainIntegrationPoint.kt b/.../integrationpoint/MainIntegrationPoint.kt → ...ation/integration/MainIntegrationPoint.kt
@@ -1,4 +1,4 @@
-package com.bumble.appyx.navigation.integrationpoint
+package com.bumble.appyx.navigation.integration
 
 import com.bumble.appyx.navigation.integrationpoint.IntegrationPoint
 

diff --git a/...avigation/integrationpoint/WebNodeHost.kt → ...pyx/navigation/integration/WebNodeHost.kt b/...avigation/integrationpoint/WebNodeHost.kt → ...pyx/navigation/integration/WebNodeHost.kt
@@ -1,14 +1,11 @@
-package com.bumble.appyx.navigation.integrationpoint
+package com.bumble.appyx.navigation.integration
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import com.bumble.appyx.navigation.integration.NodeFactory
-import com.bumble.appyx.navigation.integration.NodeHost
-import com.bumble.appyx.navigation.integration.ScreenSize
 import com.bumble.appyx.navigation.integrationpoint.IntegrationPoint
 import com.bumble.appyx.navigation.node.Node
 import com.bumble.appyx.navigation.platform.LocalOnBackPressedDispatcherOwner

diff --git a/appyx-navigation/desktop/build.gradle.kts b/appyx-navigation/desktop/build.gradle.kts
diff --git a/appyx-navigation/web/build.gradle.kts b/appyx-navigation/web/build.gradle.kts
diff --git a/demos/appyx-navigation/android/build.gradle.kts b/demos/appyx-navigation/android/build.gradle.kts
@@ -56,7 +56,6 @@ dependencies {
     val composeBom = platform(libs.compose.bom)
 
     implementation(composeBom)
-    implementation(project(":appyx-navigation:android"))
     implementation(project(":demos:common"))
     implementation(project(":demos:appyx-navigation:common"))
     implementation(project(":appyx-interactions:appyx-interactions"))

diff --git a/demos/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/MainActivity.kt b/demos/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/MainActivity.kt
@@ -12,8 +12,8 @@ import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.ExperimentalUnitApi
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import com.bumble.appyx.navigation.integration.NodeActivity
 import com.bumble.appyx.navigation.integration.NodeHost
-import com.bumble.appyx.navigation.integrationpoint.NodeActivity
 import com.bumble.appyx.navigation.modality.BuildContext
 import com.bumble.appyx.navigation.node.container.ContainerNode
 import com.bumble.appyx.navigation.platform.AndroidLifecycle

diff --git a/demos/appyx-navigation/desktop/build.gradle.kts b/demos/appyx-navigation/desktop/build.gradle.kts
@@ -19,7 +19,6 @@ kotlin {
                 implementation(project(":demos:appyx-navigation:common"))
                 implementation(project(":appyx-interactions:appyx-interactions"))
                 implementation(project(":appyx-navigation:appyx-navigation"))
-                implementation(project(":appyx-navigation:desktop"))
                 implementation(project(":appyx-components:stable:backstack:backstack"))
                 api(compose.runtime)
                 api(compose.foundation)

diff --git a/demos/appyx-navigation/desktop/src/desktopMain/kotlin/com/bumble/appyx/navigation/Main.kt b/demos/appyx-navigation/desktop/src/desktopMain/kotlin/com/bumble/appyx/navigation/Main.kt
@@ -14,7 +14,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
-import com.bumble.appyx.navigation.integrationpoint.DesktopNodeHost
+import com.bumble.appyx.navigation.integration.DesktopNodeHost
 import com.bumble.appyx.navigation.node.container.ContainerNode
 import com.bumble.appyx.navigation.ui.AppyxSampleAppTheme
 import kotlinx.coroutines.CoroutineScope

diff --git a/demos/appyx-navigation/web/build.gradle.kts b/demos/appyx-navigation/web/build.gradle.kts
@@ -15,7 +15,6 @@ kotlin {
                 implementation(project(":demos:appyx-navigation:common"))
                 implementation(project(":appyx-interactions:appyx-interactions"))
                 implementation(project(":appyx-navigation:appyx-navigation"))
-                implementation(project(":appyx-navigation:web"))
                 implementation(project(":appyx-components:stable:backstack:backstack"))
                 api(compose.runtime)
                 api(compose.foundation)