feat: Add pull-to-refresh and improve navigation in settings

- **Settings Categories**:
    - Added `Refresh` and `NavBackDetail` actions to `SettingsCategoriesViewModel`.
    - Implemented `navBackDetail` to clear the selected category and navigate back via the router.
    - Updated `SettingsCategoriesResult` to include a `loading` state.
    - Wrapped `SettingsMasterScreenBody` content in a `PullToRefreshBox`.

- **Settings Detail**:
    - Added a `Refresh` action to `SettingsViewModel` to trigger switch updates.
    - Integrated `PullToRefreshBox` into `SettingsDetailScreen` for manual updates.
    - Optimized state collection using `derivedStateOf` for refresh and loading indicators.

- **Adaptive UI & Navigation**:
    - Updated `AdaptiveSettingsScreen` to use the view model's `NavBackDetail` action for back navigation, ensuring state synchronization.
    - Replaced local coroutine-based navigation in the UI with view model actions.

- **Testing**:
    - Enabled the navigation back test case in `AdaptiveInteractorTest`.

Author: softartdev

core/presentation/src/androidHostTest/kotlin/com/softartdev/notedelight/presentation/adaptive/AdaptiveInteractorTest.kt

@@ -221,8 +221,7 @@ class AdaptiveInteractorTest {
             val selected: SecurityResult = awaitItem()
             assertEquals(SettingsCategory.Theme, selected.selectedCategory)
 
-            //FIXME
-//            settingsCategoriesViewModel.onAction(SettingsCategoriesAction.NavBackDetail)
+            settingsCategoriesViewModel.onAction(SettingsCategoriesAction.NavBackDetail)
 
             val cleared: SecurityResult = awaitItem()
             assertNull(cleared.selectedCategory)

core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/SecurityResult.kt

@@ -18,6 +18,7 @@ data class SecurityResult(
 
 sealed interface SettingsAction {
     data object NavBack : SettingsAction
+    data object Refresh : SettingsAction
     data object ChangeTheme : SettingsAction
     data object ChangeLanguage : SettingsAction
     data class ChangeEncryption(val checked: Boolean) : SettingsAction

core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/SettingsCategoriesResult.kt

@@ -4,9 +4,15 @@ import com.softartdev.notedelight.model.SettingsCategory
 
 data class SettingsCategoriesResult(
     val selectedCategoryId: Long? = null,
-)
+    val loading: Boolean = false,
+) {
+    fun showLoading(): SettingsCategoriesResult = copy(loading = true)
+    fun hideLoading(): SettingsCategoriesResult = copy(loading = false)
+}
 
 sealed interface SettingsCategoriesAction {
     data class SelectCategory(val category: SettingsCategory) : SettingsCategoriesAction
+    data object Refresh : SettingsCategoriesAction
+    data object NavBackDetail : SettingsCategoriesAction
     data object NavBack : SettingsCategoriesAction
 }

core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/SettingsCategoriesViewModel.kt

@@ -34,6 +34,8 @@ class SettingsCategoriesViewModel(
 
     fun onAction(action: SettingsCategoriesAction) = when (action) {
         is SettingsCategoriesAction.SelectCategory -> selectCategory(action.category)
+        is SettingsCategoriesAction.Refresh -> refresh()
+        is SettingsCategoriesAction.NavBackDetail -> navBackDetail()
         is SettingsCategoriesAction.NavBack -> navBack()
     }
 
@@ -42,6 +44,19 @@ class SettingsCategoriesViewModel(
         router.adaptiveNavigateToDetail(contentKey = category.id)
     }
 
+    private fun refresh() = viewModelScope.launch {
+        mutableStateFlow.update(SettingsCategoriesResult::showLoading)
+        mutableStateFlow.update { result ->
+            result.copy(selectedCategoryId = adaptiveInteractor.selectedSettingsCategoryIdStateFlow.value)
+        }
+        mutableStateFlow.update(SettingsCategoriesResult::hideLoading)
+    }
+
+    private fun navBackDetail() = viewModelScope.launch {
+        adaptiveInteractor.selectedSettingsCategoryIdStateFlow.value = null
+        router.adaptiveNavigateBack()
+    }
+
     private fun navBack() {
         if (!router.popBackStack()) router.navigate(route = AppNavGraph.Splash)
     }

core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/SettingsViewModel.kt

@@ -55,6 +55,7 @@ class SettingsViewModel(
 
     fun onAction(action: SettingsAction) = when (action) {
         is SettingsAction.NavBack -> navBack()
+        is SettingsAction.Refresh -> updateSwitches()
         is SettingsAction.ChangeTheme -> changeTheme()
         is SettingsAction.ChangeLanguage -> changeLanguage()
         is SettingsAction.ChangeEncryption -> changeEncryption(action.checked)

ui/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/settings/AdaptiveSettingsScreen.kt

@@ -13,7 +13,6 @@ import androidx.compose.material3.adaptive.navigation.ThreePaneScaffoldNavigator
 import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import com.softartdev.notedelight.di.PreviewKoin
@@ -26,7 +25,6 @@ import com.softartdev.notedelight.ui.VerticalPaneExpansionDragHandle
 import com.softartdev.notedelight.ui.settings.detail.SettingsDetailScreen
 import com.softartdev.notedelight.ui.settings.master.SettingsMasterScreen
 import com.softartdev.theme.material3.PreferableMaterialTheme
-import kotlinx.coroutines.launch
 import org.koin.compose.koinInject
 import org.koin.compose.viewmodel.koinViewModel
 
@@ -36,7 +34,6 @@ fun AdaptiveSettingsScreen(
     categoriesViewModel: SettingsCategoriesViewModel = koinViewModel(),
     settingsViewModel: SettingsViewModel = koinViewModel(),
 ) {
-    val coroutineScope = rememberCoroutineScope()
     val navigator: ThreePaneScaffoldNavigator<Long> = rememberListDetailPaneScaffoldNavigator<Long>()
     val paneExpansionState: PaneExpansionState = rememberPaneExpansionState()
     DisposableEffect(key1 = router, key2 = navigator) {
@@ -53,13 +50,13 @@ fun AdaptiveSettingsScreen(
         detailPane = {
             SettingsDetailScreen(
                 settingsViewModel = settingsViewModel,
-                onBackClick = { coroutineScope.launch { navigator.navigateBack() } },
+                onBackClick = { categoriesViewModel.onAction(SettingsCategoriesAction.NavBackDetail) },
             )
         },
         paneExpansionDragHandle = ThreePaneScaffoldScope::VerticalPaneExpansionDragHandle,
         paneExpansionState = paneExpansionState
     )
-    BackHandler(enabled = navigator.canNavigateBack()) { coroutineScope.launch { navigator.navigateBack() } }
+    BackHandler(enabled = navigator.canNavigateBack()) { categoriesViewModel.onAction(SettingsCategoriesAction.NavBackDetail) }
     BackHandler(enabled = !navigator.canNavigateBack()) { categoriesViewModel.onAction(SettingsCategoriesAction.NavBack) }
 }
 

ui/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/settings/detail/SettingsDetailScreen.kt

@@ -29,10 +29,15 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.PullToRefreshState
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalUriHandler
@@ -79,7 +84,11 @@ fun SettingsDetailScreen(
     LaunchedEffect(settingsViewModel) {
         settingsViewModel.launchCollectingSelectedCategoryId()
     }
-    val result: SecurityResult by settingsViewModel.stateFlow.collectAsState()
+    val resultState: State<SecurityResult> = settingsViewModel.stateFlow.collectAsState()
+    val result: SecurityResult = resultState.value
+    val refreshState: State<Boolean> = remember {
+        derivedStateOf { resultState.value.loading }
+    }
     LifecycleResumeEffect(key1 = settingsViewModel) {
         settingsViewModel.updateSwitches()
         onPauseOrDispose {}
@@ -90,6 +99,8 @@ fun SettingsDetailScreen(
             result = result,
             onBackClick = onBackClick,
             onAction = settingsViewModel::onAction,
+            onRefresh = { settingsViewModel.onAction(SettingsAction.Refresh) },
+            refreshState = refreshState,
         )
     }
 }
@@ -100,6 +111,9 @@ fun SettingsDetailScreenBody(
     category: SettingsCategory = result.selectedCategory!!,
     onBackClick: () -> Unit = {},
     onAction: (action: SettingsAction) -> Unit = {},
+    onRefresh: () -> Unit = {},
+    pullToRefreshState: PullToRefreshState = rememberPullToRefreshState(),
+    refreshState: State<Boolean> = remember { derivedStateOf { result.loading } },
 ) = Scaffold(
     topBar = {
         TopAppBar(
@@ -115,12 +129,22 @@ fun SettingsDetailScreenBody(
         )
     },
     content = { paddingValues: PaddingValues ->
-        Column(modifier = Modifier.padding(paddingValues).verticalScroll(rememberScrollState())) {
-            if (result.loading) LinearProgressIndicator(Modifier.fillMaxWidth())
-            when (category) {
-                SettingsCategory.Theme -> ThemePreferences(result = result, onAction = onAction)
-                SettingsCategory.Security -> SecurityPreferences(result = result, onAction = onAction)
-                SettingsCategory.Info -> InfoPreferences(result = result, onAction = onAction)
+        PullToRefreshBox(
+            modifier = Modifier.padding(paddingValues),
+            isRefreshing = refreshState.value,
+            onRefresh = onRefresh,
+            state = pullToRefreshState
+        ) {
+            LaunchedEffect(key1 = refreshState.value) {
+                pullToRefreshState.animateToHidden()
+            }
+            Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
+                if (result.loading) LinearProgressIndicator(Modifier.fillMaxWidth())
+                when (category) {
+                    SettingsCategory.Theme -> ThemePreferences(result = result, onAction = onAction)
+                    SettingsCategory.Security -> SecurityPreferences(result = result, onAction = onAction)
+                    SettingsCategory.Info -> InfoPreferences(result = result, onAction = onAction)
+                }
             }
         }
     },

ui/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/settings/master/SettingsMasterScreen.kt

@@ -18,10 +18,15 @@ import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.PullToRefreshState
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.tooling.preview.Preview
@@ -43,12 +48,18 @@ fun SettingsMasterScreen(categoriesViewModel: SettingsCategoriesViewModel) {
     LaunchedEffect(categoriesViewModel) {
         categoriesViewModel.launchCategories()
     }
-    val result: SettingsCategoriesResult by categoriesViewModel.stateFlow.collectAsState()
+    val resultState: State<SettingsCategoriesResult> = categoriesViewModel.stateFlow.collectAsState()
+    val result: SettingsCategoriesResult = resultState.value
+    val refreshState: State<Boolean> = remember {
+        derivedStateOf { resultState.value.loading }
+    }
     SettingsMasterScreenBody(
         selectedCategoryId = result.selectedCategoryId,
         onCategoryClick = { category: SettingsCategory ->
             categoriesViewModel.onAction(SettingsCategoriesAction.SelectCategory(category))
         },
+        onRefresh = { categoriesViewModel.onAction(SettingsCategoriesAction.Refresh) },
+        refreshState = refreshState,
         onNavigateBack = { categoriesViewModel.onAction(SettingsCategoriesAction.NavBack) }
     )
 }
@@ -58,6 +69,9 @@ fun SettingsMasterScreenBody(
     selectedCategoryId: Long? = null,
     onCategoryClick: (SettingsCategory) -> Unit = {},
     onNavigateBack: () -> Unit = {},
+    onRefresh: () -> Unit = {},
+    pullToRefreshState: PullToRefreshState = rememberPullToRefreshState(),
+    refreshState: State<Boolean> = remember { derivedStateOf { false } },
 ) = Scaffold(
     topBar = {
         TopAppBar(
@@ -73,18 +87,26 @@ fun SettingsMasterScreenBody(
         )
     },
     content = { paddingValues: PaddingValues ->
-        Column(
-            modifier = Modifier
-                .padding(paddingValues)
-                .verticalScroll(rememberScrollState())
+        PullToRefreshBox(
+            modifier = Modifier.padding(paddingValues),
+            isRefreshing = refreshState.value,
+            onRefresh = onRefresh,
+            state = pullToRefreshState
         ) {
-            SettingsCategory.entries.forEach { category: SettingsCategory ->
-                SettingsCategoryItem(
-                    category = category,
-                    selected = selectedCategoryId == category.id,
-                    modifier = Modifier.testTag(category.tag),
-                    onClick = { onCategoryClick(category) },
-                )
+            LaunchedEffect(key1 = refreshState.value) {
+                pullToRefreshState.animateToHidden()
+            }
+            Column(
+                modifier = Modifier.verticalScroll(rememberScrollState())
+            ) {
+                SettingsCategory.entries.forEach { category: SettingsCategory ->
+                    SettingsCategoryItem(
+                        category = category,
+                        selected = selectedCategoryId == category.id,
+                        modifier = Modifier.testTag(category.tag),
+                        onClick = { onCategoryClick(category) },
+                    )
+                }
             }
         }
     }