diff --git a/Zockerhoehle.xcodeproj/project.pbxproj b/Zockerhoehle.xcodeproj/project.pbxproj index 3df618d..67103f1 100644 --- a/Zockerhoehle.xcodeproj/project.pbxproj +++ b/Zockerhoehle.xcodeproj/project.pbxproj @@ -552,10 +552,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = 85J8CBD673; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Zockerhoehle/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.1; LD_RUNPATH_SEARCH_PATHS = ( @@ -578,10 +575,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = M9N7K3KZX9; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Zockerhoehle/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.1; LD_RUNPATH_SEARCH_PATHS = ( diff --git a/Zockerhoehle/Utils/LibraryImport.swift b/Zockerhoehle/Utils/LibraryImport.swift index c4a6995..44e030b 100644 --- a/Zockerhoehle/Utils/LibraryImport.swift +++ b/Zockerhoehle/Utils/LibraryImport.swift @@ -32,7 +32,7 @@ class LibraryImport { func backupFiles() -> [String] { do { - guard let documentDirectory = try ICloudManager.backup_folder else { return [] } + guard let documentDirectory = ICloudManager.backup_folder else { return [] } let filesInDocumentsDir = try FileManager.default.contentsOfDirectory(at: documentDirectory, includingPropertiesForKeys: .none, options: []) @@ -169,7 +169,7 @@ class LibraryImport { for console in library.consoles { let cdConsole = makeCDConsole(from: console) - print("CONSOLE: \(cdConsole.name ?? "n/a") with \(console.games.count) games") + print("CONSOLE: \(cdConsole.name) with \(console.games.count) games") for uuid in console.games { if let game = library.games.first(where: {$0.uuid == uuid}) { diff --git a/Zockerhoehle/Views/AccessoryDetailView.swift b/Zockerhoehle/Views/AccessoryDetailView.swift index 0fe7053..9208c40 100644 --- a/Zockerhoehle/Views/AccessoryDetailView.swift +++ b/Zockerhoehle/Views/AccessoryDetailView.swift @@ -19,6 +19,6 @@ struct AccessoryDetailView : View { Toggle(isOn: $accessory.inWishlist, label: { Text("In Wunschliste") }) - }.navigationBarTitle(Text("\(accessory.name ?? "n/a")"), displayMode: .automatic) + }.navigationBarTitle(Text("\(accessory.name)"), displayMode: .automatic) } } diff --git a/Zockerhoehle/Views/ConsoleLibraryView.swift b/Zockerhoehle/Views/ConsoleLibraryView.swift index 8411cdc..a009fb9 100644 --- a/Zockerhoehle/Views/ConsoleLibraryView.swift +++ b/Zockerhoehle/Views/ConsoleLibraryView.swift @@ -129,7 +129,7 @@ struct ConsoleLibraryView : View { } } } - .navigationBarTitle(Text("\(self.console.name ?? "n/a")"), displayMode: .automatic) + .navigationBarTitle(Text("\(self.console.name)"), displayMode: .automatic) .navigationBarItems(trailing: HStack { NavigationLink(destination: ConsoleEditView(console: self.console)) { diff --git a/Zockerhoehle/Views/GameSeriesAllView.swift b/Zockerhoehle/Views/GameSeriesAllView.swift index 24640b2..c38e8e0 100644 --- a/Zockerhoehle/Views/GameSeriesAllView.swift +++ b/Zockerhoehle/Views/GameSeriesAllView.swift @@ -87,7 +87,7 @@ struct GameSeriesAllView: View { //Sonst wird der TExt kurioser Weise abgeschnitten wenn ein Bild davor ist. Hier nochmal später rein //schauen .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity, alignment: .leading) - Text("Spiele: \(game_series.games.filter({!($0 as! Game).inWishlist}).count ?? 0)/\(game_series.games.count ?? 0)").font(.caption) + Text("Spiele: \(game_series.games.filter({!($0 as! Game).inWishlist}).count)/\(game_series.games.count)").font(.caption) } }