Merge pull request #10 from IFTTT/fix-scheme

Fix scheme

.slather.yml

@@ -1,3 +1,3 @@
 coverage_service: coveralls
-xcodeproj: Example/jot.xcodeproj
+xcodeproj: Example/JotDemo.xcodeproj
 source_directory: jot

.travis.yml

@@ -6,7 +6,7 @@ podfile: Example/Podfile
 env:
 - LC_CTYPE=en_US.UTF-8 LANG=en_US.UTF-8
 script:
-- set -o pipefail && xcodebuild -workspace Example/jot.xcworkspace -scheme jot -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 6" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test | xcpretty -c
+- set -o pipefail && xcodebuild -workspace Example/JotDemo.xcworkspace -scheme JotDemo -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 6" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test | xcpretty -c
 - pod lib lint --quick
 - obcd --path jot find HeaderStyle
 after_success: slather

Example/jot.xcodeproj/xcshareddata/xcschemes/jot.xcscheme → Example/JotDemo.xcodeproj/xcshareddata/xcschemes/JotDemo.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "FA0B14C81AF30EB300441BBD"
-               BuildableName = "jot.app"
-               BlueprintName = "jot"
-               ReferencedContainer = "container:jot.xcodeproj">
+               BlueprintIdentifier = "FA96BA021B72A6440025BFB3"
+               BuildableName = "JotDemo.app"
+               BlueprintName = "JotDemo"
+               ReferencedContainer = "container:JotDemo.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -28,10 +28,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "FA0B14E11AF30EB300441BBD"
-               BuildableName = "jotTests.xctest"
-               BlueprintName = "jotTests"
-               ReferencedContainer = "container:jot.xcodeproj">
+               BlueprintIdentifier = "FA96BA1B1B72A6440025BFB3"
+               BuildableName = "JotDemoTests.xctest"
+               BlueprintName = "JotDemoTests"
+               ReferencedContainer = "container:JotDemo.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -46,20 +46,20 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "FA0B14E11AF30EB300441BBD"
-               BuildableName = "jotTests.xctest"
-               BlueprintName = "jotTests"
-               ReferencedContainer = "container:jot.xcodeproj">
+               BlueprintIdentifier = "FA96BA1B1B72A6440025BFB3"
+               BuildableName = "JotDemoTests.xctest"
+               BlueprintName = "JotDemoTests"
+               ReferencedContainer = "container:JotDemo.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "FA0B14C81AF30EB300441BBD"
-            BuildableName = "jot.app"
-            BlueprintName = "jot"
-            ReferencedContainer = "container:jot.xcodeproj">
+            BlueprintIdentifier = "FA96BA021B72A6440025BFB3"
+            BuildableName = "JotDemo.app"
+            BlueprintName = "JotDemo"
+            ReferencedContainer = "container:JotDemo.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </TestAction>
@@ -76,10 +76,10 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "FA0B14C81AF30EB300441BBD"
-            BuildableName = "jot.app"
-            BlueprintName = "jot"
-            ReferencedContainer = "container:jot.xcodeproj">
+            BlueprintIdentifier = "FA96BA021B72A6440025BFB3"
+            BuildableName = "JotDemo.app"
+            BlueprintName = "JotDemo"
+            ReferencedContainer = "container:JotDemo.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
@@ -95,10 +95,10 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "FA0B14C81AF30EB300441BBD"
-            BuildableName = "jot.app"
-            BlueprintName = "jot"
-            ReferencedContainer = "container:jot.xcodeproj">
+            BlueprintIdentifier = "FA96BA021B72A6440025BFB3"
+            BuildableName = "JotDemo.app"
+            BlueprintName = "JotDemo"
+            ReferencedContainer = "container:JotDemo.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>

Example/jot/ExampleViewController.m → Example/JotDemo/ExampleViewController.m

@@ -68,8 +68,8 @@ - (instancetype)init
         [self.toggleDrawingButton setTitleColor:[UIColor lightGrayColor] forState:UIControlStateHighlighted];
         [self.toggleDrawingButton setTitle:kTextImageName forState:UIControlStateNormal];
         [self.toggleDrawingButton addTarget:self
-                             action:@selector(toggleDrawingButtonAction)
-                   forControlEvents:UIControlEventTouchUpInside];
+                                     action:@selector(toggleDrawingButtonAction)
+                           forControlEvents:UIControlEventTouchUpInside];
     }
 
     return self;

Example/jot/Images.xcassets/AppIcon.appiconset/Contents.json → Example/JotDemo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -29,6 +29,36 @@
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "2x"
     }
   ],
   "info" : {

Example/JotDemo/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json

@@ -0,0 +1,49 @@
+{
+  "images" : [
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "minimum-system-version" : "7.0",
+      "subtype" : "retina4",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "extent" : "full-screen",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Example/jot/Info.plist → Example/JotDemo/Supporting Files/Info.plist

@@ -22,23 +22,28 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>UIAppFonts</key>
-	<array>
-		<string>fontawesome-webfont.ttf</string>
-	</array>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
 	</array>
-	<key>UIStatusBarHidden</key>
-	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UIAppFonts</key>
+	<array>
+		<string>fontawesome-webfont.ttf</string>
+	</array>
 </dict>
 </plist>

Example/jot/main.m → Example/JotDemo/Supporting Files/main.m

@@ -1,8 +1,8 @@
 //
 //  main.m
-//  jot
+//  JotDemo
 //
-//  Created by Laura Skelton on 4/30/15.
+//  Created by Laura Skelton on 8/5/15.
 //  Copyright (c) 2015 IFTTT. All rights reserved.
 //
 

Example/Podfile

@@ -1,18 +1,18 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
-xcodeproj 'jot'
+xcodeproj 'JotDemo'
 
 platform :ios, '8.0'
 
 def install_pods
   pod "jot", :path => "../jot.podspec"
 end
 
-target 'jot', :exclusive => true do
+target 'JotDemo', :exclusive => true do
   install_pods
 end
 
-target 'jotTests', :exclusive => true do
+target 'JotDemoTests', :exclusive => true do
   install_pods
   pod 'Specta'
   pod 'Expecta'

Example/Podfile.lock

@@ -1,16 +1,16 @@
 PODS:
-  - Expecta (0.4.2)
-  - Expecta+Snapshots (1.3.2):
-    - Expecta (~> 0.3)
-    - FBSnapshotTestCase (= 1.6)
-  - FBSnapshotTestCase (1.6)
+  - Expecta (1.0.2)
+  - Expecta+Snapshots (2.0.0):
+    - Expecta (~> 1.0)
+    - FBSnapshotTestCase/Core (~> 2.0.3)
+  - FBSnapshotTestCase/Core (2.0.3)
   - jot (0.1.5):
     - Masonry (~> 0.6.1)
   - Masonry (0.6.2)
   - OCHamcrest (4.1.1)
   - OCMockito (1.4.0):
     - OCHamcrest (~> 4.0)
-  - Specta (0.5.0)
+  - Specta (1.0.3)
 
 DEPENDENCIES:
   - Expecta
@@ -24,13 +24,13 @@ EXTERNAL SOURCES:
     :path: ../jot.podspec
 
 SPEC CHECKSUMS:
-  Expecta: 78b4e8b0c8291fa4524d7f74016b6065c2e391ec
-  Expecta+Snapshots: 40c5ec43b43da3bae957f14fed5dc9177d08ec8b
-  FBSnapshotTestCase: 9d5fe43b29ae3a0ed8fc829477971b281038f748
+  Expecta: 54e8a3530add08f4f0208c111355eda7cde74a53
+  Expecta+Snapshots: 29b38dd695bc72a0ed2bea833937d78df41943ba
+  FBSnapshotTestCase: d0eeca6bf87958e088b254396ae66873f971cfb1
   jot: 0f5dc333defa6ad805d01adc3834b201c22510a7
   Masonry: 362e8a1cc0beada4a4c4832d5e863da2a51533be
   OCHamcrest: 6f03ffa81d12feab872638490a44ab0a6d3aca10
   OCMockito: 4981140c9a9ec06c31af40f636e3c0f25f27e6b2
-  Specta: eb90708ed77569bbda089f8ead10bb99b8e9489e
+  Specta: cf3e4188cf35375c3ee2cd03f8db8f1f4ef98234
 
 COCOAPODS: 0.38.2