[Don't Merge] This branch demonstrates use of basic xml views and compose views with multi module project and clean architecture

app/build.gradle.kts

@@ -126,6 +126,8 @@ dependencies {
 
   Lib.Androidx.list.forEach(::api)
   Lib.Androidx.Compose.list.forEach(::api)
+  Lib.Androidx.Navigation.list.forEach(::api)
+
   Lib.ThirdParty.list.forEach(::api)
   Lib.Accompanist.list.forEach(::api)
   Lib.Google.list.forEach(::api)

app/src/main/java/com/mutualmobile/praxis/di/NavigationModule.kt

@@ -1,7 +1,7 @@
 package com.mutualmobile.praxis.di
 
-import com.mutualmobile.praxis.navigator.ComposeNavigator
-import com.mutualmobile.praxis.navigator.composenavigator.PraxisCloneComposeNavigator
+import com.mutualmobile.praxis.navigator.AbsComposeNavigator
+import com.mutualmobile.praxis.navigator.navigators.PraxisComposeNavigator
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -14,5 +14,5 @@ abstract class NavigationModule {
 
   @Binds
   @Singleton
-  abstract fun provideComposeNavigator(praxisComposeNavigator: PraxisCloneComposeNavigator): ComposeNavigator
+  abstract fun provideComposeNavigator(praxisComposeNavigator: PraxisComposeNavigator): AbsComposeNavigator
 }

app/src/main/java/com/mutualmobile/praxis/root/OnboardingActivity.kt

@@ -10,7 +10,7 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.insets.ProvideWindowInsets
 import dagger.hilt.android.AndroidEntryPoint
-import com.mutualmobile.praxis.navigator.ComposeNavigator
+import com.mutualmobile.praxis.navigator.AbsComposeNavigator
 import com.mutualmobile.praxis.navigator.PraxisRoute
 import com.mutualmobile.praxis.uionboarding.nav.onboardingNavigation
 import com.praxis.feat.authentication.nav.authNavGraph
@@ -20,7 +20,7 @@ import javax.inject.Inject
 class OnboardingActivity : AppCompatActivity() {
 
   @Inject
-  lateinit var composeNavigator: ComposeNavigator
+  lateinit var absComposeNavigator: AbsComposeNavigator
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
@@ -31,7 +31,7 @@ class OnboardingActivity : AppCompatActivity() {
       val navController = rememberNavController()
 
       LaunchedEffect(Unit) {
-        composeNavigator.handleNavigationCommands(navController)
+        absComposeNavigator.handleNavigationCommands(navController)
       }
 
       ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
@@ -40,7 +40,7 @@ class OnboardingActivity : AppCompatActivity() {
           startDestination = PraxisRoute.OnBoarding.name,
         ) {
           onboardingNavigation(
-            composeNavigator = composeNavigator,
+            absComposeNavigator = absComposeNavigator,
           )
           authNavGraph()
         }

app/src/main/res/layout/main.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/nav_host_fragment"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:defaultNavHost="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:navGraph="@navigation/app_nav_graph" />
+</androidx.constraintlayout.widget.ConstraintLayout>

buildSrc/src/main/kotlin/Dependencies.kt

@@ -56,6 +56,22 @@ object Lib {
       SPLASH_SCREEN_API
     )
 
+    object Navigation {
+      private const val nav_version = "2.4.1"
+
+      // Kotlin
+      private const val NAV_FRAGMENT = "androidx.navigation:navigation-fragment-ktx:$nav_version"
+      private const val NAV_UI_KTX = "androidx.navigation:navigation-ui-ktx:$nav_version"
+
+      // Feature module Support
+      private const val NAV_DYNAMIC_MODULES =
+        "androidx.navigation:navigation-dynamic-features-fragment:$nav_version"
+      private const val COMPOSE_NAVIGATION = "androidx.navigation:navigation-compose:2.5.0-alpha01"
+
+      val list = listOf(NAV_FRAGMENT, NAV_UI_KTX, NAV_DYNAMIC_MODULES, COMPOSE_NAVIGATION)
+
+    }
+
     object Compose {
       private const val ACTIVITY_COMPOSE = "androidx.activity:activity-compose:${composeVersion}"
       private const val CONSTRAINT_LAYOUT_COMPOSE =
@@ -66,7 +82,6 @@ object Lib {
       private const val COMPOSE_MATERIAL = "androidx.compose.material:material:${composeVersion}"
       private const val COMPOSE_TOOLING = "androidx.compose.ui:ui-tooling-preview:${composeVersion}"
       private const val COMPOSE_DEBUG_TOOLING = "androidx.compose.ui:ui-tooling:${composeVersion}"
-      private const val COMPOSE_NAVIGATION = "androidx.navigation:navigation-compose:2.5.0-alpha01"
 
       val list = listOf(
         CONSTRAINT_LAYOUT_COMPOSE,
@@ -76,7 +91,6 @@ object Lib {
         COMPOSE_MATERIAL,
         COMPOSE_TOOLING,
         COMPOSE_DEBUG_TOOLING,
-        COMPOSE_NAVIGATION,
       )
     }
   }

common/build.gradle.kts

@@ -35,6 +35,7 @@ dependencies {
 
     Lib.Androidx.list.forEach(::implementation)
     Lib.Androidx.Compose.list.forEach(::implementation)
+    Lib.Androidx.Navigation.list.forEach(::implementation)
     Lib.ThirdParty.list.forEach(::implementation)
     Lib.Accompanist.list.forEach(::implementation)
     Lib.Google.list.forEach(::implementation)

commonui/build.gradle.kts

@@ -47,6 +47,7 @@ dependencies {
 
     Lib.Androidx.list.forEach(::implementation)
     Lib.Androidx.Compose.list.forEach(::implementation)
+    Lib.Androidx.Navigation.list.forEach(::implementation)
     Lib.ThirdParty.list.forEach(::implementation)
     Lib.Accompanist.list.forEach(::implementation)
     Lib.Google.list.forEach(::implementation)

commonui/src/main/res/navigation/app_nav_graph.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/app_nav_graph">
+
+</navigation>

navigator/build.gradle.kts

@@ -46,6 +46,7 @@ dependencies {
 
   Lib.Androidx.list.forEach(::implementation)
   Lib.Androidx.Compose.list.forEach(::implementation)
+    Lib.Androidx.Navigation.list.forEach(::implementation)
   Lib.ThirdParty.list.forEach(::implementation)
   Lib.Accompanist.list.forEach(::implementation)
   Lib.Google.list.forEach(::implementation)

navigator/src/main/java/com/mutualmobile/praxis/navigator/NavigationCommand.kt

@@ -17,4 +17,16 @@ sealed class ComposeNavigationCommand : NavigationCommand() {
   ) : ComposeNavigationCommand()
 
   data class PopUpToRoute(val route: String, val inclusive: Boolean) : ComposeNavigationCommand()
-}
+}
+
+sealed class FragmentNavigationCommand : NavigationCommand() {
+  data class NavigateToFragmentDestination(val destination: Int, val options: NavOptions? = null) : FragmentNavigationCommand()
+  data class NavigateUpWithResult<T>(
+    val key: String,
+    val result: T,
+    val destination: Int? = null
+  ) : FragmentNavigationCommand()
+
+  data class PopUpToDestination(val destination: Int, val inclusive: Boolean) : FragmentNavigationCommand()
+
+}

navigator/src/main/java/com/mutualmobile/praxis/navigator/Navigator.kt

@@ -21,7 +21,7 @@ abstract class Navigator {
 
 }
 
-abstract class ComposeNavigator : Navigator() {
+abstract class AbsComposeNavigator : Navigator() {
   abstract fun navigate(route: String, optionsBuilder: (NavOptionsBuilder.() -> Unit)? = null)
   abstract fun <T> observeResult(key: String, route: String? = null): Flow<T>
   abstract fun <T> navigateBackWithResult(key: String, result: T, route: String?)
@@ -31,8 +31,8 @@ abstract class ComposeNavigator : Navigator() {
 
   suspend fun handleNavigationCommands(navController: NavController) {
     navigationCommands
-      .onSubscription { this@ComposeNavigator.navControllerFlow.value = navController }
-      .onCompletion { this@ComposeNavigator.navControllerFlow.value = null }
+      .onSubscription { this@AbsComposeNavigator.navControllerFlow.value = navController }
+      .onCompletion { this@AbsComposeNavigator.navControllerFlow.value = null }
       .collect { navController.handleComposeNavigationCommand(it) }
   }
 
@@ -72,8 +72,66 @@ abstract class ComposeNavigator : Navigator() {
   }
 }
 
+abstract class AbsFragmentNavigatior : Navigator() {
+  abstract fun navigateFragment(
+    destination: Int,
+    optionsBuilder: (NavOptionsBuilder.() -> Unit)? = null
+  )
+
+  abstract fun <T> observeResult(key: String, destination: Int? = null): Flow<T>
+  abstract fun <T> navigateBackWithResult(key: String, result: T, destination: Int?)
+
+  abstract fun popUpTo(destination: Int, inclusive: Boolean)
+  abstract fun navigateAndClearBackStack(destination: Int)
+
+  suspend fun handleNavigationCommands(navController: NavController) {
+    navigationCommands
+      .onSubscription { [email protected] = navController }
+      .onCompletion { [email protected] = null }
+      .collect { navController.handleFragmentNavigationCommand(it) }
+  }
+
+  private fun NavController.handleFragmentNavigationCommand(navigationCommand: NavigationCommand) {
+    when (navigationCommand) {
+      NavigationCommand.NavigateUp -> navigateUp()
+      is FragmentNavigationCommand.NavigateUpWithResult<*> -> {
+        navUpWithResult(navigationCommand)
+      }
+      is FragmentNavigationCommand.NavigateToFragmentDestination -> navigate(
+        navigationCommand.destination,
+        null,
+        navigationCommand.options
+      )
+      is FragmentNavigationCommand.PopUpToDestination -> {
+        popBackStack(
+          navigationCommand.destination,
+          navigationCommand.inclusive
+        )
+      }
+      else -> {
+        throw RuntimeException("can't handle this with FragmentNavGraphNavigator")
+      }
+    }
+  }
+
+  private fun NavController.navUpWithResult(navigationCommand: FragmentNavigationCommand.NavigateUpWithResult<*>) {
+    val backStackEntry =
+      navigationCommand.destination?.let { getBackStackEntry(it) }
+        ?: previousBackStackEntry
+    backStackEntry?.savedStateHandle?.set(
+      navigationCommand.key,
+      navigationCommand.result
+    )
+
+    navigationCommand.destination?.let {
+      popBackStack(it, false)
+    } ?: run {
+      navigateUp()
+    }
+  }
+}
+
 
-@OptIn(DelicateCoroutinesApi::class)
 fun <T> LiveData<T>.asFlow(): Flow<T> = flow {
   val channel = Channel<T>(Channel.CONFLATED)
   val observer = Observer<T> {

navigator/src/main/java/com/mutualmobile/praxis/navigator/composenavigator/ComposeNavigator.kt → navigator/src/main/java/com/mutualmobile/praxis/navigator/navigators/ComposeNavigator.kt

@@ -1,15 +1,15 @@
-package com.mutualmobile.praxis.navigator.composenavigator
+package com.mutualmobile.praxis.navigator.navigators
 
 import androidx.navigation.NavOptionsBuilder
 import androidx.navigation.navOptions
 import com.mutualmobile.praxis.navigator.ComposeNavigationCommand
-import com.mutualmobile.praxis.navigator.ComposeNavigator
+import com.mutualmobile.praxis.navigator.AbsComposeNavigator
 import com.mutualmobile.praxis.navigator.asFlow
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.*
 import javax.inject.Inject
 
-class PraxisCloneComposeNavigator @Inject constructor(): ComposeNavigator() {
+class PraxisComposeNavigator @Inject constructor(): AbsComposeNavigator() {
 
   override fun navigate(route: String, optionsBuilder: (NavOptionsBuilder.() -> Unit)?) {
     val options = optionsBuilder?.let { navOptions(it) }

navigator/src/main/java/com/mutualmobile/praxis/navigator/navigators/PraxisFragmentNavigator.kt

@@ -0,0 +1,65 @@
+package com.mutualmobile.praxis.navigator.navigators
+
+import androidx.navigation.NavOptionsBuilder
+import androidx.navigation.navOptions
+import com.mutualmobile.praxis.navigator.AbsFragmentNavigatior
+import com.mutualmobile.praxis.navigator.FragmentNavigationCommand
+import com.mutualmobile.praxis.navigator.asFlow
+import kotlinx.coroutines.flow.*
+import javax.inject.Inject
+
+class PraxisFragmentNavigator @Inject constructor() : AbsFragmentNavigatior() {
+
+  override fun navigateFragment(destination: Int, optionsBuilder: (NavOptionsBuilder.() -> Unit)?) {
+    val options = optionsBuilder?.let { navOptions(it) }
+    navigationCommands.tryEmit(
+      FragmentNavigationCommand.NavigateToFragmentDestination(
+        destination,
+        options
+      )
+    )
+  }
+
+  override fun navigateAndClearBackStack(destination: Int) {
+    navigationCommands.tryEmit(
+      FragmentNavigationCommand.NavigateToFragmentDestination(
+        destination,
+        navOptions {
+          popUpTo(0)
+        })
+    )
+  }
+
+  override fun popUpTo(destination: Int, inclusive: Boolean) {
+    navigationCommands.tryEmit(FragmentNavigationCommand.PopUpToDestination(destination, inclusive))
+  }
+
+  override fun <T> navigateBackWithResult(key: String, result: T, destination: Int?) {
+    navigationCommands.tryEmit(
+      FragmentNavigationCommand.NavigateUpWithResult(
+        key = key,
+        result = result,
+        destination = destination
+      )
+    )
+  }
+
+  override fun <T> observeResult(key: String, destination: Int?): Flow<T> {
+    return navControllerFlow
+      .filterNotNull()
+      .flatMapLatest { navController ->
+        val backStackEntry = destination?.let { navController.getBackStackEntry(it) }
+          ?: navController.currentBackStackEntry
+
+        backStackEntry?.savedStateHandle?.let { savedStateHandle ->
+          savedStateHandle.getLiveData<T?>(key)
+            .asFlow()
+            .filter { it != null }
+            .onEach {
+              // Nullify the result to avoid resubmitting it
+              savedStateHandle.set(key, null)
+            }
+        } ?: emptyFlow()
+      }
+  }
+}

ui-authentication/build.gradle.kts

@@ -66,6 +66,7 @@ dependencies {
 
     Lib.Androidx.list.forEach(::implementation)
     Lib.Androidx.Compose.list.forEach(::implementation)
+    Lib.Androidx.Navigation.list.forEach(::implementation)
     Lib.ThirdParty.list.forEach(::implementation)
     Lib.Accompanist.list.forEach(::implementation)
     Lib.Google.list.forEach(::implementation)