Migrate Beneficiary List from XML to compose openMF#2607

itsPronay · Jun 15, 2024 · fc176b1 · fc176b1
1 parent b3352f8
commit fc176b1
Show file tree

Hide file tree

Showing 10 changed files with 154 additions and 227 deletions.
diff --git a/...c/main/java/org/mifos/mobile/ui/beneficiary/presentation/BeneficiaryAddOptionsFragment.kt b/...c/main/java/org/mifos/mobile/ui/beneficiary/presentation/BeneficiaryAddOptionsFragment.kt
@@ -256,13 +256,7 @@ class BeneficiaryAddOptionsFragment : BaseFragment() {
         (activity as? BaseActivity)?.hideToolbar()
     }
 
-    override fun onPause() {
-        super.onPause()
-        (activity as? BaseActivity)?.showToolbar()
-    }
-
     companion object {
-        @JvmStatic
         fun newInstance(): BeneficiaryAddOptionsFragment {
             val fragment = BeneficiaryAddOptionsFragment()
             val args = Bundle()

diff --git a/app/src/main/java/org/mifos/mobile/ui/beneficiary_list/BeneficiaryListContent.kt b/app/src/main/java/org/mifos/mobile/ui/beneficiary_list/BeneficiaryListContent.kt
@@ -50,20 +50,18 @@ import org.mifos.mobile.utils.Network
 
 @Composable
 fun ShowBeneficiary(
-    beneficiaryList: List<Beneficiary?>?,
+    beneficiaryList: List<Beneficiary>,
     onClick: (position: Int) -> Unit
 ) {
     Box(
         modifier = Modifier
             .fillMaxSize()
     ) {
         LazyColumn {
-            itemsIndexed(beneficiaryList ?: emptyList()) { index, beneficiary ->
-                beneficiary?.let {
-                    BeneficiaryItem(beneficiary, onClick = {
-                        onClick(index)
-                    })
-                }
+            itemsIndexed(beneficiaryList) { index, beneficiary ->
+                BeneficiaryItem(beneficiary, onClick = {
+                    onClick(index)
+                })
             }
         }
     }
@@ -120,79 +118,15 @@ fun BeneficiaryItem(
     }
 }
 
-@Composable
-fun ShowBeneficiaryListEmpty(modifier: Modifier = Modifier) {
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .background(MaterialTheme.colorScheme.background),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-        Icon(
-            modifier = Modifier
-                .size(100.dp)
-                .padding(bottom = 12.dp),
-            painter = painterResource(id = R.drawable.ic_error_black_24dp),
-            contentDescription = null,
-            tint = MaterialTheme.colorScheme.onSecondary
-        )
-
-        Text(
-            modifier = Modifier.padding(horizontal = 16.dp),
-            text = stringResource(id = R.string.no_beneficiary_found_please_add),
-            style = TextStyle(fontSize = 20.sp),
-            color = MaterialTheme.colorScheme.onSecondary,
-            textAlign = TextAlign.Center
-        )
-    }
-}
-
-@Composable
-fun ErrorComponent(
-    retryConnection: () -> Unit,
-    retryLoadingBeneficiary: () -> Unit
-) {
-    val context = LocalContext.current
-    if (!Network.isConnected(context)) {
-        NoInternet(
-            icon = R.drawable.ic_portable_wifi_off_black_24dp,
-            error = R.string.no_internet_connection,
-            isRetryEnabled = true,
-            retry = retryConnection
-        )
-        Toast.makeText(
-            context,
-            stringResource(R.string.internet_not_connected),
-            Toast.LENGTH_SHORT,
-        ).show()
-    } else {
-        Column(
-            modifier = Modifier.fillMaxSize(),
-            verticalArrangement = Arrangement.Center,
-            horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-            EmptyDataView(
-                icon = R.drawable.ic_error_black_24dp,
-                error = R.string.error_fetching_beneficiaries,
-                modifier = Modifier.align(Alignment.CenterHorizontally)
-            )
-
-            Button(
-                modifier = Modifier.padding(top = 16.dp),
-                onClick = { retryLoadingBeneficiary.invoke() }
-            ) {
-                Text(text = stringResource(id = R.string.try_again))
-            }
-        }
-    }
-}
-
 @Composable
 @Preview(showSystemUi = true)
 fun PreviewBeneficiaryListEmpty(modifier: Modifier = Modifier) {
+    val beneficiary = Beneficiary(name = "Victor", id = 242344343, officeName = "Main office")
     MifosMobileTheme {
-        ShowBeneficiaryListEmpty()
+        BeneficiaryItem(
+            beneficiary = beneficiary,
+            onClick = {}
+        )
     }
 }