Merge branch 'compose-1.1' into compose-1.2

compose-destinations-wear/build.gradle.kts

@@ -0,0 +1,53 @@
+plugins {
+    id("com.android.library")
+    kotlin("android")
+}
+
+apply(from = "${rootProject.projectDir}/publish.gradle")
+
+android {
+
+    compileSdk = libs.versions.compileSdk.get().toIntOrNull()
+
+    defaultConfig {
+        minSdk = libs.versions.minSdk.get().toIntOrNull()
+        targetSdk = libs.versions.targetSdk.get().toIntOrNull()
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles.add(File("consumer-rules.pro"))
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    buildFeatures {
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+}
+
+dependencies {
+    api(project(mapOf("path" to ":compose-destinations")))
+
+    api(libs.wear.compose.navigation)
+}

compose-destinations-wear/gradle.properties

@@ -0,0 +1,2 @@
+POM_ARTIFACT_ID=wear-core
+POM_NAME=wear-core

compose-destinations-wear/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.kts.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

compose-destinations-wear/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.ramcosta.composedestinations.wear">
+
+</manifest>

compose-destinations-wear/src/main/java/com/ramcosta/composedestinations/wear/WearNavHostEngine.kt

@@ -0,0 +1,160 @@
+package com.ramcosta.composedestinations.wear
+
+import android.annotation.SuppressLint
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.navigation.*
+import androidx.wear.compose.navigation.*
+import com.ramcosta.composedestinations.annotation.InternalDestinationsApi
+import com.ramcosta.composedestinations.manualcomposablecalls.DestinationLambda
+import com.ramcosta.composedestinations.manualcomposablecalls.ManualComposableCalls
+import com.ramcosta.composedestinations.navigation.DependenciesContainerBuilder
+import com.ramcosta.composedestinations.rememberNavHostEngine
+import com.ramcosta.composedestinations.scope.DestinationScopeImpl
+import com.ramcosta.composedestinations.spec.*
+
+/**
+ * Returns the [WearNavHostEngine] to be used with Wear OS apps.
+ */
+@Composable
+fun rememberWearNavHostEngine(
+    state: SwipeDismissableNavHostState = rememberSwipeDismissableNavHostState(),
+): NavHostEngine {
+    val defaultNavHostEngine = rememberNavHostEngine()
+
+    return remember {
+        WearNavHostEngine(defaultNavHostEngine, state)
+    }
+}
+
+internal class WearNavHostEngine(
+    private val defaultNavHostEngine: NavHostEngine,
+    private val state: SwipeDismissableNavHostState,
+) : NavHostEngine {
+
+    override val type = NavHostEngine.Type.WEAR
+
+    @Composable
+    override fun rememberNavController(
+        vararg navigators: Navigator<out NavDestination>
+    ) =
+        androidx.navigation.compose.rememberNavController(remember { WearNavigator() }, *navigators)
+
+    @Composable
+    override fun NavHost(
+        modifier: Modifier,
+        route: String,
+        startRoute: Route,
+        navController: NavHostController,
+        builder: NavGraphBuilder.() -> Unit
+    ) {
+        SwipeDismissableNavHost(
+            navController = navController,
+            startDestination = startRoute.route,
+            modifier = modifier,
+            route = route,
+            state = state,
+            builder = builder
+        )
+    }
+
+    override fun NavGraphBuilder.navigation(
+        navGraph: NavGraphSpec,
+        builder: NavGraphBuilder.() -> Unit
+    ) {
+        with(defaultNavHostEngine) { navigation(navGraph, builder) }
+    }
+
+    @OptIn(ExperimentalAnimationApi::class, InternalDestinationsApi::class)
+    override fun <T> NavGraphBuilder.composable(
+        destination: DestinationSpec<T>,
+        navController: NavHostController,
+        dependenciesContainerBuilder: @Composable DependenciesContainerBuilder<*>.() -> Unit,
+        manualComposableCalls: ManualComposableCalls,
+    ) {
+        when (destination.style) {
+            is DestinationStyle.Runtime,
+            is DestinationStyle.Default -> {
+                addComposable(
+                    destination,
+                    navController,
+                    dependenciesContainerBuilder,
+                    manualComposableCalls
+                )
+            }
+
+            is DestinationStyle.Activity -> {
+                with(defaultNavHostEngine) {
+                    composable(destination, navController, dependenciesContainerBuilder, manualComposableCalls)
+                }
+            }
+
+            is DestinationStyle.Dialog,
+            is DestinationStyle.Animated,
+            is DestinationStyle.BottomSheet -> {
+                throw IllegalStateException("${destination.style.javaClass.name} cannot be used on Wear OS version of the core library!")
+            }
+        }
+    }
+
+    private fun <T> NavGraphBuilder.addComposable(
+        destination: DestinationSpec<T>,
+        navController: NavHostController,
+        dependenciesContainerBuilder: @Composable DependenciesContainerBuilder<*>.() -> Unit,
+        manualComposableCalls: ManualComposableCalls,
+    ) {
+        @SuppressLint("RestrictedApi")
+        val contentLambda = manualComposableCalls[destination.baseRoute]
+
+        composable(
+            route = destination.route,
+            arguments = destination.arguments,
+            deepLinks = destination.deepLinks
+        ) { navBackStackEntry ->
+            CallComposable(
+                destination,
+                navController,
+                navBackStackEntry,
+                dependenciesContainerBuilder,
+                contentLambda
+            )
+        }
+    }
+
+    internal class WearDestinationScope<T>(
+        destination: DestinationSpec<T>,
+        navBackStackEntry: NavBackStackEntry,
+        navController: NavController,
+    ) : DestinationScopeImpl<T>(
+        destination,
+        navBackStackEntry,
+        navController,
+    )
+
+    @Suppress("UNCHECKED_CAST")
+    @Composable
+    private fun <T> CallComposable(
+        destination: DestinationSpec<T>,
+        navController: NavHostController,
+        navBackStackEntry: NavBackStackEntry,
+        dependenciesContainerBuilder: @Composable DependenciesContainerBuilder<*>.() -> Unit,
+        contentLambda: DestinationLambda<*>?
+    ) {
+        val scope = remember {
+            WearDestinationScope(
+                destination,
+                navBackStackEntry,
+                navController
+            )
+        }
+
+        if (contentLambda == null) {
+            with(destination) { scope.Content(dependenciesContainerBuilder) }
+        } else {
+            contentLambda as DestinationLambda<T>
+            contentLambda(scope)
+        }
+    }
+}

compose-destinations/src/main/java/com/ramcosta/composedestinations/manualcomposablecalls/ManualComposableCallsBuilder.kt

@@ -113,7 +113,7 @@ class ManualComposableCallsBuilder internal constructor(
 private fun ManualComposableCallsBuilder.validateAnimated(
     destination: DestinationSpec<*>
 ) {
-    if (engineType == NavHostEngine.Type.DEFAULT) {
+    if (engineType != NavHostEngine.Type.ANIMATED) {
         error("'animatedComposable' can only be called with a 'AnimatedNavHostEngine'")
     }
 
@@ -125,7 +125,7 @@ private fun ManualComposableCallsBuilder.validateAnimated(
 private fun ManualComposableCallsBuilder.validateBottomSheet(
     destination: DestinationSpec<*>
 ) {
-    if (engineType == NavHostEngine.Type.DEFAULT) {
+    if (engineType != NavHostEngine.Type.ANIMATED) {
         error("'bottomSheetComposable' can only be called with a 'AnimatedNavHostEngine'")
     }
 

compose-destinations/src/main/java/com/ramcosta/composedestinations/spec/NavHostEngine.kt

@@ -29,7 +29,13 @@ interface NavHostEngine {
          * The engine you get if using "io.github.raamcosta.compose-destinations:animations-core"
          * and calling `rememberAnimatedNavHostEngine`
          */
-        ANIMATED
+        ANIMATED,
+
+        /**
+         * The engine you get if using "io.github.raamcosta.compose-destinations:wear-core"
+         * and calling `rememberWearNavHostEngine`
+         */
+        WEAR
     }
 
     /**

gradle/libs.versions.toml

@@ -29,6 +29,7 @@ ktxSerialization = "1.4.1"
 mockk = "1.13.2"
 
 compileTesting = "1.4.9"
+composeWear = "1.1.0"
 
 [plugins]
 dependencyCheckPlugin = { id = "com.github.ben-manes.versions", version.ref = "dependencyCheckPluginVersion" }
@@ -69,3 +70,10 @@ test-junit = { module = "junit:junit", version.ref = "junit" }
 test-mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 test-kotlinCompile = { module = "com.github.tschuchortdev:kotlin-compile-testing", version.ref = "compileTesting" }
 test-kotlinCompileKsp = { module = "com.github.tschuchortdev:kotlin-compile-testing-ksp", version.ref = "compileTesting" }
+
+# Wear
+
+wear-compose-navigation = { module = "androidx.wear.compose:compose-navigation", version.ref = "composeWear" }
+wear-compose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "composeWear" }
+wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "composeWear" }
+wear-input = { module = "androidx.wear:wear-input", version.ref = "composeWear" }

playground-core/.gitignore

@@ -0,0 +1 @@
+/build

playground-shared/build.gradle.kts → playground-core/build.gradle.kts

@@ -1,10 +1,9 @@
 plugins {
     id("java-library")
-    id("kotlin")
-    kotlin("plugin.serialization")
+    id("org.jetbrains.kotlin.jvm")
 }
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
-}
+}

playground-shared/src/main/java/com/ramcosta/samples/playgroundshared/BlogPostArgs.kt → playground-core/src/main/java/com/ramcosta/playground/core/BlogPostArgs.kt

@@ -1,4 +1,4 @@
-package com.ramcosta.samples.playgroundshared
+package com.ramcosta.playground.core
 
 data class BlogPostArgs(
     val slug: String

playground-shared/src/main/java/com/ramcosta/samples/playgroundshared/WithDefaultValueArgs.kt → playground-core/src/main/java/com/ramcosta/playground/core/WithDefaultValueArgs.kt

@@ -1,4 +1,4 @@
-package com.ramcosta.samples.playgroundshared
+package com.ramcosta.playground.core
 
 data class WithDefaultValueArgs(
     val isCreate: Boolean = false,

playground/build.gradle.kts

@@ -96,7 +96,7 @@ android {
 dependencies {
 
     implementation(project(mapOf("path" to ":compose-destinations-animations")))
-    implementation(project(mapOf("path" to ":playground-shared")))
+    implementation(project(mapOf("path" to ":playground-core")))
     ksp(project(":compose-destinations-ksp"))
 
     implementation(libs.androidMaterial)

playground/src/test/kotlin/com/ramcosta/composedestinations/ksp/ProcessorProviderTests.kt

@@ -363,7 +363,7 @@ class ProcessorProviderTests {
 
           import com.ramcosta.composedestinations.annotation.Destination
           import com.ramcosta.composedestinations.annotation.RootNavGraph
-          import com.ramcosta.samples.playgroundshared.BlogPostArgs
+          import com.ramcosta.playground.core.BlogPostArgs
 
           @RootNavGraph(start = true)
           @Destination(route = "test1")
@@ -398,7 +398,7 @@ class ProcessorProviderTests {
 
           import com.ramcosta.composedestinations.annotation.Destination
           import com.ramcosta.composedestinations.annotation.RootNavGraph
-          import com.ramcosta.samples.playgroundshared.WithDefaultValueArgs
+          import com.ramcosta.playground.core.WithDefaultValueArgs
 
           @RootNavGraph(start = true)
           @Destination(route = "test1")

sample-wear/.gitignore

@@ -0,0 +1 @@
+/build