From e1a504f63f3f734e6570b4b5fdcfb1f4771aec49 Mon Sep 17 00:00:00 2001
From: Raz <razmig@staxriver.com>
Date: Thu, 5 Sep 2024 12:43:51 +0200
Subject: [PATCH] fix regression

---
 PadelClub.xcodeproj/project.pbxproj        | 8 ++++----
 PadelClub/Data/Tournament.swift            | 2 +-
 PadelClub/ViewModel/SeedInterval.swift     | 8 ++++++++
 PadelClub/Views/Match/MatchSetupView.swift | 2 +-
 PadelClub/Views/Round/RoundView.swift      | 4 ++--
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/PadelClub.xcodeproj/project.pbxproj b/PadelClub.xcodeproj/project.pbxproj
index 9df465b..42b5196 100644
--- a/PadelClub.xcodeproj/project.pbxproj
+++ b/PadelClub.xcodeproj/project.pbxproj
@@ -1958,7 +1958,7 @@
 				CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
 				DEVELOPMENT_TEAM = BQ3Y44M3Q6;
@@ -1979,7 +1979,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.4;
+				MARKETING_VERSION = 1.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1999,7 +1999,7 @@
 				CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
 				DEVELOPMENT_TEAM = BQ3Y44M3Q6;
@@ -2020,7 +2020,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.4;
+				MARKETING_VERSION = 1.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/PadelClub/Data/Tournament.swift b/PadelClub/Data/Tournament.swift
index 5ab4fd8..3fe8d03 100644
--- a/PadelClub/Data/Tournament.swift
+++ b/PadelClub/Data/Tournament.swift
@@ -1211,7 +1211,7 @@ defer {
         others.forEach { round in
             print("round", round.roundTitle())
             if let interval = round.seedInterval() {
-                print("interval", interval.localizedLabel())
+                print("interval", interval.localizedInterval())
                 let playedMatches = round.playedMatches().filter { $0.disabled == false || $0.isReady() }
                 print("playedMatches", playedMatches.count)
                 let winners = playedMatches.compactMap({ $0.winningTeamId }).filter({ ids.contains($0) == false })
diff --git a/PadelClub/ViewModel/SeedInterval.swift b/PadelClub/ViewModel/SeedInterval.swift
index e34f620..65641a3 100644
--- a/PadelClub/ViewModel/SeedInterval.swift
+++ b/PadelClub/ViewModel/SeedInterval.swift
@@ -57,4 +57,12 @@ struct SeedInterval: Hashable, Comparable {
             return "Place \(first) à \(last)"
         }
     }
+    
+    func localizedInterval(_ displayStyle: DisplayStyle = .wide) -> String {
+        if dimension < 2 {
+            return "#\(first) / #\(last)"
+        } else {
+            return "#\(first) à #\(last)"
+        }
+    }
 }
diff --git a/PadelClub/Views/Match/MatchSetupView.swift b/PadelClub/Views/Match/MatchSetupView.swift
index 296c4b4..65a98f7 100644
--- a/PadelClub/Views/Match/MatchSetupView.swift
+++ b/PadelClub/Views/Match/MatchSetupView.swift
@@ -138,7 +138,7 @@ struct MatchSetupView: View {
                                         }
                                     }
                                 } label: {
-                                    Label(seedGroup.localizedLabel(), systemImage: "dice")
+                                    Label(seedGroup.localizedInterval(), systemImage: "dice")
                                 }
                             }
                         } label: {
diff --git a/PadelClub/Views/Round/RoundView.swift b/PadelClub/Views/Round/RoundView.swift
index 3891599..3e52112 100644
--- a/PadelClub/Views/Round/RoundView.swift
+++ b/PadelClub/Views/Round/RoundView.swift
@@ -123,7 +123,7 @@ struct RoundView: View {
 
                 if availableSeeds.isEmpty == false, let availableSeedGroup {
                     Section {
-                        RowButtonView("Placer \(availableSeedGroup.localizedLabel())" + ((availableSeedGroup.isFixed() == false) ? " au hasard" : ""))  {
+                        RowButtonView("Placer \(availableSeedGroup.localizedInterval())" + ((availableSeedGroup.isFixed() == false) ? " au hasard" : ""))  {
                             Task {
                                 tournament.setSeeds(inRoundIndex: upperRound.round.index, inSeedGroup: availableSeedGroup)
                                 _save()
@@ -137,7 +137,7 @@ struct RoundView: View {
                     
                     if (availableSeedGroup.isFixed() == false) {
                         Section {
-                            RowButtonView("Tirage au sort \(availableSeedGroup.localizedLabel()) visuel") {
+                            RowButtonView("Tirage au sort \(availableSeedGroup.localizedInterval()) visuel") {
                                 self.selectedSeedGroup = availableSeedGroup
                             }
                         } footer: {