Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 46 additions & 14 deletions EmpowerPlant.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
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 */; };
D17C73CC27D82EB8006650AF /* EmpowerPlantViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D17C73CB27D82EB8006650AF /* EmpowerPlantViewController.swift */; };
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 */
Expand Down Expand Up @@ -62,7 +62,6 @@
D15FCDA827E00F0D00258BF3 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = "<group>"; };
D17C73B227D8291D006650AF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
D17C73B427D8291D006650AF /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
D1ERRORTOAST002 /* ErrorToastManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorToastManager.swift; sourceTree = "<group>"; };
D17C73B927D8291D006650AF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
D17C73BB27D8291D006650AF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
D17C73BE27D8291D006650AF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
Expand All @@ -71,6 +70,7 @@
D17C73CE27D82ED1006650AF /* CartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CartViewController.swift; sourceTree = "<group>"; };
D17C73D127D83321006650AF /* ListAppViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListAppViewController.swift; sourceTree = "<group>"; };
D19EBE6E2805ED52007022DC /* ShoppingCart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCart.swift; sourceTree = "<group>"; };
D1ERRORTOAST002 /* ErrorToastManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorToastManager.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -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 = "<group>";
};
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 = "<group>";
};
F4ED5FED2E749717006B47D6 /* Views */ = {
isa = PBXGroup;
children = (
D17C73D127D83321006650AF /* ListAppViewController.swift */,
D17C73CB27D82EB8006650AF /* EmpowerPlantViewController.swift */,
D19EBE6E2805ED52007022DC /* ShoppingCart.swift */,
D17C73CE27D82ED1006650AF /* CartViewController.swift */,
);
path = Views;
sourceTree = "<group>";
};
F4ED5FEE2E74971E006B47D6 /* Models */ = {
isa = PBXGroup;
children = (
D15EDF13282BF80400FC13D6 /* Product+CoreDataClass.swift */,
D15EDF11282BF7FB00FC13D6 /* Product+CoreDataProperties.swift */,
);
path = Models;
sourceTree = "<group>";
};
F4ED5FEF2E749733006B47D6 /* Helpers */ = {
isa = PBXGroup;
children = (
D1ERRORTOAST002 /* ErrorToastManager.swift */,
843BD60E2AD08CE900B0098F /* Utils.swift */,
8B21663B29D3F8C80009C890 /* RandomErrors.swift */,
);
path = Helpers;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand Down Expand Up @@ -196,7 +228,7 @@
D17C73A727D8291D006650AF /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1430;
LastSwiftUpdateCheck = 1640;
LastUpgradeCheck = 1240;
TargetAttributes = {
8BA3AB2B2A201FE900BE1EA8 = {
Expand Down
25 changes: 0 additions & 25 deletions EmpowerPlant/Base.lproj/LaunchScreen.storyboard

This file was deleted.

File renamed without changes.
6 changes: 6 additions & 0 deletions EmpowerPlant/Resources/Assets.xcassets/products/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
47 changes: 47 additions & 0 deletions EmpowerPlant/Resources/Base.lproj/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Icon" translatesAutoresizingMaskIntoConstraints="NO" id="fhC-wa-bx7">
<rect key="frame" x="50" y="304.66666666666669" width="293" height="293.00000000000006"/>
<constraints>
<constraint firstAttribute="width" secondItem="fhC-wa-bx7" secondAttribute="height" multiplier="1:1" id="nBO-cY-TV4"/>
</constraints>
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="fhC-wa-bx7" firstAttribute="centerY" secondItem="6Tk-OE-BBY" secondAttribute="centerY" id="4ce-EW-doz"/>
<constraint firstAttribute="trailing" secondItem="fhC-wa-bx7" secondAttribute="trailing" constant="50" id="QPh-jW-i2i"/>
<constraint firstItem="fhC-wa-bx7" firstAttribute="centerX" secondItem="6Tk-OE-BBY" secondAttribute="centerX" id="eES-4P-GN9"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="52.671755725190835" y="374.64788732394368"/>
</scene>
</scenes>
<resources>
<image name="Icon" width="512" height="512"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
File renamed without changes.
File renamed without changes.