🔀 Merge branch 'hugo/feature/Upgrade-AnswerViews-UI-styles'

leka · Sep 20, 2023 · dd06565 · dd06565
2 parents 5098475 + 0083f10
commit dd06565
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 9 deletions.
diff --git a/Modules/GameEngineKit/Sources/UI/Views/ColoredAnswerView.swift b/Modules/GameEngineKit/Sources/UI/Views/ColoredAnswerView.swift
@@ -14,11 +14,12 @@ struct ColoredAnswerView: View {
 
     @ViewBuilder
     var view: some View {
-        let circle = Circle()
-            .foregroundColor(color)
+        let circle = Image(systemName: "circle.fill")
+            .foregroundStyle(color)
+            .font(.system(size: size))
             .frame(
-                width: size,
-                height: size
+                width: size * 1.05,
+                height: size * 1.05
             )
 
         switch status {
@@ -74,3 +75,12 @@ struct ColoredAnswerView: View {
         view
     }
 }
+
+struct ColoredAnswerView_Previews:
+    PreviewProvider
+{
+    static var previews: some View {
+        ColoredAnswerView(color: "red", size: 500, status: .playingRightAnimation)
+            .previewInterfaceOrientation(.landscapeLeft)
+    }
+}
diff --git a/Modules/GameEngineKit/Sources/UI/Views/TextAnswerView.swift b/Modules/GameEngineKit/Sources/UI/Views/TextAnswerView.swift
@@ -2,6 +2,7 @@
 // Copyright 2023 APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
+import DesignKit
 import SwiftUI
 
 struct TextAnswerView: View {
@@ -15,15 +16,17 @@ struct TextAnswerView: View {
     @ViewBuilder
     var view: some View {
         let circle = ZStack {
-            Circle()
-                .fill(.gray.opacity(0.8))
+            Image(systemName: "circle.fill")
+                .foregroundStyle(DesignKitAsset.Colors.lekaDarkBlue.swiftUIColor)
+                .font(.system(size: size))
                 .frame(
-                    width: size,
-                    height: size
+                    width: size * 1.05,
+                    height: size * 1.05
                 )
 
             Text(text.uppercased())
-                .font(.title.bold())
+                .font(.largeTitle.uppercaseSmallCaps())
+                .foregroundColor(.white)
         }
 
         switch status {
@@ -67,3 +70,12 @@ struct TextAnswerView: View {
         view
     }
 }
+
+struct TextAnswerView_Previews:
+    PreviewProvider
+{
+    static var previews: some View {
+        TextAnswerView(text: "Hello", size: 500, status: .playingRightAnimation)
+            .previewInterfaceOrientation(.landscapeLeft)
+    }
+}