更新

composeApp/src/commonMain/kotlin/com/taskttl/presentation/task/TaskDetailScreen.kt

@@ -37,7 +37,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.taskttl.core.ui.LoadingScreen
+import com.taskttl.core.ui.LoadingOverlay
+
 import com.taskttl.data.state.TaskEffect
 import com.taskttl.data.state.TaskIntent
 import com.taskttl.data.viewmodel.TaskViewModel
@@ -111,6 +112,7 @@ fun TaskDetailScreen(
             Column(
                 modifier = Modifier
                     .fillMaxSize()
+                    .background(MaterialTheme.colorScheme.background)
                     .verticalScroll(rememberScrollState())
                     .padding(16.dp),
                 verticalArrangement = Arrangement.Top
@@ -229,6 +231,6 @@ fun TaskDetailScreen(
             }
 
         }
-        if (state.isLoading) LoadingScreen()
+        LoadingOverlay(state.isLoading)
     }
 }

composeApp/src/commonMain/kotlin/com/taskttl/presentation/task/TaskEditorScreen.kt

@@ -1,5 +1,6 @@
 package com.taskttl.presentation.task
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -39,7 +40,8 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.taskttl.core.routes.Routes
-import com.taskttl.core.ui.LoadingScreen
+import com.taskttl.core.ui.LoadingOverlay
+
 import com.taskttl.core.utils.ToastUtils
 import com.taskttl.data.local.model.Category
 import com.taskttl.data.local.model.Task
@@ -168,6 +170,7 @@ fun TaskEditorScreen(
             Column(
                 modifier = Modifier
                     .fillMaxSize()
+                    .background(MaterialTheme.colorScheme.background)
                     .verticalScroll(rememberScrollState())
                     .padding(16.dp),
             ) {
@@ -292,6 +295,6 @@ fun TaskEditorScreen(
                 )
             }
         }
-        if (state.isLoading) LoadingScreen()
+        LoadingOverlay(state.isLoading)
     }
 }

composeApp/src/commonMain/kotlin/com/taskttl/presentation/task/TaskScreen.kt

@@ -54,7 +54,8 @@ import androidx.navigation.NavHostController
 import com.taskttl.core.routes.Routes
 import com.taskttl.core.ui.ActionButtonListItem
 import com.taskttl.core.ui.ErrorDialog
-import com.taskttl.core.ui.LoadingScreen
+import com.taskttl.core.ui.LoadingOverlay
+
 import com.taskttl.core.utils.ToastUtils
 import com.taskttl.data.local.model.Task
 import com.taskttl.data.state.TaskEffect
@@ -129,7 +130,7 @@ fun TaskScreen(
             Column(
                 modifier = Modifier
                     .fillMaxSize()
-                    .background(Color(0xFFF5F5F5))
+                    .background(MaterialTheme.colorScheme.background)
                     .padding(16.dp)
             ) {
                 if (state.isSearch) {
@@ -258,7 +259,7 @@ fun TaskScreen(
                 contentDescription = stringResource(Res.string.title_add_task)
             )
         }
-        if (state.isLoading) LoadingScreen()
+        LoadingOverlay(state.isLoading)
     }
 }