update icons

WatchKeynoteController.xcodeproj/project.pbxproj

@@ -322,7 +322,7 @@
  TargetAttributes = {
  8BBD93131E6E3E11009DCF65 = {
  CreatedOnToolsVersion = 8.2.1;
- DevelopmentTeam = ENLH686A45;
+ DevelopmentTeam = 54JDK55DR5;
  LastSwiftMigration = 0920;
  ProvisioningStyle = Automatic;
  SystemCapabilities = {
@@ -611,7 +611,7 @@
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  CODE_SIGN_IDENTITY = "Mac Developer";
  COMBINE_HIDPI_IMAGES = YES;
- DEVELOPMENT_TEAM = ENLH686A45;
+ DEVELOPMENT_TEAM = 54JDK55DR5;
  INFOPLIST_FILE = WatchKeynoteController/Info.plist;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
  MACOSX_DEPLOYMENT_TARGET = 10.10;
@@ -628,7 +628,7 @@
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  CODE_SIGN_IDENTITY = "Mac Developer";
  COMBINE_HIDPI_IMAGES = YES;
- DEVELOPMENT_TEAM = ENLH686A45;
+ DEVELOPMENT_TEAM = 54JDK55DR5;
  INFOPLIST_FILE = WatchKeynoteController/Info.plist;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
  MACOSX_DEPLOYMENT_TARGET = 10.10;

WatchKeynoteController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IDEDidComputeMac32BitWarning</key>
+ <true/>
+</dict>
+</plist>

WatchKeynoteController/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -3,61 +3,61 @@
  {
  "size" : "16x16",
  "idiom" : "mac",
- "filename" : "16.png",
+ "filename" : "Icon-App-20x20@1x-1.png",
  "scale" : "1x"
  },
  {
  "size" : "16x16",
  "idiom" : "mac",
- "filename" : "32.png",
+ "filename" : "Icon-App-20x20@2x-1.png",
  "scale" : "2x"
  },
  {
  "size" : "32x32",
  "idiom" : "mac",
- "filename" : "32-1.png",
+ "filename" : "Icon-App-40x40@1x-1.png",
  "scale" : "1x"
  },
  {
  "size" : "32x32",
  "idiom" : "mac",
- "filename" : "64.png",
+ "filename" : "Icon-App-40x40@3x-1.png",
  "scale" : "2x"
  },
  {
  "size" : "128x128",
  "idiom" : "mac",
- "filename" : "128.png",
+ "filename" : "Icon-App-60x60@3x-1.png",
  "scale" : "1x"
  },
  {
  "size" : "128x128",
  "idiom" : "mac",
- "filename" : "256.png",
+ "filename" : "ItunesArtwork@2x-2.png",
  "scale" : "2x"
  },
  {
  "size" : "256x256",
  "idiom" : "mac",
- "filename" : "256-1.png",
+ "filename" : "ItunesArtwork@2x-1.png",
  "scale" : "1x"
  },
  {
  "size" : "256x256",
  "idiom" : "mac",
- "filename" : "512.png",
+ "filename" : "ItunesArtwork@2x copy-1.png",
  "scale" : "2x"
  },
  {
  "size" : "512x512",
  "idiom" : "mac",
- "filename" : "512-1.png",
+ "filename" : "ItunesArtwork@2x copy-2.png",
  "scale" : "1x"
  },
  {
  "size" : "512x512",
  "idiom" : "mac",
- "filename" : "1024.png",
+ "filename" : "iTunesArtwork@2x.png",
  "scale" : "2x"
  }
  ],

WatchKeynoteControllerApp/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -42,18 +42,6 @@
  "filename" : "[email protected]",
  "scale" : "3x"
  },
- {
- "size" : "57x57",
- "idiom" : "iphone",
- "filename" : "[email protected]",
- "scale" : "1x"
- },
- {
- "size" : "57x57",
- "idiom" : "iphone",
- "filename" : "[email protected]",
- "scale" : "2x"
- },
  {
  "size" : "60x60",
  "idiom" : "iphone",
@@ -102,30 +90,6 @@
  "filename" : "[email protected]",
  "scale" : "2x"
  },
- {
- "size" : "50x50",
- "idiom" : "ipad",
- "filename" : "[email protected]",
- "scale" : "1x"
- },
- {
- "size" : "50x50",
- "idiom" : "ipad",
- "filename" : "[email protected]",
- "scale" : "2x"
- },
- {
- "size" : "72x72",
- "idiom" : "ipad",
- "filename" : "[email protected]",
- "scale" : "1x"
- },
- {
- "size" : "72x72",
- "idiom" : "ipad",
- "filename" : "[email protected]",
- "scale" : "2x"
- },
  {
  "size" : "76x76",
  "idiom" : "ipad",
@@ -145,8 +109,9 @@
  "scale" : "2x"
  },
  {
- "idiom" : "ios-marketing",
  "size" : "1024x1024",
+ "idiom" : "ios-marketing",
+ "filename" : "[email protected]",
  "scale" : "1x"
  }
  ],

WatchKeynoteControllerApp/Assets.xcassets/next.imageset/Contents.json

@@ -17,5 +17,8 @@
  "info" : {
  "version" : 1,
  "author" : "xcode"
+ },
+ "properties" : {
+ "template-rendering-intent" : "template"
  }
 }

WatchKeynoteControllerApp/Assets.xcassets/previous.imageset/Contents.json

@@ -17,5 +17,8 @@
  "info" : {
  "version" : 1,
  "author" : "xcode"
+ },
+ "properties" : {
+ "template-rendering-intent" : "template"
  }
 }

WatchKeynoteControllerApp/Base.lproj/Main.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
  <device id="retina5_5" orientation="portrait">
  <adaptation id="fullscreen"/>
  </device>
  <dependencies>
  <deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
  <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
  </dependencies>
  <scenes>
@@ -21,52 +21,49 @@
  <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
  <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
  <subviews>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="btO-au-cwI">
- <rect key="frame" x="0.0" y="28" width="414" height="30"/>
- <color key="backgroundColor" red="0.86666666670000003" green="0.87058823529999996" blue="0.8862745098" alpha="1" colorSpace="calibratedRGB"/>
- <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="17"/>
- <state key="normal" title="Connect">
- <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
- </state>
- <connections>
- <action selector="toggleConnectionButtonTapped:" destination="BYZ-38-t0r" eventType="touchUpInside" id="c4s-M8-821"/>
- </connections>
- </button>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bdm-iW-gNN">
- <rect key="frame" x="0.0" y="66" width="414" height="310"/>
- <constraints>
- <constraint firstAttribute="height" constant="310" id="jHF-d4-2AE"/>
- </constraints>
- <state key="normal" image="previous">
- <color key="titleColor" red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="calibratedRGB"/>
- </state>
- <connections>
- <action selector="backButtonTapped:" destination="BYZ-38-t0r" eventType="touchUpInside" id="wRG-GV-2LY"/>
- </connections>
- </button>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OK1-KW-bHn">
- <rect key="frame" x="0.0" y="384" width="414" height="309"/>
- <state key="normal" image="next">
- <color key="titleColor" red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="calibratedRGB"/>
- </state>
- <connections>
- <action selector="nextButtonTapped:" destination="BYZ-38-t0r" eventType="touchUpInside" id="bT1-Dc-F1E"/>
- </connections>
- </button>
+ <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="B6G-yW-9W6">
+ <rect key="frame" x="0.0" y="30" width="414" height="706"/>
+ <subviews>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="btO-au-cwI">
+ <rect key="frame" x="0.0" y="0.0" width="414" height="93.666666666666671"/>
+ <color key="backgroundColor" red="0.86666666670000003" green="0.87058823529999996" blue="0.8862745098" alpha="1" colorSpace="calibratedRGB"/>
+ <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="17"/>
+ <state key="normal" title="Connect">
+ <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ </state>
+ <connections>
+ <action selector="toggleConnectionButtonTapped:" destination="BYZ-38-t0r" eventType="touchUpInside" id="c4s-M8-821"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bdm-iW-gNN">
+ <rect key="frame" x="0.0" y="101.66666666666666" width="414" height="283.33333333333337"/>
+ <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ <state key="normal" image="previous">
+ <color key="titleColor" red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="calibratedRGB"/>
+ </state>
+ <connections>
+ <action selector="backButtonTapped:" destination="BYZ-38-t0r" eventType="touchUpInside" id="wRG-GV-2LY"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OK1-KW-bHn">
+ <rect key="frame" x="0.0" y="393" width="414" height="313"/>
+ <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ <state key="normal" image="next">
+ <color key="titleColor" red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="calibratedRGB"/>
+ </state>
+ <connections>
+ <action selector="nextButtonTapped:" destination="BYZ-38-t0r" eventType="touchUpInside" id="bT1-Dc-F1E"/>
+ </connections>
+ </button>
+ </subviews>
+ </stackView>
  </subviews>
- <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="backgroundColor" cocoaTouchSystemColor="darkTextColor"/>
  <constraints>
- <constraint firstItem="OK1-KW-bHn" firstAttribute="width" secondItem="8bC-Xf-vdC" secondAttribute="width" id="3z0-vU-0JP"/>
- <constraint firstItem="btO-au-cwI" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="Eu1-vg-Gor"/>
- <constraint firstItem="bdm-iW-gNN" firstAttribute="top" secondItem="btO-au-cwI" secondAttribute="bottom" constant="8" symbolic="YES" id="FZZ-YK-UKe"/>
- <constraint firstItem="OK1-KW-bHn" firstAttribute="trailing" secondItem="btO-au-cwI" secondAttribute="trailing" id="NjE-tV-EG7"/>
- <constraint firstItem="btO-au-cwI" firstAttribute="top" secondItem="y3c-jy-aDJ" secondAttribute="bottom" constant="8" symbolic="YES" id="NjP-5l-fHm"/>
- <constraint firstItem="bdm-iW-gNN" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" constant="66" id="gJ0-fF-3x6"/>
- <constraint firstItem="OK1-KW-bHn" firstAttribute="leading" secondItem="bdm-iW-gNN" secondAttribute="leading" id="gp3-Te-0JN"/>
- <constraint firstItem="OK1-KW-bHn" firstAttribute="top" secondItem="bdm-iW-gNN" secondAttribute="bottom" constant="8" symbolic="YES" id="jig-lA-ZwI"/>
- <constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="OK1-KW-bHn" secondAttribute="bottom" constant="43" id="kdk-rW-rFn"/>
- <constraint firstItem="OK1-KW-bHn" firstAttribute="trailing" secondItem="bdm-iW-gNN" secondAttribute="trailing" id="vem-Uf-ijp"/>
- <constraint firstItem="OK1-KW-bHn" firstAttribute="leading" secondItem="btO-au-cwI" secondAttribute="leading" id="zY1-CH-jJW"/>
+ <constraint firstAttribute="trailing" secondItem="B6G-yW-9W6" secondAttribute="trailing" id="Lbl-fj-svz"/>
+ <constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="B6G-yW-9W6" secondAttribute="bottom" id="WWF-5M-oUu"/>
+ <constraint firstItem="B6G-yW-9W6" firstAttribute="top" secondItem="y3c-jy-aDJ" secondAttribute="bottom" constant="10" id="lvP-Q7-vnz"/>
+ <constraint firstItem="B6G-yW-9W6" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="nV2-i4-otX"/>
  </constraints>
  </view>
  <connections>
@@ -75,7 +72,7 @@
  </viewController>
  <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
  </objects>
- <point key="canvasLocation" x="32.799999999999997" y="38.23088455772114"/>
+ <point key="canvasLocation" x="31.884057971014496" y="37.5"/>
  </scene>
  </scenes>
  <resources>

WatchKeynoteControllerApp/ViewController.swift

@@ -26,6 +26,8 @@ class ViewController: UIViewController, MCBrowserViewControllerDelegate {
  wcSession.delegate = self
  wcSession.activate()
  }
+ connectionToggleButton.layer.cornerRadius = 10
+ connectionToggleButton.clipsToBounds = true
  updateConnectButtonTitle()
  }
 

WatchKeynoteControllerWatchApp Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json

@@ -2,13 +2,23 @@
  "images" : [
  {
  "idiom" : "watch",
- "screenWidth" : "{130,145}",
- "scale" : "2x"
+ "scale" : "2x",
+ "screen-width" : "<=145"
  },
  {
  "idiom" : "watch",
- "screenWidth" : "{146,165}",
- "scale" : "2x"
+ "scale" : "2x",
+ "screen-width" : ">161"
+ },
+ {
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : ">145"
+ },
+ {
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : ">183"
  }
  ],
  "info" : {

WatchKeynoteControllerWatchApp Extension/Assets.xcassets/Complication.complicationset/Contents.json

@@ -10,6 +10,26 @@
  "filename" : "Extra Large.imageset",
  "role" : "extra-large"
  },
+ {
+ "idiom" : "watch",
+ "filename" : "Graphic Bezel.imageset",
+ "role" : "graphic-bezel"
+ },
+ {
+ "idiom" : "watch",
+ "filename" : "Graphic Circular.imageset",
+ "role" : "graphic-circular"
+ },
+ {
+ "idiom" : "watch",
+ "filename" : "Graphic Corner.imageset",
+ "role" : "graphic-corner"
+ },
+ {
+ "idiom" : "watch",
+ "filename" : "Graphic Large Rectangular.imageset",
+ "role" : "graphic-large-rectangular"
+ },
  {
  "idiom" : "watch",
  "filename" : "Modular.imageset",
@@ -25,4 +45,4 @@
  "version" : 1,
  "author" : "xcode"
  }
-}
+}