Skip to content
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.

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

Update master #7

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
8824e0d
Add UICollectionView and Navigation Controller
gionoa Feb 23, 2019
b67cb0f
CALayer
gionoa Feb 26, 2019
5710e4b
Add CollectionView to Home screen
gionoa Feb 28, 2019
dc93ed7
stuff
gionoa Mar 5, 2019
b5c258f
Create .gitignore
czuria1 Mar 7, 2019
bfddd4b
Remove tracking from uneccessary workspace file
czuria1 Mar 7, 2019
729cf94
Merge branch 'master_gio'
czuria1 Mar 7, 2019
7b3af16
Add MenuItemDetailViewController, TabBarController, HomeScreen
gionoa Mar 21, 2019
106e8ea
Merge branch 'master_gio'
czuria1 Mar 21, 2019
73561bb
Merge master_gio into dev
czuria1 Mar 21, 2019
f355180
Add GoogleService-Info.plist
czuria1 Mar 21, 2019
56dc022
Some refactoring;
gionoa Mar 23, 2019
5a38074
Add:
gionoa Mar 24, 2019
e6ba757
Refactored some things
gionoa Mar 24, 2019
811fb90
Add SearchViewController TableView and SearchController
gionoa Mar 26, 2019
6230fa5
Refactor init
gionoa Mar 26, 2019
0768d53
Add drop shadow for categoriesCollectionView
gionoa Mar 26, 2019
a043d04
Change categoriesCollectionView to use custom cell class
gionoa Mar 26, 2019
f50e0b9
- Update Firebase
gionoa Mar 27, 2019
a34650c
Refactor TabBarController
gionoa Mar 27, 2019
4d682fa
Update models and FirebaseAPI service
czuria1 Mar 31, 2019
55b9481
Update models and FirebaseAPI service
czuria1 Mar 31, 2019
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
75c453b
Update the ShoppingCartViewController with cells
czuria1 Apr 1, 2019
1237c30
Update ShoppingCartTableViewCell
czuria1 Apr 2, 2019
8ade7a0
HomeViewController loads menu categories from Firebase
czuria1 Apr 2, 2019
fca6c7c
Update Firebase service and custom cells
czuria1 Apr 2, 2019
e52f18c
Update pods and Firebase service model
czuria1 Apr 3, 2019
a435d88
Merge branch 'dev' of https://github.com/SparkDev-Spring-2019/md_Food…
czuria1 Apr 3, 2019
2962a04
Merge pull request #6 from SparkDev-Spring-2019/master_gio
czuria1 Apr 3, 2019
f9b238f
Update Login
czuria1 Apr 3, 2019
fcb24f8
Overwrite branch
czuria1 Apr 3, 2019
bc2a213
Change AppIcon asset
czuria1 Apr 3, 2019
7143d79
Update ShoppingCart
czuria1 Apr 3, 2019
d7fba4e
Update the reviews model
czuria1 Apr 3, 2019
960c426
Update AppDelegate
czuria1 Apr 3, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
69 changes: 69 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData/

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/

## Other
*.moved-aside
*.xccheckout
*.xcscmblueprint
*.DS_Store

## Obj-C/Swift specific
*.hmap
*.ipa
*.dSYM.zip
*.dSYM

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
# Package.resolved
.build/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output
245 changes: 235 additions & 10 deletions FoodApp/FoodApp.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

574 changes: 574 additions & 0 deletions FoodApp/FoodApp.xcodeproj/project.pbxproj.orig

Large diffs are not rendered by default.

Binary file not shown.
91 changes: 91 additions & 0 deletions FoodApp/FoodApp.xcodeproj/xcshareddata/xcschemes/FoodApp.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "79EBBE22221340D8006C4341"
BuildableName = "FoodApp.app"
BlueprintName = "FoodApp"
ReferencedContainer = "container:FoodApp.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "79EBBE22221340D8006C4341"
BuildableName = "FoodApp.app"
BlueprintName = "FoodApp"
ReferencedContainer = "container:FoodApp.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "79EBBE22221340D8006C4341"
BuildableName = "FoodApp.app"
BlueprintName = "FoodApp"
ReferencedContainer = "container:FoodApp.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "79EBBE22221340D8006C4341"
BuildableName = "FoodApp.app"
BlueprintName = "FoodApp"
ReferencedContainer = "container:FoodApp.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
10 changes: 10 additions & 0 deletions FoodApp/FoodApp.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?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>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?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/>
</plist>
14 changes: 13 additions & 1 deletion FoodApp/FoodApp/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
//

import UIKit
import Firebase
import IQKeyboardManagerSwift

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {
Expand All @@ -15,7 +17,17 @@ class AppDelegate: UIResponder, UIApplicationDelegate {


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.

FirebaseApp.configure()

window = UIWindow(frame: UIScreen.main.bounds)
window?.rootViewController = LoginViewController()
window?.makeKeyAndVisible()

UITabBar.appearance().tintColor = .customOrange

IQKeyboardManager.shared.enable = true

return true
}

Expand Down
56 changes: 56 additions & 0 deletions FoodApp/FoodApp/AppDelegate.swift.orig
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
//
// AppDelegate.swift
// FoodApp
//
// Created by Cassandra Zuria on 2/12/19.
// Copyright © 2019 SparkDev. All rights reserved.
//

import UIKit
import Firebase
import IQKeyboardManagerSwift

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {

FirebaseApp.configure()

window = UIWindow(frame: UIScreen.main.bounds)
window?.rootViewController = LoginViewController()
window?.makeKeyAndVisible()

IQKeyboardManager.shared.enable = true

return true
}

func applicationWillResignActive(_ application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
}

func applicationDidEnterBackground(_ application: UIApplication) {
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
}

func applicationWillEnterForeground(_ application: UIApplication) {
// Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
}

func applicationDidBecomeActive(_ application: UIApplication) {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
}

func applicationWillTerminate(_ application: UIApplication) {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}


}

61 changes: 61 additions & 0 deletions FoodApp/FoodApp/AppDelegate_BACKUP_1928.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
//
// AppDelegate.swift
// FoodApp
//
// Created by Cassandra Zuria on 2/12/19.
// Copyright © 2019 SparkDev. All rights reserved.
//

import UIKit
import Firebase
import IQKeyboardManagerSwift

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {

FirebaseApp.configure()

window = UIWindow(frame: UIScreen.main.bounds)
<<<<<<< HEAD
window?.rootViewController = LoginViewController()
=======
window?.rootViewController = TabBarController()
// window?.rootViewController = ShoppingCartViewController()
>>>>>>> e52f18c2553988c046c489e0ecf20b0cf96fe655
window?.makeKeyAndVisible()

IQKeyboardManager.shared.enable = true

return true
}

func applicationWillResignActive(_ application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
}

func applicationDidEnterBackground(_ application: UIApplication) {
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
}

func applicationWillEnterForeground(_ application: UIApplication) {
// Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
}

func applicationDidBecomeActive(_ application: UIApplication) {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
}

func applicationWillTerminate(_ application: UIApplication) {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}


}

56 changes: 56 additions & 0 deletions FoodApp/FoodApp/AppDelegate_BACKUP_2088.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
//
// AppDelegate.swift
// FoodApp
//
// Created by Cassandra Zuria on 2/12/19.
// Copyright © 2019 SparkDev. All rights reserved.
//

import UIKit
import Firebase
import IQKeyboardManagerSwift

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {

FirebaseApp.configure()

window = UIWindow(frame: UIScreen.main.bounds)
window?.rootViewController = LoginViewController()
window?.makeKeyAndVisible()

IQKeyboardManager.shared.enable = true

return true
}

func applicationWillResignActive(_ application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
}

func applicationDidEnterBackground(_ application: UIApplication) {
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
}

func applicationWillEnterForeground(_ application: UIApplication) {
// Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
}

func applicationDidBecomeActive(_ application: UIApplication) {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
}

func applicationWillTerminate(_ application: UIApplication) {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}


}

Loading