aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Filipenkov <decapitator@ukr.net>2020-12-13 19:31:34 +0300
committerAndrey Filipenkov <decapitator@ukr.net>2020-12-14 21:48:23 +0000
commitd3d49f4167e72f3a91d349b36ce95a415234e9d1 (patch)
treee1a56a9899f6d7cbfac4c5a3ac2e22b15369e46a
parent3f6d0cdd4d2e415509760b0f7f85065586e59f57 (diff)
Cocoa Touch Application: use launch storyboard
replace legacy static launch images with launch storyboard Change-Id: I16c5d829bc2852f5388ef66218c23f1a126e5130 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-rw-r--r--examples/cocoa-touch-application/CocoaTouchApplication.xcodeproj/project.pbxproj16
-rw-r--r--examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Info.plist2
-rw-r--r--examples/cocoa-touch-application/CocoaTouchApplication/Default-568h@2x.pngbin18594 -> 0 bytes
-rw-r--r--examples/cocoa-touch-application/CocoaTouchApplication/Default.pngbin6540 -> 0 bytes
-rw-r--r--examples/cocoa-touch-application/CocoaTouchApplication/Default@2x.pngbin16107 -> 0 bytes
-rw-r--r--examples/cocoa-touch-application/CocoaTouchApplication/LaunchScreen.storyboard49
-rw-r--r--examples/cocoa-touch-application/cocoa-touch-application.qbs5
7 files changed, 57 insertions, 15 deletions
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication.xcodeproj/project.pbxproj b/examples/cocoa-touch-application/CocoaTouchApplication.xcodeproj/project.pbxproj
index d4daa60bd..62d4425c9 100644
--- a/examples/cocoa-touch-application/CocoaTouchApplication.xcodeproj/project.pbxproj
+++ b/examples/cocoa-touch-application/CocoaTouchApplication.xcodeproj/project.pbxproj
@@ -13,15 +13,13 @@
14E3FEB4175FB2E800C857C6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 14E3FEB2175FB2E800C857C6 /* InfoPlist.strings */; };
14E3FEB6175FB2E800C857C6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 14E3FEB5175FB2E800C857C6 /* main.m */; };
14E3FEBA175FB2E800C857C6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 14E3FEB9175FB2E800C857C6 /* AppDelegate.m */; };
- 14E3FEBC175FB2E800C857C6 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 14E3FEBB175FB2E800C857C6 /* Default.png */; };
- 14E3FEBE175FB2E800C857C6 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 14E3FEBD175FB2E800C857C6 /* Default@2x.png */; };
- 14E3FEC0175FB2E800C857C6 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 14E3FEBF175FB2E800C857C6 /* Default-568h@2x.png */; };
14E3FEC3175FB2E800C857C6 /* MasterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14E3FEC2175FB2E800C857C6 /* MasterViewController.m */; };
14E3FEC6175FB2E900C857C6 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14E3FEC5175FB2E900C857C6 /* DetailViewController.m */; };
14E3FEC9175FB2E900C857C6 /* MasterViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 14E3FEC7175FB2E900C857C6 /* MasterViewController_iPhone.xib */; };
14E3FECC175FB2E900C857C6 /* MasterViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 14E3FECA175FB2E900C857C6 /* MasterViewController_iPad.xib */; };
14E3FECF175FB2E900C857C6 /* DetailViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 14E3FECD175FB2E900C857C6 /* DetailViewController_iPhone.xib */; };
14E3FED2175FB2E900C857C6 /* DetailViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 14E3FED0175FB2E900C857C6 /* DetailViewController_iPad.xib */; };
+ AC83486F258674C900A9CBBB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AC83486E258674C900A9CBBB /* LaunchScreen.storyboard */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -35,9 +33,6 @@
14E3FEB7175FB2E800C857C6 /* CocoaTouchApplication-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CocoaTouchApplication-Prefix.pch"; sourceTree = "<group>"; };
14E3FEB8175FB2E800C857C6 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
14E3FEB9175FB2E800C857C6 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
- 14E3FEBB175FB2E800C857C6 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
- 14E3FEBD175FB2E800C857C6 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
- 14E3FEBF175FB2E800C857C6 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
14E3FEC1175FB2E800C857C6 /* MasterViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MasterViewController.h; sourceTree = "<group>"; };
14E3FEC2175FB2E800C857C6 /* MasterViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MasterViewController.m; sourceTree = "<group>"; };
14E3FEC4175FB2E800C857C6 /* DetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DetailViewController.h; sourceTree = "<group>"; };
@@ -46,6 +41,7 @@
14E3FECB175FB2E900C857C6 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MasterViewController_iPad.xib; sourceTree = "<group>"; };
14E3FECE175FB2E900C857C6 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/DetailViewController_iPhone.xib; sourceTree = "<group>"; };
14E3FED1175FB2E900C857C6 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/DetailViewController_iPad.xib; sourceTree = "<group>"; };
+ AC83486E258674C900A9CBBB /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -103,6 +99,7 @@
14E3FECD175FB2E900C857C6 /* DetailViewController_iPhone.xib */,
14E3FED0175FB2E900C857C6 /* DetailViewController_iPad.xib */,
14E3FEB0175FB2E800C857C6 /* Supporting Files */,
+ AC83486E258674C900A9CBBB /* LaunchScreen.storyboard */,
);
path = CocoaTouchApplication;
sourceTree = "<group>";
@@ -114,9 +111,6 @@
14E3FEB2175FB2E800C857C6 /* InfoPlist.strings */,
14E3FEB5175FB2E800C857C6 /* main.m */,
14E3FEB7175FB2E800C857C6 /* CocoaTouchApplication-Prefix.pch */,
- 14E3FEBB175FB2E800C857C6 /* Default.png */,
- 14E3FEBD175FB2E800C857C6 /* Default@2x.png */,
- 14E3FEBF175FB2E800C857C6 /* Default-568h@2x.png */,
);
name = "Supporting Files";
sourceTree = "<group>";
@@ -173,10 +167,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ AC83486F258674C900A9CBBB /* LaunchScreen.storyboard in Resources */,
14E3FEB4175FB2E800C857C6 /* InfoPlist.strings in Resources */,
- 14E3FEBC175FB2E800C857C6 /* Default.png in Resources */,
- 14E3FEBE175FB2E800C857C6 /* Default@2x.png in Resources */,
- 14E3FEC0175FB2E800C857C6 /* Default-568h@2x.png in Resources */,
14E3FEC9175FB2E900C857C6 /* MasterViewController_iPhone.xib in Resources */,
14E3FECC175FB2E900C857C6 /* MasterViewController_iPad.xib in Resources */,
14E3FECF175FB2E900C857C6 /* DetailViewController_iPhone.xib in Resources */,
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Info.plist b/examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Info.plist
index cad00fa66..8075a9d96 100644
--- a/examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Info.plist
+++ b/examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Info.plist
@@ -24,6 +24,8 @@
<string>1.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
+ <key>UILaunchStoryboardName</key>
+ <string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication/Default-568h@2x.png b/examples/cocoa-touch-application/CocoaTouchApplication/Default-568h@2x.png
deleted file mode 100644
index 0891b7aab..000000000
--- a/examples/cocoa-touch-application/CocoaTouchApplication/Default-568h@2x.png
+++ /dev/null
Binary files differ
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication/Default.png b/examples/cocoa-touch-application/CocoaTouchApplication/Default.png
deleted file mode 100644
index 4c8ca6f69..000000000
--- a/examples/cocoa-touch-application/CocoaTouchApplication/Default.png
+++ /dev/null
Binary files differ
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication/Default@2x.png b/examples/cocoa-touch-application/CocoaTouchApplication/Default@2x.png
deleted file mode 100644
index 35b84cffe..000000000
--- a/examples/cocoa-touch-application/CocoaTouchApplication/Default@2x.png
+++ /dev/null
Binary files differ
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication/LaunchScreen.storyboard b/examples/cocoa-touch-application/CocoaTouchApplication/LaunchScreen.storyboard
new file mode 100644
index 000000000..344bbca5c
--- /dev/null
+++ b/examples/cocoa-touch-application/CocoaTouchApplication/LaunchScreen.storyboard
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17506" 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" appearance="light"/>
+ <dependencies>
+ <deployment identifier="iOS"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
+ <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>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2020 io.qbs. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
+ <rect key="frame" x="0.0" y="439.5" width="320" height="20.5"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cocoa Touch Application" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
+ <rect key="frame" x="0.0" y="139.5" width="320" height="43"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <constraints>
+ <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
+ <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
+ <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="20" symbolic="YES" id="SfN-ll-jLj"/>
+ <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
+ <constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
+ <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="x7j-FC-K8j"/>
+ </constraints>
+ </view>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="53" y="375"/>
+ </scene>
+ </scenes>
+</document>
diff --git a/examples/cocoa-touch-application/cocoa-touch-application.qbs b/examples/cocoa-touch-application/cocoa-touch-application.qbs
index 25e6d7029..bf2fb4080 100644
--- a/examples/cocoa-touch-application/cocoa-touch-application.qbs
+++ b/examples/cocoa-touch-application/cocoa-touch-application.qbs
@@ -59,6 +59,7 @@ CppApplication {
install: true
bundle.identifierPrefix: "io.qbs"
+ bundle.infoPlist: ({"UILaunchStoryboardName": "LaunchScreen"})
cpp.useObjcPrecompiledHeader: true
cpp.minimumIosVersion: "9.0"
@@ -93,9 +94,7 @@ CppApplication {
Group {
id: bundle_resources
files: [
- "CocoaTouchApplication/Default-568h@2x.png",
- "CocoaTouchApplication/Default.png",
- "CocoaTouchApplication/Default@2x.png",
+ "CocoaTouchApplication/LaunchScreen.storyboard",
"CocoaTouchApplication/en.lproj/InfoPlist.strings"
]
}