diff --git a/Zockerhoehle.xcodeproj/project.pbxproj b/Zockerhoehle.xcodeproj/project.pbxproj index a92dc01..0a0cc7d 100644 --- a/Zockerhoehle.xcodeproj/project.pbxproj +++ b/Zockerhoehle.xcodeproj/project.pbxproj @@ -7,23 +7,16 @@ objects = { /* Begin PBXBuildFile section */ - B926F12B2149B173004D36B7 /* ConsoleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B926F12A2149B173004D36B7 /* ConsoleCell.swift */; }; B926F12D2149B264004D36B7 /* FlockeEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = B926F12C2149B264004D36B7 /* FlockeEntry.swift */; }; B926F131214AD9E4004D36B7 /* GameCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = B926F130214AD9E4004D36B7 /* GameCollection.swift */; }; B926F139214AE884004D36B7 /* FlockeWS.swift in Sources */ = {isa = PBXBuildFile; fileRef = B926F138214AE884004D36B7 /* FlockeWS.swift */; }; B926F13C214C44FE004D36B7 /* Attachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = B926F13B214C44FE004D36B7 /* Attachment.swift */; }; - B926F13F214E4678004D36B7 /* GameCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B926F13E214E4678004D36B7 /* GameCell.swift */; }; B926F14721502D53004D36B7 /* CodableExtensionAny.swift in Sources */ = {isa = PBXBuildFile; fileRef = B926F14621502D53004D36B7 /* CodableExtensionAny.swift */; }; B926F14A21502DE1004D36B7 /* ConsoleEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = B926F14921502DE1004D36B7 /* ConsoleEntry.swift */; }; B93C1B9D21496BFD0014FD6E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B93C1B9C21496BFD0014FD6E /* AppDelegate.swift */; }; - B93C1BA221496BFD0014FD6E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B93C1BA021496BFD0014FD6E /* Main.storyboard */; }; B93C1BA421496BFE0014FD6E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B93C1BA321496BFE0014FD6E /* Assets.xcassets */; }; - B93C1BB02149750E0014FD6E /* AllConsolesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B93C1BAF2149750E0014FD6E /* AllConsolesViewController.swift */; }; - B93D60CC22D88F2B00DD390F /* AccessoryDetailController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B93D60CB22D88F2B00DD390F /* AccessoryDetailController.swift */; }; B93D60CE22D88F5700DD390F /* AccessoryDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B93D60CD22D88F5700DD390F /* AccessoryDetailView.swift */; }; B93D60D122E5009700DD390F /* GameViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B93D60D022E5009700DD390F /* GameViewModel.swift */; }; - B9418449215422ED0050D099 /* AddEntryPopUpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9418448215422ED0050D099 /* AddEntryPopUpViewController.swift */; }; - B941844B2156891E0050D099 /* UIButtonX.swift in Sources */ = {isa = PBXBuildFile; fileRef = B941844A2156891E0050D099 /* UIButtonX.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 */; }; B94CB50122D1352F0029BFAD /* Cover+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = B94CB4F522D1352F0029BFAD /* Cover+CoreDataClass.swift */; }; @@ -37,18 +30,13 @@ 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 */; }; - B94CB53922D3B6490029BFAD /* GameDetailController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B94CB53822D3B6490029BFAD /* GameDetailController.swift */; }; B98A734D22BAD27D00FB3410 /* Zockerhoehle.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B98A731722BA9E4600FB3410 /* Zockerhoehle.xcdatamodeld */; }; B98A735E22BFAA4B00FB3410 /* ConsoleLibraryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B926F12E2149B6F5004D36B7 /* ConsoleLibraryViewController.swift */; }; B98A736022C1738800FB3410 /* CDManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B98A735F22C1738800FB3410 /* CDManager.swift */; }; B9BCF4CA2168ACB600ECBAAC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B9BCF4C92168ACB600ECBAAC /* LaunchScreen.storyboard */; }; - B9BCF523217900D700ECBAAC /* WaitingPopOver.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B9BCF521217900D700ECBAAC /* WaitingPopOver.storyboard */; }; B9D2C6F722E98ED800797F67 /* AccessoryViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9D2C6F622E98ED800797F67 /* AccessoryViewModel.swift */; }; - B9D6A39A22D885DD00A280DC /* AccessoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9D6A39922D885DD00A280DC /* AccessoryCell.swift */; }; - B9E256FE2156D026009FD133 /* UIViewX.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9E256FD2156D026009FD133 /* UIViewX.swift */; }; B9F002E52187AA3200E12B0A /* FlockeConnector.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9F002E42187AA3200E12B0A /* FlockeConnector.swift */; }; B9F44ABA22F312E600FC6B29 /* ConsoleLibraryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9F44AB922F312E600FC6B29 /* ConsoleLibraryView.swift */; }; - B9F44ABC22F3145300FC6B29 /* ConsoleDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9F44ABB22F3145300FC6B29 /* ConsoleDetailViewController.swift */; }; B9F44ABE22F31DEF00FC6B29 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9F44ABD22F31DEF00FC6B29 /* SceneDelegate.swift */; }; B9F44AE322F3216F00FC6B29 /* ConsolesListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9F44AE222F3216F00FC6B29 /* ConsolesListView.swift */; }; B9F44AE522F418F600FC6B29 /* ConsoleStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9F44AE422F418F600FC6B29 /* ConsoleStore.swift */; }; @@ -57,25 +45,19 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - B926F12A2149B173004D36B7 /* ConsoleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConsoleCell.swift; sourceTree = ""; }; B926F12C2149B264004D36B7 /* FlockeEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlockeEntry.swift; sourceTree = ""; }; B926F12E2149B6F5004D36B7 /* ConsoleLibraryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConsoleLibraryViewController.swift; sourceTree = ""; }; B926F130214AD9E4004D36B7 /* GameCollection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameCollection.swift; sourceTree = ""; }; B926F138214AE884004D36B7 /* FlockeWS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlockeWS.swift; sourceTree = ""; }; B926F13B214C44FE004D36B7 /* Attachment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Attachment.swift; sourceTree = ""; }; - B926F13E214E4678004D36B7 /* GameCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameCell.swift; sourceTree = ""; }; B926F14621502D53004D36B7 /* CodableExtensionAny.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableExtensionAny.swift; sourceTree = ""; }; B926F14921502DE1004D36B7 /* ConsoleEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConsoleEntry.swift; sourceTree = ""; }; B93C1B9921496BFD0014FD6E /* Zockerhoehle.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Zockerhoehle.app; sourceTree = BUILT_PRODUCTS_DIR; }; B93C1B9C21496BFD0014FD6E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; B93C1BA321496BFE0014FD6E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; B93C1BA821496BFE0014FD6E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - B93C1BAF2149750E0014FD6E /* AllConsolesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllConsolesViewController.swift; sourceTree = ""; }; - B93D60CB22D88F2B00DD390F /* AccessoryDetailController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessoryDetailController.swift; sourceTree = ""; }; B93D60CD22D88F5700DD390F /* AccessoryDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessoryDetailView.swift; sourceTree = ""; }; B93D60D022E5009700DD390F /* GameViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameViewModel.swift; sourceTree = ""; }; - B9418448215422ED0050D099 /* AddEntryPopUpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEntryPopUpViewController.swift; sourceTree = ""; }; - B941844A2156891E0050D099 /* UIButtonX.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIButtonX.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 = ""; }; @@ -90,18 +72,12 @@ 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 = ""; }; - B94CB53822D3B6490029BFAD /* GameDetailController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameDetailController.swift; sourceTree = ""; }; B98A731822BA9E4600FB3410 /* Zockerhoehle.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Zockerhoehle.xcdatamodel; sourceTree = ""; }; B98A735F22C1738800FB3410 /* CDManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CDManager.swift; sourceTree = ""; }; - B9A054FE22F852B00054D9A0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Zockerhoehle/Base.lproj/WaitingPopOver.storyboard; sourceTree = ""; }; - B9A054FF22F852B00054D9A0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; B9BCF4C92168ACB600ECBAAC /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; B9D2C6F622E98ED800797F67 /* AccessoryViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessoryViewModel.swift; sourceTree = ""; }; - B9D6A39922D885DD00A280DC /* AccessoryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessoryCell.swift; sourceTree = ""; }; - B9E256FD2156D026009FD133 /* UIViewX.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewX.swift; sourceTree = ""; }; B9F002E42187AA3200E12B0A /* FlockeConnector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlockeConnector.swift; sourceTree = ""; }; B9F44AB922F312E600FC6B29 /* ConsoleLibraryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConsoleLibraryView.swift; sourceTree = ""; }; - B9F44ABB22F3145300FC6B29 /* ConsoleDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConsoleDetailViewController.swift; sourceTree = ""; }; B9F44ABD22F31DEF00FC6B29 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; B9F44AE222F3216F00FC6B29 /* ConsolesListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConsolesListView.swift; sourceTree = ""; }; B9F44AE422F418F600FC6B29 /* ConsoleStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConsoleStore.swift; sourceTree = ""; }; @@ -142,11 +118,6 @@ isa = PBXGroup; children = ( B926F12E2149B6F5004D36B7 /* ConsoleLibraryViewController.swift */, - B93C1BAF2149750E0014FD6E /* AllConsolesViewController.swift */, - B9418448215422ED0050D099 /* AddEntryPopUpViewController.swift */, - B94CB53822D3B6490029BFAD /* GameDetailController.swift */, - B93D60CB22D88F2B00DD390F /* AccessoryDetailController.swift */, - B9F44ABB22F3145300FC6B29 /* ConsoleDetailViewController.swift */, ); path = ViewController; sourceTree = ""; @@ -154,10 +125,7 @@ B926F136214AE2E3004D36B7 /* Views */ = { isa = PBXGroup; children = ( - B926F12A2149B173004D36B7 /* ConsoleCell.swift */, - B926F13E214E4678004D36B7 /* GameCell.swift */, B94CB53622D3B3CC0029BFAD /* GameDetailView.swift */, - B9D6A39922D885DD00A280DC /* AccessoryCell.swift */, B93D60CD22D88F5700DD390F /* AccessoryDetailView.swift */, B9F44AB922F312E600FC6B29 /* ConsoleLibraryView.swift */, B9F44AE222F3216F00FC6B29 /* ConsolesListView.swift */, @@ -178,8 +146,6 @@ isa = PBXGroup; children = ( B926F14621502D53004D36B7 /* CodableExtensionAny.swift */, - B941844A2156891E0050D099 /* UIButtonX.swift */, - B9E256FD2156D026009FD133 /* UIViewX.swift */, ); path = Lib; sourceTree = ""; @@ -205,7 +171,6 @@ B93C1B9B21496BFD0014FD6E /* Zockerhoehle */ = { isa = PBXGroup; children = ( - B9F44ABD22F31DEF00FC6B29 /* SceneDelegate.swift */, B93D60CF22E5006F00DD390F /* ViewModel */, B98A734622BACA9C00FB3410 /* CDModel */, B926F14821502D7F004D36B7 /* Lib */, @@ -214,8 +179,7 @@ B926F135214AE2D4004D36B7 /* ViewController */, B926F134214AE2C0004D36B7 /* Model */, B93C1B9C21496BFD0014FD6E /* AppDelegate.swift */, - B9BCF521217900D700ECBAAC /* WaitingPopOver.storyboard */, - B93C1BA021496BFD0014FD6E /* Main.storyboard */, + B9F44ABD22F31DEF00FC6B29 /* SceneDelegate.swift */, B9BCF4C92168ACB600ECBAAC /* LaunchScreen.storyboard */, B98A735F22C1738800FB3410 /* CDManager.swift */, B93C1BA321496BFE0014FD6E /* Assets.xcassets */, @@ -318,8 +282,6 @@ files = ( B9BCF4CA2168ACB600ECBAAC /* LaunchScreen.storyboard in Resources */, B93C1BA421496BFE0014FD6E /* Assets.xcassets in Resources */, - B9BCF523217900D700ECBAAC /* WaitingPopOver.storyboard in Resources */, - B93C1BA221496BFD0014FD6E /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -351,7 +313,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - B94CB53922D3B6490029BFAD /* GameDetailController.swift in Sources */, B926F139214AE884004D36B7 /* FlockeWS.swift in Sources */, B926F13C214C44FE004D36B7 /* Attachment.swift in Sources */, B93C1B9D21496BFD0014FD6E /* AppDelegate.swift in Sources */, @@ -361,31 +322,22 @@ B9F44ABA22F312E600FC6B29 /* ConsoleLibraryView.swift in Sources */, B9F44ABE22F31DEF00FC6B29 /* SceneDelegate.swift in Sources */, B9D2C6F722E98ED800797F67 /* AccessoryViewModel.swift in Sources */, - B93C1BB02149750E0014FD6E /* AllConsolesViewController.swift in Sources */, - B926F13F214E4678004D36B7 /* GameCell.swift in Sources */, B9F002E52187AA3200E12B0A /* FlockeConnector.swift in Sources */, B94CB50A22D1352F0029BFAD /* Logo+CoreDataProperties.swift in Sources */, B94CB4FF22D1352F0029BFAD /* Accessory+CoreDataClass.swift in Sources */, B98A734D22BAD27D00FB3410 /* Zockerhoehle.xcdatamodeld in Sources */, B93D60D122E5009700DD390F /* GameViewModel.swift in Sources */, - B9E256FE2156D026009FD133 /* UIViewX.swift in Sources */, - B926F12B2149B173004D36B7 /* ConsoleCell.swift in Sources */, B9F44AE722F429D300FC6B29 /* GameStore.swift in Sources */, B926F12D2149B264004D36B7 /* FlockeEntry.swift in Sources */, B98A735E22BFAA4B00FB3410 /* ConsoleLibraryViewController.swift in Sources */, B94CB50522D1352F0029BFAD /* Console+CoreDataClass.swift in Sources */, - B941844B2156891E0050D099 /* UIButtonX.swift in Sources */, B94CB50922D1352F0029BFAD /* Logo+CoreDataClass.swift in Sources */, B94CB50622D1352F0029BFAD /* Console+CoreDataProperties.swift in Sources */, B926F131214AD9E4004D36B7 /* GameCollection.swift in Sources */, B93D60CE22D88F5700DD390F /* AccessoryDetailView.swift in Sources */, B926F14A21502DE1004D36B7 /* ConsoleEntry.swift in Sources */, - B93D60CC22D88F2B00DD390F /* AccessoryDetailController.swift in Sources */, B94CB50722D1352F0029BFAD /* GameSeries+CoreDataClass.swift in Sources */, - B9F44ABC22F3145300FC6B29 /* ConsoleDetailViewController.swift in Sources */, - B9418449215422ED0050D099 /* AddEntryPopUpViewController.swift in Sources */, B94CB50022D1352F0029BFAD /* Accessory+CoreDataProperties.swift in Sources */, - B9D6A39A22D885DD00A280DC /* AccessoryCell.swift in Sources */, B926F14721502D53004D36B7 /* CodableExtensionAny.swift in Sources */, B94CB50422D1352F0029BFAD /* Game+CoreDataProperties.swift in Sources */, B9F44AE922F4655600FC6B29 /* AccessoryStore.swift in Sources */, @@ -399,25 +351,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXVariantGroup section */ - B93C1BA021496BFD0014FD6E /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - B9A054FF22F852B00054D9A0 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - B9BCF521217900D700ECBAAC /* WaitingPopOver.storyboard */ = { - isa = PBXVariantGroup; - children = ( - B9A054FE22F852B00054D9A0 /* Base */, - ); - name = WaitingPopOver.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - /* Begin XCBuildConfiguration section */ B93C1BA921496BFE0014FD6E /* Debug */ = { isa = XCBuildConfiguration; diff --git a/Zockerhoehle/Base.lproj/Main.storyboard b/Zockerhoehle/Base.lproj/Main.storyboard deleted file mode 100644 index 3c1da85..0000000 --- a/Zockerhoehle/Base.lproj/Main.storyboard +++ /dev/null @@ -1,536 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Zockerhoehle/Lib/UIButtonX.swift b/Zockerhoehle/Lib/UIButtonX.swift deleted file mode 100644 index 2914c46..0000000 --- a/Zockerhoehle/Lib/UIButtonX.swift +++ /dev/null @@ -1,43 +0,0 @@ -// -// UIButtonStoryBoardExtenstion.swift -// Zockerhoehle -// -// Created by Julian-Steffen Müller on 22.09.18. -// Copyright © 2018 Julian-Steffen Müller. All rights reserved. -// - -import UIKit -import Foundation - -@IBDesignable class UIButtonX : UIButton { - - @IBInspectable var borderWidth: CGFloat { - set { - layer.borderWidth = newValue - } - get { - return layer.borderWidth - } - } - - @IBInspectable var cornerRadius: CGFloat { - set { - layer.cornerRadius = newValue - } - get { - return layer.cornerRadius - } - } - - @IBInspectable var borderColor: UIColor? { - set { - guard let uiColor = newValue else { return } - layer.borderColor = uiColor.cgColor - } - get { - guard let color = layer.borderColor else { return nil } - return UIColor(cgColor: color) - } - } -} - diff --git a/Zockerhoehle/Lib/UIViewX.swift b/Zockerhoehle/Lib/UIViewX.swift deleted file mode 100644 index cb399fe..0000000 --- a/Zockerhoehle/Lib/UIViewX.swift +++ /dev/null @@ -1,53 +0,0 @@ -// -// UIViewX.swift -// Zockerhoehle -// -// Created by Julian-Steffen Müller on 22.09.18. -// Copyright © 2018 Julian-Steffen Müller. All rights reserved. -// - -import Foundation - -// -// UIButtonStoryBoardExtenstion.swift -// Zockerhoehle -// -// Created by Julian-Steffen Müller on 22.09.18. -// Copyright © 2018 Julian-Steffen Müller. All rights reserved. -// - -import UIKit -import Foundation - -@IBDesignable class UIViewX : UIView { - - @IBInspectable var borderWidth: CGFloat { - set { - layer.borderWidth = newValue - } - get { - return layer.borderWidth - } - } - - @IBInspectable var cornerRadius: CGFloat { - set { - layer.cornerRadius = newValue - } - get { - return layer.cornerRadius - } - } - - @IBInspectable var borderColor: UIColor? { - set { - guard let uiColor = newValue else { return } - layer.borderColor = uiColor.cgColor - } - get { - guard let color = layer.borderColor else { return nil } - return UIColor(cgColor: color) - } - } -} - diff --git a/Zockerhoehle/ViewController/AccessoryDetailController.swift b/Zockerhoehle/ViewController/AccessoryDetailController.swift deleted file mode 100644 index 47882c7..0000000 --- a/Zockerhoehle/ViewController/AccessoryDetailController.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// AccessoryDetailController.swift -// Zockerhoehle -// -// Created by Julian-Steffen Müller on 12.07.19. -// Copyright © 2019 Julian-Steffen Müller. All rights reserved. -// - -import Foundation -import UIKit -import SwiftUI - -class AccessoryDetailController : UIViewController { - var accessory : Accessory? - - - @IBSegueAction func emebdedAccessoryDetaio(_ coder: NSCoder) -> UIViewController? { - let accessoryVM = AccessoryViewModel(accessory: accessory!) - return UIHostingController(coder: coder, rootView: AccessoryDetailView(accessoryVM: accessoryVM)) - } -} diff --git a/Zockerhoehle/ViewController/AddEntryPopUpViewController.swift b/Zockerhoehle/ViewController/AddEntryPopUpViewController.swift deleted file mode 100644 index 8ad6f53..0000000 --- a/Zockerhoehle/ViewController/AddEntryPopUpViewController.swift +++ /dev/null @@ -1,74 +0,0 @@ -// -// AddEntryPopUpViewController.swift -// Zockerhoehle -// -// Created by Julian-Steffen Müller on 20.09.18. -// Copyright © 2018 Julian-Steffen Müller. All rights reserved. -// - -import UIKit - -class AddEntryPopUpViewController: UIViewController { - var isWishlist : Bool = false - var isVideogame : Bool = true - var console : Console? - - @IBOutlet weak var icon: UIImageView! - @IBOutlet weak var category: UISegmentedControl! - @IBOutlet weak var name: UITextField! - @IBOutlet weak var addButton: UIButtonX! - @IBOutlet weak var wishlist: UISwitch! - - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - - self.category.selectedSegmentIndex = 0 - - if (!self.isVideogame) { - self.category.selectedSegmentIndex = 1 - } - - self.wishlist.isOn = self.isWishlist - - self.icon.image = self.console?.logo?.image - - //If the name is not filled the add Button should be disabled - addButton.isEnabled = name.text != "" - } - - @IBAction func nameChanged(_ sender: Any) { - addButton.isEnabled = name.text != "" - } - - @IBAction func add(_ sender: Any) { - self.isVideogame = self.category.selectedSegmentIndex == 0 - - guard let name = self.name.text else { - print("ERROR AddEntryPopoUpViewController::Add; Game name is empty") - return - } - - if self.isVideogame { - let game = Game(entity: Game.entity(), insertInto: CDManager.shared.viewContext) - print("Created New Game") - game.name = name - game.inWishlist = self.wishlist.isOn - game.console = self.console - - print("Added Game '\(game.name)' onWishlist \(self.wishlist.isOn)") - }else{ - let accessory = Accessory(entity: Accessory.entity(), insertInto: CDManager.shared.viewContext) - accessory.name = name - accessory.console = console - accessory.inWishlist = wishlist.isOn - - print("Added Accessory '\(accessory.name)' onWishlist \(wishlist.isOn)") - } - - self.dismiss(animated: true) - } - - @IBAction func cancel(_ sender: Any) { - self.dismiss(animated: true) - } -} diff --git a/Zockerhoehle/ViewController/AllConsolesViewController.swift b/Zockerhoehle/ViewController/AllConsolesViewController.swift deleted file mode 100644 index 4912a25..0000000 --- a/Zockerhoehle/ViewController/AllConsolesViewController.swift +++ /dev/null @@ -1,78 +0,0 @@ -// -// UIConsoleTableViewController.swift -// Zockerhoehle -// -// Created by Julian-Steffen Müller on 12.09.18. -// Copyright © 2018 Julian-Steffen Müller. All rights reserved. -// - -import UIKit -import CoreData - -class AllConsolesViewController: UIViewController, NSFetchedResultsControllerDelegate { - @IBOutlet weak var consolesTable: UITableView! - @IBOutlet weak var manufacturer: UILabel! - @IBOutlet weak var consoleLogo: UIImageView! - - lazy var fetchResultsController : NSFetchedResultsController = { - let consolesFetch : NSFetchRequest = Console.fetchRequest() - - consolesFetch.sortDescriptors = [NSSortDescriptor(key: "manufacturer", ascending: true), NSSortDescriptor(key: "generation", ascending: true), NSSortDescriptor(key: "name", ascending: true)] - - var consolesfetchRC = NSFetchedResultsController(fetchRequest: consolesFetch, managedObjectContext: CDManager.shared.viewContext, sectionNameKeyPath: nil, cacheName: nil) - - consolesfetchRC.delegate = self - - return consolesfetchRC - - }() - - func controllerDidChangeContent(_ controller: NSFetchedResultsController) { - print("AllConsolesViewController::controllerDidChangeContent") - self.consolesTable.reloadData() - } - - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - if (segue.identifier == "consoleDetail" && sender! is ConsoleCell) { - guard let consoleVC = segue.destination as? ConsoleLibraryViewController else { - return - } - guard let consoleCell = sender as? ConsoleCell else { - return - } - - consoleVC.console = consoleCell.console - } - } - - override func viewDidLoad() { - super.viewDidLoad() - FlockeWS.fetchEntries(for: GameCollection.consoleID) - do { - try fetchResultsController.performFetch() - }catch{ - print("AllConsolesViewController::viewDidLoad: Fetch not possible"); - } - } -} -extension AllConsolesViewController: UITableViewDataSource { - func numberOfSections(in tableView: UITableView) -> Int { - guard let sections = fetchResultsController.sections else { return 0 } - - return sections.count - } - - func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - guard let sections = fetchResultsController.sections else { return 0 } - - return sections[section].numberOfObjects - } - - func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - let cell = (tableView.dequeueReusableCell(withIdentifier: "ConsoleCell", for: indexPath)) as! ConsoleCell - - cell.console = fetchResultsController.object(at: indexPath) - - return cell - } -} diff --git a/Zockerhoehle/ViewController/ConsoleDetailViewController.swift b/Zockerhoehle/ViewController/ConsoleDetailViewController.swift deleted file mode 100644 index df4bc20..0000000 --- a/Zockerhoehle/ViewController/ConsoleDetailViewController.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// ConsoleDetailViewController.swift -// Zockerhoehle -// -// Created by Julian-Steffen Müller on 01.08.19. -// Copyright © 2019 Julian-Steffen Müller. All rights reserved. -// - -import Foundation -import UIKit -import SwiftUI - -class ConsoleDetailViewController : UIViewController { - @IBSegueAction func embedConsoleDetail(_ coder: NSCoder) -> UIViewController? { - return UIHostingController(coder: coder, rootView: ConsoleLibraryView(console: .none)) - } -} diff --git a/Zockerhoehle/ViewController/ConsoleLibraryViewController.swift b/Zockerhoehle/ViewController/ConsoleLibraryViewController.swift index f0e292e..a27735e 100644 --- a/Zockerhoehle/ViewController/ConsoleLibraryViewController.swift +++ b/Zockerhoehle/ViewController/ConsoleLibraryViewController.swift @@ -5,7 +5,7 @@ // Created by Julian-Steffen Müller on 12.09.18. // Copyright © 2018 Julian-Steffen Müller. All rights reserved. // - +/* import UIKit import CoreData import Combine @@ -210,3 +210,4 @@ extension ConsoleLibraryViewController: UITableViewDelegate { return swipeConf } } +*/ diff --git a/Zockerhoehle/ViewController/GameDetailController.swift b/Zockerhoehle/ViewController/GameDetailController.swift deleted file mode 100644 index 92db689..0000000 --- a/Zockerhoehle/ViewController/GameDetailController.swift +++ /dev/null @@ -1,25 +0,0 @@ -// -// ConsoleDetailEmbewdViewController.swift -// Zockerhoehle -// -// Created by Julian-Steffen Müller on 08.07.19. -// Copyright © 2019 Julian-Steffen Müller. All rights reserved. -// - -import Foundation -import UIKit -import SwiftUI - -class GameDetailController : UIViewController { - var game : Game? - - - @IBSegueAction func embedConsoleDetail(_ coder: NSCoder) -> UIViewController? { - guard let game = self.game else { - print("ERROR GameDetailController::emedConsoleDetail; Game optional is empty") - - return UIViewController() - } - return UIHostingController(coder: coder, rootView: GameDetailView(gameVM: GameViewModel(game: game)) ) - } -} diff --git a/Zockerhoehle/Views/AccessoryCell.swift b/Zockerhoehle/Views/AccessoryCell.swift deleted file mode 100644 index 9961014..0000000 --- a/Zockerhoehle/Views/AccessoryCell.swift +++ /dev/null @@ -1,24 +0,0 @@ -// -// AccessoryCell.swift -// Zockerhoehle -// -// Created by Julian-Steffen Müller on 12.07.19. -// Copyright © 2019 Julian-Steffen Müller. All rights reserved. -// - -import UIKit - -class AccessoryCell: UITableViewCell { - @IBOutlet weak var name: UILabel! - - var accessory : Accessory? { - didSet { - self.name.text = accessory?.name ?? "N/A" - } - } - - /*func setAccessory(accessory : Accessory?) { - self.accessory = accessory - self.name.text = accessory?.name ?? "N/A" - }*/ -} diff --git a/Zockerhoehle/Views/ConsoleCell.swift b/Zockerhoehle/Views/ConsoleCell.swift deleted file mode 100644 index 165770c..0000000 --- a/Zockerhoehle/Views/ConsoleCell.swift +++ /dev/null @@ -1,30 +0,0 @@ -// -// ConsoleCell.swift -// Zockerhoehle -// -// Created by Julian-Steffen Müller on 12.09.18. -// Copyright © 2018 Julian-Steffen Müller. All rights reserved. -// - -import UIKit - -class ConsoleCell: UITableViewCell { - @IBOutlet weak var consoleName: UILabel! - @IBOutlet weak var logo: UIImageView! - @IBOutlet weak var gamesCounter: UILabel! - @IBOutlet weak var accessoryCounter: UILabel! - - public var console: Console? { - didSet { - consoleName.text = console?.name - self.logo.image = console?.logo?.image - - let ownedGames = console?.games.filtered(using: NSPredicate(format: "inWishlist = false")).count ?? 0 - let ownedAccessories = console?.accessories.filtered(using: NSPredicate(format: "inWishlist = false")).count ?? 0 - self.gamesCounter.text = "\(ownedGames)" - self.accessoryCounter.text = "\(ownedAccessories)" - - self.setNeedsDisplay() - } - } -} diff --git a/Zockerhoehle/Views/GameCell.swift b/Zockerhoehle/Views/GameCell.swift deleted file mode 100644 index 3f35e36..0000000 --- a/Zockerhoehle/Views/GameCell.swift +++ /dev/null @@ -1,20 +0,0 @@ -// -// GameCell.swift -// Zockerhoehle -// -// Created by Julian-Steffen Müller on 16.09.18. -// Copyright © 2018 Julian-Steffen Müller. All rights reserved. -// - -import UIKit - -class GameCell: UITableViewCell { - @IBOutlet weak var name: UILabel! - - var game : Game? { - didSet { - self.name.text = game?.name ?? "N/A" - } - } -} - diff --git a/Zockerhoehle/Zockerhoehle/Base.lproj/WaitingPopOver.storyboard b/Zockerhoehle/Zockerhoehle/Base.lproj/WaitingPopOver.storyboard deleted file mode 100644 index 99d74f9..0000000 --- a/Zockerhoehle/Zockerhoehle/Base.lproj/WaitingPopOver.storyboard +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -