✨ Implement circle shape (#466)

Signed-off-by: The one with the braid <info@braid.business>

Author: TheOneWithTheBraid

app/src/main/kotlin/de/hbch/traewelling/api/models/lineIcons/LineIcon.kt

@@ -19,9 +19,10 @@ data class LineIcon(
 }
 
 enum class LineIconShape {
-    rectangle,
+    circle,
+    hexagon,
     pill,
+    rectangle,
+    rectangle_rounded_corner,
     trapezoid,
-    hexagon,
-    rectangle_rounded_corner
 }

app/src/main/kotlin/de/hbch/traewelling/ui/composables/LineIcon.kt

@@ -2,11 +2,8 @@ package de.hbch.traewelling.ui.composables
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -56,6 +53,7 @@ fun LineIcon(
     }
 
     val shape: Shape = when (lineIcon?.shape) {
+        LineIconShape.circle -> CircleShape
         LineIconShape.hexagon -> HexagonShape()
         LineIconShape.pill -> RoundedCornerShape(percent = 50)
         LineIconShape.rectangle_rounded_corner -> RoundedCornerShape(percent = 20)
@@ -79,14 +77,26 @@ fun LineIcon(
     ) {
         if (lineIcon != null) {
             Box(
-                modifier = Modifier
-                    .widthIn(48.dp, 144.dp)
-                    .background(
-                        color = lineIcon.getBackgroundColor(),
-                        shape = shape
-                    )
-                    .border(2.dp, borderColor, shape)
-                    .padding(2.dp)
+                modifier = when (lineIcon.shape) {
+                    LineIconShape.circle -> Modifier
+                        .width(32.dp)
+                        .aspectRatio(1f)
+                        .background(
+                            color = lineIcon.getBackgroundColor(),
+                            shape = shape
+                        )
+                        .border(2.dp, borderColor, shape)
+                        .padding(2.dp)
+
+                    else -> Modifier
+                        .widthIn(48.dp, 144.dp)
+                        .background(
+                            color = lineIcon.getBackgroundColor(),
+                            shape = shape
+                        )
+                        .border(2.dp, borderColor, shape)
+                        .padding(2.dp)
+                }
             ) {
                 Text(
                     text = displayedName,
@@ -96,7 +106,7 @@ fun LineIcon(
                     fontWeight = FontWeight.Bold
                 )
             }
-        }  else if (switzerlandString?.first != null) {
+        } else if (switzerlandString?.first != null) {
             Box(
                 modifier = Modifier
                     .widthIn(48.dp, 144.dp)
@@ -125,7 +135,8 @@ fun LineIcon(
         if (displayJourneyNumber
             && displayJourneyNumberSetting
             && !displayedName.contains(journeyNumber.toString())
-            && journeyNumber != null && journeyNumber != 0) {
+            && journeyNumber != null && journeyNumber != 0
+        ) {
             Text(
                 text = "($journeyNumber)",
                 style = LocalFont.current.bodySmall
@@ -150,8 +161,11 @@ fun LineIconView(
     }
 
     val shape: Shape = when (lineIcon?.shape) {
+        LineIconShape.circle -> CircleShape
+        LineIconShape.hexagon -> HexagonShape()
         LineIconShape.pill -> RoundedCornerShape(percent = 50)
         LineIconShape.rectangle_rounded_corner -> RoundedCornerShape(percent = 20)
+        LineIconShape.trapezoid -> TrapezoidShape()
         else -> RectangleShape
     }
     val borderColor: Color = lineIcon?.getBorderColor() ?: Color.Transparent
@@ -188,7 +202,7 @@ fun LineIconView(
                     fontWeight = FontWeight.Bold
                 )
             }
-        }  else if (switzerlandString?.first != null) {
+        } else if (switzerlandString?.first != null) {
             Box(
                 modifier = Modifier
                     .widthIn(48.dp, 144.dp)