diff --git a/EmpowerPlant.xcodeproj/project.pbxproj b/EmpowerPlant.xcodeproj/project.pbxproj index 6454135..218b7b6 100644 --- a/EmpowerPlant.xcodeproj/project.pbxproj +++ b/EmpowerPlant.xcodeproj/project.pbxproj @@ -20,7 +20,6 @@ D15FCDA927E00F0D00258BF3 /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = D15FCDA727E00F0D00258BF3 /* Model.xcdatamodeld */; }; D17C73B327D8291D006650AF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D17C73B227D8291D006650AF /* AppDelegate.swift */; }; D17C73B527D8291D006650AF /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D17C73B427D8291D006650AF /* SceneDelegate.swift */; }; - D1ERRORTOAST001 /* ErrorToastManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1ERRORTOAST002 /* ErrorToastManager.swift */; }; D17C73BA27D8291D006650AF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D17C73B827D8291D006650AF /* Main.storyboard */; }; D17C73BC27D8291D006650AF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D17C73BB27D8291D006650AF /* Assets.xcassets */; }; D17C73BF27D8291D006650AF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D17C73BD27D8291D006650AF /* LaunchScreen.storyboard */; }; @@ -28,6 +27,7 @@ D17C73CF27D82ED1006650AF /* CartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D17C73CE27D82ED1006650AF /* CartViewController.swift */; }; D17C73D227D83321006650AF /* ListAppViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D17C73D127D83321006650AF /* ListAppViewController.swift */; }; D19EBE6F2805ED52007022DC /* ShoppingCart.swift in Sources */ = {isa = PBXBuildFile; fileRef = D19EBE6E2805ED52007022DC /* ShoppingCart.swift */; }; + D1ERRORTOAST001 /* ErrorToastManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1ERRORTOAST002 /* ErrorToastManager.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -62,7 +62,6 @@ D15FCDA827E00F0D00258BF3 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = ""; }; D17C73B227D8291D006650AF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; D17C73B427D8291D006650AF /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; - D1ERRORTOAST002 /* ErrorToastManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorToastManager.swift; sourceTree = ""; }; D17C73B927D8291D006650AF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; D17C73BB27D8291D006650AF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; D17C73BE27D8291D006650AF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; @@ -71,6 +70,7 @@ D17C73CE27D82ED1006650AF /* CartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CartViewController.swift; sourceTree = ""; }; D17C73D127D83321006650AF /* ListAppViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListAppViewController.swift; sourceTree = ""; }; D19EBE6E2805ED52007022DC /* ShoppingCart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCart.swift; sourceTree = ""; }; + D1ERRORTOAST002 /* ErrorToastManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorToastManager.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -124,26 +124,58 @@ D17C73B127D8291D006650AF /* EmpowerPlant */ = { isa = PBXGroup; children = ( - 8B21663B29D3F8C80009C890 /* RandomErrors.swift */, + F4ED5FEF2E749733006B47D6 /* Helpers */, + F4ED5FEE2E74971E006B47D6 /* Models */, + F4ED5FED2E749717006B47D6 /* Views */, + F4ED5FEC2E7496A6006B47D6 /* Resources */, D17C73B227D8291D006650AF /* AppDelegate.swift */, D17C73B427D8291D006650AF /* SceneDelegate.swift */, - D1ERRORTOAST002 /* ErrorToastManager.swift */, D17C73B827D8291D006650AF /* Main.storyboard */, - D15EDF13282BF80400FC13D6 /* Product+CoreDataClass.swift */, - D15EDF11282BF7FB00FC13D6 /* Product+CoreDataProperties.swift */, - D17C73D127D83321006650AF /* ListAppViewController.swift */, - 843BD60E2AD08CE900B0098F /* Utils.swift */, + D17C73C027D8291D006650AF /* Info.plist */, + ); + path = EmpowerPlant; + sourceTree = ""; + }; + F4ED5FEC2E7496A6006B47D6 /* Resources */ = { + isa = PBXGroup; + children = ( D15FCDA727E00F0D00258BF3 /* Model.xcdatamodeld */, - D17C73CB27D82EB8006650AF /* EmpowerPlantViewController.swift */, 846BEA1B2ABE611A0032F77F /* mobydick.txt */, - D19EBE6E2805ED52007022DC /* ShoppingCart.swift */, - D17C73CE27D82ED1006650AF /* CartViewController.swift */, D17C73BB27D8291D006650AF /* Assets.xcassets */, D17C73BD27D8291D006650AF /* LaunchScreen.storyboard */, - D17C73C027D8291D006650AF /* Info.plist */, 843BD6262AD7798C00B0098F /* jwt-deep-field.png */, ); - path = EmpowerPlant; + path = Resources; + sourceTree = ""; + }; + F4ED5FED2E749717006B47D6 /* Views */ = { + isa = PBXGroup; + children = ( + D17C73D127D83321006650AF /* ListAppViewController.swift */, + D17C73CB27D82EB8006650AF /* EmpowerPlantViewController.swift */, + D19EBE6E2805ED52007022DC /* ShoppingCart.swift */, + D17C73CE27D82ED1006650AF /* CartViewController.swift */, + ); + path = Views; + sourceTree = ""; + }; + F4ED5FEE2E74971E006B47D6 /* Models */ = { + isa = PBXGroup; + children = ( + D15EDF13282BF80400FC13D6 /* Product+CoreDataClass.swift */, + D15EDF11282BF7FB00FC13D6 /* Product+CoreDataProperties.swift */, + ); + path = Models; + sourceTree = ""; + }; + F4ED5FEF2E749733006B47D6 /* Helpers */ = { + isa = PBXGroup; + children = ( + D1ERRORTOAST002 /* ErrorToastManager.swift */, + 843BD60E2AD08CE900B0098F /* Utils.swift */, + 8B21663B29D3F8C80009C890 /* RandomErrors.swift */, + ); + path = Helpers; sourceTree = ""; }; /* End PBXGroup section */ @@ -196,7 +228,7 @@ D17C73A727D8291D006650AF /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 1430; + LastSwiftUpdateCheck = 1640; LastUpgradeCheck = 1240; TargetAttributes = { 8BA3AB2B2A201FE900BE1EA8 = { diff --git a/EmpowerPlant/Base.lproj/LaunchScreen.storyboard b/EmpowerPlant/Base.lproj/LaunchScreen.storyboard deleted file mode 100644 index 865e932..0000000 --- a/EmpowerPlant/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EmpowerPlant/Base.lproj/Main.storyboard b/EmpowerPlant/Base.lproj/Main.storyboard index 481b5a5..cbdd5a0 100644 --- a/EmpowerPlant/Base.lproj/Main.storyboard +++ b/EmpowerPlant/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - + - + @@ -63,7 +63,7 @@ - + - + @@ -262,7 +262,7 @@ - + @@ -294,7 +294,7 @@ - + diff --git a/EmpowerPlant/ErrorToastManager.swift b/EmpowerPlant/Helpers/ErrorToastManager.swift similarity index 100% rename from EmpowerPlant/ErrorToastManager.swift rename to EmpowerPlant/Helpers/ErrorToastManager.swift diff --git a/EmpowerPlant/RandomErrors.swift b/EmpowerPlant/Helpers/RandomErrors.swift similarity index 100% rename from EmpowerPlant/RandomErrors.swift rename to EmpowerPlant/Helpers/RandomErrors.swift diff --git a/EmpowerPlant/Utils.swift b/EmpowerPlant/Helpers/Utils.swift similarity index 100% rename from EmpowerPlant/Utils.swift rename to EmpowerPlant/Helpers/Utils.swift diff --git a/EmpowerPlant/Product+CoreDataClass.swift b/EmpowerPlant/Models/Product+CoreDataClass.swift similarity index 100% rename from EmpowerPlant/Product+CoreDataClass.swift rename to EmpowerPlant/Models/Product+CoreDataClass.swift diff --git a/EmpowerPlant/Product+CoreDataProperties.swift b/EmpowerPlant/Models/Product+CoreDataProperties.swift similarity index 100% rename from EmpowerPlant/Product+CoreDataProperties.swift rename to EmpowerPlant/Models/Product+CoreDataProperties.swift diff --git a/EmpowerPlant/Assets.xcassets/AccentColor.colorset/Contents.json b/EmpowerPlant/Resources/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from EmpowerPlant/Assets.xcassets/AccentColor.colorset/Contents.json rename to EmpowerPlant/Resources/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/EmpowerPlant/Assets.xcassets/AppIcon.appiconset/Contents.json b/EmpowerPlant/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from EmpowerPlant/Assets.xcassets/AppIcon.appiconset/Contents.json rename to EmpowerPlant/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/EmpowerPlant/Assets.xcassets/Contents.json b/EmpowerPlant/Resources/Assets.xcassets/Contents.json similarity index 100% rename from EmpowerPlant/Assets.xcassets/Contents.json rename to EmpowerPlant/Resources/Assets.xcassets/Contents.json diff --git a/EmpowerPlant/Resources/Assets.xcassets/products/Contents.json b/EmpowerPlant/Resources/Assets.xcassets/products/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/EmpowerPlant/Resources/Assets.xcassets/products/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/EmpowerPlant/Resources/Base.lproj/LaunchScreen.storyboard b/EmpowerPlant/Resources/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..8333c2f --- /dev/null +++ b/EmpowerPlant/Resources/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EmpowerPlant/Model.xcdatamodeld/Model.xcdatamodel/contents b/EmpowerPlant/Resources/Model.xcdatamodeld/Model.xcdatamodel/contents similarity index 100% rename from EmpowerPlant/Model.xcdatamodeld/Model.xcdatamodel/contents rename to EmpowerPlant/Resources/Model.xcdatamodeld/Model.xcdatamodel/contents diff --git a/EmpowerPlant/jwt-deep-field.png b/EmpowerPlant/Resources/jwt-deep-field.png similarity index 100% rename from EmpowerPlant/jwt-deep-field.png rename to EmpowerPlant/Resources/jwt-deep-field.png diff --git a/EmpowerPlant/mobydick.txt b/EmpowerPlant/Resources/mobydick.txt similarity index 100% rename from EmpowerPlant/mobydick.txt rename to EmpowerPlant/Resources/mobydick.txt diff --git a/EmpowerPlant/CartViewController.swift b/EmpowerPlant/Views/CartViewController.swift similarity index 98% rename from EmpowerPlant/CartViewController.swift rename to EmpowerPlant/Views/CartViewController.swift index 59c1fcb..ad57b0e 100644 --- a/EmpowerPlant/CartViewController.swift +++ b/EmpowerPlant/Views/CartViewController.swift @@ -34,8 +34,7 @@ class CartViewController: UIViewController, UITableViewDelegate, UITableViewData } required init?(coder: NSCoder) { - //fatalError("init(coder:) has not been implemented") - super.init(nibName: nil, bundle: nil) + super.init(coder: coder) } override func viewDidLoad() { diff --git a/EmpowerPlant/EmpowerPlantViewController.swift b/EmpowerPlant/Views/EmpowerPlantViewController.swift similarity index 100% rename from EmpowerPlant/EmpowerPlantViewController.swift rename to EmpowerPlant/Views/EmpowerPlantViewController.swift diff --git a/EmpowerPlant/ListAppViewController.swift b/EmpowerPlant/Views/ListAppViewController.swift similarity index 100% rename from EmpowerPlant/ListAppViewController.swift rename to EmpowerPlant/Views/ListAppViewController.swift diff --git a/EmpowerPlant/ShoppingCart.swift b/EmpowerPlant/Views/ShoppingCart.swift similarity index 100% rename from EmpowerPlant/ShoppingCart.swift rename to EmpowerPlant/Views/ShoppingCart.swift