Update project

Author: michaelbel

mobile/src/main/kotlin/org/michaelbel/template/ui/settings/SettingsScreen.kt

@@ -4,33 +4,33 @@ package org.michaelbel.template.ui.settings
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.calculateEndPadding
-import androidx.compose.foundation.layout.calculateStartPadding
+import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButtonDefaults
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.ScaffoldDefaults
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.koin.androidx.compose.koinViewModel
-import org.michaelbel.shared.icons.Github
+import org.michaelbel.shared.icons.FormatPaint
 import org.michaelbel.shared.middleLargeIncreasedListItemShape
 import org.michaelbel.template.ui.settings.intent.SettingsIntent
 
@@ -39,55 +39,43 @@ fun SettingsScreen(
     viewModel: SettingsViewModel = koinViewModel()
 ) {
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
+    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
 
     Scaffold(
-        modifier = Modifier.fillMaxSize(),
+        modifier = Modifier
+            .fillMaxSize()
+            .nestedScroll(scrollBehavior.nestedScrollConnection),
         topBar = {
             TopAppBar(
-                title = {
-                    Text(
-                        text = "Settings"
-                    )
-                }
+                title = { Text(text = "Settings") },
+                colors = TopAppBarDefaults.topAppBarColors(
+                    scrolledContainerColor = MaterialTheme.colorScheme.surfaceContainer
+                ),
+                scrollBehavior = scrollBehavior
             )
-        }
+        },
+        contentWindowInsets = ScaffoldDefaults.contentWindowInsets.only(WindowInsetsSides.Horizontal)
     ) { innerPadding ->
-        val layoutDirection = LocalLayoutDirection.current
-
         LazyColumn(
-            modifier = Modifier.fillMaxSize(),
-            contentPadding = PaddingValues(
-                start = innerPadding.calculateStartPadding(layoutDirection),
-                top = innerPadding.calculateTopPadding().plus(16.dp),
-                end = innerPadding.calculateEndPadding(layoutDirection),
-                bottom = innerPadding.calculateBottomPadding().plus(16.dp)
-            )
+            modifier = Modifier
+                .padding(innerPadding)
+                .fillMaxSize(),
+            contentPadding = PaddingValues(16.dp)
         ) {
             item {
                 ListItem(
                     modifier = Modifier
                         .fillMaxWidth()
-                        .padding(horizontal = 16.dp)
                         .clip(middleLargeIncreasedListItemShape)
                         .clickable { viewModel.dispatch(SettingsIntent.ToggleDynamicColors) },
-                    colors = ListItemDefaults.colors(containerColor = MaterialTheme.colorScheme.inversePrimary),
-                    headlineContent = {
-                        Text(
-                            text = "Dynamic Colors",
-                            style = MaterialTheme.typography.titleLarge
-                        )
-                    },
-                    supportingContent = {
-                        Text(
-                            text = "Apply colors from Wallpaper",
-                            style = MaterialTheme.typography.bodyMedium
-                        )
-                    },
+                    colors = ListItemDefaults.colors(
+                        containerColor = MaterialTheme.colorScheme.surfaceContainerHighest
+                    ),
+                    headlineContent = { Text(text = "Dynamic Colors") },
                     leadingContent = {
                         Icon(
-                            imageVector = Github,
-                            contentDescription = null,
-                            modifier = Modifier.size(IconButtonDefaults.smallIconSize)
+                            imageVector = FormatPaint,
+                            contentDescription = null
                         )
                     },
                     trailingContent = {

shared/src/main/kotlin/org/michaelbel/shared/icons/FormatPaint.kt

@@ -0,0 +1,46 @@
+package org.michaelbel.shared.icons
+
+import androidx.compose.material.icons.materialIcon
+import androidx.compose.material.icons.materialPath
+import androidx.compose.ui.graphics.vector.ImageVector
+
+private var _formatPaint: ImageVector? = null
+val FormatPaint: ImageVector
+    get() {
+        if (_formatPaint != null) {
+            return _formatPaint!!
+        }
+        _formatPaint = materialIcon(name = "Outlined.FormatPaint") {
+            materialPath {
+                moveTo(18.0f, 4.0f)
+                lineTo(18.0f, 3.0f)
+                curveToRelative(0.0f, -0.55f, -0.45f, -1.0f, -1.0f, -1.0f)
+                lineTo(5.0f, 2.0f)
+                curveToRelative(-0.55f, 0.0f, -1.0f, 0.45f, -1.0f, 1.0f)
+                verticalLineToRelative(4.0f)
+                curveToRelative(0.0f, 0.55f, 0.45f, 1.0f, 1.0f, 1.0f)
+                horizontalLineToRelative(12.0f)
+                curveToRelative(0.55f, 0.0f, 1.0f, -0.45f, 1.0f, -1.0f)
+                lineTo(18.0f, 6.0f)
+                horizontalLineToRelative(1.0f)
+                verticalLineToRelative(4.0f)
+                lineTo(9.0f, 10.0f)
+                verticalLineToRelative(11.0f)
+                curveToRelative(0.0f, 0.55f, 0.45f, 1.0f, 1.0f, 1.0f)
+                horizontalLineToRelative(2.0f)
+                curveToRelative(0.55f, 0.0f, 1.0f, -0.45f, 1.0f, -1.0f)
+                verticalLineToRelative(-9.0f)
+                horizontalLineToRelative(8.0f)
+                lineTo(21.0f, 4.0f)
+                horizontalLineToRelative(-3.0f)
+                close()
+                moveTo(16.0f, 6.0f)
+                lineTo(6.0f, 6.0f)
+                lineTo(6.0f, 4.0f)
+                horizontalLineToRelative(10.0f)
+                verticalLineToRelative(2.0f)
+                close()
+            }
+        }
+        return _formatPaint!!
+    }