Skip to content
This repository was archived by the owner on Dec 19, 2022. It is now read-only.

Commit 3782a6d

Browse files
philips77philips77
authored
Merge pull request #12 from NordicSemiconductor/develop
Version 1.2.0
2 parents 5632c39 + e556b5e commit 3782a6d

File tree

12 files changed

+131
-76
lines changed

12 files changed

+131
-76
lines changed

‎nRFBlinky.xcodeproj/project.pbxproj

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@
288288
};
289289
30B6645F1FCD6E65003C8B55 = {
290290
CreatedOnToolsVersion = 9.1;
291-
LastSwiftMigration = 1010;
291+
LastSwiftMigration = 1130;
292292
ProvisioningStyle = Automatic;
293293
TestTargetID = 30B664401FCD6E65003C8B55;
294294
};
@@ -581,13 +581,15 @@
581581
buildSettings = {
582582
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
583583
CODE_SIGN_STYLE = Automatic;
584+
CURRENT_PROJECT_VERSION = 1;
584585
DEVELOPMENT_TEAM = P3R8YQEV4L;
585586
INFOPLIST_FILE = nRFBlinky/Info.plist;
586587
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
587588
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
589+
MARKETING_VERSION = 1.2.0;
588590
PRODUCT_BUNDLE_IDENTIFIER = "com.nordicsemi.nrf-blinky";
589591
PRODUCT_NAME = "$(TARGET_NAME)";
590-
SWIFT_VERSION = 4.2;
592+
SWIFT_VERSION = 5.0;
591593
TARGETED_DEVICE_FAMILY = "1,2";
592594
};
593595
name = Debug;
@@ -597,13 +599,15 @@
597599
buildSettings = {
598600
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
599601
CODE_SIGN_STYLE = Automatic;
602+
CURRENT_PROJECT_VERSION = 1;
600603
DEVELOPMENT_TEAM = P3R8YQEV4L;
601604
INFOPLIST_FILE = nRFBlinky/Info.plist;
602605
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
603606
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
607+
MARKETING_VERSION = 1.2.0;
604608
PRODUCT_BUNDLE_IDENTIFIER = "com.nordicsemi.nrf-blinky";
605609
PRODUCT_NAME = "$(TARGET_NAME)";
606-
SWIFT_VERSION = 4.2;
610+
SWIFT_VERSION = 5.0;
607611
TARGETED_DEVICE_FAMILY = "1,2";
608612
};
609613
name = Release;
@@ -619,7 +623,7 @@
619623
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
620624
PRODUCT_BUNDLE_IDENTIFIER = com.nordicsemi.nRFBlinkyTests;
621625
PRODUCT_NAME = "$(TARGET_NAME)";
622-
SWIFT_VERSION = 4.2;
626+
SWIFT_VERSION = 5.0;
623627
TARGETED_DEVICE_FAMILY = "1,2";
624628
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/nRFBlinky.app/nRFBlinky";
625629
};
@@ -636,7 +640,7 @@
636640
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
637641
PRODUCT_BUNDLE_IDENTIFIER = com.nordicsemi.nRFBlinkyTests;
638642
PRODUCT_NAME = "$(TARGET_NAME)";
639-
SWIFT_VERSION = 4.2;
643+
SWIFT_VERSION = 5.0;
640644
TARGETED_DEVICE_FAMILY = "1,2";
641645
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/nRFBlinky.app/nRFBlinky";
642646
};
@@ -652,7 +656,7 @@
652656
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
653657
PRODUCT_BUNDLE_IDENTIFIER = com.nordicsemi.nRFBlinkyUITests;
654658
PRODUCT_NAME = "$(TARGET_NAME)";
655-
SWIFT_VERSION = 4.2;
659+
SWIFT_VERSION = 5.0;
656660
TARGETED_DEVICE_FAMILY = "1,2";
657661
TEST_TARGET_NAME = nRFBlinky;
658662
};
@@ -668,7 +672,7 @@
668672
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
669673
PRODUCT_BUNDLE_IDENTIFIER = com.nordicsemi.nRFBlinkyUITests;
670674
PRODUCT_NAME = "$(TARGET_NAME)";
671-
SWIFT_VERSION = 4.2;
675+
SWIFT_VERSION = 5.0;
672676
TARGETED_DEVICE_FAMILY = "1,2";
673677
TEST_TARGET_NAME = nRFBlinky;
674678
};

‎nRFBlinky/Assets.xcassets/ic_lightbulb_outline_48pt.imageset/Contents.json

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
{
2-
"images": [
3-
{
4-
"filename": "ic_lightbulb_outline_48pt.png",
5-
"idiom": "universal",
6-
"scale": "1x"
7-
},
8-
{
9-
"filename": "ic_lightbulb_outline_48pt_2x.png",
10-
"idiom": "universal",
11-
"scale": "2x"
12-
},
13-
{
14-
"filename": "ic_lightbulb_outline_48pt_3x.png",
15-
"idiom": "universal",
16-
"scale": "3x"
17-
}
18-
],
19-
"info": {
20-
"author": "xcode",
21-
"version": 1
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "ic_lightbulb_outline_48pt.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "ic_lightbulb_outline_48pt_2x.png",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "ic_lightbulb_outline_48pt_3x.png",
16+
"scale" : "3x"
2217
}
23-
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
25+
}
26+
}

‎nRFBlinky/Assets.xcassets/ic_radio_button_checked.imageset/Contents.json

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
{
2-
"images": [
3-
{
4-
"filename": "ic_radio_button_checked.png",
5-
"idiom": "universal",
6-
"scale": "1x"
7-
},
8-
{
9-
"filename": "ic_radio_button_checked_2x.png",
10-
"idiom": "universal",
11-
"scale": "2x"
12-
},
13-
{
14-
"filename": "ic_radio_button_checked_3x.png",
15-
"idiom": "universal",
16-
"scale": "3x"
17-
}
18-
],
19-
"info": {
20-
"author": "xcode",
21-
"version": 1
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "ic_radio_button_checked.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "ic_radio_button_checked_2x.png",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "ic_radio_button_checked_3x.png",
16+
"scale" : "3x"
2217
}
23-
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
25+
}
26+
}

‎nRFBlinky/Assets.xcassets/rssi_1.imageset/Contents.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@
1919
"info" : {
2020
"version" : 1,
2121
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
2225
}
2326
}

‎nRFBlinky/Assets.xcassets/rssi_2.imageset/Contents.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@
1919
"info" : {
2020
"version" : 1,
2121
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
2225
}
2326
}

‎nRFBlinky/Assets.xcassets/rssi_3.imageset/Contents.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@
1919
"info" : {
2020
"version" : 1,
2121
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
2225
}
2326
}

‎nRFBlinky/Assets.xcassets/rssi_4.imageset/Contents.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@
1919
"info" : {
2020
"version" : 1,
2121
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
2225
}
2326
}

‎nRFBlinky/Base.lproj/Main.storyboard

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
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" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="PGS-Qc-QX1">
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="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="PGS-Qc-QX1">
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="15706"/>
97
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
108
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
119
</dependencies>
@@ -39,25 +37,26 @@
3937
<objects>
4038
<tableViewController id="CiD-oR-yqB" customClass="ScannerTableViewController" customModule="nRFBlinky" customModuleProvider="target" sceneMemberID="viewController">
4139
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="50" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="KMv-Sr-wl8">
42-
<rect key="frame" x="0.0" y="0.0" width="375" height="672"/>
40+
<rect key="frame" x="0.0" y="0.0" width="375" height="724"/>
4341
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
4442
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
4543
<prototypes>
4644
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="blinkyPeripheralCell" id="mag-9E-0Rv" userLabel="Table View Cell" customClass="BlinkyTableViewCell" customModule="nRFBlinky" customModuleProvider="target">
47-
<rect key="frame" x="0.0" y="55.333333333333343" width="375" height="50"/>
45+
<rect key="frame" x="0.0" y="55.333332061767578" width="375" height="50"/>
4846
<autoresizingMask key="autoresizingMask"/>
4947
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" tableViewCell="mag-9E-0Rv" id="md2-Pu-VGj">
50-
<rect key="frame" x="0.0" y="0.0" width="341" height="49.666666666666664"/>
48+
<rect key="frame" x="0.0" y="0.0" width="348" height="50"/>
5149
<autoresizingMask key="autoresizingMask"/>
5250
<subviews>
5351
<imageView userInteractionEnabled="NO" alpha="0.80000000000000004" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rssi_4" translatesAutoresizingMaskIntoConstraints="NO" id="jsd-rJ-BYZ">
54-
<rect key="frame" x="295" y="8" width="38" height="33.666666666666664"/>
52+
<rect key="frame" x="302" y="8" width="38" height="34"/>
53+
<color key="tintColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
5554
<constraints>
5655
<constraint firstAttribute="width" constant="38" id="fse-ld-z1Y"/>
5756
</constraints>
5857
</imageView>
5958
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Nordic Blinky" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ufl-Iw-mhn">
60-
<rect key="frame" x="16" y="14.333333333333336" width="101" height="21"/>
59+
<rect key="frame" x="16" y="14.666666666666664" width="101" height="21"/>
6160
<fontDescription key="fontDescription" type="system" pointSize="17"/>
6261
<nil key="textColor"/>
6362
<nil key="highlightedColor"/>
@@ -195,14 +194,15 @@
195194
<tableViewSection headerTitle="LED" footerTitle="Toggling the switch will cause LED 3 on the Blinky peripheral to turn ON or OFF." id="4YT-Qt-7PG">
196195
<cells>
197196
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="56" id="CfY-WS-s1U">
198-
<rect key="frame" x="0.0" y="55.333333333333343" width="375" height="56"/>
197+
<rect key="frame" x="0.0" y="55.333332061767578" width="375" height="56"/>
199198
<autoresizingMask key="autoresizingMask"/>
200199
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="CfY-WS-s1U" id="Yh0-rd-aOm">
201-
<rect key="frame" x="0.0" y="0.0" width="375" height="55.666666666666664"/>
200+
<rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
202201
<autoresizingMask key="autoresizingMask"/>
203202
<subviews>
204203
<imageView opaque="NO" userInteractionEnabled="NO" alpha="0.80000000000000004" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_lightbulb_outline_48pt" translatesAutoresizingMaskIntoConstraints="NO" id="fWV-Uh-cs6">
205204
<rect key="frame" x="16" y="16" width="24" height="24"/>
205+
<color key="tintColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
206206
<constraints>
207207
<constraint firstAttribute="height" constant="24" id="2Ju-TJ-MHf"/>
208208
<constraint firstAttribute="width" constant="24" id="tZj-gq-7Hp"/>
@@ -211,11 +211,10 @@
211211
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="UNKNOWN" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sXe-8K-21Q">
212212
<rect key="frame" x="48.000000000000007" y="19" width="80.666666666666686" height="18"/>
213213
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
214-
<color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
215214
<nil key="highlightedColor"/>
216215
</label>
217216
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="ug3-O5-D3G">
218-
<rect key="frame" x="310" y="12.333333333333336" width="51" height="31"/>
217+
<rect key="frame" x="310" y="12.666666666666664" width="51" height="31"/>
219218
<color key="onTintColor" red="0.0" green="0.46666666670000001" blue="0.7843137255" alpha="1" colorSpace="calibratedRGB"/>
220219
<connections>
221220
<action selector="ledToggleSwitchDidChange:" destination="pK8-7d-htc" eventType="valueChanged" id="LAy-So-9v3"/>
@@ -238,14 +237,15 @@
238237
<tableViewSection headerTitle="Button" footerTitle="Pressing and releasing BUTTON 1 on the Blinky peripheral will update the button state here." id="qKS-C3-Jkd">
239238
<cells>
240239
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="56" id="e04-76-3eK">
241-
<rect key="frame" x="0.0" y="202.66666666666669" width="375" height="56"/>
240+
<rect key="frame" x="0.0" y="202.66666412353516" width="375" height="56"/>
242241
<autoresizingMask key="autoresizingMask"/>
243242
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="e04-76-3eK" id="vyB-hh-Z5o">
244-
<rect key="frame" x="0.0" y="0.0" width="375" height="55.666666666666664"/>
243+
<rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
245244
<autoresizingMask key="autoresizingMask"/>
246245
<subviews>
247246
<imageView userInteractionEnabled="NO" alpha="0.80000000000000004" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_radio_button_checked" translatesAutoresizingMaskIntoConstraints="NO" id="xUH-nx-YIX">
248247
<rect key="frame" x="16" y="16" width="24" height="24"/>
248+
<color key="tintColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
249249
<constraints>
250250
<constraint firstAttribute="height" constant="24" id="c4J-S6-AGl"/>
251251
<constraint firstAttribute="width" constant="24" id="eFo-h9-BEb"/>
@@ -254,7 +254,6 @@
254254
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="UNKNOWN" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oaQ-Ex-coH">
255255
<rect key="frame" x="48.000000000000007" y="19" width="80.666666666666686" height="18"/>
256256
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
257-
<color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
258257
<nil key="highlightedColor"/>
259258
</label>
260259
</subviews>
@@ -287,9 +286,9 @@
287286
</scene>
288287
</scenes>
289288
<resources>
290-
<image name="ic_lightbulb_outline_48pt" width="144" height="144"/>
291-
<image name="ic_radio_button_checked" width="72" height="72"/>
292-
<image name="rssi_4" width="409.60000610351562" height="409.60000610351562"/>
289+
<image name="ic_lightbulb_outline_48pt" width="48" height="48"/>
290+
<image name="ic_radio_button_checked" width="24" height="24"/>
291+
<image name="rssi_4" width="170.66667175292969" height="170.66667175292969"/>
293292
<image name="scanning" width="64" height="64"/>
294293
</resources>
295294
<color key="tintColor" red="0.0" green="0.60392156862745094" blue="0.80784313725490198" alpha="1" colorSpace="calibratedRGB"/>

‎nRFBlinky/Info.plist

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.1.0</string>
20+
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleVersion</key>
22-
<string>6</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
25+
<key>NSBluetoothAlwaysUsageDescription</key>
26+
<string>nRF Blinky uses Bluetooth to communicate with the nRF Blinky sample application on nRF DK.</string>
2527
<key>NSBluetoothPeripheralUsageDescription</key>
2628
<string>nRF Blinky uses Bluetooth to communicate with the nRF Blinky Development Kit</string>
2729
<key>UILaunchStoryboardName</key>

0 commit comments

Comments
 (0)