Merge pull request #35 from beeware/app-icons

Replace explicit splash screen with an icon-based screen.

{{ cookiecutter.format }}/briefcase.toml

@@ -28,8 +28,7 @@ icon.120 = "{{ cookiecutter.class_name }}/Images.xcassets/AppIcon.appiconset/ico
 icon.152 = "{{ cookiecutter.class_name }}/Images.xcassets/AppIcon.appiconset/icon-152.png"
 icon.167 = "{{ cookiecutter.class_name }}/Images.xcassets/AppIcon.appiconset/icon-167.png"
 icon.180 = "{{ cookiecutter.class_name }}/Images.xcassets/AppIcon.appiconset/icon-180.png"
+icon.640 = "{{ cookiecutter.class_name }}/Images.xcassets/Splash.imageset/splash-640.png"
 icon.1024 = "{{ cookiecutter.class_name }}/Images.xcassets/AppIcon.appiconset/icon-1024.png"
-
-splash.800 = "{{ cookiecutter.class_name }}/Images.xcassets/Splash.imageset/splash-800.png"
-splash.1600 = "{{ cookiecutter.class_name }}/Images.xcassets/Splash.imageset/splash-1600.png"
-splash.2400 = "{{ cookiecutter.class_name }}/Images.xcassets/Splash.imageset/splash-2400.png"
+icon.1280 = "{{ cookiecutter.class_name }}/Images.xcassets/Splash.imageset/splash-1280.png"
+icon.1920 = "{{ cookiecutter.class_name }}/Images.xcassets/Splash.imageset/splash-1920.png"

{{ cookiecutter.format }}/{{ cookiecutter.class_name }}/Images.xcassets/Splash.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "splash-800.png",
+      "filename" : "splash-640.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "splash-1600.png",
+      "filename" : "splash-1280.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "splash-2400.png",
+      "filename" : "splash-1920.png",
       "scale" : "3x"
     }
   ],

{{ cookiecutter.format }}/{{ cookiecutter.class_name }}/Launch Screen.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="ipad12_9rounded" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,17 +17,18 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Splash" translatesAutoresizingMaskIntoConstraints="NO" id="993-d8-iHn">
-                                <rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
-                                <color key="backgroundColor" red="{{ cookiecutter.splash_background_color | float_red }}" green="{{ cookiecutter.splash_background_color | float_green }}" blue="{{ cookiecutter.splash_background_color | float_blue }}" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <rect key="frame" x="100" y="100" width="824" height="1166"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </imageView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
+                        <color key="backgroundColor" red="{{ cookiecutter.splash_background_color | float_red }}" green="{{ cookiecutter.splash_background_color | float_green }}" blue="{{ cookiecutter.splash_background_color | float_blue }}" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="993-d8-iHn" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" id="FUL-JQ-Kxu"/>
-                            <constraint firstItem="993-d8-iHn" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="dFF-ek-zRv"/>
-                            <constraint firstItem="993-d8-iHn" firstAttribute="trailing" secondItem="Bcu-3y-fUS" secondAttribute="trailing" id="f3h-U5-02m"/>
-                            <constraint firstAttribute="bottom" secondItem="993-d8-iHn" secondAttribute="bottom" id="kxX-UK-khH"/>
+                            <constraint firstItem="993-d8-iHn" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="100" id="FUL-JQ-Kxu"/>
+                            <constraint firstItem="993-d8-iHn" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" constant="100" id="dFF-ek-zRv"/>
+                            <constraint firstItem="993-d8-iHn" firstAttribute="trailing" secondItem="Bcu-3y-fUS" secondAttribute="trailing" constant="-100" id="f3h-U5-02m"/>
+                            <constraint firstAttribute="bottom" secondItem="993-d8-iHn" secondAttribute="bottom" constant="100" id="kxX-UK-khH"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -36,6 +37,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="Splash" width="400" height="400"/>
+        <image name="Splash" width="640" height="640"/>
     </resources>
 </document>