From 938bd670b365b2c85b110ee75182733612ef76dd Mon Sep 17 00:00:00 2001 From: JeremyStevens Date: Mon, 14 Aug 2023 14:03:44 +0100 Subject: [PATCH] repackaged code from platform-specific navigation modules to within common navigation module, simplifying the dependency situation --- appyx-navigation/android/build.gradle.kts | 1 - appyx-navigation/common/build.gradle.kts | 21 +++++++++++++++ .../integration}/ActivityIntegrationPoint.kt | 11 ++++---- .../integration}/AndroidIntegrationPoint.kt | 9 ++++--- .../integration}/LocalIntegrationPoint.kt | 3 ++- .../navigation/integration}/NodeActivity.kt | 3 ++- .../integration}/NodeComponentActivity.kt | 3 ++- .../activitystarter/ActivityBoundary.kt | 10 +++---- .../activitystarter/ActivityResultHandler.kt | 2 +- .../activitystarter/ActivityStarter.kt | 10 +++---- .../activitystarter/ActivityStarterHost.kt | 2 +- .../CanProvideActivityStarter.kt | 2 +- .../PermissionRequestBoundary.kt | 14 +++++----- .../PermissionRequestResultHandler.kt | 2 +- .../PermissionRequester.kt | 8 +++--- .../PermissionRequesterHost.kt | 2 +- .../RequestCodeBasedEventStream.kt | 2 +- .../RequestCodeBasedEventStreamImpl.kt | 4 +-- .../requestcode/RequestCodeClient.kt | 2 +- .../requestcode/RequestCodeDoesntFitInMask.kt | 2 +- .../requestcode/RequestCodeRegistry.kt | 2 +- .../DesktopNodeHost.kt | 6 ++--- .../MainIntegrationPoint.kt | 2 +- .../BrowserViewportWindow.kt | 0 .../MainIntegrationPoint.kt | 2 +- .../WebNodeHost.kt | 5 +--- appyx-navigation/desktop/build.gradle.kts | 22 ---------------- appyx-navigation/web/build.gradle.kts | 26 ------------------- .../appyx-navigation/android/build.gradle.kts | 1 - .../bumble/appyx/navigation/MainActivity.kt | 2 +- .../appyx-navigation/desktop/build.gradle.kts | 1 - .../com/bumble/appyx/navigation/Main.kt | 2 +- demos/appyx-navigation/web/build.gradle.kts | 1 - .../com/bumble/appyx/navigation/Main.kt | 3 +-- .../testing/ui/rules/AppyxTestActivity.kt | 2 +- 35 files changed, 79 insertions(+), 111 deletions(-) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/ActivityIntegrationPoint.kt (85%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/AndroidIntegrationPoint.kt (59%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/LocalIntegrationPoint.kt (62%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/NodeActivity.kt (93%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/NodeComponentActivity.kt (94%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/activitystarter/ActivityBoundary.kt (78%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/activitystarter/ActivityResultHandler.kt (67%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/activitystarter/ActivityStarter.kt (59%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/activitystarter/ActivityStarterHost.kt (94%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/activitystarter/CanProvideActivityStarter.kt (54%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/permissionrequester/PermissionRequestBoundary.kt (82%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/permissionrequester/PermissionRequestResultHandler.kt (71%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/permissionrequester/PermissionRequester.kt (73%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/permissionrequester/PermissionRequesterHost.kt (95%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/requestcode/RequestCodeBasedEventStream.kt (80%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/requestcode/RequestCodeBasedEventStreamImpl.kt (94%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/requestcode/RequestCodeClient.kt (51%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/requestcode/RequestCodeDoesntFitInMask.kt (58%) rename appyx-navigation/{android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint => common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration}/requestcode/RequestCodeRegistry.kt (97%) rename appyx-navigation/common/src/desktopMain/kotlin/com/bumble/appyx/navigation/{integrationpoint => integration}/DesktopNodeHost.kt (92%) rename appyx-navigation/common/src/desktopMain/kotlin/com/bumble/appyx/navigation/{integrationpoint => integration}/MainIntegrationPoint.kt (87%) rename appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/{integrationpoint => integration}/BrowserViewportWindow.kt (100%) rename appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/{integrationpoint => integration}/MainIntegrationPoint.kt (84%) rename appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/{integrationpoint => integration}/WebNodeHost.kt (92%) delete mode 100644 appyx-navigation/desktop/build.gradle.kts delete mode 100644 appyx-navigation/web/build.gradle.kts diff --git a/appyx-navigation/android/build.gradle.kts b/appyx-navigation/android/build.gradle.kts index 302127aae3..ee28e29c09 100644 --- 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 index bb1750ee2e..4321ca7fbf 100644 --- 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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/ActivityIntegrationPoint.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/ActivityIntegrationPoint.kt similarity index 85% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/ActivityIntegrationPoint.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/ActivityIntegrationPoint.kt index 73fa9d1b9f..6d0d7e7d66 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/ActivityIntegrationPoint.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/AndroidIntegrationPoint.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/AndroidIntegrationPoint.kt similarity index 59% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/AndroidIntegrationPoint.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/AndroidIntegrationPoint.kt index c6c88f7906..29ee8e8c75 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/AndroidIntegrationPoint.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/LocalIntegrationPoint.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/LocalIntegrationPoint.kt similarity index 62% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/LocalIntegrationPoint.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/LocalIntegrationPoint.kt index 5150c92309..d0e7a72802 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/LocalIntegrationPoint.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/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 { error("CompositionLocal LocalIntegrationPoint not present") diff --git a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/NodeActivity.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/NodeActivity.kt similarity index 93% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/NodeActivity.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/NodeActivity.kt index 3071ece22d..1d38d40af3 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/NodeActivity.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/NodeComponentActivity.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/NodeComponentActivity.kt similarity index 94% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/NodeComponentActivity.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/NodeComponentActivity.kt index 495225c0c0..ea8ffbdf80 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/NodeComponentActivity.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/activitystarter/ActivityBoundary.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/activitystarter/ActivityBoundary.kt similarity index 78% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/activitystarter/ActivityBoundary.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/activitystarter/ActivityBoundary.kt index d710275ef3..bf931baf90 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/activitystarter/ActivityBoundary.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/activitystarter/ActivityResultHandler.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/activitystarter/ActivityResultHandler.kt similarity index 67% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/activitystarter/ActivityResultHandler.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/activitystarter/ActivityResultHandler.kt index 584cf3807e..7f5b205aa3 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/activitystarter/ActivityResultHandler.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/activitystarter/ActivityStarter.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/activitystarter/ActivityStarter.kt similarity index 59% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/activitystarter/ActivityStarter.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/activitystarter/ActivityStarter.kt index eac7aac8e9..ea3f19955c 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/activitystarter/ActivityStarter.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/activitystarter/ActivityStarterHost.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/activitystarter/ActivityStarterHost.kt similarity index 94% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/activitystarter/ActivityStarterHost.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/activitystarter/ActivityStarterHost.kt index 2a142bda0d..643e4f5403 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/activitystarter/ActivityStarterHost.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/activitystarter/CanProvideActivityStarter.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/activitystarter/CanProvideActivityStarter.kt similarity index 54% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/activitystarter/CanProvideActivityStarter.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/activitystarter/CanProvideActivityStarter.kt index aac4340e62..0bd268a6e7 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/activitystarter/CanProvideActivityStarter.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/activitystarter/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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/permissionrequester/PermissionRequestBoundary.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/permissionrequester/PermissionRequestBoundary.kt similarity index 82% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/permissionrequester/PermissionRequestBoundary.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/permissionrequester/PermissionRequestBoundary.kt index 1915112dad..7c7e7bcd13 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/permissionrequester/PermissionRequestBoundary.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/permissionrequester/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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/permissionrequester/PermissionRequestResultHandler.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/permissionrequester/PermissionRequestResultHandler.kt similarity index 71% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/permissionrequester/PermissionRequestResultHandler.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/permissionrequester/PermissionRequestResultHandler.kt index 11cc94fc00..67cbbbc125 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/permissionrequester/PermissionRequestResultHandler.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/permissionrequester/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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/permissionrequester/PermissionRequester.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/permissionrequester/PermissionRequester.kt similarity index 73% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/permissionrequester/PermissionRequester.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/permissionrequester/PermissionRequester.kt index 6340a11545..4bf3f946af 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/permissionrequester/PermissionRequester.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/permissionrequester/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 { diff --git a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/permissionrequester/PermissionRequesterHost.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/permissionrequester/PermissionRequesterHost.kt similarity index 95% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/permissionrequester/PermissionRequesterHost.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/permissionrequester/PermissionRequesterHost.kt index c75af7c08f..129254fa7e 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/permissionrequester/PermissionRequesterHost.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/permissionrequester/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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/requestcode/RequestCodeBasedEventStream.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/requestcode/RequestCodeBasedEventStream.kt similarity index 80% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/requestcode/RequestCodeBasedEventStream.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/requestcode/RequestCodeBasedEventStream.kt index 517cbb241f..698aa8f720 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/requestcode/RequestCodeBasedEventStream.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/requestcode/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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/requestcode/RequestCodeBasedEventStreamImpl.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/requestcode/RequestCodeBasedEventStreamImpl.kt similarity index 94% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/requestcode/RequestCodeBasedEventStreamImpl.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/requestcode/RequestCodeBasedEventStreamImpl.kt index e426f77efc..bd2181510b 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/requestcode/RequestCodeBasedEventStreamImpl.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/requestcode/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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/requestcode/RequestCodeClient.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/requestcode/RequestCodeClient.kt similarity index 51% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/requestcode/RequestCodeClient.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/requestcode/RequestCodeClient.kt index 59b5f91cb8..8fd6de3527 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/requestcode/RequestCodeClient.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/requestcode/RequestCodeDoesntFitInMask.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/requestcode/RequestCodeDoesntFitInMask.kt similarity index 58% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/requestcode/RequestCodeDoesntFitInMask.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/requestcode/RequestCodeDoesntFitInMask.kt index b7b57f6173..dea06c4288 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/requestcode/RequestCodeDoesntFitInMask.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/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/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/requestcode/RequestCodeRegistry.kt b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/requestcode/RequestCodeRegistry.kt similarity index 97% rename from appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/requestcode/RequestCodeRegistry.kt rename to appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/requestcode/RequestCodeRegistry.kt index b01e5792ef..903c27e269 100644 --- a/appyx-navigation/android/src/main/kotlin/com/bumble/appyx/navigation/integrationpoint/requestcode/RequestCodeRegistry.kt +++ b/appyx-navigation/common/src/androidMain/kotlin/com/bumble/appyx/navigation/integration/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/appyx-navigation/common/src/desktopMain/kotlin/com/bumble/appyx/navigation/integrationpoint/DesktopNodeHost.kt b/appyx-navigation/common/src/desktopMain/kotlin/com/bumble/appyx/navigation/integration/DesktopNodeHost.kt similarity index 92% rename from appyx-navigation/common/src/desktopMain/kotlin/com/bumble/appyx/navigation/integrationpoint/DesktopNodeHost.kt rename to appyx-navigation/common/src/desktopMain/kotlin/com/bumble/appyx/navigation/integration/DesktopNodeHost.kt index cadf2cbb92..8dee15d441 100644 --- a/appyx-navigation/common/src/desktopMain/kotlin/com/bumble/appyx/navigation/integrationpoint/DesktopNodeHost.kt +++ b/appyx-navigation/common/src/desktopMain/kotlin/com/bumble/appyx/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/appyx-navigation/common/src/desktopMain/kotlin/com/bumble/appyx/navigation/integrationpoint/MainIntegrationPoint.kt b/appyx-navigation/common/src/desktopMain/kotlin/com/bumble/appyx/navigation/integration/MainIntegrationPoint.kt similarity index 87% rename from appyx-navigation/common/src/desktopMain/kotlin/com/bumble/appyx/navigation/integrationpoint/MainIntegrationPoint.kt rename to appyx-navigation/common/src/desktopMain/kotlin/com/bumble/appyx/navigation/integration/MainIntegrationPoint.kt index e6ac4547ad..774f3432f5 100644 --- a/appyx-navigation/common/src/desktopMain/kotlin/com/bumble/appyx/navigation/integrationpoint/MainIntegrationPoint.kt +++ b/appyx-navigation/common/src/desktopMain/kotlin/com/bumble/appyx/navigation/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/appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/integrationpoint/BrowserViewportWindow.kt b/appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/integration/BrowserViewportWindow.kt similarity index 100% rename from appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/integrationpoint/BrowserViewportWindow.kt rename to appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/integration/BrowserViewportWindow.kt diff --git a/appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/integrationpoint/MainIntegrationPoint.kt b/appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/integration/MainIntegrationPoint.kt similarity index 84% rename from appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/integrationpoint/MainIntegrationPoint.kt rename to appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/integration/MainIntegrationPoint.kt index b6f6be938a..079829509a 100644 --- a/appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/integrationpoint/MainIntegrationPoint.kt +++ b/appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/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/appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/integrationpoint/WebNodeHost.kt b/appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/integration/WebNodeHost.kt similarity index 92% rename from appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/integrationpoint/WebNodeHost.kt rename to appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/integration/WebNodeHost.kt index dbab83e16e..4af59b0701 100644 --- a/appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/integrationpoint/WebNodeHost.kt +++ b/appyx-navigation/common/src/jsMain/kotlin/com/bumble/appyx/navigation/integration/WebNodeHost.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 @@ -6,9 +6,6 @@ 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 deleted file mode 100644 index affe7b82e3..0000000000 --- a/appyx-navigation/desktop/build.gradle.kts +++ /dev/null @@ -1,22 +0,0 @@ -plugins { - kotlin("multiplatform") - id("org.jetbrains.compose") -} - - -kotlin { - jvm { - compilations.all { - kotlinOptions.jvmTarget = libs.versions.jvmTarget.get() - } - } - sourceSets { - val jvmMain by getting { - dependencies { - implementation(project(":appyx-navigation:appyx-navigation")) - implementation(compose.desktop.currentOs) - } - } - val jvmTest by getting - } -} diff --git a/appyx-navigation/web/build.gradle.kts b/appyx-navigation/web/build.gradle.kts deleted file mode 100644 index a59d4ac985..0000000000 --- a/appyx-navigation/web/build.gradle.kts +++ /dev/null @@ -1,26 +0,0 @@ -plugins { - kotlin("multiplatform") - id("org.jetbrains.compose") -} - - -kotlin { - targets.withType { - binaries.all { - freeCompilerArgs += "-Xlazy-ir-for-caches=disable" - } - } - js(IR) { - // Adding moduleName as a workaround for this issue: https://youtrack.jetbrains.com/issue/KT-51942 - moduleName = "appyx-navigation-js" - browser() - } - sourceSets { - val jsMain by getting { - dependencies { - implementation(project(":appyx-navigation:appyx-navigation")) - } - } - val jsTest by getting - } -} diff --git a/demos/appyx-navigation/android/build.gradle.kts b/demos/appyx-navigation/android/build.gradle.kts index f4233f05ff..d46fbafd3e 100644 --- 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 index 523741f7fe..5e4621b83e 100644 --- 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 index d071805ea8..acd1484edf 100644 --- 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 index fe607a62d8..be145a1c4b 100644 --- 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 index 76ca1dca67..ec08b8165c 100644 --- 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) diff --git a/demos/appyx-navigation/web/src/jsMain/kotlin/com/bumble/appyx/navigation/Main.kt b/demos/appyx-navigation/web/src/jsMain/kotlin/com/bumble/appyx/navigation/Main.kt index b885783e5c..46bc765cf0 100644 --- a/demos/appyx-navigation/web/src/jsMain/kotlin/com/bumble/appyx/navigation/Main.kt +++ b/demos/appyx-navigation/web/src/jsMain/kotlin/com/bumble/appyx/navigation/Main.kt @@ -2,7 +2,6 @@ package com.bumble.appyx.navigation import BrowserViewportWindow import androidx.compose.foundation.focusable -import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface @@ -25,9 +24,9 @@ import androidx.compose.ui.input.key.type import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.unit.dp import com.bumble.appyx.navigation.integration.ScreenSize +import com.bumble.appyx.navigation.integration.WebNodeHost import com.bumble.appyx.navigation.node.container.ContainerNode import com.bumble.appyx.navigation.ui.AppyxSampleAppTheme -import com.bumble.appyx.navigation.integrationpoint.WebNodeHost import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/utils/testing-ui-activity/src/main/kotlin/com/bumble/appyx/utils/testing/ui/rules/AppyxTestActivity.kt b/utils/testing-ui-activity/src/main/kotlin/com/bumble/appyx/utils/testing/ui/rules/AppyxTestActivity.kt index a014ba239f..ed2240d0bf 100644 --- a/utils/testing-ui-activity/src/main/kotlin/com/bumble/appyx/utils/testing/ui/rules/AppyxTestActivity.kt +++ b/utils/testing-ui-activity/src/main/kotlin/com/bumble/appyx/utils/testing/ui/rules/AppyxTestActivity.kt @@ -3,7 +3,7 @@ package com.bumble.appyx.utils.testing.ui.rules import android.os.Bundle import androidx.activity.compose.setContent import androidx.compose.runtime.Composable -import com.bumble.appyx.navigation.integrationpoint.NodeActivity +import com.bumble.appyx.navigation.integration.NodeActivity open class AppyxTestActivity : NodeActivity() {