Merge pull request #47 from DatepollSystems/refactor/order-screen

WR-158 & WR-410: Refactor OrderScreen

Author: dev-Fabi

androidApp/src/main/java/org/datepollsystems/waiterrobot/android/ui/common/LazyVerticalGridExtensions.kt

@@ -1,46 +1,33 @@
 package org.datepollsystems.waiterrobot.android.ui.common
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.grid.GridItemSpan
-import androidx.compose.foundation.lazy.grid.LazyGridItemScope
 import androidx.compose.foundation.lazy.grid.LazyGridScope
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 
-fun LazyGridScope.header(
-    key: Any? = null,
-    contentType: Any? = null,
-    content: @Composable LazyGridItemScope.() -> Unit
-) {
-    item(
-        key = key,
-        contentType = contentType,
-        span = { GridItemSpan(this.maxLineSpan) },
-        content = content
-    )
-}
-
 fun LazyGridScope.sectionHeader(
     key: Any? = null,
     contentType: Any? = null,
     title: String
 ) {
-    header(key = key, contentType = contentType) {
+    stickyHeader(key = key, contentType = contentType) {
         Row(
+            modifier = Modifier.background(MaterialTheme.colorScheme.surface),
             verticalAlignment = Alignment.CenterVertically
         ) {
-            Divider(modifier = Modifier.weight(1f))
+            HorizontalDivider(modifier = Modifier.weight(1f))
             Text(
                 text = title,
                 modifier = Modifier.padding(horizontal = 10.dp),
                 maxLines = 1,
             )
-            Divider(modifier = Modifier.weight(1f))
+            HorizontalDivider(modifier = Modifier.weight(1f))
         }
     }
 }

androidApp/src/main/java/org/datepollsystems/waiterrobot/android/ui/core/preview/Preview.kt

@@ -1,14 +1,21 @@
 package org.datepollsystems.waiterrobot.android.ui.core.preview
 
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.remember
+import org.datepollsystems.waiterrobot.android.ui.core.LocalSnackbarHostState
 import org.datepollsystems.waiterrobot.android.ui.core.theme.WaiterRobotTheme
 
 @Composable
 fun Preview(block: @Composable () -> Unit) {
+    val snackbarHostState = remember { SnackbarHostState() }
     WaiterRobotTheme {
-        Surface {
-            block()
+        CompositionLocalProvider(LocalSnackbarHostState provides snackbarHostState) {
+            Surface {
+                block()
+            }
         }
     }
 }