Skip to content

Commit 500b238

Browse files
authored
Merge pull request #108 from NordicSemiconductor/launchscreen
New launch screen
2 parents 5d2f4fb + b796023 commit 500b238

File tree

9 files changed

+30
-60
lines changed

9 files changed

+30
-60
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"info" : {
3-
"version" : 1,
4-
"author" : "xcode"
3+
"author" : "xcode",
4+
"version" : 1
55
}
6-
}
6+
}

Example/nRFBlinky/Images.xcassets/splashscreen.imageset/Contents.json

Lines changed: 9 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -5,82 +5,48 @@
55
"scale" : "1x"
66
},
77
{
8-
"idiom" : "universal",
9-
"scale" : "1x",
10-
"appearances" : [
11-
{
12-
"appearance" : "luminosity",
13-
"value" : "light"
14-
}
15-
]
16-
},
17-
{
18-
"idiom" : "universal",
19-
"scale" : "1x",
208
"appearances" : [
219
{
2210
"appearance" : "luminosity",
2311
"value" : "dark"
2412
}
25-
]
26-
},
27-
{
13+
],
2814
"idiom" : "universal",
29-
"filename" : "splashscreen@2x.png",
30-
"scale" : "2x"
15+
"scale" : "1x"
3116
},
3217
{
3318
"idiom" : "universal",
34-
"filename" : "splashscreen@2x.png",
35-
"appearances" : [
36-
{
37-
"appearance" : "luminosity",
38-
"value" : "light"
39-
}
40-
],
4119
"scale" : "2x"
4220
},
4321
{
44-
"idiom" : "universal",
45-
"filename" : "splashscreenDark@2x.png",
4622
"appearances" : [
4723
{
4824
"appearance" : "luminosity",
4925
"value" : "dark"
5026
}
5127
],
28+
"idiom" : "universal",
5229
"scale" : "2x"
5330
},
5431
{
32+
"filename" : "NordicLogo_light.png",
5533
"idiom" : "universal",
56-
"filename" : "splashscreen@3x.png",
5734
"scale" : "3x"
5835
},
5936
{
60-
"idiom" : "universal",
61-
"filename" : "splashscreen@3x.png",
62-
"appearances" : [
63-
{
64-
"appearance" : "luminosity",
65-
"value" : "light"
66-
}
67-
],
68-
"scale" : "3x"
69-
},
70-
{
71-
"idiom" : "universal",
72-
"filename" : "splashscreenDark@3x.png",
7337
"appearances" : [
7438
{
7539
"appearance" : "luminosity",
7640
"value" : "dark"
7741
}
7842
],
43+
"filename" : "NordicLogo_dark.png",
44+
"idiom" : "universal",
7945
"scale" : "3x"
8046
}
8147
],
8248
"info" : {
83-
"version" : 1,
84-
"author" : "xcode"
49+
"author" : "xcode",
50+
"version" : 1
8551
}
86-
}
52+
}
Loading
Loading
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
3-
<device id="retina5_9" orientation="portrait">
4-
<adaptation id="fullscreen"/>
5-
</device>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
3+
<device id="retina5_9" orientation="portrait" appearance="light"/>
64
<dependencies>
75
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
97
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
8+
<capability name="System colors in document resources" minToolsVersion="11.0"/>
109
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
1110
</dependencies>
1211
<scenes>
@@ -18,18 +17,20 @@
1817
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
1918
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2019
<subviews>
21-
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="splashscreen" translatesAutoresizingMaskIntoConstraints="NO" id="xAk-gJ-3io">
22-
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
20+
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="splashscreen" translatesAutoresizingMaskIntoConstraints="NO" id="ZPT-F6-KX5">
21+
<rect key="frame" x="87.666666666666686" y="306" width="200" height="200"/>
22+
<constraints>
23+
<constraint firstAttribute="width" constant="200" id="2SM-Hl-x0J"/>
24+
<constraint firstAttribute="height" constant="200" id="DUc-D3-tF0"/>
25+
</constraints>
2326
</imageView>
2427
</subviews>
25-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
28+
<viewLayoutGuide key="safeArea" id="wXR-uw-n6f"/>
29+
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
2630
<constraints>
27-
<constraint firstItem="xAk-gJ-3io" firstAttribute="trailing" secondItem="Ze5-6b-2t3" secondAttribute="trailing" id="4H2-g1-UXR"/>
28-
<constraint firstItem="xAk-gJ-3io" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="6bb-I4-Oy5"/>
29-
<constraint firstItem="xAk-gJ-3io" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="Y80-u8-M1P"/>
30-
<constraint firstItem="xAk-gJ-3io" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="lFw-hM-Ho5"/>
31+
<constraint firstItem="ZPT-F6-KX5" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="sQZ-R4-5Go"/>
32+
<constraint firstItem="ZPT-F6-KX5" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="yVi-Si-jWh"/>
3133
</constraints>
32-
<viewLayoutGuide key="safeArea" id="wXR-uw-n6f"/>
3334
</view>
3435
</viewController>
3536
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -38,6 +39,9 @@
3839
</scene>
3940
</scenes>
4041
<resources>
41-
<image name="splashscreen" width="2732" height="2732"/>
42+
<image name="splashscreen" width="251.66667175292969" height="215.66667175292969"/>
43+
<systemColor name="systemBackgroundColor">
44+
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
45+
</systemColor>
4246
</resources>
4347
</document>

0 commit comments

Comments
 (0)