From bea50f7fe71cfeae158c8a813b2a4cfecb1836ff Mon Sep 17 00:00:00 2001
From: Odweta <code.62rdl@aleeas.com>
Date: Fri, 3 Jan 2025 10:21:33 +0100
Subject: [PATCH] buttons now have icons and text instead of just text

---
 .../src/main/java/com/odweta/solon/Menu.kt    | 100 +++++++++++++-----
 1 file changed, 72 insertions(+), 28 deletions(-)

diff --git a/mobile/app/src/main/java/com/odweta/solon/Menu.kt b/mobile/app/src/main/java/com/odweta/solon/Menu.kt
index 04b8cca..5a483a3 100644
--- a/mobile/app/src/main/java/com/odweta/solon/Menu.kt
+++ b/mobile/app/src/main/java/com/odweta/solon/Menu.kt
@@ -10,12 +10,21 @@ import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ExitToApp
+import androidx.compose.material.icons.filled.AccountBox
+import androidx.compose.material.icons.filled.ArrowBackIosNew
+import androidx.compose.material.icons.filled.ExitToApp
+import androidx.compose.material.icons.filled.Info
+import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.Text
 import androidx.compose.material3.Button
 import androidx.compose.runtime.Composable
@@ -26,8 +35,11 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.odweta.solon.ui.theme.PastelYellow
@@ -35,7 +47,7 @@ import kotlin.system.exitProcess
 
 @Composable
 fun MenuScreen() {
-    var showDialog by remember { mutableStateOf(false) }
+    val menuSeparatorDimen = 40.dp
 
     Column(
         modifier = Modifier
@@ -43,45 +55,77 @@ fun MenuScreen() {
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center
     ) {
-        MenuButton({ global.currentScreenElement = ScreenElement.SignOut }, "Odhlásit se")
+        Row {
+            MenuButton(
+                { global.currentScreenElement = ScreenElement.SignOut },
+                Icons.AutoMirrored.Filled.ExitToApp,
+                "Odhlásit se"
+            )
 
-        Spacer(modifier = Modifier.height(80.dp))
+            Spacer(modifier = Modifier.width(menuSeparatorDimen))
 
-        MenuButton({
-            global.noSignInBackHandle = false
-            global.currentScreen = Screen.SignIn
-        }, "Změnit přihlášení")
+            MenuButton(
+                {
+                    global.noSignInBackHandle = false
+                    global.currentScreen = Screen.SignIn
+                },
+                Icons.Default.AccountBox,
+                "Změnit přihlášení"
+            )
+        }
 
-        Spacer(modifier = Modifier.height(80.dp))
+        Spacer(modifier = Modifier.height(menuSeparatorDimen))
 
-        MenuButton({ global.currentScreenElement = ScreenElement.About }, "O aplikaci")
+        Row {
+            MenuButton(
+                { global.currentScreenElement = ScreenElement.About },
+                Icons.Default.Info,
+                "O aplikaci"
+            )
 
-        Spacer(modifier = Modifier.height(80.dp))
+            Spacer(modifier = Modifier.width(menuSeparatorDimen))
 
-        MenuButton({ global.currentScreenElement = ScreenElement.Settings }, "Nastavení")
+            MenuButton(
+                { global.currentScreenElement = ScreenElement.Settings },
+                Icons.Default.Settings,
+                "Nastavení"
+            )
+        }
     }
 }
 
 @Composable
-fun MenuButton(onClick: () -> Unit, text: String) {
-    Button(
-        onClick = onClick,
-        colors = ButtonDefaults.buttonColors(
-            contentColor = Color.White,
-            containerColor = Color.Black
-        ),
-        modifier = Modifier
-            .border(
-                width = global.dimens.borderWidth,
-                shape = RoundedCornerShape(global.dimens.roundedCorner),
-                color = PastelYellow
-            )
-            .width(230.dp)
-            .height(80.dp)
+fun MenuButton(onClick: () -> Unit, icon: ImageVector, altText: String) {
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally
     ) {
+        Button(
+            onClick = onClick,
+            colors = ButtonDefaults.buttonColors(
+                contentColor = Color.White,
+                containerColor = Color.Black
+            ),
+            modifier = Modifier
+                .border(
+                    width = global.dimens.borderWidth,
+                    shape = RoundedCornerShape(global.dimens.roundedCorner),
+                    color = PastelYellow
+                )
+                .size(80.dp)
+        ) {
+            Icon(
+                imageVector = icon,
+                contentDescription = altText,
+                modifier = Modifier.size(40.dp)
+            )
+        }
+
         Text(
-            text = text,
-            fontSize = 23.sp
+            text = altText,
+            modifier = Modifier.padding(5.dp).width(80.dp),
+            color = Color.White,
+            fontSize = 17.sp,
+            textAlign = TextAlign.Center
         )
     }
 }
\ No newline at end of file