Cleanup

steventroughtonsmith · Jun 19, 2016 · 64deca0 · 64deca0
1 parent 6ce7e22
commit 64deca0
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 8 deletions.
diff --git a/Files.xcodeproj/project.pbxproj b/Files.xcodeproj/project.pbxproj
@@ -505,7 +505,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
+				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};

diff --git a/Files/Assets.xcassets/AppIcon.appiconset/120-2.png b/Files/Assets.xcassets/AppIcon.appiconset/120-2.png
diff --git a/Files/Assets.xcassets/AppIcon.appiconset/40.png b/Files/Assets.xcassets/AppIcon.appiconset/40.png
diff --git a/Files/Assets.xcassets/AppIcon.appiconset/80-2.png b/Files/Assets.xcassets/AppIcon.appiconset/80-2.png
diff --git a/Files/Assets.xcassets/AppIcon.appiconset/Contents.json b/Files/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -51,13 +51,13 @@
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "80-1.png",
+      "filename" : "40.png",
       "scale" : "1x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "120-2.png",
+      "filename" : "80-2.png",
       "scale" : "2x"
     },
     {
@@ -77,6 +77,54 @@
       "idiom" : "ipad",
       "filename" : "167.png",
       "scale" : "2x"
+    },
+    {
+      "size" : "24x24",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "notificationCenter",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "27.5x27.5",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "notificationCenter",
+      "subtype" : "42mm"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "watch",
+      "role" : "companionSettings",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "watch",
+      "role" : "companionSettings",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "watch",
+      "filename" : "80-1.png",
+      "scale" : "2x",
+      "role" : "appLauncher",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "86x86",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "98x98",
+      "idiom" : "watch",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "42mm"
     }
   ],
   "info" : {

diff --git a/Files/Base.lproj/LaunchScreen.storyboard b/Files/Base.lproj/LaunchScreen.storyboard
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" launchScreen="YES" initialViewController="2Yf-Ae-sKQ">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="16A201w" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" launchScreen="YES" initialViewController="2Yf-Ae-sKQ">
     <dependencies>
         <deployment identifier="iOS"/>
+        <development version="7000" identifier="xcode"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
     </dependencies>
     <scenes>

diff --git a/Files/FBFilesTableViewController.m b/Files/FBFilesTableViewController.m
@@ -14,6 +14,8 @@
 
 @implementation FBFilesTableViewController
 
+
+
 - (id)initWithPath:(NSString *)path
 {
 	self = [super initWithStyle:UITableViewStylePlain];

diff --git a/FilesDocumentProvider/Base.lproj/MainInterface.storyboard b/FilesDocumentProvider/Base.lproj/MainInterface.storyboard
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="J6p-g8-CHO">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="16A201w" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="J6p-g8-CHO">
     <dependencies>
         <deployment identifier="iOS"/>
+        <development version="7000" identifier="xcode"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
     </dependencies>
     <scenes>
@@ -16,7 +17,7 @@
                     <view key="view" contentMode="scaleToFill" id="Vdh-Gp-eV6">
                         <rect key="frame" x="0.0" y="0.0" width="350" height="400"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                     <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
                     <size key="freeformSize" width="350" height="400"/>
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,8 @@ @@
     @implementation FBFilesTableViewController
     - (id)initWithPath:(NSString *)path
     {
     	self = [super initWithStyle:UITableViewStylePlain];
@@ Expand Down @@