diff --git a/Zockerhoehle copy-Info.plist b/Zockerhoehle copy-Info.plist deleted file mode 100644 index e49a713..0000000 --- a/Zockerhoehle copy-Info.plist +++ /dev/null @@ -1,52 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - Zockerhöhle - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - LSRequiresIPhoneOS - - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/Zockerhoehle.xcodeproj/project.pbxproj b/Zockerhoehle.xcodeproj/project.pbxproj index b58f9bc..70977ea 100644 --- a/Zockerhoehle.xcodeproj/project.pbxproj +++ b/Zockerhoehle.xcodeproj/project.pbxproj @@ -16,14 +16,10 @@ B94112E4233B597D00159AE4 /* ConsoleEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B94112E3233B597D00159AE4 /* ConsoleEditView.swift */; }; B94CB4FF22D1352F0029BFAD /* Accessory+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = B94CB4F322D1352F0029BFAD /* Accessory+CoreDataClass.swift */; }; B94CB50022D1352F0029BFAD /* Accessory+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = B94CB4F422D1352F0029BFAD /* Accessory+CoreDataProperties.swift */; }; - B94CB50222D1352F0029BFAD /* Cover+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = B94CB4F622D1352F0029BFAD /* Cover+CoreDataProperties.swift */; }; B94CB50322D1352F0029BFAD /* Game+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = B94CB4F722D1352F0029BFAD /* Game+CoreDataClass.swift */; }; B94CB50422D1352F0029BFAD /* Game+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = B94CB4F822D1352F0029BFAD /* Game+CoreDataProperties.swift */; }; - B94CB50922D1352F0029BFAD /* Logo+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = B94CB4FD22D1352F0029BFAD /* Logo+CoreDataClass.swift */; }; - B94CB50A22D1352F0029BFAD /* Logo+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = B94CB4FE22D1352F0029BFAD /* Logo+CoreDataProperties.swift */; }; B94CB53722D3B3CC0029BFAD /* GameDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B94CB53622D3B3CC0029BFAD /* GameDetailView.swift */; }; B9839983233A086A002F9946 /* Overview.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9839982233A086A002F9946 /* Overview.swift */; }; - B983998C233A0BC9002F9946 /* Cover+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = B94CB4F522D1352F0029BFAD /* Cover+CoreDataClass.swift */; }; B98A734D22BAD27D00FB3410 /* Zockerhoehle.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B98A731722BA9E4600FB3410 /* Zockerhoehle.xcdatamodeld */; }; B98A736022C1738800FB3410 /* CDManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B98A735F22C1738800FB3410 /* CDManager.swift */; }; B98CBBD2264E933A00B1B7AC /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B98CBBD1264E933A00B1B7AC /* CloudKit.framework */; }; @@ -84,15 +80,10 @@ B94112E3233B597D00159AE4 /* ConsoleEditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConsoleEditView.swift; sourceTree = ""; }; B94CB4F322D1352F0029BFAD /* Accessory+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Accessory+CoreDataClass.swift"; sourceTree = ""; }; B94CB4F422D1352F0029BFAD /* Accessory+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Accessory+CoreDataProperties.swift"; sourceTree = ""; }; - B94CB4F522D1352F0029BFAD /* Cover+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Cover+CoreDataClass.swift"; sourceTree = ""; }; - B94CB4F622D1352F0029BFAD /* Cover+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Cover+CoreDataProperties.swift"; sourceTree = ""; }; B94CB4F722D1352F0029BFAD /* Game+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Game+CoreDataClass.swift"; sourceTree = ""; }; B94CB4F822D1352F0029BFAD /* Game+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Game+CoreDataProperties.swift"; sourceTree = ""; }; B94CB4F922D1352F0029BFAD /* Console+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Console+CoreDataClass.swift"; sourceTree = ""; }; B94CB4FA22D1352F0029BFAD /* Console+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Console+CoreDataProperties.swift"; sourceTree = ""; }; - B94CB4FD22D1352F0029BFAD /* Logo+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Logo+CoreDataClass.swift"; sourceTree = ""; }; - B94CB4FE22D1352F0029BFAD /* Logo+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Logo+CoreDataProperties.swift"; sourceTree = ""; }; - B94CB53522D3708F0029BFAD /* Zockerhoehle copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Zockerhoehle copy-Info.plist"; path = "/Users/julian/Entwicklung/Zockerhoehle/Zockerhoehle copy-Info.plist"; sourceTree = ""; }; B94CB53622D3B3CC0029BFAD /* GameDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameDetailView.swift; sourceTree = ""; }; B9839982233A086A002F9946 /* Overview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Overview.swift; sourceTree = ""; }; B98A731822BA9E4600FB3410 /* Zockerhoehle.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Zockerhoehle.xcdatamodel; sourceTree = ""; }; @@ -187,7 +178,6 @@ B98CBBE92652B75F00B1B7AC /* ZockerhoehleTests */, B93C1B9A21496BFD0014FD6E /* Products */, B90B64A12235909900E54BA3 /* Frameworks */, - B94CB53522D3708F0029BFAD /* Zockerhoehle copy-Info.plist */, ); sourceTree = ""; }; @@ -227,14 +217,10 @@ B98CBBD7264E98DD00B1B7AC /* GameSeries+CoreDataProperties.swift */, B94CB4F322D1352F0029BFAD /* Accessory+CoreDataClass.swift */, B94CB4F422D1352F0029BFAD /* Accessory+CoreDataProperties.swift */, - B94CB4F522D1352F0029BFAD /* Cover+CoreDataClass.swift */, - B94CB4F622D1352F0029BFAD /* Cover+CoreDataProperties.swift */, B94CB4F722D1352F0029BFAD /* Game+CoreDataClass.swift */, B94CB4F822D1352F0029BFAD /* Game+CoreDataProperties.swift */, B94CB4F922D1352F0029BFAD /* Console+CoreDataClass.swift */, B94CB4FA22D1352F0029BFAD /* Console+CoreDataProperties.swift */, - B94CB4FD22D1352F0029BFAD /* Logo+CoreDataClass.swift */, - B94CB4FE22D1352F0029BFAD /* Logo+CoreDataProperties.swift */, ); path = CDModel; sourceTree = ""; @@ -381,7 +367,6 @@ files = ( B98CBBDD264E98F300B1B7AC /* Console+CoreDataClass.swift in Sources */, B98CBBDB264E98DE00B1B7AC /* Console+CoreDataProperties.swift in Sources */, - B983998C233A0BC9002F9946 /* Cover+CoreDataClass.swift in Sources */, B98CBBE3265045AC00B1B7AC /* URLExtension.swift in Sources */, B94112E0233A4EF800159AE4 /* GamePickupsView.swift in Sources */, B9A0550522F8CB400054D9A0 /* GameSeriesLibraryView.swift in Sources */, @@ -393,11 +378,9 @@ B9F44ABE22F31DEF00FC6B29 /* SceneDelegate.swift in Sources */, B9A0550322F8C2740054D9A0 /* MainView.swift in Sources */, B98CBBDA264E98DD00B1B7AC /* GameSeries+CoreDataProperties.swift in Sources */, - B94CB50A22D1352F0029BFAD /* Logo+CoreDataProperties.swift in Sources */, B94CB4FF22D1352F0029BFAD /* Accessory+CoreDataClass.swift in Sources */, B98A734D22BAD27D00FB3410 /* Zockerhoehle.xcdatamodeld in Sources */, B90E03EB238557D900E79643 /* LibraryImport.swift in Sources */, - B94CB50922D1352F0029BFAD /* Logo+CoreDataClass.swift in Sources */, B98CBBDC264E98DE00B1B7AC /* GameSeries+CoreDataClass.swift in Sources */, B9A0550122F8C22D0054D9A0 /* GameSeriesAllView.swift in Sources */, B94112E4233B597D00159AE4 /* ConsoleEditView.swift in Sources */, @@ -409,7 +392,6 @@ B94CB50422D1352F0029BFAD /* Game+CoreDataProperties.swift in Sources */, B9BCCEBB2653CA8E005F46D6 /* SwiftUIBindingExtension.swift in Sources */, B98A736022C1738800FB3410 /* CDManager.swift in Sources */, - B94CB50222D1352F0029BFAD /* Cover+CoreDataProperties.swift in Sources */, B9E2A07E233B6E4F00EAEB14 /* ConsoleAllView.swift in Sources */, B9BCCEB92653BDEA005F46D6 /* ICloudManager.swift in Sources */, B9EC0987238555BF004BC9AB /* SettingsView.swift in Sources */, diff --git a/Zockerhoehle/CDModel/Cover+CoreDataClass.swift b/Zockerhoehle/CDModel/Cover+CoreDataClass.swift deleted file mode 100644 index b9e1480..0000000 --- a/Zockerhoehle/CDModel/Cover+CoreDataClass.swift +++ /dev/null @@ -1,15 +0,0 @@ -// -// Cover+CoreDataClass.swift -// Zockerhoehle -// -// Created by Julian-Steffen Müller on 06.07.19. -// Copyright © 2019 Julian-Steffen Müller. All rights reserved. -// -// - -import Foundation -import CoreData - -@objc(Cover) -public class Cover: NSManagedObject { -} diff --git a/Zockerhoehle/CDModel/Cover+CoreDataProperties.swift b/Zockerhoehle/CDModel/Cover+CoreDataProperties.swift deleted file mode 100644 index c8dff2e..0000000 --- a/Zockerhoehle/CDModel/Cover+CoreDataProperties.swift +++ /dev/null @@ -1,23 +0,0 @@ -// -// Cover+CoreDataProperties.swift -// Zockerhoehle -// -// Created by Julian-Steffen Müller on 06.07.19. -// Copyright © 2019 Julian-Steffen Müller. All rights reserved. -// -// - -import Foundation -import CoreData -import UIKit.UIImage - -extension Cover { - - @nonobjc public class func fetchRequest() -> NSFetchRequest { - return NSFetchRequest(entityName: "Cover") - } - - @NSManaged public var image: UIImage? - @NSManaged public var game: Game - -} diff --git a/Zockerhoehle/CDModel/Logo+CoreDataClass.swift b/Zockerhoehle/CDModel/Logo+CoreDataClass.swift deleted file mode 100644 index e1f4c51..0000000 --- a/Zockerhoehle/CDModel/Logo+CoreDataClass.swift +++ /dev/null @@ -1,16 +0,0 @@ -// -// Logo+CoreDataClass.swift -// Zockerhoehle -// -// Created by Julian-Steffen Müller on 06.07.19. -// Copyright © 2019 Julian-Steffen Müller. All rights reserved. -// -// - -import Foundation -import CoreData - -@objc(Logo) -public class Logo: NSManagedObject { - -} diff --git a/Zockerhoehle/CDModel/Logo+CoreDataProperties.swift b/Zockerhoehle/CDModel/Logo+CoreDataProperties.swift deleted file mode 100644 index 6c8d3b6..0000000 --- a/Zockerhoehle/CDModel/Logo+CoreDataProperties.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// Logo+CoreDataProperties.swift -// Zockerhoehle -// -// Created by Julian-Steffen Müller on 06.07.19. -// Copyright © 2019 Julian-Steffen Müller. All rights reserved. -// -// - -import Foundation -import CoreData -import UIKit.UIImage - -extension Logo { - @NSManaged public var image: UIImage? - -} diff --git a/Zockerhoehle/Utils/LibraryImport.swift b/Zockerhoehle/Utils/LibraryImport.swift index a3ca050..f8e9f50 100644 --- a/Zockerhoehle/Utils/LibraryImport.swift +++ b/Zockerhoehle/Utils/LibraryImport.swift @@ -54,9 +54,7 @@ class LibraryImport { [NSBatchDeleteRequest(fetchRequest: Game.fetchRequest()), NSBatchDeleteRequest(fetchRequest: Accessory.fetchRequest()), NSBatchDeleteRequest(fetchRequest: Console.fetchRequest()), - NSBatchDeleteRequest(fetchRequest: GameSeries.fetchRequest()), - NSBatchDeleteRequest(fetchRequest: Logo.fetchRequest()), - NSBatchDeleteRequest(fetchRequest: Cover.fetchRequest())] + NSBatchDeleteRequest(fetchRequest: GameSeries.fetchRequest())] let storeCoordinator = CDManager.shared.persistentContainer.persistentStoreCoordinator do { diff --git a/Zockerhoehle/Zockerhoehle.xcdatamodeld/Zockerhoehle.xcdatamodel/contents b/Zockerhoehle/Zockerhoehle.xcdatamodeld/Zockerhoehle.xcdatamodel/contents index 6e71f25..7496269 100644 --- a/Zockerhoehle/Zockerhoehle.xcdatamodeld/Zockerhoehle.xcdatamodel/contents +++ b/Zockerhoehle/Zockerhoehle.xcdatamodeld/Zockerhoehle.xcdatamodel/contents @@ -21,9 +21,6 @@ - - - @@ -51,16 +48,11 @@ - - - - - \ No newline at end of file