Add liquid glass BoxView and fix Swift 6 concurrency

Author: rudrankriyam

Sources/BlocKit/Extensions/Text.swift

@@ -65,7 +65,7 @@ struct OffsetText<S>: View where S: StringProtocol {
     }
 }
 
-struct CustomFont {
+struct CustomFont: Sendable {
     var type: FontType
     var weight: FontWeight
     var style: UIFont.TextStyle

Sources/BlocKit/Extensions/View+CustomFont.swift

@@ -35,7 +35,7 @@ public extension Font {
 }
 #endif
 
-public enum FontType: String {
+public enum FontType: String, Sendable {
   case montserrat
   case josefinSans
   case poppins
@@ -47,7 +47,7 @@ public enum FontType: String {
   }
 }
 
-public enum FontWeight: String {
+public enum FontWeight: String, Sendable {
   case light
   case medium
   case semiBold

Sources/BlocKit/Views/BoxView.swift

@@ -6,74 +6,85 @@
 //
 
 import SwiftUI
-import UIKit
 
-public enum BoxHeaderType: String {
+public enum BoxHeaderType: String, Sendable {
     case target
     case yours
+
+    public var localizedString: LocalizedStringKey {
+        switch self {
+        case .target: return "Target"
+        case .yours: return "Yours"
+        }
+    }
 }
 
 public struct BoxView<Content: View, Fill: ShapeStyle>: View {
     let header: BoxHeaderType
     let fill: Fill
     let content: Content
-    
+
     public init(_ header: BoxHeaderType, _ fill: Fill, @ViewBuilder _ content: () -> Content) {
         self.header = header
         self.fill = fill
         self.content = content()
     }
-    
+
     public var body: some View {
         ZStack(alignment: .top) {
-            RoundedRectangle(cornerRadius: Constants.cornerRadius)
+            RoundedRectangle(cornerRadius: 16)
                 .fill(fill)
-                .overlay(RoundedRectangle(cornerRadius: Constants.cornerRadius)
-                            .stroke(Color.stroke))
-            
+
             VStack {
-                Text(header.rawValue.lowercased())
-                    .blurredBackgroundText()
+                Text(header.localizedString)
+                    .modifier(GlassHeaderViewModifier())
 
-                    .padding(8)
-//                    .background(
-//                        NotchRectangle(corner: [.bottomLeft, .bottomRight], size: Constants.cornerRadius / 1.5)
-//                            .fill(Color.white.opacity(0.25))
-//                                    .padding(.top, -1))
                 content
             }
         }
         .padding(.bottom, 4)
     }
 }
 
-struct VisualEffectView: UIViewRepresentable {
-    var effect: UIVisualEffect?
-    func makeUIView(context: UIViewRepresentableContext<Self>) -> UIVisualEffectView { UIVisualEffectView() }
-    func updateUIView(_ uiView: UIVisualEffectView, context: UIViewRepresentableContext<Self>) { uiView.effect = effect }
+public struct GlassHeaderViewModifier: ViewModifier {
+    public init() {}
+
+    public func body(content: Content) -> some View {
+        content
+            .font(.caption)
+            .fontWidth(.expanded)
+            .foregroundStyle(.white)
+            .accessibility(addTraits: .isHeader)
+            .padding(.top, 1)
+            .padding(.horizontal)
+            .padding(8)
+            .glassEffect(.clear.tint(.black.opacity(0.3)), in: .rect(cornerRadius: 8))
+            .padding(8)
+    }
 }
 
-struct BoxView_Previews: PreviewProvider {
-    static var previews: some View {
-        GeometryReader { proxy in
-        BoxView(.target, .orange, {
-            Text("HELLO")
-        })
-                .frame(width: proxy.size.width, height: proxy.size.height / 3, alignment: .bottom)
-        }
-        .padding()
-        .preferredColorScheme(.light)
+public struct NavigationBarHeader: View {
+    let title: LocalizedStringKey
 
+    public init(_ title: LocalizedStringKey) {
+        self.title = title
+    }
+
+    public var body: some View {
+        Text(title)
+            .font(.system(size: 24, weight: .bold, design: .rounded))
+            .fontWidth(.expanded)
+            .foregroundColor(.primary)
     }
 }
 
-struct NotchRectangle: Shape {
-    var corner: UIRectCorner
-    var size: CGFloat
-    
-    func path(in rect: CGRect) -> Path {
-        let path = UIBezierPath(roundedRect: rect, byRoundingCorners: corner, cornerRadii: CGSize(width: size, height: size))
-        
-        return Path(path.cgPath)
+#Preview {
+    GeometryReader { proxy in
+        BoxView(.target, .orange, {
+            Text("HELLO")
+        })
+        .frame(width: proxy.size.width, height: proxy.size.height / 3, alignment: .bottom)
     }
+    .padding()
+    .preferredColorScheme(.light)
 }