added FeaturesNavigator

miduch · Feb 4, 2022 · 4c6256e · 4c6256e
1 parent fc26ac1
commit 4c6256e
Show file tree

Hide file tree

Showing 12 changed files with 104 additions and 27 deletions.
diff --git a/homescreen/build.gradle b/homescreen/build.gradle
@@ -45,8 +45,7 @@ ksp {
 }
 
 dependencies {
-    implementation project(":onboarding")
-    implementation project(":settings")
+    implementation project(":shared")
 
     implementation 'io.github.raamcosta.compose-destinations:animations-core:1.2.1-beta'
     ksp 'io.github.raamcosta.compose-destinations:ksp:1.2.1-beta'

diff --git a/homescreen/src/main/java/com/example/homescreen/HomeScreen.kt b/homescreen/src/main/java/com/example/homescreen/HomeScreen.kt
@@ -5,16 +5,14 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.Button
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.example.homescreen.destinations.HomeScreenLevel2Destination
-import com.example.onboarding.destinations.OnBoardingScreenDestination
-import com.example.settings.destinations.SettingsScreenDestination
+import com.example.shared.FeaturesNavigator
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 
@@ -24,22 +22,17 @@ import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 )
 @Destination
 @Composable
-fun HomeScreen(navigator: DestinationsNavigator) {
+fun HomeScreen(
+    navigator: DestinationsNavigator,
+    featuresNavigator: FeaturesNavigator,
+) {
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .background(MaterialTheme.colors.background),
+            .background(Color.Cyan),
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        LaunchedEffect(Unit) {
-            if (listOf(true, false).random()) {
-                navigator.navigate(
-                    OnBoardingScreenDestination
-                )
-            }
-        }
-
         Text(text = "Homescreen")
         Spacer(modifier = Modifier.padding(vertical = 12.dp))
         Button(
@@ -52,7 +45,7 @@ fun HomeScreen(navigator: DestinationsNavigator) {
         Spacer(modifier = Modifier.padding(vertical = 12.dp))
         Button(
             onClick = {
-                navigator.navigate(SettingsScreenDestination)
+                featuresNavigator.openSettings()
             }
         ) {
             Text(text = "Settings")
@@ -66,7 +59,7 @@ fun HomeScreenLevel2(navigator: DestinationsNavigator) {
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .background(MaterialTheme.colors.background),
+            .background(Color.Magenta),
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {

diff --git a/navigation/build.gradle b/navigation/build.gradle
@@ -45,6 +45,7 @@ ksp {
 }
 
 dependencies {
+    implementation project(":shared")
     implementation project(":onboarding")
     implementation project(":homescreen")
     implementation project(":settings")

diff --git a/navigation/src/main/java/com/example/navigation/AppNavigation.kt b/navigation/src/main/java/com/example/navigation/AppNavigation.kt
@@ -2,18 +2,25 @@ package com.example.navigation
 
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.runtime.Composable
+import com.example.homescreen.HomeScreen
 import com.example.homescreen.destinations.HomeScreenDestination
 import com.example.homescreen.destinations.HomeScreenLevel2Destination
+import com.example.onboarding.OnBoardingScreen
 import com.example.onboarding.destinations.OnBoardingScreenDestination
 import com.example.settings.destinations.SettingsScreenDestination
 import com.example.settings.destinations.SettingsScreenLevel2Destination
+import com.example.shared.FeaturesNavigator
 import com.ramcosta.composedestinations.DestinationsNavHost
+import com.ramcosta.composedestinations.manualcomposablecalls.DestinationScope
+import com.ramcosta.composedestinations.manualcomposablecalls.composable
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import com.ramcosta.composedestinations.spec.NavGraphSpec
 
 object AppNavGraphs {
     val onboarding = object : NavGraphSpec {
         override val route = "onboarding_route"
-        override val destinationsByRoute = listOf(OnBoardingScreenDestination).associateBy { it.route }
+        override val destinationsByRoute =
+            listOf(OnBoardingScreenDestination).associateBy { it.route }
         override val startRoute = OnBoardingScreenDestination
     }
 
@@ -37,8 +44,43 @@ object AppNavGraphs {
     }
 }
 
+class FeaturesNavigatorImpl(private val navigator: DestinationsNavigator): FeaturesNavigator {
+
+    override fun closeOnboarding() {
+        navigator.navigate(HomeScreenDestination) {
+            this.popUpTo(OnBoardingScreenDestination.route) {
+                inclusive = true
+            }
+        }
+    }
+
+    override fun openSettings() {
+        navigator.navigate(SettingsScreenDestination)
+    }
+}
+
+fun DestinationScope<*>.featuresNavigator() = FeaturesNavigatorImpl(destinationsNavigator)
+
+
 @OptIn(ExperimentalAnimationApi::class)
 @Composable
 fun AppNavigation() {
-    DestinationsNavHost(navGraph = AppNavGraphs.home)
+    val showOnboarding = listOf(true, false).random()
+    DestinationsNavHost(
+        navGraph = AppNavGraphs.home,
+        startRoute = if (showOnboarding) AppNavGraphs.onboarding else AppNavGraphs.home.startRoute
+    ) {
+        composable(HomeScreenDestination) {
+            HomeScreen(
+                navigator = destinationsNavigator,
+                featuresNavigator = featuresNavigator()
+            )
+        }
+        composable(OnBoardingScreenDestination) {
+            OnBoardingScreen(
+                navigator = destinationsNavigator,
+                featuresNavigator = featuresNavigator()
+            )
+        }
+    }
 }
diff --git a/onboarding/build.gradle b/onboarding/build.gradle
@@ -45,6 +45,7 @@ ksp {
 }
 
 dependencies {
+    implementation project(":shared")
 
     implementation 'io.github.raamcosta.compose-destinations:animations-core:1.2.1-beta'
     ksp 'io.github.raamcosta.compose-destinations:ksp:1.2.1-beta'

diff --git a/onboarding/src/main/java/com/example/onboarding/OnBoardingScreen.kt b/onboarding/src/main/java/com/example/onboarding/OnBoardingScreen.kt
@@ -5,12 +5,13 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.Button
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
+import com.example.shared.FeaturesNavigator
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 
@@ -20,19 +21,22 @@ import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 )
 @Destination
 @Composable
-fun OnBoardingScreen(navigator: DestinationsNavigator) {
+fun OnBoardingScreen(
+    navigator: DestinationsNavigator,
+    featuresNavigator: FeaturesNavigator,
+) {
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .background(MaterialTheme.colors.background),
+            .background(Color.Yellow),
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Text(text = "Onboarding")
         Spacer(modifier = Modifier.padding(vertical = 12.dp))
         Button(
             onClick = {
-                navigator.popBackStack()
+                featuresNavigator.closeOnboarding()
             }
         ) {
             Text(text = "Done")

diff --git a/settings.gradle b/settings.gradle
@@ -18,3 +18,4 @@ include ':navigation'
 include ':homescreen'
 include ':onboarding'
 include ':settings'
+include ':shared'
diff --git a/settings/build.gradle b/settings/build.gradle
@@ -45,6 +45,7 @@ ksp {
 }
 
 dependencies {
+    implementation project(":shared")
 
     implementation 'io.github.raamcosta.compose-destinations:animations-core:1.2.1-beta'
     ksp 'io.github.raamcosta.compose-destinations:ksp:1.2.1-beta'

diff --git a/settings/src/main/java/com/example/settings/SettingsScreen.kt b/settings/src/main/java/com/example/settings/SettingsScreen.kt
@@ -5,11 +5,11 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.Button
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.example.settings.destinations.SettingsScreenLevel2Destination
 import com.ramcosta.composedestinations.annotation.Destination
@@ -25,7 +25,7 @@ fun SettingsScreen(navigator: DestinationsNavigator) {
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .background(MaterialTheme.colors.background),
+            .background(Color.Green),
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
@@ -55,7 +55,7 @@ fun SettingsScreenLevel2(navigator: DestinationsNavigator) {
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .background(MaterialTheme.colors.background),
+            .background(Color.Red),
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {

diff --git a/shared/build.gradle b/shared/build.gradle
@@ -0,0 +1,24 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    compileSdk 31
+
+    defaultConfig {
+        minSdk 24
+        targetSdk 31
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+}
+
+dependencies {
+}
diff --git a/shared/src/main/AndroidManifest.xml b/shared/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.example.shared">
+
+</manifest>
diff --git a/shared/src/main/java/com/example/shared/FeaturesNavigator.kt b/shared/src/main/java/com/example/shared/FeaturesNavigator.kt
@@ -0,0 +1,6 @@
+package com.example.shared
+
+interface FeaturesNavigator {
+    fun closeOnboarding()
+    fun openSettings()
+}