refactor #1507: migrated settings screen to compose

openMF · Feb 17, 2024 · e203eab · e203eab
1 parent 251c82d
commit e203eab
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 42 deletions.
diff --git a/...em/src/main/java/org/mifos/mobilewallet/mifospay/designsystem/component/MifosDialogBox.kt b/...em/src/main/java/org/mifos/mobilewallet/mifospay/designsystem/component/MifosDialogBox.kt
@@ -2,19 +2,25 @@ import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
 import androidx.compose.ui.res.stringResource
 
+/**
+ * @author pratyush
+ * @since 12/02/2024
+ */
+
 @Composable
 fun MifosDialogBox(
-    showDialog: Boolean,
+    showDialogState: MutableState<Boolean>,
     onDismiss: () -> Unit,
     title: Int,
     message: Int? = null,
     confirmButtonText: Int,
     onConfirm: () -> Unit,
     dismissButtonText: Int
 ) {
-    if (showDialog) {
+    if (showDialogState.value) {
         AlertDialog(
             onDismissRequest = onDismiss,
             title = { Text(text = stringResource(id = title)) },

diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -9,7 +9,7 @@ android {
     compileSdk = 34
 
     defaultConfig {
-        minSdk = 24
+        minSdk = 21
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

diff --git a/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/utility/DialogState.kt b/core/ui/src/main/kotlin/org/mifos/mobilewallet/mifospay/ui/utility/DialogState.kt
@@ -0,0 +1,6 @@
+package org.mifos.mobilewallet.mifospay.ui.utility
+
+data class DialogState(
+    val type: DialogType = DialogType.NONE,
+    val onConfirm: () -> Unit = {}
+)
diff --git a/...wallet/mifospay/settings/ui/DialogType.kt → ...ewallet/mifospay/ui/utility/DialogType.kt b/...wallet/mifospay/settings/ui/DialogType.kt → ...ewallet/mifospay/ui/utility/DialogType.kt
@@ -1,4 +1,4 @@
-package org.mifos.mobilewallet.mifospay.settings.ui
+package org.mifos.mobilewallet.mifospay.ui.utility
 
 enum class DialogType {
     NONE,

diff --git a/mifospay/build.gradle.kts b/mifospay/build.gradle.kts
@@ -47,6 +47,7 @@ dependencies {
     implementation(projects.core.data)
     implementation(libs.androidx.constraintlayout)
 
+    implementation(projects.core.ui)
     implementation(projects.core.designsystem)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.core.ktx)

diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/ui/DialogManager.kt b/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/ui/DialogManager.kt
@@ -0,0 +1,36 @@
+package org.mifos.mobilewallet.mifospay.settings.ui
+
+import MifosDialogBox
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import org.mifos.mobilewallet.mifospay.R
+import org.mifos.mobilewallet.mifospay.ui.utility.DialogState
+import org.mifos.mobilewallet.mifospay.ui.utility.DialogType
+
+@Composable
+fun DialogManager(dialogState: DialogState, onDismiss: () -> Unit) {
+    when (dialogState.type) {
+        DialogType.DISABLE_ACCOUNT -> MifosDialogBox(
+            showDialogState = remember { mutableStateOf(true) },
+            title = R.string.alert_disable_account,
+            message = R.string.alert_disable_account_desc,
+            confirmButtonText = R.string.ok,
+            dismissButtonText = R.string.cancel,
+            onConfirm = dialogState.onConfirm,
+            onDismiss = onDismiss
+        )
+
+        DialogType.LOGOUT -> MifosDialogBox(
+            showDialogState = remember { mutableStateOf(true) },
+            title = R.string.log_out_title,
+            message = R.string.empty,
+            confirmButtonText = R.string.yes,
+            dismissButtonText = R.string.no,
+            onConfirm = dialogState.onConfirm,
+            onDismiss = onDismiss
+        )
+
+        DialogType.NONE -> {}
+    }
+}
diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/ui/SettingsScreen.kt b/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/settings/ui/SettingsScreen.kt
@@ -1,6 +1,5 @@
 package org.mifos.mobilewallet.mifospay.settings.ui
 
-import MifosDialogBox
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -27,14 +26,26 @@ import org.mifos.mobilewallet.mifospay.designsystem.component.MifosItemCard
 import org.mifos.mobilewallet.mifospay.designsystem.component.MifosTopBar
 import org.mifos.mobilewallet.mifospay.designsystem.theme.mifosText
 import org.mifos.mobilewallet.mifospay.designsystem.theme.styleSettingsButton
+import org.mifos.mobilewallet.mifospay.ui.utility.DialogState
+import org.mifos.mobilewallet.mifospay.ui.utility.DialogType
+
+/**
+ * @author pratyush
+ * @since 12/02/2024
+ */
 
 @Composable
 fun SettingsScreen(
     backPress: () -> Unit,
     disable: () -> Unit,
     logout: () -> Unit
 ) {
-    var currentDialog by remember { mutableStateOf(DialogType.NONE) }
+    var dialogState by remember { mutableStateOf(DialogState()) }
+
+    DialogManager(
+        dialogState = dialogState,
+        onDismiss = { dialogState = DialogState(type = DialogType.NONE) }
+    )
 
     Scaffold(
         topBar = {
@@ -69,7 +80,12 @@ fun SettingsScreen(
 
             Row(modifier = Modifier.padding(8.dp)) {
                 MifosItemCard(
-                    onClick = { currentDialog = DialogType.DISABLE_ACCOUNT },
+                    onClick = {
+                        dialogState = DialogState(
+                            type = DialogType.DISABLE_ACCOUNT,
+                            onConfirm = { disable.invoke() }
+                        )
+                    },
                     colors = CardDefaults.cardColors(Color.Black)
                 ) {
                     Text(
@@ -84,7 +100,12 @@ fun SettingsScreen(
 
             Row(modifier = Modifier.padding(8.dp)) {
                 MifosItemCard(
-                    onClick = { currentDialog = DialogType.LOGOUT },
+                    onClick = {
+                        dialogState = DialogState(
+                            type = DialogType.LOGOUT,
+                            onConfirm = { logout() }
+                        )
+                    },
                     colors = CardDefaults.cardColors(Color.Black)
                 ) {
                     Text(
@@ -99,40 +120,6 @@ fun SettingsScreen(
         }
     }
 
-    if (currentDialog != DialogType.NONE) {
-        MifosDialogBox(
-            showDialog = true,
-            onDismiss = { currentDialog = DialogType.NONE },
-            title = when (currentDialog) {
-                DialogType.DISABLE_ACCOUNT -> R.string.alert_disable_account
-                DialogType.LOGOUT -> R.string.log_out_title
-                else -> R.string.empty
-            },
-            message = when (currentDialog) {
-                DialogType.DISABLE_ACCOUNT -> R.string.alert_disable_account_desc
-                else -> R.string.empty
-            },
-            confirmButtonText = when (currentDialog) {
-                DialogType.DISABLE_ACCOUNT -> R.string.ok
-                DialogType.LOGOUT -> R.string.yes
-                else -> R.string.empty
-            },
-            dismissButtonText = when (currentDialog) {
-                DialogType.DISABLE_ACCOUNT -> R.string.cancel
-                DialogType.LOGOUT -> R.string.no
-                else -> R.string.empty
-            },
-            onConfirm = {
-                when (currentDialog) {
-                    DialogType.DISABLE_ACCOUNT -> disable()
-                    DialogType.LOGOUT -> logout()
-                    else -> {}
-                }
-                currentDialog = DialogType.NONE
-            }
-        )
-    }
-
 }
 
 @Preview(showSystemUi = true)