Skip to content

Commit 71260bb

Browse files
committed
Minor issues fixed
1 parent 4236a16 commit 71260bb

File tree

3 files changed

+8
-18
lines changed

3 files changed

+8
-18
lines changed

nRF Toolbox/Base.lproj/Main.storyboard

+6-15
Original file line numberDiff line numberDiff line change
@@ -5194,7 +5194,7 @@
51945194
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
51955195
<subviews>
51965196
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SERVICES" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bJK-g0-Q0c">
5197-
<rect key="frame" x="33" y="264.5" width="309" height="21"/>
5197+
<rect key="frame" x="33" y="235" width="309" height="21"/>
51985198
<color key="backgroundColor" red="0.0" green="0.66274509800000003" blue="0.80784313730000001" alpha="1" colorSpace="calibratedRGB"/>
51995199
<constraints>
52005200
<constraint firstAttribute="height" constant="21" id="rPj-q5-Xjn"/>
@@ -5204,7 +5204,7 @@
52045204
<nil key="highlightedColor"/>
52055205
</label>
52065206
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="VvQ-ZD-9NU" userLabel="HomeKit Accessory Table View">
5207-
<rect key="frame" x="33" y="285.5" width="309" height="185.5"/>
5207+
<rect key="frame" x="33" y="256" width="309" height="215"/>
52085208
<color key="backgroundColor" red="0.96067994830000003" green="0.96084433790000001" blue="0.96066969629999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
52095209
<color key="separatorColor" red="0.73333334920000004" green="0.74117648599999997" blue="0.75294119120000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
52105210
<prototypes>
@@ -5241,14 +5241,8 @@
52415241
<outlet property="delegate" destination="Pe3-Ug-J4P" id="IHh-cd-9ZU"/>
52425242
</connections>
52435243
</tableView>
5244-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="DEFAULT ACCESSORY" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QYh-eH-e78">
5245-
<rect key="frame" x="32" y="11" width="182" height="23.5"/>
5246-
<fontDescription key="fontDescription" name="TrebuchetMS" family="Trebuchet MS" pointSize="20"/>
5247-
<nil key="textColor"/>
5248-
<nil key="highlightedColor"/>
5249-
</label>
52505244
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ACCESSORY DATA" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IaN-1D-GpV">
5251-
<rect key="frame" x="33" y="45.5" width="309" height="21"/>
5245+
<rect key="frame" x="33" y="16" width="309" height="21"/>
52525246
<color key="backgroundColor" red="0.0" green="0.66274509800000003" blue="0.80784313730000001" alpha="1" colorSpace="calibratedRGB"/>
52535247
<constraints>
52545248
<constraint firstAttribute="height" constant="21" id="qUn-Q2-75U"/>
@@ -5258,7 +5252,7 @@
52585252
<nil key="highlightedColor"/>
52595253
</label>
52605254
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="res-a9-nzD" userLabel="View - DATA">
5261-
<rect key="frame" x="33" y="66.5" width="309" height="187"/>
5255+
<rect key="frame" x="33" y="37" width="309" height="187"/>
52625256
<subviews>
52635257
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Firmware version" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jPv-Lm-vpF">
52645258
<rect key="frame" x="7" y="12" width="130" height="21"/>
@@ -5367,17 +5361,15 @@
53675361
<constraint firstItem="VvQ-ZD-9NU" firstAttribute="top" secondItem="bJK-g0-Q0c" secondAttribute="bottom" id="036-VO-7j2"/>
53685362
<constraint firstItem="5ct-bt-wwr" firstAttribute="centerX" secondItem="fhU-BF-poh" secondAttribute="centerX" id="1iJ-g8-wsg"/>
53695363
<constraint firstItem="VvQ-ZD-9NU" firstAttribute="leading" secondItem="Ngl-Bo-tNz" secondAttribute="leadingMargin" constant="17" id="AUL-ip-WmQ"/>
5364+
<constraint firstItem="IaN-1D-GpV" firstAttribute="top" secondItem="fhU-BF-poh" secondAttribute="top" constant="16" id="BB4-OO-yHW"/>
53705365
<constraint firstItem="fhU-BF-poh" firstAttribute="bottom" secondItem="5ct-bt-wwr" secondAttribute="bottom" constant="16" id="EPY-Nq-n9g"/>
53715366
<constraint firstItem="bJK-g0-Q0c" firstAttribute="top" secondItem="res-a9-nzD" secondAttribute="bottom" constant="11" id="IUy-Gl-nHu"/>
53725367
<constraint firstAttribute="trailingMargin" secondItem="bJK-g0-Q0c" secondAttribute="trailing" constant="17" id="Icx-dN-2jy"/>
53735368
<constraint firstAttribute="trailingMargin" secondItem="VvQ-ZD-9NU" secondAttribute="trailing" constant="17" id="OVq-JC-LVA"/>
5374-
<constraint firstItem="QYh-eH-e78" firstAttribute="leading" secondItem="Ngl-Bo-tNz" secondAttribute="leadingMargin" constant="16" id="PKD-hC-BFb"/>
53755369
<constraint firstAttribute="trailingMargin" secondItem="res-a9-nzD" secondAttribute="trailing" constant="17" id="PY3-kM-Ugm"/>
5376-
<constraint firstItem="QYh-eH-e78" firstAttribute="top" secondItem="fhU-BF-poh" secondAttribute="top" constant="11" id="b5k-2h-hOp"/>
53775370
<constraint firstItem="IaN-1D-GpV" firstAttribute="leading" secondItem="Ngl-Bo-tNz" secondAttribute="leadingMargin" constant="17" id="bXV-2l-wLF"/>
53785371
<constraint firstItem="5ct-bt-wwr" firstAttribute="top" secondItem="VvQ-ZD-9NU" secondAttribute="bottom" constant="16" id="bu1-rw-Dmg"/>
53795372
<constraint firstAttribute="trailingMargin" secondItem="IaN-1D-GpV" secondAttribute="trailing" constant="17" id="cvq-zj-fMM"/>
5380-
<constraint firstItem="IaN-1D-GpV" firstAttribute="top" secondItem="QYh-eH-e78" secondAttribute="bottom" constant="11" id="eew-Bj-BVW"/>
53815373
<constraint firstItem="bJK-g0-Q0c" firstAttribute="leading" secondItem="Ngl-Bo-tNz" secondAttribute="leadingMargin" constant="17" id="qfK-C4-HMF"/>
53825374
<constraint firstItem="res-a9-nzD" firstAttribute="top" secondItem="IaN-1D-GpV" secondAttribute="bottom" id="rx1-WH-d4C"/>
53835375
<constraint firstItem="res-a9-nzD" firstAttribute="leading" secondItem="Ngl-Bo-tNz" secondAttribute="leadingMargin" constant="17" id="zcZ-r1-bsI"/>
@@ -5405,7 +5397,6 @@
54055397
<connections>
54065398
<outlet property="accessoryCategoryLabel" destination="gkX-Fz-smf" id="Lhe-XD-HZc"/>
54075399
<outlet property="accessoryDFUSupportLabel" destination="GLy-uD-wAK" id="2Tm-Qj-09F"/>
5408-
<outlet property="accessoryNameTitle" destination="QYh-eH-e78" id="GAL-fg-lwc"/>
54095400
<outlet property="accessoryServicesTableView" destination="VvQ-ZD-9NU" id="Bnd-UL-OGY"/>
54105401
<outlet property="activityIndicator" destination="ly1-PX-kjv" id="Vgm-PA-VCe"/>
54115402
<outlet property="dfuModeButton" destination="5ct-bt-wwr" id="Jm5-o4-yaQ"/>
@@ -5495,7 +5486,7 @@
54955486
<image name="userIcon" width="24" height="24"/>
54965487
</resources>
54975488
<inferredMetricsTieBreakers>
5498-
<segue reference="9aU-2l-xWz"/>
5489+
<segue reference="0i8-Ot-uid"/>
54995490
</inferredMetricsTieBreakers>
55005491
<color key="tintColor" red="0.0" green="0.60392159219999997" blue="0.85490196939999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
55015492
</document>

nRF Toolbox/HomeKit/HKAccessoryViewController.swift

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ class HKAccessoryViewController: UIViewController, UITableViewDataSource, UITabl
2020

2121
//MARK: - IBOutlets
2222
@IBOutlet weak var accessoryServicesTableView: UITableView!
23-
@IBOutlet weak var accessoryNameTitle: UILabel!
2423
@IBOutlet weak var homeNameTitle: UILabel!
2524
@IBOutlet weak var accessoryDFUSupportLabel: UILabel!
2625
@IBOutlet weak var accessoryCategoryLabel: UILabel!
@@ -108,7 +107,7 @@ class HKAccessoryViewController: UIViewController, UITableViewDataSource, UITabl
108107
hardwareVersionLabel.text = "Reading..."
109108
accessoryDFUSupportLabel.text = "Checking..."
110109
dfuModeButton.isEnabled = false
111-
accessoryNameTitle.text = targetAccessory.name
110+
title = targetAccessory.name
112111
homeNameTitle.text = targetAccessory.room?.name ?? "Unknown"
113112

114113
accessoryCategoryLabel.text = targetAccessory.category.localizedDescription

nRF Toolbox/nRF Toolbox-Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<key>CFBundleSignature</key>
5959
<string>????</string>
6060
<key>CFBundleVersion</key>
61-
<string>21</string>
61+
<string>22</string>
6262
<key>ITSAppUsesNonExemptEncryption</key>
6363
<false/>
6464
<key>LSRequiresIPhoneOS</key>

0 commit comments

Comments
 (0)