Refactor: Feature/Settings clean up (#2235)

* . * sync changes * Settings Module CleanUp * Settings Module CleanUp * Making the required changes. Login activity added back. settings activity removed
openMF · Nov 19, 2024 · 0ba80e6 · 0ba80e6
1 parent ef08ef6
commit 0ba80e6
Show file tree

Hide file tree

Showing 26 changed files with 402 additions and 661 deletions.
diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/android-client/blob/master/LICENSE.md
+ */
 plugins {
     alias(libs.plugins.mifos.android.feature)
     alias(libs.plugins.mifos.android.library.compose)

diff --git a/feature/settings/src/androidTest/java/com/mifos/feature/settings/ExampleInstrumentedTest.kt b/feature/settings/src/androidTest/java/com/mifos/feature/settings/ExampleInstrumentedTest.kt
@@ -1,13 +1,20 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/android-client/blob/master/LICENSE.md
+ */
 package com.mifos.feature.settings
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
@@ -21,4 +28,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.mifos.feature.settings", appContext.packageName)
     }
-}
+}
diff --git a/feature/settings/src/main/AndroidManifest.xml b/feature/settings/src/main/AndroidManifest.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/android-client/blob/master/LICENSE.md
+-->
 <manifest>
 
 

diff --git a/feature/settings/src/main/java/com/mifos/feature/settings/navigation/SettingsNavigation.kt b/feature/settings/src/main/java/com/mifos/feature/settings/navigation/SettingsNavigation.kt
@@ -1,10 +1,17 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/android-client/blob/master/LICENSE.md
+ */
 package com.mifos.feature.settings.navigation
 
-import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import com.mifos.feature.settings.settings.SettingsScreen
-import com.mifos.feature.settings.updateServer.UpdateServerConfigScreenRoute
 
 /**
  * Created by Pronay Sarker on 10/08/2024 (7:52 AM)
@@ -16,13 +23,13 @@ fun NavGraphBuilder.settingsScreen(
     languageChanged: () -> Unit,
 ) {
     composable(
-        route = SettingsScreens.SettingsScreen.route
+        route = SettingsScreens.SettingsScreen.route,
     ) {
         SettingsScreen(
             onBackPressed = navigateBack,
             navigateToLoginScreen = navigateToLoginScreen,
             languageChanged = languageChanged,
-            changePasscode = changePasscode
+            changePasscode = changePasscode,
         )
     }
-}
+}
diff --git a/feature/settings/src/main/java/com/mifos/feature/settings/navigation/SettingsScreens.kt b/feature/settings/src/main/java/com/mifos/feature/settings/navigation/SettingsScreens.kt
@@ -1,8 +1,17 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/android-client/blob/master/LICENSE.md
+ */
 package com.mifos.feature.settings.navigation
 
 /**
  * Created by Pronay Sarker on 22/08/2024 (4:31 PM)
  */
 sealed class SettingsScreens(val route: String) {
     data object SettingsScreen : SettingsScreens("settings_screen")
-}
+}
diff --git a/feature/settings/src/main/java/com/mifos/feature/settings/settings/SettingsScreen.kt b/feature/settings/src/main/java/com/mifos/feature/settings/settings/SettingsScreen.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2024 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/android-client/blob/master/LICENSE.md
+ */
 package com.mifos.feature.settings.settings
 
 import android.content.ComponentName
@@ -9,7 +18,6 @@ import android.widget.Toast
 import androidx.compose.foundation.layout.Column
 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.padding
 import androidx.compose.foundation.lazy.LazyColumn
@@ -34,13 +42,11 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalAutofill
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringArrayResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContentProviderCompat.requireContext
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.mifos.core.common.enums.MifosAppLanguage
@@ -55,7 +61,7 @@ import com.mifos.feature.settings.updateServer.UpdateServerConfigScreenRoute
 import java.util.Locale
 
 @Composable
-fun SettingsScreen(
+internal fun SettingsScreen(
     onBackPressed: () -> Unit,
     navigateToLoginScreen: () -> Unit,
     changePasscode: (String) -> Unit,
@@ -89,17 +95,16 @@ fun SettingsScreen(
             updateLanguageLocale(
                 context = context,
                 language = it.code,
-                isSystemLanguage = isSystemLanguage
+                isSystemLanguage = isSystemLanguage,
             )
             languageChanged()
         },
     )
 }
 
-
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun SettingsScreen(
+internal fun SettingsScreen(
     onBackPressed: () -> Unit,
     selectedLanguage: String,
     selectedTheme: String,
@@ -110,7 +115,6 @@ fun SettingsScreen(
     updateTheme: (theme: AppTheme) -> Unit,
     updateLanguage: (language: MifosAppLanguage) -> Unit,
 ) {
-
     val snackbarHostState = remember { SnackbarHostState() }
     var showLanguageUpdateDialog by rememberSaveable { mutableStateOf(false) }
     var showEndpointUpdateDialog by rememberSaveable { mutableStateOf(false) }
@@ -128,7 +132,7 @@ fun SettingsScreen(
         snackbarHostState = snackbarHostState,
     ) { paddingValues ->
         Column(
-            Modifier.padding(paddingValues)
+            Modifier.padding(paddingValues),
         ) {
             SettingsCards(
                 settingsCardClicked = { item ->
@@ -145,7 +149,7 @@ fun SettingsScreen(
 
                         SettingsCardItem.SERVER_CONFIG -> showServerConfig = true
                     }
-                }
+                },
             )
         }
     }
@@ -154,7 +158,7 @@ fun SettingsScreen(
         SyncSurveysDialog(
             closeDialog = {
                 showSyncSurveyDialog = false
-            }
+            },
         )
     }
 
@@ -168,7 +172,7 @@ fun SettingsScreen(
                 onSuccessful = {
                     showServerConfig = false
                     showRestartCountdownToast(context, 2)
-                }
+                },
             )
         }
     }
@@ -179,7 +183,7 @@ fun SettingsScreen(
             items = stringArrayResource(R.array.feature_settings_languages),
             selectItem = { _, index -> updateLanguage(MifosAppLanguage.entries[index]) },
             onDismissRequest = { showLanguageUpdateDialog = false },
-            selectedItem = MifosAppLanguage.fromCode(selectedLanguage).displayName
+            selectedItem = MifosAppLanguage.fromCode(selectedLanguage).displayName,
         )
     }
 
@@ -189,7 +193,7 @@ fun SettingsScreen(
             items = AppTheme.entries.map { it.themeName }.toTypedArray(),
             selectItem = { _, index -> updateTheme(AppTheme.entries[index]) },
             onDismissRequest = { showThemeUpdateDialog = false },
-            selectedItem = selectedTheme
+            selectedItem = selectedTheme,
         )
     }
 
@@ -198,13 +202,13 @@ fun SettingsScreen(
             initialBaseURL = baseURL,
             initialTenant = tenant,
             onDismissRequest = { showEndpointUpdateDialog = false },
-            handleEndpointUpdate = handleEndpointUpdate
+            handleEndpointUpdate = handleEndpointUpdate,
         )
     }
 }
 
 @Composable
-fun SettingsCards(
+private fun SettingsCards(
     settingsCardClicked: (SettingsCardItem) -> Unit,
 ) {
     LazyColumn {
@@ -215,24 +219,24 @@ fun SettingsCards(
                 icon = card.icon,
                 onclick = {
                     settingsCardClicked(card)
-                }
+                },
             )
         }
     }
 }
 
 @Composable
-fun SettingsCardItem(
+private fun SettingsCardItem(
     title: Int,
     details: Int,
     icon: ImageVector?,
-    onclick: () -> Unit
+    onclick: () -> Unit,
 ) {
     Card(
         modifier = Modifier.fillMaxWidth(),
         colors = CardDefaults.cardColors(containerColor = Color.Transparent),
         shape = RoundedCornerShape(0.dp),
-        onClick = { onclick.invoke() }
+        onClick = { onclick.invoke() },
     ) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
@@ -242,18 +246,18 @@ fun SettingsCardItem(
                 Icon(
                     imageVector = it,
                     contentDescription = null,
-                    modifier = Modifier.weight(0.2f)
+                    modifier = Modifier.weight(0.2f),
                 )
             }
             if (icon == null) {
                 Spacer(modifier = Modifier.weight(0.2f))
             }
             Column(
-                modifier = Modifier.weight(0.8f)
+                modifier = Modifier.weight(0.8f),
             ) {
                 Text(
                     text = stringResource(id = title),
-                    style = MaterialTheme.typography.bodyMedium
+                    style = MaterialTheme.typography.bodyMedium,
                 )
                 Text(
                     modifier = Modifier.padding(end = 16.dp),
@@ -266,8 +270,7 @@ fun SettingsCardItem(
     }
 }
 
-
-fun updateLanguageLocale(context: Context, language: String, isSystemLanguage: Boolean) {
+private fun updateLanguageLocale(context: Context, language: String, isSystemLanguage: Boolean) {
     if (isSystemLanguage) {
         LanguageHelper.setLocale(context, language)
     } else {
@@ -287,7 +290,7 @@ private fun showRestartCountdownToast(context: Context, seconds: Int) {
             Toast.makeText(
                 context,
                 "Restarting app in $secondsRemaining seconds",
-                Toast.LENGTH_SHORT
+                Toast.LENGTH_SHORT,
             ).show()
         }
 
@@ -298,7 +301,7 @@ private fun showRestartCountdownToast(context: Context, seconds: Int) {
     countDownTimer.start()
 }
 
-fun Context.restartApplication() {
+private fun Context.restartApplication() {
     val packageManager: PackageManager = this.packageManager
     val intent: Intent = packageManager.getLaunchIntentForPackage(this.packageName)!!
     val componentName: ComponentName = intent.component!!
@@ -309,7 +312,7 @@ fun Context.restartApplication() {
 
 @Composable
 @Preview(showSystemUi = true, showBackground = true)
-fun PreviewSettingsScreen() {
+private fun PreviewSettingsScreen() {
     SettingsScreen(
         onBackPressed = {},
         selectedLanguage = "",
@@ -321,5 +324,4 @@ fun PreviewSettingsScreen() {
         updateTheme = {},
         changePasscode = {},
     )
-
-}
+}