Skip to content

Commit b6d98ec

Browse files
committed
Launch screen added
1 parent 95e871e commit b6d98ec

25 files changed

+79
-122
lines changed

App/Sources/Assets.xcassets/AppIcon.appiconset/Contents.json

+18
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,109 @@
11
{
22
"images" : [
33
{
4+
"filename" : "[email protected]",
45
"idiom" : "iphone",
56
"scale" : "2x",
67
"size" : "20x20"
78
},
89
{
10+
"filename" : "[email protected]",
911
"idiom" : "iphone",
1012
"scale" : "3x",
1113
"size" : "20x20"
1214
},
1315
{
16+
"filename" : "[email protected]",
1417
"idiom" : "iphone",
1518
"scale" : "2x",
1619
"size" : "29x29"
1720
},
1821
{
22+
"filename" : "[email protected]",
1923
"idiom" : "iphone",
2024
"scale" : "3x",
2125
"size" : "29x29"
2226
},
2327
{
28+
"filename" : "[email protected]",
2429
"idiom" : "iphone",
2530
"scale" : "2x",
2631
"size" : "40x40"
2732
},
2833
{
34+
"filename" : "[email protected]",
2935
"idiom" : "iphone",
3036
"scale" : "3x",
3137
"size" : "40x40"
3238
},
3339
{
40+
"filename" : "AppIcon-60@2x~car.png",
3441
"idiom" : "iphone",
3542
"scale" : "2x",
3643
"size" : "60x60"
3744
},
3845
{
46+
"filename" : "AppIcon-60@3x~car.png",
3947
"idiom" : "iphone",
4048
"scale" : "3x",
4149
"size" : "60x60"
4250
},
4351
{
52+
"filename" : "AppIcon-20~ipad.png",
4453
"idiom" : "ipad",
4554
"scale" : "1x",
4655
"size" : "20x20"
4756
},
4857
{
58+
"filename" : "AppIcon-20@2x~ipad.png",
4959
"idiom" : "ipad",
5060
"scale" : "2x",
5161
"size" : "20x20"
5262
},
5363
{
64+
"filename" : "AppIcon-29.png",
5465
"idiom" : "ipad",
5566
"scale" : "1x",
5667
"size" : "29x29"
5768
},
5869
{
70+
"filename" : "AppIcon-29@2x~ipad.png",
5971
"idiom" : "ipad",
6072
"scale" : "2x",
6173
"size" : "29x29"
6274
},
6375
{
76+
"filename" : "AppIcon-40~ipad.png",
6477
"idiom" : "ipad",
6578
"scale" : "1x",
6679
"size" : "40x40"
6780
},
6881
{
82+
"filename" : "AppIcon-40@2x~ipad.png",
6983
"idiom" : "ipad",
7084
"scale" : "2x",
7185
"size" : "40x40"
7286
},
7387
{
88+
"filename" : "AppIcon~ipad.png",
7489
"idiom" : "ipad",
7590
"scale" : "1x",
7691
"size" : "76x76"
7792
},
7893
{
94+
"filename" : "AppIcon@2x~ipad.png",
7995
"idiom" : "ipad",
8096
"scale" : "2x",
8197
"size" : "76x76"
8298
},
8399
{
100+
"filename" : "AppIcon-83.5@2x~ipad.png",
84101
"idiom" : "ipad",
85102
"scale" : "2x",
86103
"size" : "83.5x83.5"
87104
},
88105
{
106+
"filename" : "AppIcon~ios-marketing.png",
89107
"idiom" : "ios-marketing",
90108
"scale" : "1x",
91109
"size" : "1024x1024"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"appearances" : [
9+
{
10+
"appearance" : "luminosity",
11+
"value" : "dark"
12+
}
13+
],
14+
"idiom" : "universal",
15+
"scale" : "1x"
16+
},
17+
{
18+
"idiom" : "universal",
19+
"scale" : "2x"
20+
},
21+
{
22+
"appearances" : [
23+
{
24+
"appearance" : "luminosity",
25+
"value" : "dark"
26+
}
27+
],
28+
"idiom" : "universal",
29+
"scale" : "2x"
30+
},
31+
{
32+
"filename" : "NordicLogo_light.png",
33+
"idiom" : "universal",
34+
"scale" : "3x"
35+
},
36+
{
37+
"appearances" : [
38+
{
39+
"appearance" : "luminosity",
40+
"value" : "dark"
41+
}
42+
],
43+
"filename" : "NordicLogo_dark.png",
44+
"idiom" : "universal",
45+
"scale" : "3x"
46+
}
47+
],
48+
"info" : {
49+
"author" : "xcode",
50+
"version" : 1
51+
}
52+
}
Loading
Loading

App/Sources/Assets.xcassets/icons/AppIcon.appiconset/Contents.json

-116
This file was deleted.

App/Sources/Info.plist

+7-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@
1717
</array>
1818
<key>CFBundleIcons</key>
1919
<dict/>
20-
<key>CFBundleIcons~ipad</key>
21-
<dict/>
20+
<key>UILaunchScreen</key>
21+
<dict>
22+
<key>UIColorName</key>
23+
<string>BackgroundColor</string>
24+
<key>UIImageName</key>
25+
<string>NordicLogo</string>
26+
</dict>
2227
</dict>
2328
</plist>

App/nRF DFU.xcodeproj/project.pbxproj

+2-4
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@
538538
CODE_SIGN_ENTITLEMENTS = Sources/dfuDebug.entitlements;
539539
CODE_SIGN_IDENTITY = "Apple Development";
540540
CODE_SIGN_STYLE = Automatic;
541-
CURRENT_PROJECT_VERSION = 1;
541+
CURRENT_PROJECT_VERSION = 2;
542542
DEVELOPMENT_ASSET_PATHS = "\"Sources/Preview Content\"";
543543
DEVELOPMENT_TEAM = P3R8YQEV4L;
544544
ENABLE_PREVIEWS = YES;
@@ -551,7 +551,6 @@
551551
INFOPLIST_KEY_NSBluetoothPeripheralUsageDescription = "This app uses Bluetooth to connect and send new firmware to a device.";
552552
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
553553
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
554-
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
555554
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
556555
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
557556
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
@@ -578,7 +577,7 @@
578577
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
579578
CODE_SIGN_ENTITLEMENTS = Sources/dfu.entitlements;
580579
CODE_SIGN_STYLE = Automatic;
581-
CURRENT_PROJECT_VERSION = 1;
580+
CURRENT_PROJECT_VERSION = 2;
582581
DEVELOPMENT_ASSET_PATHS = "\"Sources/Preview Content\"";
583582
DEVELOPMENT_TEAM = P3R8YQEV4L;
584583
ENABLE_PREVIEWS = YES;
@@ -591,7 +590,6 @@
591590
INFOPLIST_KEY_NSBluetoothPeripheralUsageDescription = "This app uses Bluetooth to connect and send new firmware to a device.";
592591
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
593592
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
594-
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
595593
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
596594
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
597595
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";

0 commit comments

Comments
 (0)