v1.1.22

PadelClub.xcodeproj/project.pbxproj

@@ -3344,7 +3344,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.21;
+				MARKETING_VERSION = 1.1.22;
 				PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3389,7 +3389,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.21;
+				MARKETING_VERSION = 1.1.22;
 				PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

PadelClub/Assets.xcassets/beigeNotUniversal.colorset/Contents.json

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

PadelClub/Assets.xcassets/grayNotUniversal.colorset/Contents.json

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

PadelClub/Data/Tournament.swift

@@ -1002,7 +1002,7 @@ defer {
     }
 
     func cutLabelColor(index: Int?, teamCount: Int?) -> Color {
-        guard let index else { return Color.gray }
+        guard let index else { return Color.grayNotUniversal }
         let _teamCount = teamCount ?? selectedSortedTeams().count
         let groupStageCut = groupStageCut()
         let bracketCut = bracketCut(teamCount: _teamCount, groupStageCut: groupStageCut)
@@ -1011,7 +1011,7 @@ defer {
         } else if index - bracketCut < groupStageCut && _teamCount > 0 {
             return Color.indigo
         } else {
-            return Color.gray
+            return Color.grayNotUniversal
         }
     }
 

PadelClub/InscriptionLegendView.swift

@@ -42,7 +42,7 @@ struct InscriptionLegendView: View {
                 
                 Section {
                     Text("Équipe en liste d'attente")
-                        .listRowView(isActive: true, color: .gray, hideColorVariation: true, alignment: .leading)
+                        .listRowView(isActive: true, color: .grayNotUniversal, hideColorVariation: true, alignment: .leading)
                     Text("Équipe forfaite")
                         .listRowView(isActive: true, color: .logoRed, hideColorVariation: true, alignment: .leading)
                 }
@@ -56,7 +56,7 @@ struct InscriptionLegendView: View {
 
                 Section {
                     Text("Équipe ayant un joueur ne provenant pas du fichier beach-padel")
-                        .listRowView(isActive: true, color: .beige, hideColorVariation: true, backgroundColor: .beige, alignment: .leading)
+                        .listRowView(isActive: true, color: .beigeNotUniversal, hideColorVariation: true, backgroundColor: .beigeNotUniversal, alignment: .leading)
                 } footer: {
                     Text("Une fois que vous avez importé votre fichier, Padel Club vous affiche ainsi les équipes ayant des joueurs ne provenant pas du fichier.")
                 }

PadelClub/Views/Tournament/Screen/InscriptionManagerView.swift

@@ -616,7 +616,7 @@ struct InscriptionManagerView: View {
                     Section {
                         ForEach(teams) { team in
                             let teamIndex = team.index(in: sortedTeams)
-                            let color: Color? = isImported ? (team.unrankedOrUnknown() ? .logoRed : (team.isImported() == false ? .beige : nil)) : nil
+                            let color: Color? = isImported ? (team.unrankedOrUnknown() ? .logoRed : (team.isImported() == false ? .beigeNotUniversal : nil)) : nil
                             
                             NavigationLink {
                                 EditingTeamView(team: team)

PadelClub/Views/ViewModifiers/ListRowViewModifier.swift

@@ -15,7 +15,7 @@ struct ListRowViewModifier: ViewModifier {
     let alignment: Alignment
     
     func colorVariation() -> Color {
-        hideColorVariation ? (backgroundColor ?? Color(uiColor: .systemBackground)) : color.variation()
+        hideColorVariation ? (backgroundColor ?? Color(uiColor: .secondarySystemGroupedBackground)) : color.variation()
     }
 
     func body(content: Content) -> some View {