Setting to cmp

cmp-navigation/build.gradle.kts

@@ -47,7 +47,7 @@ kotlin {
 //            implementation(projects.feature.report)
 //            implementation(projects.feature.savings)
 //            implementation(projects.feature.search)
-//            implementation(projects.feature.settings)
+            implementation(projects.feature.settings)
 //            implementation(projects.feature.splash)
 //
 //            implementation(project.libs.mifos.passcode)

cmp-navigation/src/commonMain/kotlin/cmp/navigation/di/KoinModules.kt

@@ -18,6 +18,7 @@ import com.mifos.core.network.di.NetworkModule
 import com.mifos.feature.activate.di.ActivateModule
 import com.mifos.feature.auth.di.AuthModule
 import com.mifos.feature.note.di.NoteModule
+import com.mifos.feature.settings.di.SettingsModule
 import com.mifos.room.di.DaoModule
 import com.mifos.room.di.HelperModule
 import com.mifos.room.di.PlatformSpecificDatabaseModule
@@ -63,7 +64,7 @@ object KoinModules {
 //            ReportModule,
 //            SavingsModule,
 //            SearchModule,
-//            SettingsModule,
+            SettingsModule,
 //            SplashModule,
         )
     }

cmp-navigation/src/commonMain/kotlin/cmp/navigation/navigation/FeatureNavHost.kt

@@ -24,9 +24,12 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import cmp.navigation.AppState
 import com.mifos.feature.about.navigation.aboutNavGraph
+import com.mifos.feature.about.navigation.navigateToAboutScreen
 import com.mifos.feature.activate.navigation.activateScreen
 import com.mifos.feature.activate.navigation.navigateToActivateScreen
 import com.mifos.feature.note.navigation.noteNavGraph
+import com.mifos.feature.settings.navigation.navigateToSettingsScreen
+import com.mifos.feature.settings.navigation.settingsScreen
 
 const val WELCOME_ROUTE = "home_screen"
 
@@ -42,13 +45,19 @@ internal fun FeatureNavHost(
         navController = appState.navController,
         modifier = modifier,
     ) {
-        homeScreen(onClick = { appState.navController.navigateToActivateScreen(0, "") })
+        homeScreen(onClick = { appState.navController.navigateToSettingsScreen() })
 
         aboutNavGraph(onBackPressed = appState.navController::popBackStack)
 
         noteNavGraph(onBackPressed = appState.navController::popBackStack)
 
         activateScreen(onBackPressed = appState.navController::popBackStack)
+
+        settingsScreen(navigateBack = appState.navController::popBackStack,
+            navigateToLoginScreen = {},
+            changePasscode = {},
+            languageChanged = {})
+
     }
 }
 

cmp-navigation/src/commonMain/kotlin/cmp/navigation/navigation/HomeDestinationsScreen.kt

@@ -12,6 +12,7 @@ package cmp.navigation.navigation
 import androidx.compose.ui.graphics.vector.ImageVector
 import com.mifos.core.designsystem.icon.MifosIcons
 import com.mifos.feature.about.navigation.AboutScreens
+import com.mifos.feature.settings.navigation.SettingsScreens
 
 sealed class HomeDestinationsScreen(
     val title: String = "",
@@ -74,7 +75,7 @@ sealed class HomeDestinationsScreen(
 
     data object SettingsScreen : HomeDestinationsScreen(
         title = "Settings",
-        route = "",
+        route = SettingsScreens.SettingsScreen.route,
         icon = MifosIcons.Settings,
     )
 

feature/settings/build.gradle.kts

@@ -8,12 +8,7 @@
  * 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)
-//    alias(libs.plugins.mifos.android.library.jacoco)
     alias(libs.plugins.mifos.cmp.feature)
-
-
 }
 
 android {
@@ -34,16 +29,5 @@ kotlin {
             api(projects.core.domain)
             api(projects.core.datastore)
         }
-
-        androidMain.dependencies {
-            implementation(libs.appcompat)
-        }
     }
-}
-
-dependencies {
-//    androidTestImplementation(libs.androidx.compose.ui.test)
-//    debugApi(libs.androidx.compose.ui.test.manifest)
-//    testImplementation(libs.hilt.android.testing)
-
 }

feature/settings/src/commonMain/kotlin/com/mifos/feature/settings/navigation/SettingsNavigation.kt

@@ -9,13 +9,16 @@
  */
 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
 
-/**
- * Created by Pronay Sarker on 10/08/2024 (7:52 AM)
- */
+
+fun NavController.navigateToSettingsScreen() {
+    navigate(SettingsScreens.SettingsScreen.route)
+}
+
 fun NavGraphBuilder.settingsScreen(
     navigateBack: () -> Unit,
     navigateToLoginScreen: () -> Unit,

feature/settings/src/commonMain/kotlin/com/mifos/feature/settings/settings/SettingsScreen.kt

@@ -54,8 +54,6 @@ import com.mifos.core.designsystem.component.MifosRadioButtonDialog
 import com.mifos.core.designsystem.component.MifosScaffold
 import com.mifos.core.designsystem.component.UpdateEndpointDialogScreen
 import com.mifos.core.ui.util.DevicePreview
-import com.mifos.feature.settings.syncSurvey.SyncSurveysDialog
-import com.mifos.feature.settings.updateServer.UpdateServerConfigScreenRoute
 import kotlinx.coroutines.delay
 import org.jetbrains.compose.resources.StringResource
 import org.jetbrains.compose.resources.stringArrayResource
@@ -74,11 +72,11 @@ internal fun SettingsScreen(
 
     SettingsScreen(
         onBackPressed = onBackPressed,
-        selectedLanguage = uiState.language.code ?: "System Language",
-        selectedTheme = uiState.theme.themeName ?: "System Theme",
-        baseURL = uiState.baseUrl ?: "",
-        tenant = uiState.tenant ?: "",
-        changePasscode = { changePasscode(uiState.passcode ?: "") },
+        selectedLanguage = uiState.language.code,
+        selectedTheme = uiState.theme.themeName,
+        baseURL = uiState.baseUrl,
+        tenant = uiState.tenant,
+        changePasscode = { changePasscode(uiState.passcode) },
         handleEndpointUpdate = { baseURL, tenant ->
             if (viewModel.tryUpdatingEndpoint(selectedBaseUrl = baseURL, selectedTenant = tenant)) {
                 navigateToLoginScreen()
@@ -147,25 +145,25 @@ internal fun SettingsScreen(
     }
 
     if (showSyncSurveyDialog) {
-        SyncSurveysDialog(
-            closeDialog = {
-                showSyncSurveyDialog = false
-            },
-        )
+//        SyncSurveysDialog(
+//            closeDialog = {
+//                showSyncSurveyDialog = false
+//            },
+//        )
     }
 
     if (showServerConfig) {
         ModalBottomSheet(
             onDismissRequest = { showServerConfig = false },
             sheetState = sheetState,
         ) {
-            UpdateServerConfigScreenRoute(
-                onCloseClick = { showServerConfig = false },
-                onSuccessful = {
-                    showServerConfig = false
-                    RestartCountdownSnackbar(2, SnackbarHostState())
-                },
-            )
+//            UpdateServerConfigScreenRoute(
+//                onCloseClick = { showServerConfig = false },
+//                onSuccessful = {
+//                    showServerConfig = false
+//                    RestartCountdownSnackbar(2, SnackbarHostState())
+//                },
+//            )
         }
     }
 

feature/settings/src/commonMain/kotlin/com/mifos/feature/settings/settings/SettingsViewModel.kt

@@ -29,7 +29,6 @@ import com.mifos.core.common.enums.MifosAppLanguage
 import com.mifos.core.datastore.UserPreferencesRepository
 import com.mifos.core.datastore.model.AppTheme
 import com.mifos.core.designsystem.icon.MifosIcons
-import com.mifos.feature.settings.R
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.first