Feat: Add Scaffolding Code That Support Dual Navigation.

app/build.gradle.kts

@@ -62,134 +62,132 @@ kotlin {
 }
 
 android {
-    (this as ApplicationExtension).apply {
-        compileSdk = appCompileSdk
-        namespace = appNamespace
+    compileSdk = appCompileSdk
+    namespace = appNamespace
 
-        defaultConfig {
-            applicationId = appNamespace
-            minSdk = appMinSdk
-            targetSdk = appTargetSdk
-            versionCode = appVersionCode
+    defaultConfig {
+        applicationId = appNamespace
+        minSdk = appMinSdk
+        targetSdk = appTargetSdk
+        versionCode = appVersionCode
 
-            // WARN: Keep it consistent with the res value property in build variants below...
-            versionName = appVersionName
+        // WARN: Keep it consistent with the res value property in build variants below...
+        versionName = appVersionName
 
-            testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        }
-
-        signingConfigs {
-            create("release") {
-                val keystorePropertiesFile = rootProject.file("keystore.properties")
-                if (keystorePropertiesFile.exists()) {
-                    val keystoreProperties = Properties()
-                    keystoreProperties.load(FileInputStream(keystorePropertiesFile))
-
-                    keyAlias = keystoreProperties.getProperty("keyAlias")
-                    keyPassword = keystoreProperties.getProperty("keyPassword")
-                    storeFile = file(keystoreProperties.getProperty("storeFile"))
-                    storePassword = keystoreProperties.getProperty("storePassword")
-                } else {
-                    logger.warn("WARNING: keystore.properties not found for release signing config.")
-                    // throw GradleException("keystore.properties not found!")
-                }
-            }
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
 
-            create("staging") {
-                val keystorePropertiesFile = rootProject.file("staging-keystore.properties")
-                if (keystorePropertiesFile.exists()) {
-                    val keystoreProperties = Properties()
-                    keystoreProperties.load(FileInputStream(keystorePropertiesFile))
-
-                    keyAlias = keystoreProperties.getProperty("stagingKeyAlias")
-                    keyPassword = keystoreProperties.getProperty("stagingKeyPassword")
-                    storeFile = file(keystoreProperties.getProperty("stagingStoreFile"))
-                    storePassword = keystoreProperties.getProperty("stagingStorePassword")
-                } else {
-                    logger.warn("WARNING: keystore.properties not found for release signing config.")
-                    // throw GradleException("keystore.properties not found!")
-                }
+    signingConfigs {
+        create("release") {
+            val keystorePropertiesFile = rootProject.file("keystore.properties")
+            if (keystorePropertiesFile.exists()) {
+                val keystoreProperties = Properties()
+                keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+
+                keyAlias = keystoreProperties.getProperty("keyAlias")
+                keyPassword = keystoreProperties.getProperty("keyPassword")
+                storeFile = file(keystoreProperties.getProperty("storeFile"))
+                storePassword = keystoreProperties.getProperty("storePassword")
+            } else {
+                logger.warn("WARNING: keystore.properties not found for release signing config.")
+                // throw GradleException("keystore.properties not found!")
             }
         }
 
-        splits {
-            abi {
-                isEnable = true
-                reset()
-                include("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
-                isUniversalApk = true
+        create("staging") {
+            val keystorePropertiesFile = rootProject.file("staging-keystore.properties")
+            if (keystorePropertiesFile.exists()) {
+                val keystoreProperties = Properties()
+                keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+
+                keyAlias = keystoreProperties.getProperty("stagingKeyAlias")
+                keyPassword = keystoreProperties.getProperty("stagingKeyPassword")
+                storeFile = file(keystoreProperties.getProperty("stagingStoreFile"))
+                storePassword = keystoreProperties.getProperty("stagingStorePassword")
+            } else {
+                logger.warn("WARNING: keystore.properties not found for release signing config.")
+                // throw GradleException("keystore.properties not found!")
             }
         }
+    }
 
-        lint {
-            // baseline = rootProject.file("lint-baseline.xml") // If you use a baseline
-            lintConfig = rootProject.file("lint.xml")
+    splits {
+        abi {
+            isEnable = true
+            reset()
+            include("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+            isUniversalApk = true
         }
+    }
 
-        buildTypes {
-            getByName("release") {
-                if (rootProject.file("keystore.properties").exists()) {
-                    signingConfig = signingConfigs.getByName("release")
-                } else {
-                    logger.warn("WARNING: Release build will not be signed as keystore.properties is missing.")
-                    // throw GradleException("Can't Sign Release Build")
-                }
-
-                isDebuggable = false
-                isShrinkResources = true
-                isMinifyEnabled = true
-                proguardFiles(
-                    getDefaultProguardFile("proguard-android-optimize.txt"),
-                    "proguard-rules.pro"
-                )
-
-                resValue("string", "app_name", appBaseName)
-                resValue("string", "app_version", appLabel)
-
-                manifestPlaceholders["appIcon"] = mainIcon
-                manifestPlaceholders["appRoundIcon"] = mainRoundIcon
-            }
+    lint {
+        // baseline = rootProject.file("lint-baseline.xml") // If you use a baseline
+        lintConfig = rootProject.file("lint.xml")
+    }
 
-            create("staging") {
-                if (rootProject.file("staging-keystore.properties").exists()) {
-                    signingConfig = signingConfigs.getByName("staging")
-                } else {
-                    logger.warn("WARNING: Staging build will not be signed as staging-keystore.properties is missing.")
-                    // throw GradleException("Can't Sign Staging Build")
-                }
-
-                applicationIdSuffix = ".staging"
-                versionNameSuffix = "-Staging"
-
-                isDebuggable = false
-                isShrinkResources = true
-                isMinifyEnabled = true
-                proguardFiles(
-                    getDefaultProguardFile("proguard-android-optimize.txt"),
-                    "proguard-rules.pro"
-                )
-
-                resValue("string", "app_name", "$appBaseName Staging")
-                resValue("string", "app_version", appDevLabel)
-
-                manifestPlaceholders["appIcon"] = devIcon
-                manifestPlaceholders["appRoundIcon"] = devRoundIcon
+    buildTypes {
+        getByName("release") {
+            if (rootProject.file("keystore.properties").exists()) {
+                signingConfig = signingConfigs.getByName("release")
+            } else {
+                logger.warn("WARNING: Release build will not be signed as keystore.properties is missing.")
+                // throw GradleException("Can't Sign Release Build")
             }
 
-            getByName("debug") {
-                applicationIdSuffix = ".dev"
-                versionNameSuffix = "-Dev"
+            isDebuggable = false
+            isShrinkResources = true
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
 
-                isDebuggable = true
-                isShrinkResources = false
-                isMinifyEnabled = false
+            resValue("string", "app_name", appBaseName)
+            resValue("string", "app_version", appLabel)
 
-                resValue("string", "app_name", "$appBaseName Debug")
-                resValue("string", "app_version", appDevLabel)
+            manifestPlaceholders["appIcon"] = mainIcon
+            manifestPlaceholders["appRoundIcon"] = mainRoundIcon
+        }
 
-                manifestPlaceholders["appIcon"] = devIcon
-                manifestPlaceholders["appRoundIcon"] = devRoundIcon
+        create("staging") {
+            if (rootProject.file("staging-keystore.properties").exists()) {
+                signingConfig = signingConfigs.getByName("staging")
+            } else {
+                logger.warn("WARNING: Staging build will not be signed as staging-keystore.properties is missing.")
+                // throw GradleException("Can't Sign Staging Build")
             }
+
+            applicationIdSuffix = ".staging"
+            versionNameSuffix = "-Staging"
+
+            isDebuggable = false
+            isShrinkResources = true
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+
+            resValue("string", "app_name", "$appBaseName Staging")
+            resValue("string", "app_version", appDevLabel)
+
+            manifestPlaceholders["appIcon"] = devIcon
+            manifestPlaceholders["appRoundIcon"] = devRoundIcon
+        }
+
+        getByName("debug") {
+            applicationIdSuffix = ".dev"
+            versionNameSuffix = "-Dev"
+
+            isDebuggable = true
+            isShrinkResources = false
+            isMinifyEnabled = false
+
+            resValue("string", "app_name", "$appBaseName Debug")
+            resValue("string", "app_version", appDevLabel)
+
+            manifestPlaceholders["appIcon"] = devIcon
+            manifestPlaceholders["appRoundIcon"] = devRoundIcon
         }
     }
 

app/src/main/kotlin/com/jeeldobariya/passcodes/navigation/NavigationRoot.kt

@@ -1,27 +1,69 @@
 package com.jeeldobariya.passcodes.navigation
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
+import androidx.navigation3.runtime.NavBackStack
+import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.runtime.rememberNavBackStack
 import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
+import com.jeeldobariya.passcodes.core.feature_flags.FeatureFlagsSettings
+import com.jeeldobariya.passcodes.core.feature_flags.featureFlagsDatastore
 import com.jeeldobariya.passcodes.core.navigation.Route
 import com.jeeldobariya.passcodes.password_manager.ui.PasswordManagerScreen
 import com.jeeldobariya.passcodes.password_manager.ui.SavePasswordScreen
 import com.jeeldobariya.passcodes.password_manager.ui.UpdatePasswordScreen
 import com.jeeldobariya.passcodes.ui.AboutScreen
+import com.jeeldobariya.passcodes.ui.ClassicalMainScreen
 import com.jeeldobariya.passcodes.ui.MainScreen
 import com.jeeldobariya.passcodes.ui.SettingsScreen
 
+
 @Composable
-fun NavigationRoot() {
-    val backStack = rememberNavBackStack(Route.Home)
+private fun ModernNavigationRoot(backStack: NavBackStack<NavKey>, navigateTo: (Route) -> Unit) {
+    NavDisplay(
+        backStack = backStack,
+        onBack = {
+            backStack.removeLastOrNull()
+        },
+        entryDecorators = mutableListOf(
+            rememberSaveableStateHolderNavEntryDecorator(),
+            rememberViewModelStoreNavEntryDecorator()
+        ),
+        entryProvider = entryProvider {
+            entry<Route.Home> {
+                MainScreen(navigateTo)
+            }
 
-    fun navigateTo(route: Route): Unit {
-        backStack.add(route)
-    }
+            entry<Route.Settings> {
+                SettingsScreen()
+            }
+
+            entry<Route.AboutUs> {
+                AboutScreen()
+            }
+
+            entry<Route.PasswordManager> {
+                PasswordManagerScreen(navigateTo)
+            }
+
+            entry<Route.SavePassword> {
+                SavePasswordScreen()
+            }
+
+            entry<Route.UpdatePassword> {
+                UpdatePasswordScreen(it.id)
+            }
+        }
+    )
+}
 
+@Composable
+private fun ClassicNavigationRoot(backStack: NavBackStack<NavKey>, navigateTo: (Route) -> Unit) {
     NavDisplay(
         backStack = backStack,
         onBack = {
@@ -33,7 +75,7 @@ fun NavigationRoot() {
         ),
         entryProvider = entryProvider {
             entry<Route.Home> {
-                MainScreen(::navigateTo)
+                ClassicalMainScreen(navigateTo)
             }
 
             entry<Route.Settings> {
@@ -45,7 +87,7 @@ fun NavigationRoot() {
             }
 
             entry<Route.PasswordManager> {
-                PasswordManagerScreen(::navigateTo)
+                PasswordManagerScreen(navigateTo)
             }
 
             entry<Route.SavePassword> {
@@ -58,3 +100,24 @@ fun NavigationRoot() {
         }
     )
 }
+
+@Composable
+fun NavigationRoot() {
+    val backStack = rememberNavBackStack(Route.Home)
+
+    val flagDataStore = LocalContext.current.featureFlagsDatastore
+    val flagDatastoreState by flagDataStore.data.collectAsState(
+        FeatureFlagsSettings(
+            version = 0,
+            isPreviewFeaturesEnabled = false,
+            isPreviewLayoutEnabled = false
+        )
+    )
+
+    fun navigateTo(route: Route): Unit {
+        backStack.add(route)
+    }
+
+    if (flagDatastoreState.isPreviewLayoutEnabled) { ModernNavigationRoot(backStack, ::navigateTo) }
+    else { ClassicNavigationRoot(backStack, ::navigateTo) }
+}