Skip to content

Master gio #6

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

Merged
czuria1 merged 5 commits into from
Apr 3, 2019
Merged

Master gio #6

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
07ee36a
Wall of Code
gionoa Mar 31, 2019
c975742
Wall of Code
gionoa Mar 31, 2019
3706ba5
Add IQKeyboardManagerSwift
gionoa Apr 1, 2019
d01cf9a
Add IQKeyboardManagerSwift
gionoa Apr 1, 2019
a435d88
Merge branch 'dev' of https://github.com/SparkDev-Spring-2019/md_Food…
czuria1 Apr 3, 2019
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
33 changes: 24 additions & 9 deletions FoodApp/FoodApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@
BF1D4F2B221F20A9000B95D5 /* TabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF1D4F29221F20A9000B95D5 /* TabBarController.swift */; };
BF1D4F31221F38DD000B95D5 /* MenuItemCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF1D4F2F221F38DD000B95D5 /* MenuItemCollectionViewCell.swift */; };
BF1D4F32221F38DD000B95D5 /* MenuItemCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF1D4F30221F38DD000B95D5 /* MenuItemCollectionViewCell.xib */; };
BF202AFD222866B90040F010 /* FoodItemCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF202AFC222866B90040F010 /* FoodItemCollectionView.swift */; };
BF509C4C223C1B4F0064AF82 /* SearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF509C4B223C1B4F0064AF82 /* SearchViewController.swift */; };
BF509C4E223C1B6A0064AF82 /* ShoppingCartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF509C4D223C1B6A0064AF82 /* ShoppingCartViewController.swift */; };
BF509C50223C1B740064AF82 /* ProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF509C4F223C1B740064AF82 /* ProfileViewController.swift */; };
BF509C52223C78DA0064AF82 /* MenuItemDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF509C51223C78DA0064AF82 /* MenuItemDetailViewController.swift */; };
BF509C54223C79050064AF82 /* MenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF509C53223C79050064AF82 /* MenuItem.swift */; };
BF509C782240661F0064AF82 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF509C772240661F0064AF82 /* Extensions.swift */; };
BF8046FA224FDE0A002DE18F /* RatingsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF8046F8224FDE0A002DE18F /* RatingsTableViewCell.swift */; };
BF8046FB224FDE0A002DE18F /* RatingsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF8046F9224FDE0A002DE18F /* RatingsTableViewCell.xib */; };
BF8046FF225149A2002DE18F /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF8046FE225149A2002DE18F /* LoginViewController.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -60,13 +61,14 @@
BF1D4F29221F20A9000B95D5 /* TabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarController.swift; sourceTree = "<group>"; };
BF1D4F2F221F38DD000B95D5 /* MenuItemCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MenuItemCollectionViewCell.swift; path = FoodApp/Views/MenuItemCollectionViewCell.swift; sourceTree = SOURCE_ROOT; };
BF1D4F30221F38DD000B95D5 /* MenuItemCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MenuItemCollectionViewCell.xib; path = FoodApp/Views/MenuItemCollectionViewCell.xib; sourceTree = SOURCE_ROOT; };
BF202AFC222866B90040F010 /* FoodItemCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FoodItemCollectionView.swift; sourceTree = "<group>"; };
BF509C4B223C1B4F0064AF82 /* SearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchViewController.swift; sourceTree = "<group>"; };
BF509C4D223C1B6A0064AF82 /* ShoppingCartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartViewController.swift; sourceTree = "<group>"; };
BF509C4F223C1B740064AF82 /* ProfileViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewController.swift; sourceTree = "<group>"; };
BF509C51223C78DA0064AF82 /* MenuItemDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuItemDetailViewController.swift; sourceTree = "<group>"; };
BF509C53223C79050064AF82 /* MenuItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuItem.swift; sourceTree = "<group>"; };
BF509C772240661F0064AF82 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
BF8046F8224FDE0A002DE18F /* RatingsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RatingsTableViewCell.swift; sourceTree = "<group>"; };
BF8046F9224FDE0A002DE18F /* RatingsTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RatingsTableViewCell.xib; sourceTree = "<group>"; };
BF8046FE225149A2002DE18F /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
D59F8127439E5E39BB747D7F /* Pods-FoodApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FoodApp.release.xcconfig"; path = "Target Support Files/Pods-FoodApp/Pods-FoodApp.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -143,6 +145,8 @@
isa = PBXGroup;
children = (
BF0A39042246682700651A6E /* CategoriesCollectionViewCell.swift */,
BF8046F8224FDE0A002DE18F /* RatingsTableViewCell.swift */,
BF8046F9224FDE0A002DE18F /* RatingsTableViewCell.xib */,
BF1D4F2F221F38DD000B95D5 /* MenuItemCollectionViewCell.swift */,
BF1D4F30221F38DD000B95D5 /* MenuItemCollectionViewCell.xib */,
796D57DC225278CD00D34142 /* ShoppingCartTableViewCell.swift */,
Expand All @@ -154,23 +158,30 @@
BF439FCD2225BBB000BCDF9A /* Controllers */ = {
isa = PBXGroup;
children = (
BF8046FE225149A2002DE18F /* LoginViewController.swift */,
BF1D4F29221F20A9000B95D5 /* TabBarController.swift */,
79EBBE28221340D8006C4341 /* HomeViewController.swift */,
BF80470022517619002DE18F /* Tabs */,
BF509C51223C78DA0064AF82 /* MenuItemDetailViewController.swift */,
BF0A38DE2243FCF400651A6E /* PageViewControllers */,
BF509C4B223C1B4F0064AF82 /* SearchViewController.swift */,
);
path = Controllers;
sourceTree = "<group>";
};
BF80470022517619002DE18F /* Tabs */ = {
isa = PBXGroup;
children = (
79EBBE28221340D8006C4341 /* HomeViewController.swift */,
BF509C4D223C1B6A0064AF82 /* ShoppingCartViewController.swift */,
BF509C4F223C1B740064AF82 /* ProfileViewController.swift */,
);
path = Controllers;
path = Tabs;
sourceTree = "<group>";
};
DE112B0C17C210FFD0D04006 /* FoodApp */ = {
isa = PBXGroup;
children = (
79EBBE26221340D8006C4341 /* AppDelegate.swift */,
BF509C772240661F0064AF82 /* Extensions.swift */,
BF202AFC222866B90040F010 /* FoodItemCollectionView.swift */,
BF439FCD2225BBB000BCDF9A /* Controllers */,
BF439FCC2225BBAB00BCDF9A /* Views */,
BF439FCB2225BBA400BCDF9A /* Models */,
Expand Down Expand Up @@ -245,6 +256,7 @@
files = (
79EBBE31221340DA006C4341 /* LaunchScreen.storyboard in Resources */,
79EBBE2E221340DA006C4341 /* Assets.xcassets in Resources */,
BF8046FB224FDE0A002DE18F /* RatingsTableViewCell.xib in Resources */,
79AA0B9E22440C1400B18A88 /* GoogleService-Info.plist in Resources */,
79EBBE2C221340D8006C4341 /* Main.storyboard in Resources */,
BF1D4F32221F38DD000B95D5 /* MenuItemCollectionViewCell.xib in Resources */,
Expand Down Expand Up @@ -290,6 +302,7 @@
"${BUILT_PRODUCTS_DIR}/CodableFirebase/CodableFirebase.framework",
"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
"${BUILT_PRODUCTS_DIR}/IQKeyboardManagerSwift/IQKeyboardManagerSwift.framework",
"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
"${BUILT_PRODUCTS_DIR}/SkyFloatingLabelTextField/SkyFloatingLabelTextField.framework",
"${BUILT_PRODUCTS_DIR}/gRPC-C++/grpcpp.framework",
Expand All @@ -305,6 +318,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CodableFirebase.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IQKeyboardManagerSwift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SkyFloatingLabelTextField.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpcpp.framework",
Expand All @@ -324,9 +338,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BF509C4C223C1B4F0064AF82 /* SearchViewController.swift in Sources */,
BF8046FA224FDE0A002DE18F /* RatingsTableViewCell.swift in Sources */,
BF509C4E223C1B6A0064AF82 /* ShoppingCartViewController.swift in Sources */,
BF0A38E2224416E900651A6E /* DescriptionViewController.swift in Sources */,
BF8046FF225149A2002DE18F /* LoginViewController.swift in Sources */,
79EBBE29221340D8006C4341 /* HomeViewController.swift in Sources */,
79EBBE27221340D8006C4341 /* AppDelegate.swift in Sources */,
7935D49C2253C0E80046F903 /* Review.swift in Sources */,
Expand Down
Loading