Skip to content

Commit 821e122

Browse files
lsecreaselsecrease
committed
Update
1 parent b3ecf79 commit 821e122

420 files changed

Lines changed: 35579 additions & 1747 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Dindr.xcodeproj/project.pbxproj‎

Lines changed: 148 additions & 24 deletions
Large diffs are not rendered by default.

‎Dindr.xcworkspace/xcshareddata/Dindr.xcscmblueprint‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
{
2-
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "EACED2723BB5600B88834009D10CCB8CD2946702",
2+
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "B7717F0503A8F935E9E2D519F1113507C38EF0F7",
33
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
44

55
},
66
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
77
"EACED2723BB5600B88834009D10CCB8CD2946702" : 0,
8+
"B7717F0503A8F935E9E2D519F1113507C38EF0F7" : 0,
89
"3CE173A00AFA646F21499F4BA53E756FEAEB54D6" : 0
910
},
1011
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "637F2BFC-C9BA-434D-A08A-479B2E1C1C63",
1112
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
1213
"EACED2723BB5600B88834009D10CCB8CD2946702" : "Dindr\/",
14+
"B7717F0503A8F935E9E2D519F1113507C38EF0F7" : "RestaurantDindr\/",
1315
"3CE173A00AFA646F21499F4BA53E756FEAEB54D6" : "Dindr\/Dindr\/"
1416
},
1517
"DVTSourceControlWorkspaceBlueprintNameKey" : "Dindr",
@@ -21,6 +23,11 @@
2123
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
2224
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "3CE173A00AFA646F21499F4BA53E756FEAEB54D6"
2325
},
26+
{
27+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/JBader89\/RestaurantDindr.git",
28+
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
29+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "B7717F0503A8F935E9E2D519F1113507C38EF0F7"
30+
},
2431
{
2532
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/JBader89\/RestaurantDindr.git",
2633
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",

‎Dindr/AppDelegate.swift‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import UIKit
1010
import Parse
11+
import Stripe
1112

1213

1314
@UIApplicationMain
@@ -18,11 +19,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1819

1920
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
2021

22+
User.initialize()
23+
Restaurant.initialize()
24+
25+
Stripe.setDefaultPublishableKey("pk_test_wSF2FSixopjY2k7tkvBLy8ox")
26+
2127
Parse.enableLocalDatastore()
2228

2329
// Parse App ID
2430
Parse.setApplicationId("0rubnb7O4htTp2ebMAM2KXnPazFxilATgmZvKLde", clientKey: "0shAOvyF065qlhgquNoHwSlu7dLOtv6vavggY8fp")
2531

32+
33+
2634
// Override point for customization after application launch.
2735
return true
2836
}
@@ -48,7 +56,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
4856
func applicationWillTerminate(application: UIApplication) {
4957
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
5058
}
59+
60+
5161

5262

5363
}
64+
//class TabBar: UITabBar {
65+
66+
//override func sizeThatFits(size: CGSize) -> CGSize {
67+
// var sizeThatFits = super.sizeThatFits(size)
68+
// sizeThatFits.height = 120
69+
70+
//return sizeThatFits
71+
//}
72+
//}
5473

‎Dindr/Base.lproj/LaunchScreen.xib‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<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">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
4+
<deployment identifier="iOS"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
56
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
67
</dependencies>
78
<objects>
@@ -11,12 +12,6 @@
1112
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
1213
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1314
<subviews>
14-
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2015 ImagineME. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
15-
<rect key="frame" x="20" y="439" width="441" height="21"/>
16-
<fontDescription key="fontDescription" type="system" pointSize="17"/>
17-
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
18-
<nil key="highlightedColor"/>
19-
</label>
2015
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Dindr" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
2116
<rect key="frame" x="20" y="140" width="441" height="43"/>
2217
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
@@ -28,9 +23,6 @@
2823
<constraints>
2924
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
3025
<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
31-
<constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
32-
<constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
33-
<constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
3426
<constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
3527
</constraints>
3628
<nil key="simulatedStatusBarMetrics"/>

0 commit comments

Comments
 (0)