Fix bad merge

2 years ago · ae05f8aa4b
parent 5c07386863
commit ae05f8aa4b
4 changed files with 20 additions and 32 deletions
--- a/PadelClub.xcodeproj/project.pbxproj
+++ b/PadelClub.xcodeproj/project.pbxproj
@ -18,7 +18,6 @@
 		C45BAE442BCA753E002EEC8A /* Purchase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C45BAE432BCA753E002EEC8A /* Purchase.swift */; };
 		C49EF0192BD694290077B5AA /* PurchaseListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49EF0182BD694290077B5AA /* PurchaseListView.swift */; };
 		C49EF01B2BD6A1E80077B5AA /* URLs.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49EF01A2BD6A1E80077B5AA /* URLs.swift */; };
-		C49EF0222BD6BBE00077B5AA /* FileManager+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49EF0212BD6BBE00077B5AA /* FileManager+Extensions.swift */; };
 		C4A47D5A2B6D383C00ADC637 /* Tournament.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A47D592B6D383C00ADC637 /* Tournament.swift */; };
 		C4A47D5E2B6D38EC00ADC637 /* DataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A47D5D2B6D38EC00ADC637 /* DataStore.swift */; };
 		C4A47D632B6D3D6500ADC637 /* Club.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A47D622B6D3D6500ADC637 /* Club.swift */; };
@ -311,7 +310,6 @@
 		C45BAE432BCA753E002EEC8A /* Purchase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Purchase.swift; sourceTree = "<group>"; };
 		C49EF0182BD694290077B5AA /* PurchaseListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchaseListView.swift; sourceTree = "<group>"; };
 		C49EF01A2BD6A1E80077B5AA /* URLs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLs.swift; sourceTree = "<group>"; };
-		C49EF0212BD6BBE00077B5AA /* FileManager+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FileManager+Extensions.swift"; sourceTree = "<group>"; };
 		C4A47D592B6D383C00ADC637 /* Tournament.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tournament.swift; sourceTree = "<group>"; };
 		C4A47D5D2B6D38EC00ADC637 /* DataStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataStore.swift; sourceTree = "<group>"; };
 		C4A47D622B6D3D6500ADC637 /* Club.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Club.swift; sourceTree = "<group>"; };
@ -1140,7 +1138,6 @@
 				FF92680A2BCEE3E10080F940 /* ContactManager.swift */,
 				FF1DC55A2BAB80C400FD8220 /* DisplayContext.swift */,
 				FFA6D7842BB0B795003A31F3 /* FileImportManager.swift */,
-				C49EF0212BD6BBE00077B5AA /* FileManager+Extensions.swift */,
 				FFC1E1072BAC29FC008D6F59 /* LocationManager.swift */,
 				FF92680C2BCEE5EA0080F940 /* NetworkMonitor.swift */,
 				FF8F26352BAD523300650388 /* PadelRule.swift */,
@ -1528,7 +1525,6 @@
 				FFCFC0142BBC59FC00B82851 /* MatchDescriptor.swift in Sources */,
 				FF8F264C2BAE0B4100650388 /* TournamentFormatSelectionView.swift in Sources */,
 				FFBF065E2BBD8040009D6715 /* MatchListView.swift in Sources */,
-				C49EF0222BD6BBE00077B5AA /* FileManager+Extensions.swift in Sources */,
 				C425D4012B6D249D002A7B48 /* PadelClubApp.swift in Sources */,
 				FF8F26432BADFE5B00650388 /* TournamentSettingsView.swift in Sources */,
 				FF4C7F022BBBD7150031B6A3 /* TabItemModifier.swift in Sources */,
--- a/PadelClub/Manager/FileManager+Extensions.swift
+++ b/PadelClub/Manager/FileManager+Extensions.swift
@ -1,26 +0,0 @@
-//
-//  FileManager+Extensions.swift
-//  PadelClub
-//
-//  Created by Laurent Morvillier on 22/04/2024.
-//
-
-import Foundation
-import LeStorage
-
-extension FileManager {
-    
-    func createDirectoryInDocuments(directoryName: String) {
-        let documentsDirectory = self.urls(for: .documentDirectory, in: .userDomainMask).first!
-        let directoryURL = documentsDirectory.appendingPathComponent(directoryName)
-
-        if !self.fileExists(atPath: directoryURL.path) {
-            do {
-                try self.createDirectory(at: directoryURL, withIntermediateDirectories: true, attributes: nil)
-            } catch {
-                Logger.error(error)
-            }
-        }
-    }
-    
-}
--- a/PadelClub/Views/Subscription/Guard.swift
+++ b/PadelClub/Views/Subscription/Guard.swift
@ -185,7 +185,7 @@ import LeStorage
            }
            return nil
        default:
-            let subscriptionPayed = DataStore.shared.tournaments.filter { $0.payment.isSubscription }
+            let subscriptionPayed = DataStore.shared.tournaments.filter { $0.payment?.isSubscription == true }
            
            let unitlyPayed = DataStore.shared.tournaments.count - subscriptionPayed.count
            if unitlyPayed == 0 {
@ -201,7 +201,7 @@ import LeStorage
    }
    
    var remainingTournaments: Int {
-        let subscriptionPayed = DataStore.shared.tournaments.filter { $0.payment.isSubscription }
+        let subscriptionPayed = DataStore.shared.tournaments.filter { $0.payment?.isSubscription == true }
        let unitlyPayed = DataStore.shared.tournaments.count - subscriptionPayed.count
        let tournamentCreditCount = self._purchasedTournamentCount()
        return tournamentCreditCount - unitlyPayed
--- a/PadelClub/Views/Subscription/OffersHeaderView.swift
+++ b/PadelClub/Views/Subscription/OffersHeaderView.swift
@ -0,0 +1,18 @@
+//
+//  OffersHeaderView.swift
+//  PadelClub
+//
+//  Created by Laurent Morvillier on 23/04/2024.
+//
+
+import SwiftUI
+
+struct OffersHeaderView: View {
+    var body: some View {
+        Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
+    }
+}
+
+#Preview {
+    OffersHeaderView()
+}