More scaleable desktop layout

Author: jdamcd

desktop/src/main/kotlin/com/jdamcd/arrivals/desktop/ArrivalsView.kt

@@ -63,53 +63,56 @@ private fun Loading() {
 
 @Composable
 private fun Data(state: ArrivalsState.Data, onClickRefresh: () -> Unit) {
-    Column(
-        modifier = Modifier
-            .padding(top = 44.dp, bottom = 16.dp, start = 32.dp, end = 32.dp)
-            .fillMaxWidth(),
-        verticalArrangement = Arrangement.spacedBy(32.dp)
-    ) {
-        state.result.arrivals.forEach {
-            ArrivalRow(it)
+    Column {
+        Column(
+            modifier = Modifier
+                .padding(top = 32.dp, bottom = 20.dp, start = 32.dp, end = 32.dp)
+                .weight(1f)
+                .fillMaxWidth(),
+            verticalArrangement = Arrangement.SpaceEvenly
+        ) {
+            state.result.arrivals.forEach {
+                ArrivalRow(it)
+            }
         }
-    }
-    Row(
-        modifier = Modifier
-            .background(color = Footer)
-            .padding(start = 32.dp, end = 28.dp)
-            .fillMaxWidth()
-            .height(70.dp),
-        horizontalArrangement = Arrangement.SpaceBetween,
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-        Text(
-            modifier = Modifier.padding(bottom = 4.dp),
-            text = state.result.station,
-            color = Text,
-            style = TextStyle(
-                fontSize = 32.sp
-            )
-        )
-        Box(
-            modifier = Modifier.size(42.dp),
-            contentAlignment = Alignment.Center
+        Row(
+            modifier = Modifier
+                .background(color = Footer)
+                .padding(start = 32.dp, end = 28.dp)
+                .fillMaxWidth()
+                .height(70.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
         ) {
-            if (state.refreshing) {
-                CircularProgressIndicator(color = LedYellow, modifier = Modifier.size(22.dp))
-            } else {
-                TextButton(
-                    onClick = { onClickRefresh() },
-                    colors = ButtonDefaults.textButtonColors(
-                        contentColor = Text,
-                        backgroundColor = Footer
-                    )
-                ) {
-                    Icon(
-                        Icons.Rounded.Refresh,
-                        contentDescription = "Refresh",
-                        modifier = Modifier.size(32.dp),
-                        tint = Text
-                    )
+            Text(
+                modifier = Modifier.padding(bottom = 4.dp),
+                text = state.result.station,
+                color = Text,
+                style = TextStyle(
+                    fontSize = 32.sp
+                )
+            )
+            Box(
+                modifier = Modifier.size(42.dp),
+                contentAlignment = Alignment.Center
+            ) {
+                if (state.refreshing) {
+                    CircularProgressIndicator(color = LedYellow, modifier = Modifier.size(22.dp))
+                } else {
+                    TextButton(
+                        onClick = { onClickRefresh() },
+                        colors = ButtonDefaults.textButtonColors(
+                            contentColor = Text,
+                            backgroundColor = Footer
+                        )
+                    ) {
+                        Icon(
+                            Icons.Rounded.Refresh,
+                            contentDescription = "Refresh",
+                            modifier = Modifier.size(32.dp),
+                            tint = Text
+                        )
+                    }
                 }
             }
         }

desktop/src/main/kotlin/com/jdamcd/arrivals/desktop/Main.kt

@@ -8,6 +8,7 @@ import androidx.compose.ui.input.key.key
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
+import androidx.compose.ui.window.WindowPlacement
 import androidx.compose.ui.window.WindowPosition
 import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
@@ -21,7 +22,7 @@ fun main(args: Array<String>) = application {
     val fixWindow = args.contains("-pi")
 
     val windowState = rememberWindowState(
-        position = WindowPosition(Alignment.Center),
+        placement = if (fixWindow) WindowPlacement.Maximized else WindowPlacement.Floating,
         size = DpSize(1280.dp, 400.dp)
     )
 

desktop/src/main/kotlin/com/jdamcd/arrivals/desktop/Theme.kt

@@ -18,5 +18,5 @@ val LurFontFamily = FontFamily(
 
 val LedYellow = Color(0xFFFFDD00)
 val Background = Color.Black
-val Footer = Color(0xFF121218)
-val Text = Color(0xFF707070)
+val Footer = Color(0xFF181822)
+val Text = Color(0xFF808080)