Commit 52f7c7b9 by Christophe Geuzaine

use launch storybord instead of launch images (which need to be adapted for each new device)

parent ac2e142e
......@@ -115,9 +115,9 @@ if(ENABLE_BUILD_IOS_EMULATOR OR ENABLE_BUILD_IOS)
add_custom_command(TARGET xcodeProject POST_BUILD COMMAND
sed -e \"s|Images.xcassets|Images_BBEMG.xcassets|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG.xcodeproj/project.pbxproj")
add_custom_command(TARGET xcodeProject POST_BUILD COMMAND
sed -e \"s|ONELAB|BBEMG|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG/en.lproj/iPhoneiPodStoryboard.storyboard")
sed -e \"s|ONELAB|BBEMG|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG/iPhoneiPodStoryboard.storyboard")
add_custom_command(TARGET xcodeProject POST_BUILD COMMAND
sed -e \"s|ONELAB|BBEMG|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG/en.lproj/iPadStoryboard.storyboard")
sed -e \"s|ONELAB|BBEMG|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG/iPadStoryboard.storyboard")
add_custom_command(TARGET xcodeProject POST_BUILD COMMAND
sed -e \"s|Onelab/Mobile|BBEMG|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG/AboutViewController.mm")
add_custom_command(TARGET xcodeProject POST_BUILD COMMAND
......
{
"images" : [
{
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "736h",
"filename" : "splash1242x2208.png",
"minimum-system-version" : "8.0",
"orientation" : "portrait",
"scale" : "3x"
},
{
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "736h",
"filename" : "splash2208x1242.png",
"minimum-system-version" : "8.0",
"orientation" : "landscape",
"scale" : "3x"
},
{
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "667h",
"filename" : "splash750x1334.png",
"minimum-system-version" : "8.0",
"orientation" : "portrait",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "splash640x960.png",
"scale" : "2x"
},
{
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "retina4",
"filename" : "splash640x1136.png",
"minimum-system-version" : "7.0",
"orientation" : "portrait",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "splash768x1024.png",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "splash1024x768.png",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "splash1536x2048.png",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "splash2048x1536.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
{
"images" : [
{
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "736h",
"filename" : "splash1242x2208.png",
"minimum-system-version" : "8.0",
"orientation" : "portrait",
"scale" : "3x"
},
{
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "736h",
"filename" : "splash2208x1242.png",
"minimum-system-version" : "8.0",
"orientation" : "landscape",
"scale" : "3x"
},
{
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "667h",
"filename" : "splash750x1334.png",
"minimum-system-version" : "8.0",
"orientation" : "portrait",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "splash640x960.png",
"scale" : "2x"
},
{
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "retina4",
"filename" : "splash640x1136.png",
"minimum-system-version" : "7.0",
"orientation" : "portrait",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "splash768x1024.png",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "splash1024x768.png",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "splash1536x2048.png",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "splash2048x1536.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina3_5" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" image="icon_onelab.png" translatesAutoresizingMaskIntoConstraints="NO" id="r7i-LQ-XXJ">
<rect key="frame" x="128" y="208" width="64" height="64"/>
</imageView>
</subviews>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="r7i-LQ-XXJ" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="Km0-Xa-0OK"/>
<constraint firstItem="r7i-LQ-XXJ" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="Nxc-iv-ZxM"/>
</constraints>
<viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="52" y="374.66266866566718"/>
</scene>
</scenes>
<resources>
<image name="icon_onelab.png" width="64" height="64"/>
</resources>
</document>
......@@ -50,6 +50,8 @@
<string>iPhoneiPodStoryboard</string>
<key>UIMainStoryboardFile~ipad</key>
<string>iPadStoryboard</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIRequiresFullScreen</key>
<true/>
<key>UIRequiredDeviceCapabilities</key>
......
#!/bin/sh
icon_source=../../../utils/icons/gmsh_mobile_1024x1024.png
launch_source=../../../utils/icons/gmsh_128x128.png
launch_source2=../../../utils/icons/gmsh_256x256.png
bg=black
#icon_source=$HOME/tex/proposals/bbemg/icons/bbemg-logo-white.png
#launch_source=$HOME/tex/proposals/bbemg/icons/bbemg-logo-text.png
#launch_source2=${launch_source}
#bg=white
mkdir -p AppIcon.appiconset
......@@ -18,26 +14,3 @@ convert -scale 76 ${icon_source} AppIcon.appiconset/icon_app_ipad.png
convert -scale 120 ${icon_source} AppIcon.appiconset/icon_app_iphone_retina.png
# App icon (iOS marketing)
cp ${icon_source} AppIcon.appiconset/icon_app_ios_marketing.png
mkdir -p LaunchImage.launchimage
# iphone 4 scale 2x (retina)
convert ${launch_source} -gravity Center -crop 640x960+0+0\! -background ${bg} -flatten LaunchImage.launchimage/splash640x960.png
# iphone 5 scale 2x (retina)
convert ${launch_source} -gravity Center -crop 640x1136+0+0\! -background ${bg} -flatten LaunchImage.launchimage/splash640x1136.png
# iphone 6 scale 2x (retina)
convert ${launch_source} -gravity Center -crop 750x1334+0+0\! -background ${bg} -flatten LaunchImage.launchimage/splash750x1334.png
convert ${launch_source} -gravity Center -crop 1334x750+0+0\! -background ${bg} -flatten LaunchImage.launchimage/splash1334x750.png
# iphone 6 plus scale 3x (retina HD)
convert ${launch_source2} -gravity Center -crop 1242x2208+0+0\! -background ${bg} -flatten LaunchImage.launchimage/splash1242x2208.png
convert ${launch_source2} -gravity Center -crop 2208x1242+0+0\! -background ${bg} -flatten LaunchImage.launchimage/splash2208x1242.png
# ipad scale 1x
convert ${launch_source} -gravity Center -crop 768x1024+0+0\! -background ${bg} -flatten LaunchImage.launchimage/splash768x1024.png
convert ${launch_source} -gravity Center -crop 1024x768+0+0\! -background ${bg} -flatten LaunchImage.launchimage/splash1024x768.png
# ipad scale 2x (retina)
convert ${launch_source2} -gravity Center -crop 1536x2048+0+0\! -background ${bg} -flatten LaunchImage.launchimage/splash1536x2048.png
convert ${launch_source2} -gravity Center -crop 2048x1536+0+0\! -background ${bg} -flatten LaunchImage.launchimage/splash2048x1536.png
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment