Add colors(GameparametersMenuView): still needs to implement them

everywhere

ArkitDoushiQi/ArkitDoushiQi/ArkitDoushiQiApp.swift

@@ -7,7 +7,14 @@
 
 import SwiftUI
 
+enum Theme {
+    static let primary = Color("Primary")
+    static let secondary = Color("Secondary")
+    static let tertiary = Color("Tertiary")
+}
+
 @main
+
 struct ArkitDoushiQiApp: App {
     @AppStorage("isDarkMode") private var isDarkMode = false
             var body: some Scene {

ArkitDoushiQi/ArkitDoushiQi/Assets.xcassets/Primary.colorset/Contents.json

@@ -16,7 +16,7 @@
       "appearances" : [
         {
           "appearance" : "luminosity",
-          "value" : "dark"
+          "value" : "light"
         }
       ],
       "color" : {
@@ -29,6 +29,19 @@
         }
       },
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "platform" : "ios",
+        "reference" : "darkTextColor"
+      },
+      "idiom" : "universal"
     }
   ],
   "info" : {

ArkitDoushiQi/ArkitDoushiQi/Assets.xcassets/Quaternary.colorset/Contents.json

@@ -0,0 +1,56 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ArkitDoushiQi/ArkitDoushiQi/Assets.xcassets/Secundary.colorset/Contents.json

@@ -0,0 +1,56 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ArkitDoushiQi/ArkitDoushiQi/Assets.xcassets/Tertiary.colorset/Contents.json

@@ -0,0 +1,51 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "color" : {
+        "platform" : "ios",
+        "reference" : "darkTextColor"
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ArkitDoushiQi/ArkitDoushiQi/Views/Components/Controls/ButtonComponent.swift

@@ -25,11 +25,11 @@ struct ButtonComponent<Content : View>: View {
                 .frame(maxWidth: .infinity)
                 .padding(EdgeInsets(top: 10, leading: 32, bottom: 10, trailing: 32))
                 .controlSize(.large)
-                .foregroundColor(.white)
+                .foregroundColor(Color(UIColor(named: "Primary") ?? .black))
         }
         .buttonBorderShape(.roundedRectangle)
         .buttonStyle(.borderedProminent)
-        .tint(.black)
+        .tint(Color(UIColor(named: "Tertiary") ?? .white))
     }
 }
 

ArkitDoushiQi/ArkitDoushiQi/Views/Components/Controls/PhotoButtonComponent.swift

@@ -44,7 +44,7 @@ struct accessCameraView: UIViewControllerRepresentable {
 }
 
 struct PhotoButtonComponent: View {
-    let Text : String
+    let Value : String
     @State private var showCamera = false
     @State private var selectedImage: UIImage?
     @State var image: UIImage?
@@ -56,7 +56,7 @@ struct PhotoButtonComponent: View {
                             .scaledToFit()
                     }
                     
-                    Button("Open camera") {
+                    Button(Value) {
                         self.showCamera.toggle()
                     }
                     .fullScreenCover(isPresented: self.$showCamera) {
@@ -68,6 +68,6 @@ struct PhotoButtonComponent: View {
 
 struct PhotoButtonComponent_Previews: PreviewProvider {
     static var previews: some View {
-        PhotoButtonComponent(Text : "Prendre Photo")
+        PhotoButtonComponent(Value : "Prendre Photo")
     }
 }

ArkitDoushiQi/ArkitDoushiQi/Views/Components/Controls/PickerComponent.swift

@@ -33,11 +33,9 @@ struct PickerComponent<EnumType: RawRepresentable & Identifiable & Hashable>: Vi
             } label: {
                 HStack {
                     Text(title)
-                        .foregroundColor(.black)
                         .padding()
                     Spacer()
                     Text(selectedOption.rawValue.description)
-                        .foregroundColor(.black)
                         .padding()
                 }
                 .frame(maxWidth: .infinity)

ArkitDoushiQi/ArkitDoushiQi/Views/GameParametersMenu/GameParametersMenuView.swift

@@ -41,8 +41,9 @@ struct GameParametersMenuView: View {
                 EditComponent(explanation: "Nom du joueur 2",value: "Joueur 2")
                 ButtonComponent(title: "Lancer la partie") {
                     GameView()
-                }
+                }.padding(EdgeInsets(top: 10, leading: 32, bottom: 10, trailing: 32))
-            }.frame(maxHeight: .infinity, alignment: .top)
+            }
+            .frame(maxHeight: .infinity, alignment: .top)
         }
     }