Skip to content

fix: CartViewController loading from Storyboard #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix: CartViewController loading from Storyboard #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2826f05
chore: Reorganize project in folders
itaybre Sep 12, 2025
01bbfcb
Merge branch 'master' of github.com:sentry-demos/ios into itay/reorga…
itaybre Sep 12, 2025
479c8f6
Restore AppIcon.appiconset
itaybre Sep 12, 2025
2577e41
Restore files
itaybre Sep 12, 2025
2371d74
fix: CartViewController loading from Storyboard
itaybre Sep 12, 2025
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions EmpowerPlant/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="zLm-2U-p5i">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="zLm-2U-p5i">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
Expand Down Expand Up @@ -63,7 +63,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="xnN-Pe-VKe">
<rect key="frame" x="0.0" y="144" width="414" height="718"/>
<rect key="frame" x="0.0" y="192" width="414" height="636"/>
<subviews>
<progressView hidden="YES" opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="b5N-Es-1yE">
<rect key="frame" x="20" y="0.0" width="374" height="0.0"/>
Expand Down Expand Up @@ -252,7 +252,7 @@
</subviews>
</stackView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="I0Z-7H-qXj">
<rect key="frame" x="157" y="618" width="100" height="100"/>
<rect key="frame" x="157" y="536" width="100" height="100"/>
<constraints>
<constraint firstAttribute="height" constant="100" id="23H-sh-JRG"/>
<constraint firstAttribute="width" secondItem="I0Z-7H-qXj" secondAttribute="height" multiplier="1:1" id="ON2-GZ-qjW"/>
Expand All @@ -262,7 +262,7 @@
</stackView>
</subviews>
<viewLayoutGuide key="safeArea" id="CaI-jg-IPv"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="CaI-jg-IPv" firstAttribute="leading" secondItem="xnN-Pe-VKe" secondAttribute="leading" id="9wl-hN-71I"/>
<constraint firstItem="CaI-jg-IPv" firstAttribute="trailing" secondItem="xnN-Pe-VKe" secondAttribute="trailing" id="MaZ-Wb-7nU"/>
Expand Down Expand Up @@ -294,7 +294,7 @@
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="zLm-2U-p5i" sceneMemberID="viewController">
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" largeTitles="YES" id="ZRT-xt-jev">
<rect key="frame" x="0.0" y="48" width="414" height="96"/>
<rect key="frame" x="0.0" y="96" width="414" height="96"/>
<autoresizingMask key="autoresizingMask"/>
<color key="tintColor" name="AccentColor"/>
<textAttributes key="largeTitleTextAttributes">
Expand Down
0 EmpowerPlant/ErrorToastManager.swift → EmpowerPlant/Helpers/ErrorToastManager.swift
View file
Open in desktop
File renamed without changes.
0 EmpowerPlant/RandomErrors.swift → EmpowerPlant/Helpers/RandomErrors.swift
View file
Open in desktop
File renamed without changes.
0 EmpowerPlant/Utils.swift → EmpowerPlant/Helpers/Utils.swift
View file
Open in desktop
File renamed without changes.
0 EmpowerPlant/Product+CoreDataClass.swift → ...rPlant/Models/Product+CoreDataClass.swift
View file
Open in desktop
File renamed without changes.
0 ...werPlant/Product+CoreDataProperties.swift → ...t/Models/Product+CoreDataProperties.swift
View file
Open in desktop
File renamed without changes.
0 ...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop
File renamed without changes.
0 EmpowerPlant/Assets.xcassets/Contents.json → ...t/Resources/Assets.xcassets/Contents.json
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 deletions EmpowerPlant/Resources/Assets.xcassets/products/Contents.json
View file
Open in desktop
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
View file
Open in desktop
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>
0 ...l.xcdatamodeld/Model.xcdatamodel/contents → ...l.xcdatamodeld/Model.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
0 EmpowerPlant/jwt-deep-field.png → EmpowerPlant/Resources/jwt-deep-field.png
View file
Open in desktop
File renamed without changes
0 EmpowerPlant/mobydick.txt → EmpowerPlant/Resources/mobydick.txt
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions EmpowerPlant/CartViewController.swift → EmpowerPlant/Views/CartViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
0 ...werPlant/EmpowerPlantViewController.swift → ...nt/Views/EmpowerPlantViewController.swift
View file
Open in desktop
File renamed without changes.
0 EmpowerPlant/ListAppViewController.swift → ...erPlant/Views/ListAppViewController.swift
View file
Open in desktop
File renamed without changes.
0 EmpowerPlant/ShoppingCart.swift → EmpowerPlant/Views/ShoppingCart.swift
View file
Open in desktop
File renamed without changes.
Loading