Merge pull request #56 from mobify/launch-image

Launch Image
mobify · Dec 2, 2016 · 5b21141 · 5b21141
2 parents 414e628 + e8cae0d
commit 5b21141
Show file tree

Hide file tree

Showing 10 changed files with 82 additions and 55 deletions.
diff --git a/android/velo/src/main/AndroidManifest.xml b/android/velo/src/main/AndroidManifest.xml
@@ -11,7 +11,8 @@
             android:name=".MainActivity"
             android:screenOrientation="portrait"
             android:label="@string/app_name"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            android:theme="@style/LaunchTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/android/velo/src/main/res/drawable/launch_screen.xml b/android/velo/src/main/res/drawable/launch_screen.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/white"></item>
+    <item>
+        <bitmap android:gravity="center" android:src="@mipmap/ic_launcher"/>
+    </item>
+</layer-list>
diff --git a/android/velo/src/main/res/values/colors.xml b/android/velo/src/main/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="white">#FFFFFF</color>
+</resources>
diff --git a/android/velo/src/main/res/values/styles.xml b/android/velo/src/main/res/values/styles.xml
@@ -5,4 +5,8 @@
         <!-- Customize your theme here. -->
     </style>
 
+    <style name="LaunchTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowBackground">@drawable/launch_screen</item>
+    </style>
+
 </resources>
diff --git a/app/app.js b/app/app.js
@@ -33,6 +33,7 @@ window.run = function() {
         // Use the mainNavigationView as the main content view for our layout
         Promise.join(layoutPromise, mainNavigationPromise, function(layout, mainNavigationView) {
             layout.setContentView(mainNavigationView);
+            Application.dismissLaunchImage();
         });
 
         // Set our layout as the main view of the app

diff --git a/ios/velo.xcodeproj/project.pbxproj b/ios/velo.xcodeproj/project.pbxproj
@@ -8,14 +8,14 @@
 
 /* Begin PBXBuildFile section */
 		0EDA55691B9257CC00AB6AF7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0EDA55681B9257CC00AB6AF7 /* Images.xcassets */; };
+		5BFB5A561DD2620C00C3A22F /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5BFB5A551DD2620C00C3A22F /* Launch Screen.storyboard */; };
 		87132A201B6016FF00FC74A4 /* Astro.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87132A1E1B6016FF00FC74A4 /* Astro.framework */; };
 		87132A211B6016FF00FC74A4 /* Astro.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 87132A1E1B6016FF00FC74A4 /* Astro.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		87132A221B6016FF00FC74A4 /* Cordova.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87132A1F1B6016FF00FC74A4 /* Cordova.framework */; };
 		87132A231B6016FF00FC74A4 /* Cordova.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 87132A1F1B6016FF00FC74A4 /* Cordova.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		87C6A88C1B43044D001876CE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87C6A88B1B43044D001876CE /* AppDelegate.swift */; };
 		87C6A88E1B43044D001876CE /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87C6A88D1B43044D001876CE /* ViewController.swift */; };
 		87C6A8911B43044D001876CE /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 87C6A88F1B43044D001876CE /* Main.storyboard */; };
-		87C6A8961B43044D001876CE /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 87C6A8941B43044D001876CE /* LaunchScreen.xib */; };
 		87C6A8A21B43044D001876CE /* veloTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87C6A8A11B43044D001876CE /* veloTests.swift */; };
 		87C6A8E91B430E15001876CE /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 87C6A8D71B430E15001876CE /* config.xml */; };
 		87C6A8F61B430EDD001876CE /* www in Resources */ = {isa = PBXBuildFile; fileRef = 87C6A8F51B430EDD001876CE /* www */; };
@@ -52,14 +52,14 @@
 
 /* Begin PBXFileReference section */
 		0EDA55681B9257CC00AB6AF7 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
+		5BFB5A551DD2620C00C3A22F /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 		87132A1E1B6016FF00FC74A4 /* Astro.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Astro.framework; path = "$(CONFIGURATION_BUILD_DIR)/Astro.framework"; sourceTree = "<group>"; };
 		87132A1F1B6016FF00FC74A4 /* Cordova.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cordova.framework; path = "$(CONFIGURATION_BUILD_DIR)/Cordova.framework"; sourceTree = "<group>"; };
 		87C6A8861B43044D001876CE /* velo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = velo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		87C6A88A1B43044D001876CE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		87C6A88B1B43044D001876CE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		87C6A88D1B43044D001876CE /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
 		87C6A8901B43044D001876CE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		87C6A8951B43044D001876CE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
 		87C6A89B1B43044D001876CE /* veloTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = veloTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		87C6A8A01B43044D001876CE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		87C6A8A11B43044D001876CE /* veloTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = veloTests.swift; sourceTree = "<group>"; };
@@ -120,9 +120,9 @@
 				87C6A8F71B430FA2001876CE /* app.js */,
 				87C6A88D1B43044D001876CE /* ViewController.swift */,
 				87C6A88F1B43044D001876CE /* Main.storyboard */,
-				87C6A8941B43044D001876CE /* LaunchScreen.xib */,
 				0EDA55681B9257CC00AB6AF7 /* Images.xcassets */,
 				87C6A8891B43044D001876CE /* Supporting Files */,
+				5BFB5A551DD2620C00C3A22F /* Launch Screen.storyboard */,
 			);
 			path = velo;
 			sourceTree = "<group>";
@@ -256,10 +256,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5BFB5A561DD2620C00C3A22F /* Launch Screen.storyboard in Resources */,
 				96C2AD861B62B6180032A784 /* app.js in Resources */,
 				0EDA55691B9257CC00AB6AF7 /* Images.xcassets in Resources */,
 				87C6A8911B43044D001876CE /* Main.storyboard in Resources */,
-				87C6A8961B43044D001876CE /* LaunchScreen.xib in Resources */,
 				87C6A8F61B430EDD001876CE /* www in Resources */,
 				87C6A8E91B430E15001876CE /* config.xml in Resources */,
 			);
@@ -328,14 +328,6 @@
 			name = Main.storyboard;
 			sourceTree = "<group>";
 		};
-		87C6A8941B43044D001876CE /* LaunchScreen.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				87C6A8951B43044D001876CE /* Base */,
-			);
-			name = LaunchScreen.xib;
-			sourceTree = "<group>";
-		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */

diff --git a/ios/velo/Base.lproj/LaunchScreen.xib b/ios/velo/Base.lproj/LaunchScreen.xib
diff --git a/ios/velo/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/velo/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -45,6 +55,16 @@
       "size" : "60x60",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "idiom" : "ipad",
       "size" : "29x29",

diff --git a/ios/velo/Info.plist b/ios/velo/Info.plist
@@ -41,7 +41,7 @@
 		<true/>
 	</dict>
 	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
+	<string>Launch Screen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>

diff --git a/ios/velo/Launch Screen.storyboard b/ios/velo/Launch Screen.storyboard
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="ozy-KZ-EUZ">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="Gn3-fi-eA4">
+            <objects>
+                <viewController id="ozy-KZ-EUZ" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="ZC1-UP-sjP"/>
+                        <viewControllerLayoutGuide type="bottom" id="iwy-ls-9v4"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="z3c-qe-2RI">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="velo" translatesAutoresizingMaskIntoConstraints="NO" id="fBz-ae-zsm"/>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="fBz-ae-zsm" firstAttribute="centerX" secondItem="z3c-qe-2RI" secondAttribute="centerX" id="evO-nR-W4R"/>
+                            <constraint firstItem="fBz-ae-zsm" firstAttribute="centerY" secondItem="z3c-qe-2RI" secondAttribute="centerY" id="kHX-hu-TQa"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="RFX-9s-bln"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="lT9-6d-aoc" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-1118" y="114"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="velo" width="59" height="23"/>
+    </resources>
+</document>