chore(flipcash): add back lab access from login router

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/App.kt

@@ -17,7 +17,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewModelScope
 import cafe.adriel.voyager.core.registry.ScreenRegistry
 import cafe.adriel.voyager.core.stack.StackEvent
 import cafe.adriel.voyager.navigator.CurrentScreen
@@ -28,12 +27,11 @@ import cafe.adriel.voyager.transitions.SlideTransition
 import com.flipcash.app.core.LocalUserManager
 import com.flipcash.app.core.NavScreenProvider
 import com.flipcash.app.core.navigation.DeeplinkType
-import com.flipcash.app.router.LocalRouter
-import com.flipcash.app.session.LocalSessionController
-import com.flipcash.app.internal.ui.theme.FlipcashTheme
 import com.flipcash.app.internal.ui.navigation.AppScreenContent
 import com.flipcash.app.internal.ui.navigation.MainRoot
-import com.flipcash.app.shareable.LocalShareController
+import com.flipcash.app.internal.ui.theme.FlipcashTheme
+import com.flipcash.app.router.LocalRouter
+import com.flipcash.app.session.LocalSessionController
 import com.flipcash.features.shareapp.R
 import com.flipcash.services.modals.ModalManager
 import com.flipcash.services.user.AuthState

apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/navigation/AppScreenContent.kt

@@ -10,7 +10,8 @@ import com.flipcash.app.core.NavScreenProvider
 import com.flipcash.app.currency.CurrencySelectionModal
 import com.flipcash.app.deposit.DepositScreen
 import com.flipcash.app.cash.CashScreen
-import com.flipcash.app.lab.LabScreen
+import com.flipcash.app.lab.LabsScreen
+import com.flipcash.app.lab.LabsModal
 import com.flipcash.app.login.accesskey.AccessKeyScreen
 import com.flipcash.app.login.router.LoginRouter
 import com.flipcash.app.login.seed.SeedInputScreen
@@ -90,8 +91,12 @@ internal fun AppScreenContent(content: @Composable () -> Unit) {
             AppSettingsScreen()
         }
 
+        register<NavScreenProvider.Login.Lab> {
+            LabsScreen()
+        }
+
         register<NavScreenProvider.HomeScreen.Menu.Lab> {
-            LabScreen()
+            LabsModal()
         }
 
         register<NavScreenProvider.HomeScreen.Menu.Deposit> {

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/NavScreenProvider.kt

@@ -14,6 +14,8 @@ sealed class NavScreenProvider : ScreenProvider {
             NavScreenProvider()
 
         data object SeedInput : NavScreenProvider()
+
+        data object Lab : NavScreenProvider()
     }
 
     sealed interface Permissions {

…kotlin/com/flipcash/app/lab/LabScreen.kt …otlin/com/flipcash/app/lab/LabsScreen.ktapps/flipcash/features/lab/src/main/kotlin/com/flipcash/app/lab/LabScreen.kt renamed to apps/flipcash/features/lab/src/main/kotlin/com/flipcash/app/lab/LabsScreen.kt apps/flipcash/features/lab/src/main/kotlin/com/flipcash/app/lab/LabScreen.kt renamed to apps/flipcash/features/lab/src/main/kotlin/com/flipcash/app/lab/LabsScreen.kt

@@ -7,6 +7,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.core.screen.ScreenKey
 import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import com.flipcash.app.lab.internal.LabsScreenContent
@@ -20,7 +21,7 @@ import kotlinx.parcelize.Parcelize
 
 
 @Parcelize
-class LabScreen: ModalScreen, NamedScreen, Parcelable {
+class LabsModal: ModalScreen, NamedScreen, Parcelable {
 
     @IgnoredOnParcel
     override val key: ScreenKey = uniqueScreenKey
@@ -44,6 +45,35 @@ class LabScreen: ModalScreen, NamedScreen, Parcelable {
                 onBackIconClicked = navigator::pop
             )
 
+            LabsScreenContent()
+        }
+    }
+}
+
+@Parcelize
+class LabsScreen: Screen, NamedScreen, Parcelable {
+
+    @IgnoredOnParcel
+    override val key: ScreenKey = uniqueScreenKey
+
+    override val name: String
+        @Composable get() = stringResource(R.string.title_betaFlags)
+
+    @Composable
+    override fun Content() {
+        val navigator = LocalCodeNavigator.current
+
+        Column(
+            modifier = Modifier.fillMaxSize(),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            AppBarWithTitle(
+                title = name,
+                titleAlignment = Alignment.CenterHorizontally,
+                backButton = true,
+                onBackIconClicked = navigator::pop
+            )
+
             LabsScreenContent()
         }
     }

apps/flipcash/features/login/src/main/kotlin/com/flipcash/app/login/internal/LoginScreenContent.kt

@@ -42,8 +42,11 @@ import com.getcode.view.LoadingSuccessState
 internal fun LoginRouterScreenContent(
     isCreatingAccount: LoadingSuccessState = LoadingSuccessState(),
     isLoggingIn: LoadingSuccessState = LoadingSuccessState(),
+    isLabsOpen: Boolean,
     createAccount: () -> Unit,
     login: () -> Unit,
+    onLogoTapped: () -> Unit,
+    openBetaFlags: () -> Unit,
 ) {
     val context = LocalContext.current
 
@@ -57,7 +60,8 @@ internal fun LoginRouterScreenContent(
 
             Column(
                 modifier = Modifier
-                    .align(Alignment.CenterHorizontally),
+                    .align(Alignment.CenterHorizontally)
+                    .noRippleClickable(enabled = !isLabsOpen) { onLogoTapped() },
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.inset)
             ) {
@@ -135,5 +139,17 @@ internal fun LoginRouterScreenContent(
                 }
             )
         }
+
+        if (isLabsOpen) {
+            IconButton(
+                modifier = Modifier
+                    .align(Alignment.TopEnd)
+                    .statusBarsPadding()
+                    .padding(top = CodeTheme.dimens.grid.x2),
+                onClick = openBetaFlags
+            ) {
+                Icon(Icons.Filled.Science, contentDescription = null, tint = Color.White)
+            }
+        }
     }
 }

apps/flipcash/features/login/src/main/kotlin/com/flipcash/app/login/router/LoginRouter.kt

@@ -26,6 +26,7 @@ class LoginRouter(
     private val seed: String? = null,
     private val fromDeeplink: Boolean = false,
 ) : Screen, Parcelable {
+
     @IgnoredOnParcel
     override val key: ScreenKey = uniqueScreenKey
 
@@ -61,7 +62,10 @@ class LoginRouter(
             isCreatingAccount = state.creatingAccount,
             isLoggingIn = state.loggingIn,
             createAccount = { vm.dispatchEvent(LoginViewModel.Event.CreateAccount) },
-            login = { navigator.push(ScreenRegistry.get(NavScreenProvider.Login.SeedInput)) }
+            login = { navigator.push(ScreenRegistry.get(NavScreenProvider.Login.SeedInput)) },
+            isLabsOpen = state.betaOptionsVisible,
+            onLogoTapped = { vm.dispatchEvent(LoginViewModel.Event.OnLogoTapped) },
+            openBetaFlags = { navigator.push(ScreenRegistry.get(NavScreenProvider.Login.Lab)) }
         )
     }
 }

apps/flipcash/shared/featureflags/src/main/kotlin/com/flipcash/app/featureflags/FeatureFlag.kt

@@ -7,19 +7,22 @@ sealed interface FeatureFlag {
     val default: Boolean
     val launched: Boolean
     val visible: Boolean
+    val persistLogOut: Boolean
 
     data object CredentialManager: FeatureFlag {
         override val key: String = "credential_manager_enabled"
         override val default: Boolean = false
         override val launched: Boolean = false
-        override val visible: Boolean = BuildConfig.DEBUG
+        override val visible: Boolean = true
+        override val persistLogOut: Boolean = true
     }
 
     data object VibrateOnScan: FeatureFlag {
         override val key: String = "scan_debug_enabled"
         override val default: Boolean = false
         override val launched: Boolean = false
         override val visible = true
+        override val persistLogOut: Boolean = false
     }
 
     companion object {

apps/flipcash/shared/featureflags/src/main/kotlin/com/flipcash/app/featureflags/internal/InternalFeatureFlagController.kt

@@ -109,7 +109,13 @@ internal class InternalFeatureFlagController @Inject constructor(
 
     override fun reset() {
         dataScope.launch {
-            betaFlags.edit { it.clear() }
+            betaFlags.edit { prefs ->
+                FeatureFlag.entries.map { it to it.booleanPreferenceKey }
+                    .filterNot { it.first.persistLogOut }
+                    .onEach { prefs.remove(it.second) }
+
+                prefs.remove(betaOverrideKey)
+            }
         }
     }
 }