chore(menu): relocate deposit to advanced features; hide quick add and make withdraw menu item

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

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

@@ -64,6 +64,7 @@
     <string name="title_withdrawUsdc">Withdraw Funds</string>
 
     <string name="title_withdraw">Withdraw</string>
+    <string name="title_withdrawFunds">Withdraw Funds</string>
 
     <string name="subtitle_validAddress">Valid address</string>
 

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

@@ -28,4 +28,14 @@ internal data object BillCustomizer : FullMenuItem<AdvancedFeaturesScreenViewMod
     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)
+    override val name: String
+        @Composable get() = stringResource(R.string.title_depositUsdc)
+    override val action: AdvancedFeaturesScreenViewModel.Event = AdvancedFeaturesScreenViewModel.Event.OpenScreen(
+        AppRoute.OnRamp.ProviderList(AppRoute.Sheets.Menu)
+    )
 }

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

@@ -17,6 +17,7 @@ import javax.inject.Inject
 
 private val FullMenuList = buildList {
     add(BillCustomizer)
+    add(Deposit)
 }
 
 @HiltViewModel

apps/flipcash/features/menu/src/main/kotlin/com/flipcash/app/menu/internal/MenuItems.kt

@@ -10,6 +10,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import cafe.adriel.voyager.core.registry.ScreenRegistry
 import com.flipcash.app.core.AppRoute
+import com.flipcash.app.core.tokens.TokenPurpose
 import com.flipcash.app.core.transfers.TransferDirection
 import com.flipcash.app.featureflags.FeatureFlag
 import com.flipcash.app.menu.FullMenuItem
@@ -27,13 +28,13 @@ internal data object MyAccount : FullMenuItem<MenuScreenViewModel.Event>() {
     )
 }
 
-internal data object Deposit : FullMenuItem<MenuScreenViewModel.Event>() {
+internal data object Withdraw : FullMenuItem<MenuScreenViewModel.Event>() {
     override val icon: Painter
-        @Composable get() = painterResource(R.drawable.ic_menu_deposit)
+        @Composable get() = painterResource(R.drawable.ic_menu_withdraw)
     override val name: String
-        @Composable get() = stringResource(R.string.title_depositUsdc)
+        @Composable get() = stringResource(R.string.title_withdrawFunds)
     override val action: MenuScreenViewModel.Event = MenuScreenViewModel.Event.OpenScreen(
-        AppRoute.OnRamp.ProviderList(AppRoute.Sheets.Menu)
+        AppRoute.Sheets.TokenSelection(TokenPurpose.Withdraw)
     )
 }
 

apps/flipcash/features/menu/src/main/kotlin/com/flipcash/app/menu/internal/MenuScreenContent.kt

@@ -1,45 +1,27 @@
 package com.flipcash.app.menu.internal
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredHeight
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentWidth
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Divider
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.flipcash.app.menu.MenuList
-import com.flipcash.app.menu.internal.MenuScreenViewModel.Event
 import com.flipcash.app.onramp.AddCashRow
 import com.flipcash.app.updates.LocalAppUpdater
 import com.flipcash.features.menu.R
@@ -49,7 +31,6 @@ import com.getcode.ui.components.AppBarDefaults
 import com.getcode.ui.components.AppBarWithTitle
 import com.getcode.ui.core.noRippleClickable
 import com.getcode.ui.core.rememberedClickable
-import com.getcode.ui.core.verticalScrollStateGradient
 import com.getcode.ui.theme.CodeScaffold
 import com.getcode.ui.utils.plus
 import kotlinx.coroutines.launch
@@ -114,18 +95,20 @@ internal fun MenuScreenContent(viewModel: MenuScreenViewModel) {
             modifier = Modifier
                 .fillMaxSize()
                 .padding(padding),
-            header = {
-                AddCashRow(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(
-                            horizontal = CodeTheme.dimens.inset,
-                            vertical = CodeTheme.dimens.grid.x4,
-                        ),
-                    onAddCash = { viewModel.dispatchEvent(MenuScreenViewModel.Event.OnAddCashClicked) },
-                    onWithdraw = { viewModel.dispatchEvent(MenuScreenViewModel.Event.OnWithdrawClicked) },
-                )
-            },
+            header = if (state.showQuickActions) {
+                {
+                    AddCashRow(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(
+                                horizontal = CodeTheme.dimens.inset,
+                                vertical = CodeTheme.dimens.grid.x4,
+                            ),
+                        onAddCash = { viewModel.dispatchEvent(MenuScreenViewModel.Event.OnAddCashClicked) },
+                        onWithdraw = { viewModel.dispatchEvent(MenuScreenViewModel.Event.OnWithdrawClicked) },
+                    )
+                }
+            } else null,
             items = state.items,
             contentPadding = PaddingValues(top = CodeTheme.dimens.grid.x6),
             onItemClick = {

apps/flipcash/features/menu/src/main/kotlin/com/flipcash/app/menu/internal/MenuScreenViewModel.kt

@@ -41,9 +41,9 @@ import javax.inject.Inject
 
 private val FullMenuList = buildList {
     add(MyAccount)
-    add(Deposit)
     add(AppSettings)
     add(AdvancedFeatures)
+    add(Withdraw)
     add(SwitchAccount)
     add(Labs)
     add(LogOut)
@@ -69,6 +69,7 @@ internal class MenuScreenViewModel @Inject constructor(
         val logoTapCount: Int = 0,
         val isStaff: Boolean = false,
         val preferredOnRampProvider: OnRampProvider? = null,
+        val showQuickActions: Boolean = false,
         val flags: List<BetaFeature> = emptyList(),
         val unlockedBetaFeaturesManually: Boolean = false,
         val appVersionInfo: VersionInfo = VersionInfo(),