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

Tutorial placement #8

Merged
merged 9 commits into from
Jun 21, 2015
Merged

Tutorial placement #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4c2ad86
[WIP] Add page view to Story board
TorIsHere Jun 17, 2015
77c34ec
Text for tutorial
TorIsHere Jun 20, 2015
25caaeb
Text for tutorial
TorIsHere Jun 20, 2015
2c5fdbf
Launch Screen (temp)
TorIsHere Jun 20, 2015
2c82bc6
Asset Tutorial
TorIsHere Jun 20, 2015
95c1951
Tutorial page
TorIsHere Jun 20, 2015
4c27d10
Add skip tutorial button
TorIsHere Jun 21, 2015
748ef31
Facebook login for tutorial
TorIsHere Jun 21, 2015
6429aeb
Add tutorial call from first view and add status background
TorIsHere Jun 21, 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
48 changes: 46 additions & 2 deletions adam.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
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 */; };
964690861B3308D800DB187D /* TutorialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 964690851B3308D800DB187D /* TutorialViewController.swift */; };
9646908A1B3392F600DB187D /* PageContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 964690891B3392F600DB187D /* PageContentViewController.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 */; };
Expand All @@ -36,6 +38,8 @@
96DA5A171AF2850E0003E506 /* MenuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DA5A161AF2850E0003E506 /* MenuCell.swift */; };
96DA5A1D1AF28AD20003E506 /* MenuServerAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DA5A1C1AF28AD20003E506 /* MenuServerAPI.swift */; };
96DA5A1F1AF28AE90003E506 /* TagServerAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DA5A1E1AF28AE90003E506 /* TagServerAPI.swift */; };
96E377171B35981100229684 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 96E377191B35981100229684 /* Localizable.strings */; };
96E3771D1B36784000229684 /* APISetting.plist in Resources */ = {isa = PBXBuildFile; fileRef = 96E3771C1B36784000229684 /* APISetting.plist */; };
96F0CF791AF136E2004E616D /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96F0CF781AF136E2004E616D /* CoreLocation.framework */; };
B60416A3C37CC1146EA0DAC9 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 988DEB37F68751845480352C /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -63,6 +67,8 @@
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>"; };
964690851B3308D800DB187D /* TutorialViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TutorialViewController.swift; sourceTree = "<group>"; };
964690891B3392F600DB187D /* PageContentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PageContentViewController.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 @@ -86,6 +92,13 @@
96DA5A161AF2850E0003E506 /* MenuCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuCell.swift; sourceTree = "<group>"; };
96DA5A1C1AF28AD20003E506 /* MenuServerAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuServerAPI.swift; sourceTree = "<group>"; };
96DA5A1E1AF28AE90003E506 /* TagServerAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TagServerAPI.swift; sourceTree = "<group>"; };
96E377111B3597DA00229684 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = "<group>"; };
96E377121B3597DA00229684 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
96E377131B3597E300229684 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Main.strings; sourceTree = "<group>"; };
96E377141B3597E300229684 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
96E377181B35981100229684 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
96E3771A1B35981500229684 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
96E3771C1B36784000229684 /* APISetting.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = APISetting.plist; sourceTree = "<group>"; };
96F0CF781AF136E2004E616D /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
988DEB37F68751845480352C /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D653A08C2BE7A9497AF35975 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -156,21 +169,25 @@
9656AD9B1AECC62800933A8E /* benri */ = {
isa = PBXGroup;
children = (
96E377191B35981100229684 /* Localizable.strings */,
21D741271B21A9A9008A8EB5 /* DiscoverView.xib */,
96DA5A191AF28AAA0003E506 /* SVAPI */,
96E3771B1B359C1F00229684 /* Tutorial */,
96DA5A131AF284A80003E506 /* Menu */,
96DA5A0A1AF2744F0003E506 /* Lib */,
9656AD9E1AECC62800933A8E /* AppDelegate.swift */,
964690851B3308D800DB187D /* TutorialViewController.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 */,
9656ADA41AECC62800933A8E /* Main.storyboard */,
96E3771C1B36784000229684 /* APISetting.plist */,
9656ADA91AECC62800933A8E /* LaunchScreen.xib */,
9656AD9C1AECC62800933A8E /* Supporting Files */,
2150F4FB1B0ED81C00AFDF5E /* Bridging-Header.h */,
Expand Down Expand Up @@ -237,6 +254,14 @@
name = SVAPI;
sourceTree = "<group>";
};
96E3771B1B359C1F00229684 /* Tutorial */ = {
isa = PBXGroup;
children = (
964690891B3392F600DB187D /* PageContentViewController.swift */,
);
name = Tutorial;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -302,8 +327,8 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
ja,
);
mainGroup = 9656AD901AECC62800933A8E;
productRefGroup = 9656AD9A1AECC62800933A8E /* Products */;
Expand All @@ -322,6 +347,8 @@
buildActionMask = 2147483647;
files = (
9656ADA61AECC62800933A8E /* Main.storyboard in Resources */,
96E377171B35981100229684 /* Localizable.strings in Resources */,
96E3771D1B36784000229684 /* APISetting.plist in Resources */,
9656ADAB1AECC62800933A8E /* LaunchScreen.xib in Resources */,
9656ADA81AECC62800933A8E /* Images.xcassets in Resources */,
21577E081B2E87DB00D4218F /* CurrencyList.plist in Resources */,
Expand Down Expand Up @@ -391,6 +418,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
964690861B3308D800DB187D /* TutorialViewController.swift in Sources */,
21AF14891B0601C800108190 /* Restaurant.swift in Sources */,
967867701B2C9A7F0047C7BB /* SearchCell.swift in Sources */,
9656ADA31AECC62800933A8E /* SecondViewController.swift in Sources */,
Expand All @@ -399,6 +427,7 @@
96DA5A171AF2850E0003E506 /* MenuCell.swift in Sources */,
96DA5A151AF284BB0003E506 /* Menu.swift in Sources */,
9656AD9F1AECC62800933A8E /* AppDelegate.swift in Sources */,
9646908A1B3392F600DB187D /* PageContentViewController.swift in Sources */,
21D7412A1B21AA4B008A8EB5 /* DiscoverView.swift in Sources */,
96DA5A1F1AF28AE90003E506 /* TagServerAPI.swift in Sources */,
96DA5A101AF274670003E506 /* HorizontalPicker.swift in Sources */,
Expand Down Expand Up @@ -438,6 +467,8 @@
isa = PBXVariantGroup;
children = (
9656ADA51AECC62800933A8E /* Base */,
96E377111B3597DA00229684 /* en */,
96E377131B3597E300229684 /* ja */,
);
name = Main.storyboard;
sourceTree = "<group>";
Expand All @@ -446,10 +477,21 @@
isa = PBXVariantGroup;
children = (
9656ADAA1AECC62800933A8E /* Base */,
96E377121B3597DA00229684 /* en */,
96E377141B3597E300229684 /* ja */,
);
name = LaunchScreen.xib;
sourceTree = "<group>";
};
96E377191B35981100229684 /* Localizable.strings */ = {
isa = PBXVariantGroup;
children = (
96E377181B35981100229684 /* en */,
96E3771A1B35981500229684 /* ja */,
);
name = Localizable.strings;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
Expand Down Expand Up @@ -541,6 +583,7 @@
baseConfigurationReference = D653A08C2BE7A9497AF35975 /* Pods.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -560,6 +603,7 @@
baseConfigurationReference = 5BD10A0AA37B5DD5EB928422 /* Pods.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down
9 changes: 7 additions & 2 deletions benri/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var mixPanelInstance:Mixpanel = Mixpanel.sharedInstanceWithToken("38c30d15d147f74c302b5162f3a2ed65")
GMSServices.provideAPIKey("AIzaSyBr0bS6ifn640dNqi9lfYk4k7YzkkSN348")

var statusView = UIView(frame: CGRectMake(0, 0, UIScreen.mainScreen().bounds.size.width, 20))
/*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)
self.window?.rootViewController?.view.addSubview(statusView)*/

var pageControllerAP = UIPageControl.appearance()
pageControllerAP.pageIndicatorTintColor = UIColor.lightGrayColor()
pageControllerAP.currentPageIndicatorTintColor = UIColor.blackColor()
pageControllerAP.backgroundColor = UIColor(red: 252.0/255.0, green: 119.0/255.0, blue: 7.0/255.0, alpha: 1.0)

return FBSDKApplicationDelegate.sharedInstance().application(application, didFinishLaunchingWithOptions: launchOptions)
}
Expand Down
4 changes: 2 additions & 2 deletions benri/Base.lproj/LaunchScreen.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<objects>
Expand Down
Loading