chore: consolidate currency creator FeatureFlags; bring back BillCustomizer when CurrencyCreator disabled

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

Author: bmc08gt

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

@@ -363,6 +363,7 @@
     <string name="title_noTransactionHistory">No Activity</string>
     <string name="description_noTransactionHistory">Your recent activity will appear here when you send or receive money</string>
 
+    <string name="title_billCustomizer">Bill Creator</string>
     <string name="title_createYourCurrency">Create Your Currency</string>
     <string name="subtitle_currencyCreatorInfo">Launch your own currency in %1$d easy steps</string>
     <string name="title_currencyCreatorStepName">Name</string>

apps/flipcash/core/src/main/res/values/strings.xml

@@ -10,8 +10,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.flipcash.app.advanced.internal.AdvancedFeaturesScreen
 import com.flipcash.app.advanced.internal.AdvancedFeaturesScreenViewModel
+import com.flipcash.app.bill.customization.Event
+import com.flipcash.app.bill.customization.LocalBillPlaygroundController
 import com.flipcash.core.R
 import com.getcode.navigation.core.LocalCodeNavigator
+import com.getcode.opencode.model.financial.Token
+import com.getcode.opencode.model.financial.usdf
 import com.getcode.ui.components.AppBarWithTitle
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
@@ -20,6 +24,7 @@ import kotlinx.coroutines.flow.onEach
 @Composable
 fun AdvancedFeaturesScreen() {
     val navigator = LocalCodeNavigator.current
+    val billPlayground = LocalBillPlaygroundController.current
     val viewModel = hiltViewModel<AdvancedFeaturesScreenViewModel>()
 
     Column(
@@ -43,4 +48,14 @@ fun AdvancedFeaturesScreen() {
             .onEach { navigator.push(it.screen) }
             .launchIn(this)
     }
+
+    LaunchedEffect(viewModel) {
+        viewModel.eventFlow
+            .filterIsInstance<AdvancedFeaturesScreenViewModel.Event.OpenBillPlayground>()
+            .onEach {
+                navigator.hide()
+                billPlayground.dispatchEvent(Event.Load())
+            }
+            .launchIn(this)
+    }
 }

apps/flipcash/features/advanced/src/main/kotlin/com/flipcash/app/advanced/AdvancedFeaturesScreen.kt

@@ -3,6 +3,7 @@ package com.flipcash.app.advanced.internal
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AddCircle
 import androidx.compose.material.icons.outlined.Description
+import androidx.compose.material.icons.outlined.Palette
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
@@ -23,6 +24,14 @@ internal data object CurrencyCreator : FullMenuItem<AdvancedFeaturesScreenViewMo
     )
 }
 
+internal data object BillCustomizer : FullMenuItem<AdvancedFeaturesScreenViewModel.Event>() {
+    override val icon: Painter
+        @Composable get() = rememberVectorPainter(Icons.Outlined.Palette)
+    override val name: String
+        @Composable get() = stringResource(R.string.title_billCustomizer)
+    override val action: AdvancedFeaturesScreenViewModel.Event = AdvancedFeaturesScreenViewModel.Event.OpenBillPlayground
+}
+
 internal data object Deposit : FullMenuItem<AdvancedFeaturesScreenViewModel.Event>() {
     override val icon: Painter
         @Composable get() = painterResource(R.drawable.ic_menu_deposit)

apps/flipcash/features/advanced/src/main/kotlin/com/flipcash/app/advanced/internal/AdvancedFeatureMenuItems.kt

@@ -17,6 +17,7 @@ import javax.inject.Inject
 
 private val FullMenuList = buildList {
     add(CurrencyCreator)
+    add(BillCustomizer)
     add(Deposit)
     add(DeviceLogs)
 }
@@ -40,10 +41,11 @@ internal class AdvancedFeaturesScreenViewModel @Inject constructor(
         data class OnBetaFeaturesUnlocked(val unlocked: Boolean) : Event
         data class OnCurrencyCreatorEnabled(val enabled: Boolean) : Event
         data class OpenScreen(val screen: AppRoute) : Event
+        data object OpenBillPlayground : Event
     }
 
     init {
-        featureFlagController.observe(FeatureFlag.BillCustomizer)
+        featureFlagController.observe(FeatureFlag.CurrencyCreator)
             .onEach {
                 dispatchEvent(Event.OnCurrencyCreatorEnabled(it))
             }.launchIn(viewModelScope)
@@ -70,14 +72,15 @@ internal class AdvancedFeaturesScreenViewModel @Inject constructor(
                 is Event.OnCurrencyCreatorEnabled -> { state ->
                     state.copy(
                         items = if (event.enabled) {
-                            FullMenuList
+                            FullMenuList.filterNot { it is BillCustomizer }
                         } else {
                             FullMenuList.filterNot { it is CurrencyCreator }
                         }
                     )
                 }
 
                 is Event.OpenScreen -> { state -> state }
+                is Event.OpenBillPlayground -> { state -> state }
             }
         }
     }

apps/flipcash/features/advanced/src/main/kotlin/com/flipcash/app/advanced/internal/AdvancedFeaturesScreenViewModel.kt

@@ -13,6 +13,7 @@ dependencies {
 
     implementation(project(":apps:flipcash:shared:bills"))
     api(project(":apps:flipcash:shared:bill-customization"))
+    implementation(project(":apps:flipcash:shared:featureflags"))
     implementation(project(":apps:flipcash:shared:tokens"))
     implementation(project(":libs:datetime"))
     implementation(project(":libs:messaging"))

apps/flipcash/features/bill-customization/build.gradle.kts

@@ -41,6 +41,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.flipcash.app.bill.customization.components.BillPlayground
 import com.flipcash.app.bills.AnimatedBill
 import com.flipcash.app.core.bill.Bill
+import com.flipcash.app.featureflags.FeatureFlag
+import com.flipcash.app.featureflags.LocalFeatureFlags
 import com.flipcash.features.bill.playground.R
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.AppBarDefaults
@@ -52,9 +54,21 @@ import com.getcode.ui.utils.AnimationUtils
 @Composable
 fun BillPlaygroundScaffold(content: @Composable () -> Unit) {
     val controller = LocalBillPlaygroundController.current
-
+    val featureFlags = LocalFeatureFlags.current
     val playgroundState by controller.state.collectAsStateWithLifecycle()
 
+    val currencyCreatorEnabled by featureFlags.observe(FeatureFlag.CurrencyCreator)
+        .collectAsStateWithLifecycle()
+
+    val isUsingPlayground by remember(
+        playgroundState.isCustomizing,
+        currencyCreatorEnabled
+    ) {
+        derivedStateOf {
+            playgroundState.isCustomizing && !currencyCreatorEnabled
+        }
+    }
+
     // bill dismiss state, restarted for every bill
     val billDismissState = remember(playgroundState.bill) {
         DismissState(
@@ -67,6 +81,7 @@ fun BillPlaygroundScaffold(content: @Composable () -> Unit) {
 
     val augmentedBill by remember(playgroundState.bill, customizationsOptions) {
         derivedStateOf {
+            if (currencyCreatorEnabled) return@derivedStateOf null
             val bill = playgroundState.bill ?: return@derivedStateOf null
             if (bill !is Bill.Cash) return@derivedStateOf null
             bill.copy(
@@ -85,7 +100,7 @@ fun BillPlaygroundScaffold(content: @Composable () -> Unit) {
         mutableStateOf(0.dp)
     }
 
-    BackHandler(playgroundState.isCustomizing) {
+    BackHandler(isUsingPlayground) {
         controller.cancel()
     }
 
@@ -94,7 +109,7 @@ fun BillPlaygroundScaffold(content: @Composable () -> Unit) {
         AnimatedBill(
             modifier = Modifier.fillMaxSize(),
             dismissState = billDismissState,
-            dismissed = !playgroundState.isCustomizing,
+            dismissed = !isUsingPlayground,
             contentPadding = PaddingValues(
                 top = topBarHeight,
                 bottom = playgroundHeight,
@@ -111,7 +126,7 @@ fun BillPlaygroundScaffold(content: @Composable () -> Unit) {
             modifier = Modifier
                 .fillMaxWidth()
                 .measured { topBarHeight = it.height },
-            visible = playgroundState.isCustomizing,
+            visible = isUsingPlayground,
             enter = fadeIn(),
             exit = fadeOut(),
         ) {
@@ -131,7 +146,7 @@ fun BillPlaygroundScaffold(content: @Composable () -> Unit) {
                 .fillMaxWidth()
                 .align(Alignment.BottomCenter)
                 .measured { playgroundHeight = it.height },
-            visible = playgroundState.isCustomizing,
+            visible = isUsingPlayground,
             enter = slideInVertically { it },
             exit = slideOutVertically { it },
             label = "bill customization",

apps/flipcash/features/bill-customization/src/main/kotlin/com/flipcash/app/bill/customization/BillCustomizationScaffold.kt

@@ -56,7 +56,7 @@ internal class TokenDiscoveryViewModel @Inject constructor(
     }
 
     init {
-        featureFlags.observe(FeatureFlag.TokenCreate)
+        featureFlags.observe(FeatureFlag.CurrencyCreator)
             .onEach { dispatchEvent(Event.OnCreateAllowed(it)) }
             .launchIn(viewModelScope)
 

apps/flipcash/features/discovery/src/main/kotlin/com/flipcash/app/discovery/internal/TokenDiscoveryViewModel.kt

@@ -14,6 +14,7 @@ dependencies {
     implementation(project(":apps:flipcash:shared:appupdates"))
     implementation(project(":apps:flipcash:shared:bills"))
     implementation(project(":apps:flipcash:shared:bill-customization"))
+    implementation(project(":apps:flipcash:shared:featureflags"))
     implementation(project(":apps:flipcash:shared:router"))
     implementation(project(":apps:flipcash:shared:session"))