Change styling

krzyzanowskim · Jan 27, 2024 · 98cac5f · 98cac5f
1 parent ea6beca
commit 98cac5f
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/DemoApp/View/AnnotationLabelView.swift b/DemoApp/View/AnnotationLabelView.swift
@@ -38,16 +38,29 @@ struct AnnotationLabelView : View {
                     Image(systemName: "xmark.octagon")
                         .foregroundStyle(.white)
                 }
-                .shadow(radius: 1)
+                .shadow(color: annotation.kind.color, radius: 1)
             }
             .buttonStyle(.plain)
         }
+        .labelStyle(
+            AnnotationLabelStyle()
+        )
         .background(
-            annotation.kind.color.background(Color.white)
+            ZStack {
+                ContainerRelativeShape()
+                    .fill(annotation.kind.color)
+                    .background(.background)
+
+                ContainerRelativeShape()
+                    .stroke(annotation.kind.color)
+            }
+        )
+        .containerShape(
+            UnevenRoundedRectangle(
+                cornerRadii: RectangleCornerRadii(topLeading: 2, bottomLeading: 2),
+                style: .circular
+            )
         )
-        .clipShape(UnevenRoundedRectangle(cornerRadii: RectangleCornerRadii(topLeading: 2, bottomLeading: 2), style: .circular))
-        .labelStyle(AnnotationLabelStyle())
-        .shadow(radius: 1, x: 0.3, y: 0.5)
     }
 }
 
@@ -62,9 +75,10 @@ private struct AnnotationLabelStyle: LabelStyle {
                 .contentShape(Rectangle())
 
             Rectangle()
-                .foregroundColor(.white)
+                .foregroundStyle(.background)
                 .frame(width: 1)
                 .frame(maxHeight: .infinity)
+                .padding(.vertical, 0.5)
 
             configuration.title
                 .padding(.leading, 4)