Feat: Streamline Oldui & Newui Exchange.

app/src/main/AndroidManifest.xml

@@ -17,7 +17,6 @@
         tools:targetApi="33" >
 
         <activity android:name=".ui.MainActivity" />
-        <activity android:name=".JetpackPreviewLayoutActivity" />
 
         <activity
             android:name=".oldui.MainActivity"

app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/MainActivity.kt

@@ -12,7 +12,6 @@ import com.jeeldobariya.passcodes.core.domain.usecases.CheckForUpdateUseCase
 import com.jeeldobariya.passcodes.core.feature_flags.featureFlagsDatastore
 import com.jeeldobariya.passcodes.databinding.ActivityMainBinding
 import com.jeeldobariya.passcodes.password_manager.oldui.PasswordManagerActivity
-import com.jeeldobariya.passcodes.JetpackPreviewLayoutActivity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
@@ -59,7 +58,10 @@ class MainActivity : AppCompatActivity() {
 
         runBlocking {
             if (featureFlagsDatastore.data.first().isPreviewLayoutEnabled) {
-                Intent(this@MainActivity, JetpackPreviewLayoutActivity::class.java).also {
+                Intent(
+                    this@MainActivity,
+                    com.jeeldobariya.passcodes.ui.MainActivity::class.java
+                ).also {
                     startActivity(it)
                 }
             }

app/src/main/kotlin/com/jeeldobariya/passcodes/presentation/main_screen/ClassicalMainScreen.kt

@@ -35,7 +35,7 @@ import com.jeeldobariya.passcodes.ui.ui.theme.PasscodesTheme
 
 @Composable
 fun ClassicalMainScreen(navigateTo: (Route) -> Unit) {
-    ClassicalMainScreen(navigateTo)
+    ClassicalMainScreenContent(navigateTo)
 }
 
 @Composable

app/src/main/kotlin/com/jeeldobariya/passcodes/presentation/setting_screen/ClassicalSettingsScreen.kt

@@ -63,15 +63,15 @@ private fun ClassicalSettingsScreenContent() {
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
 
-    val flagDataStore = LocalContext.current.featureFlagsDatastore
+    val flagDataStore = context.featureFlagsDatastore
     val flagDatastoreState by flagDataStore.data.collectAsState(
         FeatureFlagsSettings(
             version = 0,
             isPreviewFeaturesEnabled = false,
             isPreviewLayoutEnabled = false
         )
     )
-    val appDataStore = LocalContext.current.appDatastore
+    val appDataStore = context.appDatastore
     val appDatastoreState by appDataStore.data.collectAsState(initial = AppSettings())
 
     var expanded by remember { mutableStateOf(false) }

app/src/main/kotlin/com/jeeldobariya/passcodes/ui/MainActivity.kt

@@ -1,10 +1,17 @@
 package com.jeeldobariya.passcodes.ui
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.platform.LocalContext
+import com.jeeldobariya.passcodes.core.feature_flags.FeatureFlagsSettings
+import com.jeeldobariya.passcodes.core.feature_flags.featureFlagsDatastore
 import com.jeeldobariya.passcodes.navigation.NavigationRoot
+import com.jeeldobariya.passcodes.oldui.MainActivity
 import com.jeeldobariya.passcodes.ui.ui.theme.PasscodesTheme
 
 class MainActivity : ComponentActivity() {
@@ -13,6 +20,18 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         setContent {
             PasscodesTheme {
+                val featureFlagState by featureFlagsDatastore.data.collectAsState(
+                    FeatureFlagsSettings(isPreviewLayoutEnabled = true)
+                )
+
+                if (!featureFlagState.isPreviewLayoutEnabled) {
+                    val content = LocalContext.current
+
+                    Intent(content, MainActivity::class.java).also {
+                        content.startActivity(it)
+                    }
+                }
+
                 NavigationRoot()
             }
         }