Skip to content
This repository has been archived by the owner on Aug 23, 2023. It is now read-only.

New Search View #3

Merged
merged 13 commits into from
Jun 15, 2015
Merged

New Search View #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
93c5a8c
Search view init
TorIsHere Jun 11, 2015
a8779bd
Merge pull request #1 from gobbl/feature/rename_adam
TorIsHere Jun 11, 2015
3810d6b
[Asset] Right arrow
TorIsHere Jun 11, 2015
b441d15
[Asset] Right Arrow
TorIsHere Jun 11, 2015
5ec22ca
Add Mixpanel for search track
TorIsHere Jun 11, 2015
beb56ef
Adjust search layout
TorIsHere Jun 11, 2015
515b0f6
New UI for search
TorIsHere Jun 11, 2015
2ce7070
[Asset] left - right arrow
TorIsHere Jun 14, 2015
0a28147
Add google map podfile
TorIsHere Jun 14, 2015
3cd9c3b
Add google maps framework
TorIsHere Jun 14, 2015
cb8f5e8
Add search page
TorIsHere Jun 14, 2015
e5e3fba
order fixed
TorIsHere Jun 14, 2015
653bc2b
Search with Location
TorIsHere Jun 15, 2015
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
1 change: 1 addition & 0 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ use_frameworks!
pod "SwiftyJSON", ">= 2.2"
pod 'Alamofire', '~> 1.2'
pod 'Mixpanel'
pod 'GoogleMaps'
12 changes: 12 additions & 0 deletions adam.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,18 @@
21D741281B21A9A9008A8EB5 /* DiscoverView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 21D741271B21A9A9008A8EB5 /* DiscoverView.xib */; };
21D7412A1B21AA4B008A8EB5 /* DiscoverView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21D741291B21AA4B008A8EB5 /* DiscoverView.swift */; };
21D7412C1B21AD36008A8EB5 /* DiscoverViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21D7412B1B21AD36008A8EB5 /* DiscoverViewController.swift */; };
9616799B1B2C72BA00A43AD3 /* LocationSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9616799A1B2C72BA00A43AD3 /* LocationSearchViewController.swift */; };
9656AD9F1AECC62800933A8E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9656AD9E1AECC62800933A8E /* AppDelegate.swift */; };
9656ADA11AECC62800933A8E /* FirstViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9656ADA01AECC62800933A8E /* FirstViewController.swift */; };
9656ADA31AECC62800933A8E /* SecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9656ADA21AECC62800933A8E /* SecondViewController.swift */; };
9656ADA61AECC62800933A8E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9656ADA41AECC62800933A8E /* Main.storyboard */; };
9656ADA81AECC62800933A8E /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9656ADA71AECC62800933A8E /* Images.xcassets */; };
9656ADAB1AECC62800933A8E /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9656ADA91AECC62800933A8E /* LaunchScreen.xib */; };
9656ADB71AECC62900933A8E /* benriTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9656ADB61AECC62900933A8E /* benriTests.swift */; };
967867701B2C9A7F0047C7BB /* SearchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9678676F1B2C9A7F0047C7BB /* SearchCell.swift */; };
969FB14E1B1AB32300439BDC /* FBSDKLoginKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 969FB14D1B1AB32300439BDC /* FBSDKLoginKit.framework */; };
969FB1501B1AB35700439BDC /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 969FB14F1B1AB35700439BDC /* FBSDKCoreKit.framework */; };
96C24E901B244527006C5806 /* SearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96C24E8F1B244527006C5806 /* SearchViewController.swift */; };
96DA5A0F1AF274670003E506 /* Const.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DA5A0B1AF274670003E506 /* Const.swift */; };
96DA5A101AF274670003E506 /* HorizontalPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DA5A0C1AF274670003E506 /* HorizontalPicker.swift */; };
96DA5A111AF274670003E506 /* LocationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DA5A0D1AF274670003E506 /* LocationService.swift */; };
Expand Down Expand Up @@ -55,6 +58,7 @@
21D741291B21AA4B008A8EB5 /* DiscoverView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiscoverView.swift; sourceTree = "<group>"; };
21D7412B1B21AD36008A8EB5 /* DiscoverViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiscoverViewController.swift; sourceTree = "<group>"; };
5BD10A0AA37B5DD5EB928422 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
9616799A1B2C72BA00A43AD3 /* LocationSearchViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocationSearchViewController.swift; sourceTree = "<group>"; };
9656AD991AECC62800933A8E /* adam.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = adam.app; sourceTree = BUILT_PRODUCTS_DIR; };
9656AD9D1AECC62800933A8E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9656AD9E1AECC62800933A8E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -66,8 +70,10 @@
9656ADB01AECC62900933A8E /* adamTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = adamTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
9656ADB51AECC62900933A8E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9656ADB61AECC62900933A8E /* benriTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = benriTests.swift; sourceTree = "<group>"; };
9678676F1B2C9A7F0047C7BB /* SearchCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchCell.swift; sourceTree = "<group>"; };
969FB14D1B1AB32300439BDC /* FBSDKLoginKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FBSDKLoginKit.framework; sourceTree = "<group>"; };
969FB14F1B1AB35700439BDC /* FBSDKCoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FBSDKCoreKit.framework; sourceTree = "<group>"; };
96C24E8F1B244527006C5806 /* SearchViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchViewController.swift; sourceTree = "<group>"; };
96DA5A0B1AF274670003E506 /* Const.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Const.swift; sourceTree = "<group>"; };
96DA5A0C1AF274670003E506 /* HorizontalPicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HorizontalPicker.swift; sourceTree = "<group>"; };
96DA5A0D1AF274670003E506 /* LocationService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocationService.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -152,11 +158,14 @@
96DA5A0A1AF2744F0003E506 /* Lib */,
9656AD9E1AECC62800933A8E /* AppDelegate.swift */,
9656ADA01AECC62800933A8E /* FirstViewController.swift */,
96C24E8F1B244527006C5806 /* SearchViewController.swift */,
9616799A1B2C72BA00A43AD3 /* LocationSearchViewController.swift */,
9656ADA21AECC62800933A8E /* SecondViewController.swift */,
2150F5001B0EFEE200AFDF5E /* ProfileViewController.swift */,
21D7412B1B21AD36008A8EB5 /* DiscoverViewController.swift */,
21D741291B21AA4B008A8EB5 /* DiscoverView.swift */,
9656ADA41AECC62800933A8E /* Main.storyboard */,
9678676F1B2C9A7F0047C7BB /* SearchCell.swift */,
9656ADA71AECC62800933A8E /* Images.xcassets */,
9656ADA91AECC62800933A8E /* LaunchScreen.xib */,
9656AD9C1AECC62800933A8E /* Supporting Files */,
Expand Down Expand Up @@ -376,6 +385,7 @@
buildActionMask = 2147483647;
files = (
21AF14891B0601C800108190 /* Restaurant.swift in Sources */,
967867701B2C9A7F0047C7BB /* SearchCell.swift in Sources */,
9656ADA31AECC62800933A8E /* SecondViewController.swift in Sources */,
96DA5A0F1AF274670003E506 /* Const.swift in Sources */,
21BF4D171B099714001CDBC3 /* RestaurantCache.swift in Sources */,
Expand All @@ -388,7 +398,9 @@
96DA5A1D1AF28AD20003E506 /* MenuServerAPI.swift in Sources */,
21D7412C1B21AD36008A8EB5 /* DiscoverViewController.swift in Sources */,
96DA5A111AF274670003E506 /* LocationService.swift in Sources */,
9616799B1B2C72BA00A43AD3 /* LocationSearchViewController.swift in Sources */,
96DA5A121AF274670003E506 /* ImageCache.swift in Sources */,
96C24E901B244527006C5806 /* SearchViewController.swift in Sources */,
2150F5011B0EFEE200AFDF5E /* ProfileViewController.swift in Sources */,
21AF14871B05FA0B00108190 /* RestaurantServerAPI.swift in Sources */,
9656ADA11AECC62800933A8E /* FirstViewController.swift in Sources */,
Expand Down
8 changes: 8 additions & 0 deletions benri/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

import UIKit
import Mixpanel

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {
Expand All @@ -16,6 +17,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
// Override point for customization after application launch.
var mixPanelInstance:Mixpanel = Mixpanel.sharedInstanceWithToken("38c30d15d147f74c302b5162f3a2ed65")
GMSServices.provideAPIKey("AIzaSyBr0bS6ifn640dNqi9lfYk4k7YzkkSN348")

var statusView = UIView(frame: CGRectMake(0, 0, UIScreen.mainScreen().bounds.size.width, 20))
statusView.backgroundColor = UIColor(red: 245.0/255.0, green: 245.0/255.0, blue: 245.0/255.0, alpha: 1.0)
self.window?.rootViewController?.view.addSubview(statusView)

return FBSDKApplicationDelegate.sharedInstance().application(application, didFinishLaunchingWithOptions: launchOptions)
}

Expand Down
Loading