Skip to content

Develop #4

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
rspec7 wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Develop #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
83bc7ba
IBOutlets and IBActions connected
rspec7 Apr 10, 2020
1dca05f
First set of features
rspec7 Apr 13, 2020
1453ba9
Merge pull request #1 from rspec7/feature/firstFeature
rspec7 Apr 13, 2020
7aca1fb
Lesson 148 completed
rspec7 Apr 17, 2020
1b6a6a7
Added segue the same way as in BMI calculator app
rspec7 Apr 20, 2020
f4255c8
implemented segue via Main.storyboard
rspec7 Apr 20, 2020
c1ee174
finished app
rspec7 Apr 20, 2020
b19a61f
Merge pull request #2 from rspec7/feature/set2c-segueProgrammatically
rspec7 Apr 20, 2020
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
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
20 changes: 16 additions & 4 deletions Tipsy.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,21 @@
objects = {

/* Begin PBXBuildFile section */
3EBB13D02421EBB0004D0768 /* ResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EBB13CF2421EBB0004D0768 /* ResultsViewController.swift */; };
ADB689532326708D006D4E2B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADB689522326708D006D4E2B /* AppDelegate.swift */; };
ADB689552326708D006D4E2B /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADB689542326708D006D4E2B /* SceneDelegate.swift */; };
ADB689572326708D006D4E2B /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADB689562326708D006D4E2B /* ViewController.swift */; };
ADB689572326708D006D4E2B /* CalculatorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADB689562326708D006D4E2B /* CalculatorViewController.swift */; };
ADB6895A2326708D006D4E2B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = ADB689582326708D006D4E2B /* Main.storyboard */; };
ADB6895C2326708E006D4E2B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = ADB6895B2326708E006D4E2B /* Assets.xcassets */; };
ADB6895F2326708E006D4E2B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = ADB6895D2326708E006D4E2B /* LaunchScreen.storyboard */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
3EBB13CF2421EBB0004D0768 /* ResultsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResultsViewController.swift; sourceTree = "<group>"; };
ADB6894F2326708D006D4E2B /* Tipsy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Tipsy.app; sourceTree = BUILT_PRODUCTS_DIR; };
ADB689522326708D006D4E2B /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
ADB689542326708D006D4E2B /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
ADB689562326708D006D4E2B /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
ADB689562326708D006D4E2B /* CalculatorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CalculatorViewController.swift; path = ../CalculatorViewController.swift; sourceTree = "<group>"; };
ADB689592326708D006D4E2B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
ADB6895B2326708E006D4E2B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
ADB6895E2326708E006D4E2B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
Expand All @@ -37,6 +39,15 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
3EBB13D12421EBC4004D0768 /* Controllers */ = {
isa = PBXGroup;
children = (
ADB689562326708D006D4E2B /* CalculatorViewController.swift */,
3EBB13CF2421EBB0004D0768 /* ResultsViewController.swift */,
);
path = Controllers;
sourceTree = "<group>";
};
ADB689462326708D006D4E2B = {
isa = PBXGroup;
children = (
Expand All @@ -58,7 +69,7 @@
children = (
ADB689522326708D006D4E2B /* AppDelegate.swift */,
ADB689542326708D006D4E2B /* SceneDelegate.swift */,
ADB689562326708D006D4E2B /* ViewController.swift */,
3EBB13D12421EBC4004D0768 /* Controllers */,
ADB689582326708D006D4E2B /* Main.storyboard */,
ADB6895B2326708E006D4E2B /* Assets.xcassets */,
ADB6895D2326708E006D4E2B /* LaunchScreen.storyboard */,
Expand Down Expand Up @@ -138,9 +149,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
ADB689572326708D006D4E2B /* ViewController.swift in Sources */,
ADB689572326708D006D4E2B /* CalculatorViewController.swift in Sources */,
ADB689532326708D006D4E2B /* AppDelegate.swift in Sources */,
ADB689552326708D006D4E2B /* SceneDelegate.swift in Sources */,
3EBB13D02421EBB0004D0768 /* ResultsViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file added ...xcodeproj/project.xcworkspace/xcuserdata/tphan.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
56 changes: 56 additions & 0 deletions Tipsy.xcodeproj/xcuserdata/tphan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "4F1886D0-9B7C-4C40-BD59-D6BDFE35EA3C"
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "DF106BC6-E045-426B-AD1C-5F81E6DC1CAB"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Tipsy/CalculatorViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "32"
endingLineNumber = "32"
landmarkName = "tipChanged(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "17ADD96D-CE3E-47D8-BF8D-B304E39E4D3B"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Tipsy/CalculatorViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "94"
endingLineNumber = "94"
landmarkName = "prepare(for:sender:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "372CDAC4-EB2A-407C-966A-6CC515FC40B7"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Tipsy/Controllers/ResultsViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "21"
endingLineNumber = "21"
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
14 changes: 14 additions & 0 deletions Tipsy.xcodeproj/xcuserdata/tphan.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>Tipsy.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
</dict>
</plist>
Loading