Skip to content

Jordan new #10

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

Jordan new #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
724bf1f
Merge pull request #5 from ukcs485gFall18/UIRedesign
jmench Dec 1, 2018
8c11cc6
Revert "Ui redesign"
jmench Dec 1, 2018
04fe96a
Merge pull request #7 from ukcs485gFall18/revert-5-UIRedesign
jmench Dec 1, 2018
f7c92d8
Merge branch 'testMaster' into JordanNew
kncarrier28 Dec 1, 2018
b4a9d94
- GUI changes
jmench Dec 4, 2018
0f745b4
more gui changes
jmench Dec 4, 2018
ef1e8e5
Merge remote-tracking branch 'refs/remotes/origin/JordanNew'
jmench Dec 4, 2018
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
29 changes: 12 additions & 17 deletions Restaurant Royale.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
objects = {

/* Begin PBXBuildFile section */
0131FCF721B08F3A0087BAA6 /* TabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0131FCF621B08F3A0087BAA6 /* TabViewController.swift */; };
0131FCF921B0933F0087BAA6 /* RewardsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0131FCF821B0933F0087BAA6 /* RewardsViewController.swift */; };
30362D0621B319FC00AB07E8 /* gif.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30362D0521B319FC00AB07E8 /* gif.swift */; };
30362D0821B31A1700AB07E8 /* money.gif in Resources */ = {isa = PBXBuildFile; fileRef = 30362D0721B31A1600AB07E8 /* money.gif */; };
30362D0A21B31A2100AB07E8 /* slots.gif in Resources */ = {isa = PBXBuildFile; fileRef = 30362D0921B31A2100AB07E8 /* slots.gif */; };
304951D121B5E5DC0022CF5D /* RestaurantViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 304951D021B5E5DC0022CF5D /* RestaurantViewController.swift */; };
CB00DE048DF123642887EB65 /* Pods_Restaurant_Royale.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E00D4DEFE6DFD07D30EAC895 /* Pods_Restaurant_Royale.framework */; };
D90CB6531A739B7A00228A1F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D90CB6521A739B7A00228A1F /* AppDelegate.swift */; };
D90CB6581A739B7A00228A1F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D90CB6561A739B7A00228A1F /* Main.storyboard */; };
Expand All @@ -28,16 +27,15 @@
E9CC65DF219CD82500B3EDE1 /* InitialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9CC65DE219CD82500B3EDE1 /* InitialViewController.swift */; };
E9CC65E1219CDE5D00B3EDE1 /* SignUpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9CC65E0219CDE5D00B3EDE1 /* SignUpViewController.swift */; };
E9CC65E3219CDE6700B3EDE1 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9CC65E2219CDE6700B3EDE1 /* LoginViewController.swift */; };
E9CC65E5219CE1E500B3EDE1 /* ProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9CC65E4219CE1E500B3EDE1 /* ProfileViewController.swift */; };
E9CC65E5219CE1E500B3EDE1 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9CC65E4219CE1E500B3EDE1 /* SettingsViewController.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
0131FCF621B08F3A0087BAA6 /* TabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabViewController.swift; sourceTree = "<group>"; };
0131FCF821B0933F0087BAA6 /* RewardsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RewardsViewController.swift; sourceTree = "<group>"; };
2C7E16726DE474D67283AED2 /* Pods-Restaurant Royale.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Restaurant Royale.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Restaurant Royale/Pods-Restaurant Royale.debug.xcconfig"; sourceTree = "<group>"; };
30362D0521B319FC00AB07E8 /* gif.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = gif.swift; sourceTree = "<group>"; };
30362D0721B31A1600AB07E8 /* money.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = money.gif; sourceTree = "<group>"; };
30362D0921B31A2100AB07E8 /* slots.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = slots.gif; sourceTree = "<group>"; };
304951D021B5E5DC0022CF5D /* RestaurantViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RestaurantViewController.swift; sourceTree = "<group>"; };
308B7289218FDB950027F45B /* TollyToLocal.gpx */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = TollyToLocal.gpx; sourceTree = "<group>"; };
7DBB1DD8B77C6707E9D01F9D /* Pods-Restaurant Royale.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Restaurant Royale.release.xcconfig"; path = "Pods/Target Support Files/Pods-Restaurant Royale/Pods-Restaurant Royale.release.xcconfig"; sourceTree = "<group>"; };
A16373B92054471A0065C2D9 /* Google.gpx */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Google.gpx; sourceTree = "<group>"; };
Expand All @@ -60,7 +58,7 @@
E9CC65DE219CD82500B3EDE1 /* InitialViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InitialViewController.swift; sourceTree = "<group>"; };
E9CC65E0219CDE5D00B3EDE1 /* SignUpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpViewController.swift; sourceTree = "<group>"; };
E9CC65E2219CDE6700B3EDE1 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
E9CC65E4219CE1E500B3EDE1 /* ProfileViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewController.swift; sourceTree = "<group>"; };
E9CC65E4219CE1E500B3EDE1 /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -115,15 +113,14 @@
E9CC65E2219CDE6700B3EDE1 /* LoginViewController.swift */,
D90CB6761A73B1ED00228A1F /* GeotificationsViewController.swift */,
D90CB67C1A73B2BD00228A1F /* AddGeotificationViewController.swift */,
E9CC65E4219CE1E500B3EDE1 /* ProfileViewController.swift */,
304951D021B5E5DC0022CF5D /* RestaurantViewController.swift */,
E9CC65E4219CE1E500B3EDE1 /* SettingsViewController.swift */,
D90CB67E1A73C4B200228A1F /* Geotification.swift */,
D9835AF21AA6076800D265BC /* Utilities.swift */,
30362D0521B319FC00AB07E8 /* gif.swift */,
30362D0721B31A1600AB07E8 /* money.gif */,
30362D0921B31A2100AB07E8 /* slots.gif */,
30362D0521B319FC00AB07E8 /* gif.swift */,
D90CB6561A739B7A00228A1F /* Main.storyboard */,
0131FCF821B0933F0087BAA6 /* RewardsViewController.swift */,
0131FCF621B08F3A0087BAA6 /* TabViewController.swift */,
D90CB6591A739B7A00228A1F /* Images.xcassets */,
D90CB65B1A739B7A00228A1F /* LaunchScreen.xib */,
D90CB6501A739B7A00228A1F /* Supporting Files */,
Expand Down Expand Up @@ -189,6 +186,7 @@
TargetAttributes = {
D90CB64C1A739B7A00228A1F = {
CreatedOnToolsVersion = 6.1.1;
DevelopmentTeam = BH9BS3QV7C;
LastSwiftMigration = 0920;
SystemCapabilities = {
com.apple.BackgroundModes = {
Expand Down Expand Up @@ -306,11 +304,8 @@
E9CC65DF219CD82500B3EDE1 /* InitialViewController.swift in Sources */,
D9835AF31AA6076800D265BC /* Utilities.swift in Sources */,
D90CB6801A73C9E200228A1F /* Geotification.swift in Sources */,

0131FCF721B08F3A0087BAA6 /* TabViewController.swift in Sources */,
0131FCF921B0933F0087BAA6 /* RewardsViewController.swift in Sources */,
E9CC65E5219CE1E500B3EDE1 /* ProfileViewController.swift in Sources */,

304951D121B5E5DC0022CF5D /* RestaurantViewController.swift in Sources */,
E9CC65E5219CE1E500B3EDE1 /* SettingsViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -442,7 +437,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = BH9BS3QV7C;
INFOPLIST_FILE = "$(SRCROOT)/RestaurantRoyale/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -459,7 +454,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = BH9BS3QV7C;
INFOPLIST_FILE = "$(SRCROOT)/RestaurantRoyale/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand Down
Loading