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

CONTRIBUTING.md

@@ -225,6 +225,7 @@ private fun ScreenContent(
 4. **Preview functions**: Add `@Preview` for visual components
 5. **Remember wisely**: Use `remember` for expensive calculations
 6. **Keys in lists**: Provide stable keys for LazyColumn/LazyRow
+7. **Adaptive drag handle**: Prefer method references for pane expansion, e.g. `paneExpansionDragHandle = ThreePaneScaffoldScope::VerticalPaneExpansionDragHandle` (use a lambda in Kotlin/Wasm actuals to avoid the current composable function reference compiler issue).
 
 ### ViewModel Style
 

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

@@ -21,6 +21,7 @@ import com.softartdev.notedelight.presentation.note.NoteAction
 import com.softartdev.notedelight.presentation.note.NoteResult
 import com.softartdev.notedelight.presentation.note.NoteViewModel
 import com.softartdev.notedelight.presentation.settings.SecurityResult
+import com.softartdev.notedelight.presentation.settings.SettingsAction
 import com.softartdev.notedelight.presentation.settings.SettingsCategoriesAction
 import com.softartdev.notedelight.presentation.settings.SettingsCategoriesViewModel
 import com.softartdev.notedelight.presentation.settings.SettingsViewModel
@@ -209,7 +210,7 @@ class AdaptiveInteractorTest {
     }
 
     @Test
-    fun `when SettingsCategoriesViewModel navigates back then selection cleared`() = runTest {
+    fun `when SettingsViewModel navigates back then selection cleared`() = runTest {
         settingsCategoriesViewModel.launchCategories()
         settingsViewModel.launchCollectingSelectedCategoryId()
 
@@ -221,7 +222,7 @@ class AdaptiveInteractorTest {
             val selected: SecurityResult = awaitItem()
             assertEquals(SettingsCategory.Theme, selected.selectedCategory)
 
-            settingsCategoriesViewModel.onAction(SettingsCategoriesAction.NavBackDetail)
+            settingsViewModel.onAction(SettingsAction.NavBack)
 
             val cleared: SecurityResult = awaitItem()
             assertNull(cleared.selectedCategory)

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

@@ -13,6 +13,5 @@ data class SettingsCategoriesResult(
 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

@@ -25,17 +25,12 @@ class SettingsCategoriesViewModel(
 
     fun launchCategories() {
         if (job != null) return
-        job = viewModelScope.launch {
-            adaptiveInteractor.selectedSettingsCategoryIdStateFlow.collect { selectedId: Long? ->
-                mutableStateFlow.update { result -> result.copy(selectedCategoryId = selectedId) }
-            }
-        }
+        startCollectingSelection()
     }
 
     fun onAction(action: SettingsCategoriesAction) = when (action) {
         is SettingsCategoriesAction.SelectCategory -> selectCategory(action.category)
         is SettingsCategoriesAction.Refresh -> refresh()
-        is SettingsCategoriesAction.NavBackDetail -> navBackDetail()
         is SettingsCategoriesAction.NavBack -> navBack()
     }
 
@@ -46,15 +41,20 @@ class SettingsCategoriesViewModel(
 
     private fun refresh() = viewModelScope.launch {
         mutableStateFlow.update(SettingsCategoriesResult::showLoading)
+        startCollectingSelection()
         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 startCollectingSelection() {
+        job?.cancel()
+        job = viewModelScope.launch {
+            adaptiveInteractor.selectedSettingsCategoryIdStateFlow.collect { selectedId: Long? ->
+                mutableStateFlow.update { result -> result.copy(selectedCategoryId = selectedId) }
+            }
+        }
     }
 
     private fun navBack() {

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

@@ -44,18 +44,12 @@ class SettingsViewModel(
 
     fun launchCollectingSelectedCategoryId() {
         if (selectedCategoryJob != null) return
-        selectedCategoryJob = viewModelScope.launch {
-            adaptiveInteractor.selectedSettingsCategoryIdStateFlow.collect { selectedId: Long? ->
-                mutableStateFlow.update { result ->
-                    result.copy(selectedCategory = SettingsCategory.fromId(selectedId))
-                }
-            }
-        }
+        startCollectingSelectedCategory()
     }
 
     fun onAction(action: SettingsAction) = when (action) {
         is SettingsAction.NavBack -> navBack()
-        is SettingsAction.Refresh -> updateSwitches()
+        is SettingsAction.Refresh -> refresh()
         is SettingsAction.ChangeTheme -> changeTheme()
         is SettingsAction.ChangeLanguage -> changeLanguage()
         is SettingsAction.ChangeEncryption -> changeEncryption(action.checked)
@@ -84,8 +78,25 @@ class SettingsViewModel(
         }
     }
 
-    private fun navBack() {
-        if (!router.popBackStack()) router.navigate(route = AppNavGraph.Splash)
+    private fun navBack() = viewModelScope.launch {
+        adaptiveInteractor.selectedSettingsCategoryIdStateFlow.value = null
+        router.adaptiveNavigateBack()
+    }
+
+    private fun refresh() {
+        startCollectingSelectedCategory()
+        updateSwitches()
+    }
+
+    private fun startCollectingSelectedCategory() {
+        selectedCategoryJob?.cancel()
+        selectedCategoryJob = viewModelScope.launch {
+            adaptiveInteractor.selectedSettingsCategoryIdStateFlow.collect { selectedId: Long? ->
+                mutableStateFlow.update { result ->
+                    result.copy(selectedCategory = SettingsCategory.fromId(selectedId))
+                }
+            }
+        }
     }
 
     private fun changeTheme() = router.navigate(route = AppNavGraph.ThemeDialog)

docs/ARCHITECTURE.md

@@ -237,7 +237,7 @@ fun NoteDetailBody(
 Use Action interfaces when you have **3+ different user actions** that need to be passed down through multiple Composable layers. Examples:
 - ✅ `NoteAction` (Save, Edit, Delete, CheckSaveChange) - 4 actions
 - ✅ `MainAction` (OnNoteClick, OnSettingsClick, OnRefresh) - 3 actions  
-- ✅ `SettingsAction` (NavBack, ChangeTheme, CheckEncryption, etc.) - 7 actions
+- ✅ `SettingsAction` (NavBack, Refresh, ChangeTheme, ChangeLanguage, ChangeEncryption, ChangePassword, ShowCipherVersion, ShowDatabasePath, ShowFileList, RevealFileList) - 10 actions
 - ✅ `ChangeAction` (OnEditOldPassword, OnEditNewPassword, OnEditRepeatPassword, etc.) - 5 actions
 
 **When NOT to Use Action Interfaces**:

ui/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/Composables.kt

@@ -143,11 +143,10 @@ fun PasswordSaveButton(
 @Composable
 fun ThreePaneScaffoldScope.VerticalPaneExpansionDragHandle(
     paneExpansionState: PaneExpansionState,
-    modifier: Modifier = Modifier,
 ) {
     val mutableInteractionSource = remember { MutableInteractionSource() }
     VerticalDragHandle(
-        modifier = modifier.paneExpansionDraggable(
+        modifier = Modifier.paneExpansionDraggable(
             state = paneExpansionState,
             minTouchTargetSize = LocalMinimumInteractiveComponentSize.current,
             interactionSource = mutableInteractionSource,
@@ -188,4 +187,4 @@ fun PreviewError() = Error(err = "Mock error")
 
 @Preview(showBackground = true)
 @Composable
-fun PreviewPasswordSaveButton() = PasswordSaveButton(tag = "PASSWORD_SAVE_BUTTON_TAG") {}
+fun PreviewPasswordSaveButton() = PasswordSaveButton(tag = "PASSWORD_SAVE_BUTTON_TAG") {}

ui/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/main/AdaptiveMainScreen.kt

@@ -9,7 +9,6 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
 import androidx.compose.material3.adaptive.layout.PaneExpansionState
-import androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope
 import androidx.compose.material3.adaptive.layout.rememberPaneExpansionState
 import androidx.compose.material3.adaptive.navigation.ThreePaneScaffoldNavigator
 import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
@@ -49,7 +48,9 @@ fun AdaptiveMainScreen(
         value = navigator.scaffoldValue,
         listPane = { MainScreen(mainViewModel, snackbarHostState) },
         detailPane = { NoteDetail(noteViewModel) },
-        paneExpansionDragHandle = ThreePaneScaffoldScope::VerticalPaneExpansionDragHandle,
+        paneExpansionDragHandle = { paneExpansionState: PaneExpansionState ->
+            VerticalPaneExpansionDragHandle(paneExpansionState)
+        },
         paneExpansionState = paneExpansionState
     )
     BackHandler(navigator.canNavigateBack()) { coroutineScope.launch { navigator.navigateBack() } }

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

@@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
 import androidx.compose.material3.adaptive.layout.PaneExpansionState
-import androidx.compose.material3.adaptive.layout.ThreePaneScaffoldScope
 import androidx.compose.material3.adaptive.layout.rememberPaneExpansionState
 import androidx.compose.material3.adaptive.navigation.ThreePaneScaffoldNavigator
 import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
@@ -17,10 +16,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import com.softartdev.notedelight.di.PreviewKoin
 import com.softartdev.notedelight.navigation.Router
-import com.softartdev.notedelight.presentation.settings.SettingsCategoriesAction
 import com.softartdev.notedelight.presentation.settings.SettingsCategoriesViewModel
 import com.softartdev.notedelight.presentation.settings.SettingsViewModel
-import com.softartdev.notedelight.ui.BackHandler
 import com.softartdev.notedelight.ui.VerticalPaneExpansionDragHandle
 import com.softartdev.notedelight.ui.settings.detail.SettingsDetailScreen
 import com.softartdev.notedelight.ui.settings.master.SettingsMasterScreen
@@ -48,16 +45,13 @@ fun AdaptiveSettingsScreen(
             SettingsMasterScreen(categoriesViewModel = categoriesViewModel)
         },
         detailPane = {
-            SettingsDetailScreen(
-                settingsViewModel = settingsViewModel,
-                onBackClick = { categoriesViewModel.onAction(SettingsCategoriesAction.NavBackDetail) },
-            )
+            SettingsDetailScreen(settingsViewModel = settingsViewModel)
+        },
+        paneExpansionDragHandle = { paneExpansionState: PaneExpansionState ->
+            VerticalPaneExpansionDragHandle(paneExpansionState)
         },
-        paneExpansionDragHandle = ThreePaneScaffoldScope::VerticalPaneExpansionDragHandle,
         paneExpansionState = paneExpansionState
     )
-    BackHandler(enabled = navigator.canNavigateBack()) { categoriesViewModel.onAction(SettingsCategoriesAction.NavBackDetail) }
-    BackHandler(enabled = !navigator.canNavigateBack()) { categoriesViewModel.onAction(SettingsCategoriesAction.NavBack) }
 }
 
 @Preview

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

@@ -54,6 +54,7 @@ import com.softartdev.notedelight.model.SettingsCategory
 import com.softartdev.notedelight.presentation.settings.SecurityResult
 import com.softartdev.notedelight.presentation.settings.SettingsAction
 import com.softartdev.notedelight.presentation.settings.SettingsViewModel
+import com.softartdev.notedelight.ui.BackHandler
 import com.softartdev.notedelight.ui.SettingsDetailPanePlaceholder
 import com.softartdev.notedelight.ui.icon.FileLock
 import com.softartdev.notedelight.util.ENABLE_ENCRYPTION_SWITCH_TAG
@@ -79,7 +80,6 @@ import androidx.compose.ui.semantics.testTag as semanticsTestTag
 @Composable
 fun SettingsDetailScreen(
     settingsViewModel: SettingsViewModel,
-    onBackClick: () -> Unit,
 ) {
     LaunchedEffect(settingsViewModel) {
         settingsViewModel.launchCollectingSelectedCategoryId()
@@ -95,13 +95,16 @@ fun SettingsDetailScreen(
     }
     when (result.selectedCategory) {
         null -> SettingsDetailPanePlaceholder()
-        else -> SettingsDetailScreenBody(
-            result = result,
-            onBackClick = onBackClick,
-            onAction = settingsViewModel::onAction,
-            onRefresh = { settingsViewModel.onAction(SettingsAction.Refresh) },
-            refreshState = refreshState,
-        )
+        else -> {
+            SettingsDetailScreenBody(
+                result = result,
+                onBackClick = { settingsViewModel.onAction(SettingsAction.NavBack) },
+                onAction = settingsViewModel::onAction,
+                onRefresh = { settingsViewModel.onAction(SettingsAction.Refresh) },
+                refreshState = refreshState,
+            )
+            BackHandler { settingsViewModel.onAction(SettingsAction.NavBack) }
+        }
     }
 }