fix: color mismatch (#46)

Author: Raival-e

app/src/main/java/com/raival/compose/file/explorer/common/compose/SafeSurface.kt

@@ -1,12 +1,17 @@
 package com.raival.compose.file.explorer.common.compose
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.windowInsetsPadding
-import androidx.compose.material3.MaterialTheme
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -17,12 +22,21 @@ fun SafeSurface(
     content: @Composable () -> Unit
 ) {
     Surface(
-        modifier = Modifier.fillMaxSize()
+        modifier = Modifier
+            .fillMaxSize()
             .windowInsetsPadding(WindowInsets.navigationBars)
-            .windowInsetsPadding(WindowInsets.statusBars)
             .windowInsetsPadding(WindowInsets.ime),
-        color = MaterialTheme.colorScheme.surfaceContainerLowest
+        color = colorScheme.surfaceContainerLowest
     ) {
-        content()
+        Column(Modifier.fillMaxSize()) {
+            Row(
+                Modifier
+                    .fillMaxWidth()
+                    .wrapContentHeight()
+                    .background(color = colorScheme.surfaceContainer)
+                    .windowInsetsPadding(WindowInsets.statusBars)
+            ) {}
+            content()
+        }
     }
 }

app/src/main/java/com/raival/compose/file/explorer/screen/preferences/PreferencesActivity.kt

@@ -4,23 +4,35 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.rounded.ArrowBack
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme.colorScheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.raival.compose.file.explorer.R
 import com.raival.compose.file.explorer.base.BaseActivity
+import com.raival.compose.file.explorer.common.compose.SafeSurface
 import com.raival.compose.file.explorer.common.compose.Space
 import com.raival.compose.file.explorer.screen.preferences.compose.DisplayContainer
 import com.raival.compose.file.explorer.screen.preferences.compose.GeneralContainer
 import com.raival.compose.file.explorer.screen.preferences.compose.SingleChoiceDialog
 import com.raival.compose.file.explorer.screen.preferences.compose.TextEditorContainer
-import com.raival.compose.file.explorer.screen.preferences.compose.ToolbarView
 import com.raival.compose.file.explorer.ui.theme.FileExplorerTheme
 
 class PreferencesActivity : BaseActivity() {
@@ -34,33 +46,45 @@ class PreferencesActivity : BaseActivity() {
     override fun onPermissionGranted() {
         setContent {
             FileExplorerTheme {
-                Scaffold(
-                    topBar = { ToolbarView() }
-                ) { paddingValues ->
-                    Surface(
-                        modifier = Modifier.fillMaxSize(),
-                        color = colorScheme.surfaceContainerLowest
+                SafeSurface(modifier = Modifier.fillMaxSize()) {
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(64.dp)
+                            .background(color = colorScheme.surfaceContainer)
+                            .padding(horizontal = 4.dp),
+                        verticalAlignment = Alignment.CenterVertically
                     ) {
-                        SingleChoiceDialog()
+                        IconButton(onClick = { onBackPressedDispatcher.onBackPressed() }) {
+                            Icon(
+                                imageVector = Icons.AutoMirrored.Rounded.ArrowBack,
+                                contentDescription = null
+                            )
+                        }
                         Column(
-                            Modifier
-                                .fillMaxSize()
-                                .verticalScroll(rememberScrollState())
-                                .padding(
-                                    top = paddingValues.calculateTopPadding(),
-                                    bottom = paddingValues.calculateBottomPadding()
-                                )
+                            Modifier.weight(1f)
                         ) {
-                            Space(size = 4.dp)
-
-                            DisplayContainer()
-
-                            GeneralContainer()
+                            Text(
+                                modifier = Modifier.fillMaxWidth(),
+                                text = stringResource(id = R.string.preferences),
+                                fontSize = 21.sp,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis
+                            )
+                        }
+                    }
 
-                            TextEditorContainer()
+                    SingleChoiceDialog()
 
-                            Space(size = 4.dp)
-                        }
+                    Column(
+                        Modifier
+                            .fillMaxSize()
+                            .verticalScroll(rememberScrollState())) {
+                        Space(size = 4.dp)
+                        DisplayContainer()
+                        GeneralContainer()
+                        TextEditorContainer()
+                        Space(size = 4.dp)
                     }
                 }
             }

app/src/main/java/com/raival/compose/file/explorer/screen/preferences/compose/ToolbarView.kt

@@ -17,7 +17,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat
@@ -73,7 +72,6 @@ fun FileExplorerTheme(
     if (!view.isInEditMode) {
         SideEffect {
             val window = (view.context as Activity).window
-            window.statusBarColor = colorScheme.surfaceContainer.toArgb()
             WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme
         }
     }