refactor: improve error handling and optimize state management in screens

Author: softartdev

core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/main/MainViewModel.kt

@@ -95,7 +95,8 @@ class MainViewModel(
     }
 
     private fun isDbError(throwable: Throwable): Boolean {
-        if (throwable::class.simpleName.orEmpty().contains("SQLite", ignoreCase = true)) return true
-        return throwable.message.orEmpty().contains("database not open", ignoreCase = true)
+        val sqlError = throwable::class.simpleName?.contains("SQLite", ignoreCase = true) ?: false
+        val dbClosed = throwable.message?.contains("database not open", ignoreCase = true) ?: false
+        return sqlError || dbClosed
     }
 }

core/ui/src/commonMain/kotlin/com/softartdev/notedelight/ui/main/MainScreen.kt

@@ -96,7 +96,7 @@ fun MainScreen(
             onRefresh = { onAction(MainAction.OnRefresh) },
             state = pullToRefreshState
         ) {
-            LaunchedEffect(key1 = noteListState.value) {
+            LaunchedEffect(key1 = refreshState.value) {
                 pullToRefreshState.animateToHidden()
             }
             when (val noteListResult = noteListState.value) {

core/ui/src/commonMain/kotlin/com/softartdev/notedelight/ui/settings/detail/ConsoleScreen.kt

@@ -36,6 +36,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -108,6 +109,7 @@ fun ConsoleScreenBody(
                             expanded = tipsExpanded,
                             onDismissRequest = { tipsExpanded = false },
                         ) {
+                            val monospaceBodySmall: TextStyle = MaterialTheme.typography.bodySmall.copy(fontFamily = FontFamily.Monospace)
                             ConsoleTips.entries.forEachIndexed { index, tip ->
                                 TipMenuItem(
                                     tip = tip.sql,
@@ -120,10 +122,9 @@ fun ConsoleScreenBody(
                                         onAction(ConsoleAction.UpdateInput(tip.sql))
                                         tipsExpanded = false
                                     },
+                                    textStyle = monospaceBodySmall,
                                 )
-                                if (index < ConsoleTips.entries.lastIndex) {
-                                    HorizontalDivider()
-                                }
+                                if (index < ConsoleTips.entries.lastIndex) HorizontalDivider()
                             }
                         }
                     }
@@ -145,14 +146,15 @@ private fun TipMenuItem(
     index: Int,
     onCopy: () -> Unit,
     onAutofill: () -> Unit,
+    textStyle: TextStyle,
 ) {
     Row(
         modifier = Modifier.padding(horizontal = 8.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Text(
             text = tip,
-            style = MaterialTheme.typography.bodySmall.copy(fontFamily = FontFamily.Monospace),
+            style = textStyle,
             modifier = Modifier.weight(1f).padding(start = 8.dp),
         )
         IconButton(

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

@@ -5,6 +5,7 @@ package com.softartdev.notedelight.ui.settings.master
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -13,6 +14,7 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.Scaffold
@@ -26,6 +28,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
@@ -61,16 +64,13 @@ fun SettingsMasterScreen(
     onSettingsCategoriesAction: (SettingsCategoriesAction) -> Unit,
 ) {
     val result: SettingsCategoriesResult = settingsCategoriesResultState.value
-    val refreshState: State<Boolean> = remember {
-        derivedStateOf { settingsCategoriesResultState.value.loading }
-    }
     SettingsMasterScreenBody(
         selectedCategoryId = result.selectedCategoryId,
         onCategoryClick = { category: SettingsCategory ->
             onSettingsCategoriesAction(SettingsCategoriesAction.SelectCategory(category))
         },
         onRefresh = { onSettingsCategoriesAction(SettingsCategoriesAction.Refresh) },
-        refreshState = refreshState,
+        refreshState = remember { derivedStateOf { settingsCategoriesResultState.value.loading } },
         onNavigateBack = { onSettingsCategoriesAction(SettingsCategoriesAction.NavBack) }
     )
     NavBackHandler(enabled = result.selectedCategoryId == null) {
@@ -85,7 +85,7 @@ fun SettingsMasterScreenBody(
     onNavigateBack: () -> Unit = {},
     onRefresh: () -> Unit = {},
     pullToRefreshState: PullToRefreshState = rememberPullToRefreshState(),
-    refreshState: State<Boolean> = remember { derivedStateOf { false } },
+    refreshState: State<Boolean> = remember { mutableStateOf(false) },
 ) = Scaffold(
     topBar = {
         TopAppBar(
@@ -110,9 +110,8 @@ fun SettingsMasterScreenBody(
             LaunchedEffect(key1 = refreshState.value) {
                 pullToRefreshState.animateToHidden()
             }
-            Column(
-                modifier = Modifier.verticalScroll(rememberScrollState())
-            ) {
+            Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
+                if (refreshState.value) LinearProgressIndicator(Modifier.fillMaxWidth())
                 SettingsCategory.entries.forEach { category: SettingsCategory ->
                     SettingsCategoryItem(
                         category = category,
@@ -142,7 +141,5 @@ private fun SettingsCategoryItem(
 @Preview
 @Composable
 fun PreviewSettingsMasterScreen() = PreferableMaterialTheme {
-    SettingsMasterScreenBody(
-        selectedCategoryId = SettingsCategory.Security.id,
-    )
+    SettingsMasterScreenBody(selectedCategoryId = SettingsCategory.Security.id)
 }