Merge pull request #1177 from stripe/yuki-fix-example-names

Fix Example folder names, README links

Example/Custom Integration (Recommended).xcodeproj/project.pbxproj

@@ -53,7 +53,7 @@
 		04533F111A68814100C7E52E /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		04533F171A688A0A00C7E52E /* Constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = "<group>"; };
 		04533F181A688A0A00C7E52E /* Constants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Constants.m; sourceTree = "<group>"; };
-		366F93AF225FF2A2005CFBF6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = "Custom Integration/README.md"; sourceTree = "<group>"; };
+		366F93AF225FF2A2005CFBF6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		8BBD79C7207FD2F900F85BED /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		8BBD79C9207FD31A00F85BED /* zh-Hans */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		8BBD79CA207FD32100F85BED /* nl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -94,7 +94,7 @@
 			isa = PBXGroup;
 			children = (
 				366F93AF225FF2A2005CFBF6 /* README.md */,
-				04533E891A687F5D00C7E52E /* Custom Integration */,
+				04533E891A687F5D00C7E52E /* Custom Integration (Recommended) */,
 				04533F0E1A68813100C7E52E /* Frameworks */,
 				04533E881A687F5D00C7E52E /* Products */,
 			);
@@ -108,7 +108,7 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		04533E891A687F5D00C7E52E /* Custom Integration */ = {
+		04533E891A687F5D00C7E52E /* Custom Integration (Recommended) */ = {
 			isa = PBXGroup;
 			children = (
 				04533E8E1A687F5D00C7E52E /* AppDelegate.h */,
@@ -131,7 +131,7 @@
 				C1CACE931E5E3DF6002D0821 /* SofortExampleViewController.m */,
 				04533E8A1A687F5D00C7E52E /* Supporting Files */,
 			);
-			path = "Custom Integration";
+			path = "Custom Integration (Recommended)";
 			sourceTree = "<group>";
 		};
 		04533E8A1A687F5D00C7E52E /* Supporting Files */ = {
@@ -194,6 +194,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				"zh-Hans",
 				nl,
@@ -401,7 +402,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/**",
 				);
-				INFOPLIST_FILE = "$(SRCROOT)/Custom Integration/Info.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/Custom Integration (Recommended)/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.stripe.CustomSDKExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -425,7 +426,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/**",
 				);
-				INFOPLIST_FILE = "$(SRCROOT)/Custom Integration/Info.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/Custom Integration (Recommended)/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.stripe.CustomSDKExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";

Example/README.md

@@ -3,5 +3,5 @@
 There are 3 example apps included in the repository:
 
 - [**UI Examples** Example/UI Examples/README.md ](/Example/UI%20Examples/README.md)
-- [**Standard Integration (Swift)** Example/Standard Integration (Swift)/README.md](/Example/Standard%20Integration%20%28Swift%29/README.md)
-- [**Custom Integration (ObjC)** Example/Custom Integration (Swift)/README.md](/Example/Custom%20Integration%20%28ObjC%29/README.md)
+- [**Standard Integration (Sources Only)** Example/Standard Integration (Sources Only)/README.md](/Example/Standard%20Integration%20%28Sources%20Only%29/README.md)
+- [**Custom Integration (Recommended)** Example/Custom Integration (Recommended)/README.md](/Example/Custom%20Integration%20%28Recommended%29/README.md)

Example/Standard Integration (Sources Only).xcodeproj/project.pbxproj

@@ -42,7 +42,7 @@
 		042CA41A1A685E8D00D778E7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		04823F781A6849200098400B /* Standard Integration (Sources Only).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Standard Integration (Sources Only).app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		04BC299F1CD81D3900318357 /* BrowseProductsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BrowseProductsViewController.swift; sourceTree = "<group>"; };
-		04D075D91A69B82B00094431 /* Standard Integration (Swift).entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Standard Integration (Swift).entitlements"; sourceTree = "<group>"; };
+		04D075D91A69B82B00094431 /* Standard Integration (Sources Only).entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Standard Integration (Sources Only).entitlements"; sourceTree = "<group>"; };
 		04D076191A69C14700094431 /* Stripe.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Stripe.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		8BBD79D2207FD44300F85BED /* fi */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = fi; path = Localizations/fi.lproj/Localizable.strings; sourceTree = "<group>"; };
 		8BBD79D3207FD45A00F85BED /* nb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = nb; path = Localizations/nb.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -59,7 +59,7 @@
 		C13C24211D14438700F3765E /* SettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
 		C186AC331ECD0DDD00497DE3 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = Carthage/Build/iOS/Alamofire.framework; sourceTree = "<group>"; };
 		C188F2A51CC1A338003A524B /* MyAPIClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyAPIClient.swift; sourceTree = "<group>"; };
-		C18A6EE11F1EB78B005600CC /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = "Standard Integration (Swift)/README.md"; sourceTree = "<group>"; };
+		C18A6EE11F1EB78B005600CC /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = "Standard Integration (Sources Only)/README.md"; sourceTree = "<group>"; };
 		C1B83CBC1CCE6C0700F0790B /* Buttons.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Buttons.swift; sourceTree = "<group>"; };
 		F1D12FE61F91721600CE68A7 /* PaymentContextFooterView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PaymentContextFooterView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -77,7 +77,7 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		042CA4131A685E8D00D778E7 /* Standard Integration (Swift) */ = {
+		042CA4131A685E8D00D778E7 /* Standard Integration (Sources Only) */ = {
 			isa = PBXGroup;
 			children = (
 				042CA4141A685E8D00D778E7 /* AppDelegate.swift */,
@@ -90,17 +90,17 @@
 				F1D12FE61F91721600CE68A7 /* PaymentContextFooterView.swift */,
 				042CA4191A685E8D00D778E7 /* Images.xcassets */,
 				042CA41A1A685E8D00D778E7 /* Info.plist */,
-				04D075D91A69B82B00094431 /* Standard Integration (Swift).entitlements */,
+				04D075D91A69B82B00094431 /* Standard Integration (Sources Only).entitlements */,
 				C13886641F293F9F00380D46 /* Localizable.strings */,
 			);
-			path = "Standard Integration (Swift)";
+			path = "Standard Integration (Sources Only)";
 			sourceTree = "<group>";
 		};
 		04823F6F1A6849200098400B = {
 			isa = PBXGroup;
 			children = (
 				C18A6EE11F1EB78B005600CC /* README.md */,
-				042CA4131A685E8D00D778E7 /* Standard Integration (Swift) */,
+				042CA4131A685E8D00D778E7 /* Standard Integration (Sources Only) */,
 				04823F9F1A6849850098400B /* Frameworks */,
 				04823F791A6849200098400B /* Products */,
 			);
@@ -180,6 +180,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				fr,
 				de,
@@ -349,7 +350,7 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
-				SWIFT_OBJC_BRIDGING_HEADER = "Standard Integration (Swift)/Standard Integration (Swift)-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "Standard Integration (Sources Only)/Standard Integration (Sources Only)-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
 			name = Debug;
@@ -397,7 +398,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				SWIFT_OBJC_BRIDGING_HEADER = "Standard Integration (Swift)/Standard Integration (Swift)-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "Standard Integration (Sources Only)/Standard Integration (Sources Only)-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -408,7 +409,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = "Standard Integration (Swift)/Standard Integration (Swift).entitlements";
+				CODE_SIGN_ENTITLEMENTS = "Standard Integration (Sources Only)/Standard Integration (Sources Only).entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEFINES_MODULE = YES;
@@ -419,7 +420,7 @@
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
 				);
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-				INFOPLIST_FILE = "Standard Integration (Swift)/Info.plist";
+				INFOPLIST_FILE = "Standard Integration (Sources Only)/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.stripe.SimpleSDKExample;
 				PRODUCT_NAME = "Standard Integration (Sources Only)";
@@ -437,7 +438,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = "Standard Integration (Swift)/Standard Integration (Swift).entitlements";
+				CODE_SIGN_ENTITLEMENTS = "Standard Integration (Sources Only)/Standard Integration (Sources Only).entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEFINES_MODULE = YES;
@@ -448,7 +449,7 @@
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
 				);
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-				INFOPLIST_FILE = "Standard Integration (Swift)/Info.plist";
+				INFOPLIST_FILE = "Standard Integration (Sources Only)/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.stripe.SimpleSDKExample;
 				PRODUCT_NAME = "Standard Integration (Sources Only)";

Example/Standard Integration (Sources Only)/AppDelegate.swift

@@ -1,6 +1,6 @@
 //
 //  AppDelegate.swift
-//  Standard Integration (Swift)
+//  Standard Integration (Sources Only)
 //
 //  Created by Jack Flintermann on 1/15/15.
 //  Copyright (c) 2015 Stripe. All rights reserved.

Example/Standard Integration (Sources Only)/BrowseProductsViewController.swift

@@ -1,6 +1,6 @@
 //
 //  BrowseProductsViewController.swift
-//  Standard Integration (Swift)
+//  Standard Integration (Sources Only)
 //
 //  Created by Jack Flintermann on 5/2/16.
 //  Copyright © 2016 Stripe. All rights reserved.

Example/Standard Integration (Sources Only)/Buttons.swift

@@ -1,6 +1,6 @@
 //
 //  Buttons.swift
-//  Standard Integration (Swift)
+//  Standard Integration (Sources Only)
 //
 //  Created by Ben Guo on 4/25/16.
 //  Copyright © 2016 Stripe. All rights reserved.

Example/Standard Integration (Sources Only)/CheckoutRowView.swift

@@ -1,6 +1,6 @@
 //
 //  CheckoutRowView.swift
-//  Standard Integration (Swift)
+//  Standard Integration (Sources Only)
 //
 //  Created by Ben Guo on 4/22/16.
 //  Copyright © 2016 Stripe. All rights reserved.

Example/Standard Integration (Sources Only)/CheckoutViewController.swift

@@ -1,6 +1,6 @@
 //
 //  CheckoutViewController.swift
-//  Standard Integration (Swift)
+//  Standard Integration (Sources Only)
 //
 //  Created by Ben Guo on 4/22/16.
 //  Copyright © 2016 Stripe. All rights reserved.

Example/Standard Integration (Sources Only)/MyAPIClient.swift

@@ -1,6 +1,6 @@
 //
 //  BackendAPIAdapter.swift
-//  Standard Integration (Swift)
+//  Standard Integration (Sources Only)
 //
 //  Created by Ben Guo on 4/15/16.
 //  Copyright © 2016 Stripe. All rights reserved.

Example/Standard Integration (Sources Only)/PaymentContextFooterView.swift

@@ -1,6 +1,6 @@
 //
 //  PaymentContextFooterView.swift
-//  Standard Integration (Swift)
+//  Standard Integration (Sources Only)
 //
 //  Created by Brian Dorfman on 10/13/17.
 //  Copyright © 2017 Stripe. All rights reserved.

Example/Standard Integration (Sources Only)/README.md

@@ -9,9 +9,9 @@ For a detailed guide, see https://stripe.com/docs/mobile/ios/standard
 1. If you haven't already, sign up for a [Stripe account](https://dashboard.stripe.com/register) (it takes seconds). Then go to https://dashboard.stripe.com/account/apikeys.
 2. Execute `./setup.sh` from the root of the repository to build the necessary dependencies
 3. Open `./Stripe.xcworkspace` (not `./Stripe.xcodeproj`) with Xcode
-4. Fill in the `stripePublishableKey` constant in `./Example/Standard Integration (Swift)/CheckoutViewController.swift` with your test "Publishable key" from Stripe. This key should start with `pk_test`.
+4. Fill in the `stripePublishableKey` constant in `./Example/Standard Integration (Sources Only)/CheckoutViewController.swift` with your test "Publishable key" from Stripe. This key should start with `pk_test`.
 5. Head to [example-ios-backend](https://github.com/stripe/example-ios-backend/tree/v15.0.1) and click "Deploy to Heroku". Provide your Stripe test "Secret key" as the `STRIPE_TEST_SECRET_KEY` environment variable. This key should start with `pk_test`.
-6. Fill in the `backendBaseURL` constant in `./Example/Standard Integration (Swift)/CheckoutViewController.swift` with the app URL Heroku provides (e.g. "https://my-example-app.herokuapp.com")
+6. Fill in the `backendBaseURL` constant in `./Example/Standard Integration (Sources Only)/CheckoutViewController.swift` with the app URL Heroku provides (e.g. "https://my-example-app.herokuapp.com")
 
 After this is done, you can make test payments through the app and see them in your Stripe dashboard.
 

Example/Standard Integration (Sources Only)/SettingsViewController.swift

@@ -1,6 +1,6 @@
 //
 //  SettingsViewController.swift
-//  Standard Integration (Swift)
+//  Standard Integration (Sources Only)
 //
 //  Created by Ben Guo on 6/17/16.
 //  Copyright © 2016 Stripe. All rights reserved.

Example/UI Examples/README.md

@@ -2,7 +2,7 @@
 
 This example app lets you try out the pre-built UI components we provide.
 
-You can run it without any initial setup and it's a great place to start if you're evaluating whether you want to use our [Standard Integration (Swift)](/Example/Standard%20Integration%20%28Swift%29/README.md) or build your own [Custom Integration (Recommended)](/Example/Custom%20Integration%20%28ObjC%29/README.md).
+You can run it without any initial setup and it's a great place to start if you're evaluating whether you want to use our [Standard Integration (Sources Only)](/Example/Standard%20Integration%20%28Sources%20Only%29/README.md) or build your own [Custom Integration (Recommended)](/Example/Custom%20Integration%20%28ObjC%29/README.md).
 
 1. Open `./Stripe.xcworkspace` (not `./Stripe.xcodeproj`) with Xcode
 2. Build and run the "UI Examples" scheme

README.md

@@ -42,14 +42,14 @@ Please see our [iOS Integration Guide](https://stripe.com/docs/mobile/ios) which
 There are 3 example apps included in the repository:
 
 - [**UI Examples** Example/UI Examples/README.md ](/Example/UI%20Examples/README.md)
-- [**Standard Integration (Sources Only)** Example/Standard Integration (Swift)/README.md](/Example/Standard%20Integration%20%28Swift%29/README.md)
-- [**Custom Integration (Recommended)** Example/Custom Integration/README.md](/Example/Custom%20Integration%20/README.md)
+- [**Standard Integration (Sources Only)** Example/Standard Integration (Sources Only)/README.md](/Example/Standard%20Integration%20%28Sources%20Only%29/README.md)
+- [**Custom Integration (Recommended)** Example/Custom Integration (Recommended)/README.md](/Example/Custom%20Integration%20%28Recommended%29/README.md)
 
 ## Card IO
 
 To add card scanning capabilities to our prebuilt UI components, you can simply [install card.io](https://github.com/card-io/card.io-iOS-SDK#setup) alongside our SDK. You'll also need to set `NSCameraUsageDescription` in your application's plist, and provide a reason for accessing the camera (e.g. "To scan cards").
 
-To try this out, you can run `./install_cardio.rb`, which will download and install card.io in Standard Integration (Swift). Now, when you run the example app on a device, you'll see a "Scan Card" button when adding a new card.
+To try this out, you can run `./install_cardio.rb`, which will download and install card.io in Standard Integration (Sources Only). Now, when you run the example app on a device, you'll see a "Scan Card" button when adding a new card.
 
 ## Contributing
 

STYLEGUIDE.md

@@ -108,8 +108,8 @@ static NSString * const STPSDKVersion = @"11.0.0";
 - Save files to the appropriate root level folder. Typical folders include:
   - `stripe-ios/Stripe/`
   - `stripe-ios/Tests/Tests/`
-  - `stripe-ios/Example/Standard Integration (Swift)/`
-  - `stripe-ios/Example/Custom Integration (ObjC)/`
+  - `stripe-ios/Example/Standard Integration (Sources Only)/`
+  - `stripe-ios/Example/Custom Integration (Recommended)/`
 
 - Save public header files in `stripe-ios/Stripe/PublicHeaders/` for Cocoapods compatibility
 

install_cardio.rb

@@ -17,7 +17,7 @@ open('Example/Cartfile', 'a') { |f|
 }
 system('cd Example; carthage update --platform ios')
 
-project_name = 'Standard Integration (Swift)'
+project_name = 'Standard Integration (Sources Only)'
 project_path = "Example/#{project_name}.xcodeproj"
 project = Xcodeproj::Project.open(project_path)
 

setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo '▸ Installing dependencies for Standard Integration (Swift)';
+echo '▸ Installing dependencies for Standard Integration (Sources Only)';
 
 cd Example;
 
@@ -17,4 +17,4 @@ fi
 
 carthage bootstrap --platform ios;
 
-echo '▸ Finished installing dependencies for Standard Integration (Swift)';
+echo '▸ Finished installing dependencies for Standard Integration (Sources Only)';