From 631b385bfcfa6ba62f57c3801aff14a962c1e83e Mon Sep 17 00:00:00 2001
From: Jimmy Lu <jimmy.m.lu@gmail.com>
Date: Tue, 25 Oct 2016 16:36:55 -0700
Subject: [PATCH 1/5] fix layout for grouped sensor and multi line

---
 SleepModel/Base.lproj/Main.storyboard | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SleepModel/Base.lproj/Main.storyboard b/SleepModel/Base.lproj/Main.storyboard
index e42a4b14..63cee99b 100644
--- a/SleepModel/Base.lproj/Main.storyboard
+++ b/SleepModel/Base.lproj/Main.storyboard
@@ -4984,7 +4984,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="89g-Uy-95X">
-                                                    <rect key="frame" x="16" y="40" width="439" height="0.0"/>
+                                                    <rect key="frame" x="16" y="40" width="552" height="0.0"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <color key="textColor" red="0.36078431370000003" green="0.41960784309999999" blue="0.49803921569999998" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -5001,9 +5001,9 @@
                                             <constraint firstAttribute="trailing" secondItem="hvf-uR-lU3" secondAttribute="trailing" id="G2c-cJ-hPH"/>
                                             <constraint firstItem="ny2-np-2JO" firstAttribute="top" secondItem="Wg6-Qw-Km1" secondAttribute="top" constant="16" id="PkI-T1-mae"/>
                                             <constraint firstItem="89g-Uy-95X" firstAttribute="top" secondItem="ny2-np-2JO" secondAttribute="bottom" id="TU1-1f-EcH"/>
-                                            <constraint firstItem="89g-Uy-95X" firstAttribute="trailing" secondItem="ny2-np-2JO" secondAttribute="trailing" id="Ufl-wv-h4C"/>
                                             <constraint firstItem="hvf-uR-lU3" firstAttribute="leading" secondItem="Wg6-Qw-Km1" secondAttribute="leading" id="V7f-Mg-U23"/>
                                             <constraint firstItem="89g-Uy-95X" firstAttribute="leading" secondItem="ny2-np-2JO" secondAttribute="leading" id="Ve8-hK-6s8"/>
+                                            <constraint firstAttribute="trailing" secondItem="89g-Uy-95X" secondAttribute="trailing" constant="16" id="cIm-j1-4A8"/>
                                             <constraint firstItem="hvf-uR-lU3" firstAttribute="top" secondItem="89g-Uy-95X" secondAttribute="bottom" constant="16" id="mIO-9e-SoF"/>
                                             <constraint firstItem="ny2-np-2JO" firstAttribute="leading" secondItem="Wg6-Qw-Km1" secondAttribute="leading" constant="16" id="odj-LP-EBO"/>
                                             <constraint firstItem="ny2-np-2JO" firstAttribute="width" secondItem="Wg6-Qw-Km1" secondAttribute="width" multiplier="0.75" constant="1" id="q0h-xY-4OS"/>

From 5996acd3b86e33d3d2f3d6444016a236aeacbe7c Mon Sep 17 00:00:00 2001
From: Jimmy Lu <jimmy.m.lu@gmail.com>
Date: Tue, 25 Oct 2016 16:37:56 -0700
Subject: [PATCH 2/5] bumping to 1.6.0.12

---
 CHANGELOG.md                         | 6 ++++++
 Extensions/RoomConditions/Info.plist | 2 +-
 SleepModel/Sense-Info.plist          | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6afbf5c..790a8493 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.6.0.12
+
+Fixes:
+
+* Fixed layout issue with grouped sensor card in room conditions
+
 ## 1.6.0.11
 
 New:
diff --git a/Extensions/RoomConditions/Info.plist b/Extensions/RoomConditions/Info.plist
index 8ee0f894..bde354ba 100644
--- a/Extensions/RoomConditions/Info.plist
+++ b/Extensions/RoomConditions/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.6.0.11</string>
+	<string>1.6.0.12</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>
diff --git a/SleepModel/Sense-Info.plist b/SleepModel/Sense-Info.plist
index 6e513e6c..8990803e 100644
--- a/SleepModel/Sense-Info.plist
+++ b/SleepModel/Sense-Info.plist
@@ -35,7 +35,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.6.0.11</string>
+	<string>1.6.0.12</string>
 	<key>FacebookAppID</key>
 	<string>372438546161587</string>
 	<key>FacebookDisplayName</key>

From f4099cad23f5509804f55c8af98feb6e520ff319 Mon Sep 17 00:00:00 2001
From: Jimmy Lu <jimmy.m.lu@gmail.com>
Date: Wed, 26 Oct 2016 10:55:48 -0700
Subject: [PATCH 3/5] fix layout / spacing in room conditions cards for smaller
 devices

---
 SleepModel/Base.lproj/Main.storyboard | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SleepModel/Base.lproj/Main.storyboard b/SleepModel/Base.lproj/Main.storyboard
index 63cee99b..b04e0cac 100644
--- a/SleepModel/Base.lproj/Main.storyboard
+++ b/SleepModel/Base.lproj/Main.storyboard
@@ -4854,7 +4854,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="584" height="189"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SENSOR NAME" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="if8-cF-4vR">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" text="SENSOR NAME" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="if8-cF-4vR">
                                                     <rect key="frame" x="16" y="16" width="439" height="24"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="24" id="nIY-QO-4M2"/>
@@ -4942,14 +4942,14 @@
                                         </view>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
-                                            <constraint firstItem="Mfy-rk-oVb" firstAttribute="leading" secondItem="if8-cF-4vR" secondAttribute="trailing" id="1e1-AZ-dzU"/>
+                                            <constraint firstItem="if8-cF-4vR" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Mfy-rk-oVb" secondAttribute="leading" id="0it-DS-QXL"/>
                                             <constraint firstItem="HCV-Es-umV" firstAttribute="trailing" secondItem="if8-cF-4vR" secondAttribute="trailing" id="2xt-2F-YZI"/>
                                             <constraint firstItem="jBm-gD-70J" firstAttribute="top" secondItem="Mfy-rk-oVb" secondAttribute="bottom" id="4vU-ax-OjQ"/>
                                             <constraint firstAttribute="trailing" secondItem="Mfy-rk-oVb" secondAttribute="trailing" constant="16" id="9JW-wU-SE6"/>
                                             <constraint firstItem="Mfy-rk-oVb" firstAttribute="top" secondItem="zFY-vB-2Pq" secondAttribute="top" constant="16" id="D2g-5m-z0n"/>
                                             <constraint firstItem="HCV-Es-umV" firstAttribute="top" secondItem="if8-cF-4vR" secondAttribute="bottom" id="Exc-hE-ikp"/>
                                             <constraint firstItem="jBm-gD-70J" firstAttribute="trailing" secondItem="Mfy-rk-oVb" secondAttribute="trailing" id="Nsu-qJ-SfP"/>
-                                            <constraint firstItem="if8-cF-4vR" firstAttribute="width" secondItem="zFY-vB-2Pq" secondAttribute="width" multiplier="0.75" constant="1" id="RM0-Zs-P8Y"/>
+                                            <constraint firstItem="if8-cF-4vR" firstAttribute="width" secondItem="zFY-vB-2Pq" secondAttribute="width" multiplier="0.75" priority="750" constant="1" id="SOt-vl-q2i"/>
                                             <constraint firstItem="HCV-Es-umV" firstAttribute="leading" secondItem="if8-cF-4vR" secondAttribute="leading" id="b9k-gc-v7E"/>
                                             <constraint firstItem="if8-cF-4vR" firstAttribute="top" secondItem="zFY-vB-2Pq" secondAttribute="top" constant="16" id="dfD-83-Soy"/>
                                             <constraint firstAttribute="trailing" secondItem="cLU-R9-XQZ" secondAttribute="trailing" id="fxT-lL-Q4T"/>

From b32f72f8ee473eba71016334953bba2529bd2bc9 Mon Sep 17 00:00:00 2001
From: Jimmy Lu <jimmy.m.lu@gmail.com>
Date: Wed, 26 Oct 2016 10:58:33 -0700
Subject: [PATCH 4/5] bumping to 1.6.0.13

---
 CHANGELOG.md                         | 6 ++++++
 Extensions/RoomConditions/Info.plist | 2 +-
 SleepModel/Sense-Info.plist          | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 790a8493..503c13ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.6.0.13
+
+Fixes:
+
+* Fixed layout issue with sensor values on smaller devices for graph cards in room conditions
+
 ## 1.6.0.12
 
 Fixes:
diff --git a/Extensions/RoomConditions/Info.plist b/Extensions/RoomConditions/Info.plist
index bde354ba..43098d87 100644
--- a/Extensions/RoomConditions/Info.plist
+++ b/Extensions/RoomConditions/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.6.0.12</string>
+	<string>1.6.0.13</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>
diff --git a/SleepModel/Sense-Info.plist b/SleepModel/Sense-Info.plist
index 8990803e..61679a0b 100644
--- a/SleepModel/Sense-Info.plist
+++ b/SleepModel/Sense-Info.plist
@@ -35,7 +35,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.6.0.12</string>
+	<string>1.6.0.13</string>
 	<key>FacebookAppID</key>
 	<string>372438546161587</string>
 	<key>FacebookDisplayName</key>

From 1d3ab19efec3aac520de17983fdff8fe0846076d Mon Sep 17 00:00:00 2001
From: Jimmy Lu <jimmy.m.lu@gmail.com>
Date: Wed, 26 Oct 2016 11:14:50 -0700
Subject: [PATCH 5/5] removed gate to upgrade

---
 SleepModel/HEMDeviceService.m | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/SleepModel/HEMDeviceService.m b/SleepModel/HEMDeviceService.m
index 218c0d56..40395427 100644
--- a/SleepModel/HEMDeviceService.m
+++ b/SleepModel/HEMDeviceService.m
@@ -255,9 +255,6 @@ - (BOOL)isPillFirmwareUpdateAvailable {
 #pragma mark - Upgrade
 
 - (BOOL)hasHardwareUpgradeForSense {
-#if STORE
-    return NO;
-#endif
     SENSenseMetadata* sense = [[self devices] senseMetadata];
     return [sense hardwareVersion] == SENSenseHardwareOne;
 }