chore(fc): add delete account action to balance tab

bmc08gt · bmc08gt · commit d71162e4a451 · 2024-12-19T06:54:28.000-05:00
Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/flipchatApp/src/main/kotlin/xyz/flipchat/app/auth/AuthManager.kt b/flipchatApp/src/main/kotlin/xyz/flipchat/app/auth/AuthManager.kt
@@ -252,35 +252,9 @@ class AuthManager @Inject constructor(
             }.map { it.first }
     }
 
-    suspend fun deleteAndLogout(context: Context, onComplete: () -> Unit = {}) {
+    suspend fun deleteAndLogout(context: Context): Result<Unit> {
         //todo: add account deletion
-        logout(context, onComplete)
-    }
-
-    suspend fun logout(context: Context, onComplete: () -> Unit = {}) {
-        coroutineScope {
-            val token = AccountUtils.getToken(context)
-            when (token) {
-                is TokenResult.Account -> {
-                    AccountUtils.removeAccounts(context)
-                        .doOnSuccess { res: Boolean ->
-                            if (res) {
-                                launch {
-                                    clearToken()
-                                }
-                                onComplete()
-                            }
-                        }
-                        .subscribe()
-                }
-
-                is TokenResult.Code -> {
-                    onComplete()
-                }
-
-                null -> Unit
-            }
-        }
+        return logout(context)
     }
 
     suspend fun logout(context: Context): Result<Unit> {
diff --git a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/balance/BalanceScreen.kt b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/balance/BalanceScreen.kt
@@ -49,7 +49,7 @@ import kotlinx.parcelize.Parcelize
 import xyz.flipchat.services.user.AuthState
 
 @Parcelize
-data object BalanceScreen : Screen, Parcelable {
+class BalanceScreen : Screen, Parcelable {
 
     @IgnoredOnParcel
     override val key: ScreenKey = uniqueScreenKey
@@ -97,8 +97,6 @@ fun BalanceContent(
 
     val canClickBalance = false
 
-    val context = LocalContext.current
-
     LazyColumn(
         modifier = Modifier
             .fillMaxWidth(),
diff --git a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/home/tabs/CashTab.kt b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/home/tabs/CashTab.kt
@@ -1,18 +1,40 @@
 package xyz.flipchat.app.features.home.tabs
 
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Scaffold
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import cafe.adriel.voyager.core.registry.ScreenRegistry
 import cafe.adriel.voyager.core.screen.ScreenKey
 import cafe.adriel.voyager.core.screen.uniqueScreenKey
+import cafe.adriel.voyager.hilt.getViewModel
 import cafe.adriel.voyager.navigator.Navigator
 import cafe.adriel.voyager.navigator.tab.TabOptions
+import com.getcode.manager.BottomBarManager
 import com.getcode.navigation.NavScreenProvider
+import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.navigation.screens.ChildNavTab
+import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.AppBarWithTitle
+import com.getcode.ui.theme.ButtonState
+import com.getcode.ui.theme.CodeButton
+import com.getcode.ui.theme.CodeScaffold
+import com.getcode.ui.utils.addIf
+import com.getcode.ui.utils.getActivity
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import xyz.flipchat.app.R
+import xyz.flipchat.app.features.chat.openChatDirectiveBottomModal
+import xyz.flipchat.app.features.home.HomeViewModel
+import xyz.flipchat.app.features.settings.SettingsViewModel
 
 internal object CashTab : ChildNavTab {
     override val key: ScreenKey = uniqueScreenKey
@@ -28,11 +50,50 @@ internal object CashTab : ChildNavTab {
 
     @Composable
     override fun Content() {
+        val viewModel = getViewModel<SettingsViewModel>()
+        val context = LocalContext.current
+        val composeScope = rememberCoroutineScope()
+        val navigator = LocalCodeNavigator.current
         Column {
             AppBarWithTitle(
                 title = options.title,
             )
-            Navigator(ScreenRegistry.get(NavScreenProvider.Balance))
+            CodeScaffold(
+                bottomBar = {
+                    CodeButton(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(horizontal = CodeTheme.dimens.inset)
+                            .padding(bottom = CodeTheme.dimens.grid.x3),
+                        buttonState = ButtonState.Subtle,
+                        text = stringResource(R.string.action_deleteMyAccount)
+                    ) {
+                        BottomBarManager.showMessage(
+                            BottomBarManager.BottomBarMessage(
+                                title = context.getString(R.string.prompt_title_deleteAccount),
+                                subtitle = context
+                                    .getString(R.string.prompt_description_deleteAccount),
+                                positiveText = context.getString(R.string.action_permanentlyDeleteAccount),
+                                tertiaryText = context.getString(R.string.action_cancel),
+                                onPositive = {
+                                    composeScope.launch {
+                                        delay(150)
+                                        context.getActivity()?.let {
+                                            viewModel.deleteAccount(it) {
+                                                navigator.replaceAll(ScreenRegistry.get(NavScreenProvider.Login.Home()))
+                                            }
+                                        }
+                                    }
+                                }
+                            )
+                        )
+                    }
+                },
+            ) { padding ->
+                Box(modifier = Modifier.padding(padding)) {
+                    Navigator(ScreenRegistry.get(NavScreenProvider.Balance))
+                }
+            }
         }
     }
 }
diff --git a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/login/accesskey/SeedInputViewModel.kt b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/login/accesskey/SeedInputViewModel.kt
@@ -96,9 +96,6 @@ class SeedInputViewModel @Inject constructor(
         }
     }
 
-    suspend fun logout(activity: Activity, onComplete: () -> Unit = {}) =
-        authManager.logout(activity, onComplete)
-
     @SuppressLint("CheckResult")
     fun performLogin(navigator: CodeNavigator, entropyB64: String, deeplink: Boolean = false) {
         viewModelScope.launch {
diff --git a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/settings/SettingsScreen.kt b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/settings/SettingsScreen.kt
@@ -62,14 +62,14 @@ class SettingsScreen : Screen, Parcelable {
                 ),
             bottomBar = {
                 LogoutButton {
-                    composeScope.launch {
-                        delay(150) // wait for dismiss
-                        context.getActivity()?.let {
-                            viewModel.logout(it) {
-                                navigator.replaceAll(ScreenRegistry.get(NavScreenProvider.Login.Home()))
-                            }
-                        }
-                    }
+//                    composeScope.launch {
+//                        delay(150) // wait for dismiss
+//                        context.getActivity()?.let {
+//                            viewModel.logout(it) {
+//                                navigator.replaceAll(ScreenRegistry.get(NavScreenProvider.Login.Home()))
+//                            }
+//                        }
+//                    }
                 }
             }
         ) { padding ->
diff --git a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/settings/SettingsViewModel.kt b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/settings/SettingsViewModel.kt
@@ -47,6 +47,14 @@ class SettingsViewModel @Inject constructor(
             }
     }
 
+    fun deleteAccount(activity: Activity, onComplete: () -> Unit) = viewModelScope.launch {
+        authManager.deleteAndLogout(activity)
+            .onSuccess {
+                chatsController.closeEventStream()
+                onComplete()
+            }
+    }
+
     internal companion object {
         val updateStateForEvent: (Event) -> ((State) -> State) = { event ->
             when (event) {
diff --git a/flipchatApp/src/main/kotlin/xyz/flipchat/app/ui/navigation/AppScreenContent.kt b/flipchatApp/src/main/kotlin/xyz/flipchat/app/ui/navigation/AppScreenContent.kt
@@ -63,7 +63,7 @@ fun AppScreenContent(content: @Composable () -> Unit) {
         }
 
         register<NavScreenProvider.Balance> {
-            BalanceScreen
+            BalanceScreen()
         }
 
         register<NavScreenProvider.AppHomeScreen> {
diff --git a/flipchatApp/src/main/res/values/strings.xml b/flipchatApp/src/main/res/values/strings.xml
@@ -170,4 +170,9 @@
     <string name="subtitle_finalizeAccountCreation">Accounts on Flipchat must be purchased for %1$s to reduce spam</string>
     <string name="action_changeCoverCharge">Change Cover Charge</string>
     <string name="action_leaveRoom">Leave Room</string>
+
+    <string name="action_deleteMyAccount">Delete My Account</string>
+    <string name="prompt_title_deleteAccount">Permanently Delete Account?</string>
+    <string name="prompt_description_deleteAccount">This will permanently delete your Flipchat account</string>
+    <string name="action_permanentlyDeleteAccount">Permanently Delete My Account</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -96,9 +96,6 @@ class SeedInputViewModel @Inject constructor(`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
`99`		`- suspend fun logout(activity: Activity, onComplete: () -> Unit = {}) =`
`100`		`- authManager.logout(activity, onComplete)`
`101`		`-`
`102`	`99`	`@SuppressLint("CheckResult")`
`103`	`100`	`fun performLogin(navigator: CodeNavigator, entropyB64: String, deeplink: Boolean = false) {`
`104`	`101`	`viewModelScope.launch {`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,14 @@ class SettingsViewModel @Inject constructor(`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ fun deleteAccount(activity: Activity, onComplete: () -> Unit) = viewModelScope.launch {`
	`51`	`+ authManager.deleteAndLogout(activity)`
	`52`	`+ .onSuccess {`
	`53`	`+ chatsController.closeEventStream()`
	`54`	`+ onComplete()`
	`55`	`+ }`
	`56`	`+ }`
	`57`	`+`
`50`	`58`	`internal companion object {`
`51`	`59`	`val updateStateForEvent: (Event) -> ((State) -> State) = { event ->`
`52`	`60`	`when (event) {`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ fun AppScreenContent(content: @Composable () -> Unit) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`register<NavScreenProvider.Balance> {`
`66`		`- BalanceScreen`
	`66`	`+ BalanceScreen()`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`register<NavScreenProvider.AppHomeScreen> {`