Skip to content

Commit 536065d

Browse files
jamesreggiojamesreggio
committed
unify diffs
1 parent 0d81f3f commit 536065d

13 files changed

Lines changed: 38 additions & 37 deletions

File tree

‎Example/StripeExample/AppDelegate.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// StripeExample
44
//
55
// Created by Jack Flintermann on 8/21/14.
6+
// Copyright (c) 2014 Stripe. All rights reserved.
67
//
78

89
#import <UIKit/UIKit.h>

‎Example/StripeExample/AppDelegate.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// StripeExample
44
//
55
// Created by Jack Flintermann on 8/21/14.
6+
// Copyright (c) 2014 Stripe. All rights reserved.
67
//
78

89
#import "AppDelegate.h"

‎Example/StripeExample/Base.lproj/Main.storyboard‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
33
<dependencies>
44
<deployment version="2048" identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
6+
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
67
</dependencies>
78
<scenes>
89
<!--View Controller-->
@@ -20,7 +21,7 @@
2021
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="llamas" translatesAutoresizingMaskIntoConstraints="NO" id="VbY-Dc-i7d">
2122
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
2223
</imageView>
23-
<view opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="dMV-m3-RoV" userLabel="Modal">
24+
<view opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="dMV-m3-RoV">
2425
<rect key="frame" x="40" y="128" width="240" height="128"/>
2526
<subviews>
2627
<stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="dQn-iV-gNX">
@@ -44,7 +45,7 @@
4445
<action selector="beginPayment:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="pVL-Dg-LSY"/>
4546
</connections>
4647
</button>
47-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dJt-kJ-RJe">
48+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dJt-kJ-RJe">
4849
<rect key="frame" x="8" y="53" width="122" height="21"/>
4950
<constraints>
5051
<constraint firstAttribute="height" constant="21" id="v1w-WQ-vCr"/>
@@ -59,14 +60,12 @@
5960
<constraint firstAttribute="trailing" secondItem="dQn-iV-gNX" secondAttribute="trailing" constant="8" id="5eB-G6-HCm"/>
6061
<constraint firstAttribute="height" constant="128" id="5hf-mO-fc1"/>
6162
<constraint firstAttribute="trailing" secondItem="GJ6-hd-Wof" secondAttribute="trailing" constant="8" id="7ci-J0-Hn4"/>
62-
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="128" id="IGb-3F-aKh"/>
6363
<constraint firstItem="dQn-iV-gNX" firstAttribute="top" secondItem="dMV-m3-RoV" secondAttribute="top" constant="49" id="RaA-gy-6Jv"/>
6464
<constraint firstItem="GJ6-hd-Wof" firstAttribute="leading" secondItem="dMV-m3-RoV" secondAttribute="leading" constant="8" id="VWc-YX-4It"/>
6565
<constraint firstItem="dJt-kJ-RJe" firstAttribute="leading" secondItem="dMV-m3-RoV" secondAttribute="leading" constant="8" id="WYe-EN-UC8"/>
6666
<constraint firstAttribute="bottom" secondItem="GJ6-hd-Wof" secondAttribute="bottom" constant="8" id="Ya8-9A-58o"/>
6767
<constraint firstItem="dQn-iV-gNX" firstAttribute="leading" secondItem="dJt-kJ-RJe" secondAttribute="trailing" constant="8" id="ZNB-KH-wHp"/>
6868
<constraint firstItem="dJt-kJ-RJe" firstAttribute="top" secondItem="dMV-m3-RoV" secondAttribute="top" constant="53" id="mfN-X4-Qqf"/>
69-
<constraint firstAttribute="width" constant="240" id="prl-13-hWl"/>
7069
</constraints>
7170
<userDefinedRuntimeAttributes>
7271
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -79,10 +78,11 @@
7978
<constraints>
8079
<constraint firstAttribute="width" secondItem="VbY-Dc-i7d" secondAttribute="width" id="9Ze-rd-8ch"/>
8180
<constraint firstAttribute="centerY" secondItem="VbY-Dc-i7d" secondAttribute="centerY" id="GSk-sB-yKj"/>
82-
<constraint firstAttribute="centerX" secondItem="dMV-m3-RoV" secondAttribute="centerX" id="Xaf-lg-giy"/>
83-
<constraint firstAttribute="centerY" secondItem="dMV-m3-RoV" secondAttribute="centerY" constant="92" id="hR3-3A-mdE"/>
81+
<constraint firstAttribute="trailingMargin" secondItem="dMV-m3-RoV" secondAttribute="trailing" constant="24" id="MS2-ts-c88"/>
82+
<constraint firstItem="dMV-m3-RoV" firstAttribute="top" secondItem="jyV-Pf-zRb" secondAttribute="bottom" constant="108" id="Wx3-Is-wy6"/>
8483
<constraint firstAttribute="centerX" secondItem="VbY-Dc-i7d" secondAttribute="centerX" id="lbp-mS-LJt"/>
8584
<constraint firstAttribute="height" secondItem="VbY-Dc-i7d" secondAttribute="height" id="o6p-dA-aC8"/>
85+
<constraint firstItem="dMV-m3-RoV" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" constant="24" id="zYN-ZG-rfU"/>
8686
</constraints>
8787
</view>
8888
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>

‎Example/StripeExample/Constants.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// StripeExample
44
//
55
// Created by Jack Flintermann on 8/22/14.
6+
// Copyright (c) 2014 Stripe. All rights reserved.
67
//
78

89
#import <Foundation/Foundation.h>

‎Example/StripeExample/Constants.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// StripeExample
44
//
55
// Created by Jack Flintermann on 8/22/14.
6+
// Copyright (c) 2014 Stripe. All rights reserved.
67
//
78

89
#import "Constants.h"

‎Example/StripeExample/Images.xcassets/llamas.imageset/Contents.json‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,24 @@
33
{
44
"idiom" : "iphone",
55
"scale" : "1x",
6-
"filename" : "llamas@2x-3.jpg"
6+
"filename" : "llamas.jpg"
77
},
88
{
99
"idiom" : "iphone",
1010
"scale" : "2x",
11-
"filename" : "llamas@2x-2.jpg"
11+
"filename" : "[email protected]"
1212
},
1313
{
1414
"idiom" : "iphone",
15-
"scale" : "3x",
16-
"filename" : "[email protected]"
15+
"scale" : "3x"
1716
},
1817
{
1918
"idiom" : "ipad",
20-
"scale" : "1x",
21-
"filename" : "[email protected]"
19+
"scale" : "1x"
2220
},
2321
{
2422
"idiom" : "ipad",
25-
"scale" : "2x",
26-
"filename" : "llamas.jpg"
23+
"scale" : "2x"
2724
}
2825
],
2926
"info" : {

‎Example/StripeExample/Stripe iOS Example-Info.plist‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleExecutable</key>
1010
<string>${EXECUTABLE_NAME}</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>com.stripe.checkout.$(PRODUCT_NAME:rfc1034identifier)</string>
12+
<string>com.stripe.$(PRODUCT_NAME:rfc1034identifier)</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>
@@ -24,8 +24,6 @@
2424
<string>1.0</string>
2525
<key>LSRequiresIPhoneOS</key>
2626
<true/>
27-
<key>UILaunchStoryboardName</key>
28-
<string>Launch Screen</string>
2927
<key>UIMainStoryboardFile</key>
3028
<string>Main</string>
3129
<key>UIRequiredDeviceCapabilities</key>
@@ -42,5 +40,7 @@
4240
<string>UIInterfaceOrientationLandscapeLeft</string>
4341
<string>UIInterfaceOrientationLandscapeRight</string>
4442
</array>
43+
<key>UIViewControllerBasedStatusBarAppearance</key>
44+
<false/>
4545
</dict>
4646
</plist>

‎Example/StripeExample/ViewController.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// StripeExample
44
//
55
// Created by Jack Flintermann on 8/21/14.
6+
// Copyright (c) 2014 Stripe. All rights reserved.
67
//
78

89
#import <UIKit/UIKit.h>

‎Example/StripeExample/main.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// StripeExample
44
//
55
// Created by Jack Flintermann on 8/21/14.
6+
// Copyright (c) 2014 Stripe. All rights reserved.
67
//
78

89
#import <UIKit/UIKit.h>

‎FauxPasConfig/main.fauxpas.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
// Xcode build configuration to check (String)
66
"buildConfig": "Release",
77
// Rules to apply (Array of strings)
8-
"rules": ["XIBUnknownClassReference"],
8+
"rules": ["IdentifierNaming","NewInitializer","StrongInsteadOfRetain","XIBUnknownClassReference"],
99
// Rules to apply only (Array of strings)
1010
//"onlyRules": [],
1111
// Rule tags to apply (Array of strings)
12-
"ruleTags": ["APIUsage","BestPractice","Config","Localization","Pedantic","Recommended","Resources","Style","VCS"],
12+
"ruleTags": ["APIUsage","BestPractice","Config","Localization","Pedantic","Recommended","Resources","VCS"],
1313
// Rules to exclude (Array of strings)
14-
"excludedRules": ["DotSyntax","OrderedComparisonOpDirection","PrefixHeaderIncludeSuggestion"],
14+
//"excludedRules": [],
1515
// Prefixes of files to exclude (Array of strings)
1616
//"fileExclusionPrefixes": [],
1717
// Xcode groups to exclude (Array of strings)

0 commit comments

Comments
 (0)