Skip to content

Swift Conversion View Controller #24

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

Swift Conversion View Controller #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
20ef45f
WIP ConversionViewController
alexking124 Apr 11, 2020
47b4888
Merge branch 'master' into aking/swift_conversion_vc
alexking124 Apr 11, 2020
119bdaa
Some stuff working
alexking124 Apr 11, 2020
00c4aaf
Fully switched to Swift
alexking124 Apr 12, 2020
1b2308e
Cleaning up
alexking124 Apr 12, 2020
4a2619a
Merge branch 'master' into aking/swift_conversion_vc
alexking124 Apr 12, 2020
9e195d1
Fix build
alexking124 Apr 12, 2020
9cbb901
Merge branch 'master' into aking/swift_conversion_vc
alexking124 Apr 19, 2020
1fd122b
Fixing merge
alexking124 Apr 19, 2020
b11cdb6
Merge branch 'master' into aking/swift_conversion_vc
alexking124 Apr 26, 2020
3813b1b
Merge branch 'master' into aking/swift_conversion_vc
alexking124 May 9, 2020
d1c69bf
Cleanup
alexking124 May 10, 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
22 changes: 12 additions & 10 deletions CookSmart/CookSmart.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
396E363F24396D5900C2815B /* UnitPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396E363E24396D5900C2815B /* UnitPickerView.swift */; };
396E3643243976A000C2815B /* GradientView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396E3642243976A000C2815B /* GradientView.swift */; };
396E3647243A3BDC00C2815B /* UnitPickerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396E3646243A3BDC00C2815B /* UnitPickerDelegate.swift */; };
39C3CE2524426BE600359EDF /* ConversionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39C3CE2424426BE600359EDF /* ConversionViewController.swift */; };
39C3CE582442775E00359EDF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39C3CE562442775E00359EDF /* AppDelegate.swift */; };
39C3CE5A2442776D00359EDF /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39C3CE592442776D00359EDF /* SceneDelegate.swift */; };
39C3CE642442A1C000359EDF /* EditIngredientViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39C3CE632442A1C000359EDF /* EditIngredientViewController.swift */; };
Expand Down Expand Up @@ -41,8 +42,6 @@
931AF96818C2B8AF0018AA8B /* WeightUnits.plist in Resources */ = {isa = PBXBuildFile; fileRef = 931AF96718C2B8AF0018AA8B /* WeightUnits.plist */; };
931AF96A18C2B9C90018AA8B /* VolumeUnits.plist in Resources */ = {isa = PBXBuildFile; fileRef = 931AF96918C2B9C90018AA8B /* VolumeUnits.plist */; };
931AF96D18C2BAE50018AA8B /* CSUnitCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 931AF96C18C2BAE50018AA8B /* CSUnitCollection.m */; };
9358BD6E1891CAAA00A99D51 /* CSConversionVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 9358BD6C1891CAAA00A99D51 /* CSConversionVC.m */; };
9358BD6F1891CAAA00A99D51 /* CSConversionVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9358BD6D1891CAAA00A99D51 /* CSConversionVC.xib */; };
936809701891059700655B89 /* CSIngredientListVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 9368096F1891059700655B89 /* CSIngredientListVC.m */; };
93D09934189766080014DB3E /* CSUnit.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D09933189766080014DB3E /* CSUnit.m */; };
93F6CCA818AED6050045400D /* CSScaleVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F6CCA618AED6050045400D /* CSScaleVC.m */; };
Expand Down Expand Up @@ -93,6 +92,7 @@
396E363E24396D5900C2815B /* UnitPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnitPickerView.swift; sourceTree = "<group>"; };
396E3642243976A000C2815B /* GradientView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradientView.swift; sourceTree = "<group>"; };
396E3646243A3BDC00C2815B /* UnitPickerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnitPickerDelegate.swift; sourceTree = "<group>"; };
39C3CE2424426BE600359EDF /* ConversionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversionViewController.swift; sourceTree = "<group>"; };
39C3CE562442775E00359EDF /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
39C3CE592442776D00359EDF /* SceneDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
39C3CE632442A1C000359EDF /* EditIngredientViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditIngredientViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -138,9 +138,6 @@
931AF96918C2B9C90018AA8B /* VolumeUnits.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = VolumeUnits.plist; sourceTree = "<group>"; };
931AF96B18C2BAE50018AA8B /* CSUnitCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSUnitCollection.h; sourceTree = "<group>"; };
931AF96C18C2BAE50018AA8B /* CSUnitCollection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSUnitCollection.m; sourceTree = "<group>"; };
9358BD6B1891CAAA00A99D51 /* CSConversionVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSConversionVC.h; sourceTree = "<group>"; };
9358BD6C1891CAAA00A99D51 /* CSConversionVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSConversionVC.m; sourceTree = "<group>"; };
9358BD6D1891CAAA00A99D51 /* CSConversionVC.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CSConversionVC.xib; sourceTree = "<group>"; };
9368096E1891059700655B89 /* CSIngredientListVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSIngredientListVC.h; sourceTree = "<group>"; };
9368096F1891059700655B89 /* CSIngredientListVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSIngredientListVC.m; sourceTree = "<group>"; };
93D09932189766080014DB3E /* CSUnit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSUnit.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -201,6 +198,14 @@
path = Core;
sourceTree = "<group>";
};
39C3CE2224426AF700359EDF /* Conversion */ = {
isa = PBXGroup;
children = (
39C3CE2424426BE600359EDF /* ConversionViewController.swift */,
);
path = Conversion;
sourceTree = "<group>";
};
39C3CE612442A1A300359EDF /* Edit Ingredient */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -352,12 +357,10 @@
39C3CE7F244BE1B100359EDF /* Scale View */,
39C3CE562442775E00359EDF /* AppDelegate.swift */,
39C3CE592442776D00359EDF /* SceneDelegate.swift */,
39C3CE2224426AF700359EDF /* Conversion */,
392D8642242FD0CA002064D6 /* Core */,
39C3CE612442A1A300359EDF /* Edit Ingredient */,
80433B351BB2731B006B7A85 /* Launch Screen.storyboard */,
9358BD6B1891CAAA00A99D51 /* CSConversionVC.h */,
9358BD6C1891CAAA00A99D51 /* CSConversionVC.m */,
9358BD6D1891CAAA00A99D51 /* CSConversionVC.xib */,
8000355C18B3CBF50032BF91 /* Scales */,
80592C0218924AEA0082D4E1 /* Model */,
807C0B681BB3DD04007D2C03 /* Ingredient List UI */,
Expand Down Expand Up @@ -502,7 +505,6 @@
buildActionMask = 2147483647;
files = (
931AF96818C2B8AF0018AA8B /* WeightUnits.plist in Resources */,
9358BD6F1891CAAA00A99D51 /* CSConversionVC.xib in Resources */,
931AF96A18C2B9C90018AA8B /* VolumeUnits.plist in Resources */,
B7BCA29B180524A800CF7588 /* InfoPlist.strings in Resources */,
B7BCA2C01805284A00CF7588 /* Ingredients.plist in Resources */,
Expand Down Expand Up @@ -617,7 +619,6 @@
77479AF924303D86000CFB0E /* Fonts.swift in Sources */,
80592C1718939E030082D4E1 /* CSGradientView.m in Sources */,
39C3CE642442A1C000359EDF /* EditIngredientViewController.swift in Sources */,
9358BD6E1891CAAA00A99D51 /* CSConversionVC.m in Sources */,
80592C0518924B010082D4E1 /* CSIngredients.m in Sources */,
77F41932243950CB0055053E /* ScaleScrollView.swift in Sources */,
39C3CE82244BE22100359EDF /* ScalesView.swift in Sources */,
Expand All @@ -628,6 +629,7 @@
93D09934189766080014DB3E /* CSUnit.m in Sources */,
773C97E5244BF0BF00208351 /* StyledView.swift in Sources */,
80433B2E1BB26C1A006B7A85 /* CSRecentsIngredientGroup.m in Sources */,
39C3CE2524426BE600359EDF /* ConversionViewController.swift in Sources */,
396E3643243976A000C2815B /* GradientView.swift in Sources */,
396E363D2439684E00C2815B /* CenterLineView.swift in Sources */,
936809701891059700655B89 /* CSIngredientListVC.m in Sources */,
Expand Down
20 changes: 0 additions & 20 deletions CookSmart/CookSmart/CSConversionVC.h
View file
Open in desktop

This file was deleted.

Loading