Merge pull request #3 from IFTTT/nibs

Added support for nib-based launch screens!
IFTTT · Feb 18, 2015 · 8410d29 · 8410d29
2 parents bb5a8d2 + 0b2c69a
commit 8410d29
Show file tree

Hide file tree

Showing 110 changed files with 4,178 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,8 +18,3 @@ profile
 DerivedData
 *.hmap
 *.ipa
-
-# Bundler
-.bundle
-
-Pods/
diff --git a/.travis.yml b/.travis.yml
@@ -2,11 +2,11 @@ osx_image: xcode611
 language: objective-c
 before_install: gem install cocoapods xcpretty obcd -N
 cache: cocoapods
-podfile: Example/Podfile
+podfile: ExampleImage/Podfile
 env:
 - LC_CTYPE=en_US.UTF-8 LANG=en_US.UTF-8
 script:
-- set -o pipefail && xcodebuild -workspace Example/IFTTTLaunchImage.xcworkspace -scheme
+- set -o pipefail && xcodebuild -workspace ExampleImage/IFTTTLaunchImage.xcworkspace -scheme
   IFTTTLaunchImage -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 6" 
   clean test | xcpretty -c
 - pod lib lint --quick

diff --git a/...FTTTLaunchImage.xcodeproj/project.pbxproj → ...FTTTLaunchImage.xcodeproj/project.pbxproj b/...FTTTLaunchImage.xcodeproj/project.pbxproj → ...FTTTLaunchImage.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...ddata/xcschemes/IFTTTLaunchImage.xcscheme → ...ddata/xcschemes/IFTTTLaunchImage.xcscheme b/...ddata/xcschemes/IFTTTLaunchImage.xcscheme → ...ddata/xcschemes/IFTTTLaunchImage.xcscheme
diff --git a/...mage.xcworkspace/contents.xcworkspacedata → ...mage.xcworkspace/contents.xcworkspacedata b/...mage.xcworkspace/contents.xcworkspacedata → ...mage.xcworkspace/contents.xcworkspacedata
diff --git a/Example/IFTTTLaunchImage/AppDelegate.h → ExampleImage/IFTTTLaunchImage/AppDelegate.h b/Example/IFTTTLaunchImage/AppDelegate.h → ExampleImage/IFTTTLaunchImage/AppDelegate.h
diff --git a/Example/IFTTTLaunchImage/AppDelegate.m → ExampleImage/IFTTTLaunchImage/AppDelegate.m b/Example/IFTTTLaunchImage/AppDelegate.m → ExampleImage/IFTTTLaunchImage/AppDelegate.m
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...ets/LaunchImage.launchimage/Contents.json → ...ets/LaunchImage.launchimage/Contents.json b/...ets/LaunchImage.launchimage/Contents.json → ...ets/LaunchImage.launchimage/Contents.json
diff --git a/...ets/LaunchImage.launchimage/ipad-land.png → ...ets/LaunchImage.launchimage/ipad-land.png b/...ets/LaunchImage.launchimage/ipad-land.png → ...ets/LaunchImage.launchimage/ipad-land.png
diff --git a/...LaunchImage.launchimage/ipad-portrait.png → ...LaunchImage.launchimage/ipad-portrait.png b/...LaunchImage.launchimage/ipad-portrait.png → ...LaunchImage.launchimage/ipad-portrait.png
diff --git a/...nchImage.launchimage/[email protected] → ...nchImage.launchimage/[email protected] b/...nchImage.launchimage/[email protected] → ...nchImage.launchimage/[email protected]
diff --git a/...ssets/LaunchImage.launchimage/[email protected] → ...ssets/LaunchImage.launchimage/[email protected] b/...ssets/LaunchImage.launchimage/[email protected] → ...ssets/LaunchImage.launchimage/[email protected]
diff --git a/...ssets/LaunchImage.launchimage/iphone4.png → ...ssets/LaunchImage.launchimage/iphone4.png b/...ssets/LaunchImage.launchimage/iphone4.png → ...ssets/LaunchImage.launchimage/iphone4.png
diff --git a/...ssets/LaunchImage.launchimage/iphone5.png → ...ssets/LaunchImage.launchimage/iphone5.png b/...ssets/LaunchImage.launchimage/iphone5.png → ...ssets/LaunchImage.launchimage/iphone5.png
diff --git a/...ssets/LaunchImage.launchimage/iphone6.png → ...ssets/LaunchImage.launchimage/iphone6.png b/...ssets/LaunchImage.launchimage/iphone6.png → ...ssets/LaunchImage.launchimage/iphone6.png
diff --git a/...s/LaunchImage.launchimage/iphone6plus.png → ...s/LaunchImage.launchimage/iphone6plus.png b/...s/LaunchImage.launchimage/iphone6plus.png → ...s/LaunchImage.launchimage/iphone6plus.png
diff --git a/Example/IFTTTLaunchImage/Info.plist → ExampleImage/IFTTTLaunchImage/Info.plist b/Example/IFTTTLaunchImage/Info.plist → ExampleImage/IFTTTLaunchImage/Info.plist
diff --git a/Example/IFTTTLaunchImage/ViewController.h → ...leImage/IFTTTLaunchImage/ViewController.h b/Example/IFTTTLaunchImage/ViewController.h → ...leImage/IFTTTLaunchImage/ViewController.h
diff --git a/Example/IFTTTLaunchImage/ViewController.m → ...leImage/IFTTTLaunchImage/ViewController.m b/Example/IFTTTLaunchImage/ViewController.m → ...leImage/IFTTTLaunchImage/ViewController.m
diff --git a/Example/IFTTTLaunchImage/main.m → ExampleImage/IFTTTLaunchImage/main.m b/Example/IFTTTLaunchImage/main.m → ExampleImage/IFTTTLaunchImage/main.m
diff --git a/...TLaunchImageTests/IFTTTLaunchImageTests.m → ...TLaunchImageTests/IFTTTLaunchImageTests.m b/...TLaunchImageTests/IFTTTLaunchImageTests.m → ...TLaunchImageTests/IFTTTLaunchImageTests.m
diff --git a/Example/IFTTTLaunchImageTests/Info.plist → ...pleImage/IFTTTLaunchImageTests/Info.plist b/Example/IFTTTLaunchImageTests/Info.plist → ...pleImage/IFTTTLaunchImageTests/Info.plist
diff --git a/...aunchImageTests/[email protected] → ...aunchImageTests/[email protected] b/...aunchImageTests/[email protected] → ...aunchImageTests/[email protected]
diff --git a/...TTTLaunchImageTests/[email protected] → ...TTTLaunchImageTests/[email protected] b/...TTTLaunchImageTests/[email protected] → ...TTTLaunchImageTests/[email protected]
diff --git a/Example/Podfile → ExampleImage/Podfile b/Example/Podfile → ExampleImage/Podfile
diff --git a/Example/Podfile.lock → ExampleImage/Podfile.lock b/Example/Podfile.lock → ExampleImage/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - FBSnapshotTestCase (1.5)
-  - IFTTTLaunchImage (0.3.1)
+  - IFTTTLaunchImage (0.4.0)
 
 DEPENDENCIES:
   - FBSnapshotTestCase
@@ -12,6 +12,6 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   FBSnapshotTestCase: e2914fbaabccea1dcc773d6a16b1c24540642488
-  IFTTTLaunchImage: 059621fbc639d57744f02721e85a0d6fec05d2ec
+  IFTTTLaunchImage: ab9e6adfce1699a480cae7ccbfda7697502ed871
 
 COCOAPODS: 0.35.0
diff --git a/ExampleImage/Pods/FBSnapshotTestCase/FBSnapshotTestCase.h b/ExampleImage/Pods/FBSnapshotTestCase/FBSnapshotTestCase.h
diff --git a/ExampleImage/Pods/FBSnapshotTestCase/FBSnapshotTestCase.m b/ExampleImage/Pods/FBSnapshotTestCase/FBSnapshotTestCase.m
diff --git a/ExampleImage/Pods/FBSnapshotTestCase/FBSnapshotTestController.h b/ExampleImage/Pods/FBSnapshotTestCase/FBSnapshotTestController.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,8 +18,3 @@ profile @@
     DerivedData
     *.hmap
     *.ipa
-    # Bundler
-    .bundle
-    Pods/