Merge pull request #748 from hello/develop

1.6.1 RC
hello · Nov 9, 2016 · 4022cdd · 4022cdd
2 parents ef9ce2e + 364a6c9
commit 4022cdd
Show file tree

Hide file tree

Showing 44 changed files with 389 additions and 102 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,39 @@
 # Changelog
 
+## 1.6.1.3
+
+Fixes:
+
+* Skipping the pill pairing process in the pill description screen should disconnect from Sense
+* Removed chevron in the coming soon state in expansions list
+* Removed chevron in the coming soon state in alarm edit screen
+
+## 1.6.1.2
+
+New:
+
+* Coming soon state for expansion list in settings
+* Coming soon state for Alarm expansion
+* Calibrating state in room conditions
+* Calibrating state in sensor detail
+
+Fixes:
+
+* Fix issue with app not disconnecting from Sense when skipping pill pairing during the description screen
+
+## 1.6.1.1
+
+New:
+
+* Updated copy in upgrade path to make it more explicit about new hardware
+* Updated expansions to use company name
+* Updated thermostat attribution to satisfy Nest requirements
+* Filtering out 1.0 Senses in upgrade path
+
+Fixes:
+
+* Fixes temperature symbol placement in room check
+
 ## 1.6.0.13
 
 Fixes:

diff --git a/Extensions/RoomConditions/Info.plist b/Extensions/RoomConditions/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.0</string>
+	<string>1.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.6.0.13</string>
+	<string>1.6.1.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>

diff --git a/Podfile.lock b/Podfile.lock
@@ -146,7 +146,7 @@ CHECKOUT OPTIONS:
     :commit: 0451b5e67dec46b8bc48fcad63d9f844cae1bf19
     :git: git@github.com:hello/NAPickerView.git
   SenseKit:
-    :commit: b3c69b658337fc4bee76e98193e2637dd36936dc
+    :commit: f2399ce5495321665556d68b7a6ab498108f9b99
     :git: git@github.com:hello/SenseKit.git
   SHSProtoBuf:
     :commit: 86b2e176097f76d130c858164eca42e15b779073

diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/SenseKit/Pod/Classes/Model/SENCondition.h b/Pods/SenseKit/Pod/Classes/Model/SENCondition.h
diff --git a/Pods/SenseKit/Pod/Classes/Model/SENCondition.m b/Pods/SenseKit/Pod/Classes/Model/SENCondition.m
diff --git a/Pods/SenseKit/Pod/Classes/Model/SENExpansion.h b/Pods/SenseKit/Pod/Classes/Model/SENExpansion.h
diff --git a/Pods/SenseKit/Pod/Classes/Model/SENExpansion.m b/Pods/SenseKit/Pod/Classes/Model/SENExpansion.m
diff --git a/Sense.xcodeproj/project.pbxproj b/Sense.xcodeproj/project.pbxproj
@@ -478,6 +478,7 @@
 		BFFCEFD21D00F98B00CA0E54 /* HEMWhatsNewService.m in Sources */ = {isa = PBXBuildFile; fileRef = BFFCEFD11D00F98B00CA0E54 /* HEMWhatsNewService.m */; };
 		BFFCEFD51D06116500CA0E54 /* HEMPresenter+HEMPhoto.m in Sources */ = {isa = PBXBuildFile; fileRef = BFFCEFD41D06116500CA0E54 /* HEMPresenter+HEMPhoto.m */; };
 		BFFCEFD91D074F6800CA0E54 /* HEMLocationService.m in Sources */ = {isa = PBXBuildFile; fileRef = BFFCEFD81D074F6800CA0E54 /* HEMLocationService.m */; };
+		BFFDC1071DD171BE008F001B /* Sensors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BFFDC1061DD171BE008F001B /* Sensors.xcassets */; };
 		EB784F705A26CD9F419529BF /* Pods_SenseApp_Sense.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DBFD3C7EB61BE26658C59485 /* Pods_SenseApp_Sense.framework */; };
 		EBD370F7E3364152E122EC70 /* Pods_SenseApp_RoomConditionsExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 44CBE61C47CEA05389AA4BDB /* Pods_SenseApp_RoomConditionsExtension.framework */; };
 /* End PBXBuildFile section */
@@ -1385,6 +1386,7 @@
 		BFFCEFD41D06116500CA0E54 /* HEMPresenter+HEMPhoto.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HEMPresenter+HEMPhoto.m"; sourceTree = "<group>"; };
 		BFFCEFD71D074F6800CA0E54 /* HEMLocationService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HEMLocationService.h; sourceTree = "<group>"; };
 		BFFCEFD81D074F6800CA0E54 /* HEMLocationService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HEMLocationService.m; sourceTree = "<group>"; };
+		BFFDC1061DD171BE008F001B /* Sensors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Sensors.xcassets; sourceTree = "<group>"; };
 		C97C9247C541175207F6E1DA /* Pods_SenseApp_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SenseApp_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D772BFE52D2777422290F4B9 /* Pods-SenseApp-Tests.dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SenseApp-Tests.dev.xcconfig"; path = "Pods/Target Support Files/Pods-SenseApp-Tests/Pods-SenseApp-Tests.dev.xcconfig"; sourceTree = "<group>"; };
 		DBFD3C7EB61BE26658C59485 /* Pods_SenseApp_Sense.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SenseApp_Sense.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2040,6 +2042,7 @@
 		8AC49F981982DE5E00C2BD63 /* Sensors */ = {
 			isa = PBXGroup;
 			children = (
+				BFFDC1061DD171BE008F001B /* Sensors.xcassets */,
 				BF6952601C57040B000A8E85 /* Presenters */,
 				BF287D601C9CBEE50052F543 /* Services */,
 				8A7214351A1C12E1008B59C4 /* Utilities */,
@@ -3761,6 +3764,7 @@
 				BF3583941CB443ED00760CD4 /* Sounds.xcassets in Resources */,
 				8A90F9A619630C3800AFD110 /* Localizable.strings in Resources */,
 				BF53D8CA1D931AF900C24F9D /* Info.plist in Resources */,
+				BFFDC1071DD171BE008F001B /* Sensors.xcassets in Resources */,
 				BFCB894E1BFBCAFB00A72ED3 /* AvenirNext-LightItalic.ttf in Resources */,
 				8AD331281BB08C4300DFF95A /* Drawer.xcassets in Resources */,
 				BFA540E71BCDC326007AF607 /* HEMMeetSenseView.xib in Resources */,

diff --git a/Sense.xcworkspace/xcshareddata/Sense.xcscmblueprint b/Sense.xcworkspace/xcshareddata/Sense.xcscmblueprint
@@ -9,7 +9,7 @@
   },
   "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "7A83AD29-E02E-44C9-ADA2-AB7376BB1F7C",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
-    "81ED32DD441023EF84FCAD446D46BF982022FBB6" : "suripu-ios",
+    "81ED32DD441023EF84FCAD446D46BF982022FBB6" : "suripu-ios\/",
     "124F63D97679E741A8408497CE145BBCC89F73C9" : "SenseKit\/"
   },
   "DVTSourceControlWorkspaceBlueprintNameKey" : "Sense",

diff --git a/SleepModel/Base.lproj/Localizable.strings b/SleepModel/Base.lproj/Localizable.strings
@@ -400,7 +400,8 @@
 "alarm.light.title" = "Lights";
 "alarm.light.attribution.format" = "%@ set at %@";
 "alarm.thermostat.title" = "Thermostat";
-"alarm.thermostat.attribution.format" = "%@ set at %@° - %@°";
+"alarm.thermostat.attribution.range.format" = "%@ set at %@° - %@°";
+"alarm.thermostat.attribution.format" = "%@ set at %@°";
 "alarm.expansion.error.unable.to.load.title" = "Expansion not loaded";
 "alarm.expansion.error.unable.to.load.message" = "Sense could not load expansions at this time. Please try again later.";
 
@@ -905,10 +906,10 @@
 "error.no-connection" = "Your mobile device is not connected to the internet. Check your internet connection and Wi-Fi settings, and try again.";
 
 // upgrade path
-"upgrade.button.title" = "Upgrade to Sense with Voice";
+"upgrade.button.title" = "Set up Sense with Voice";
 "upgrade.new-sense.title" = "Sense with Voice";
-"upgrade.new-sense.desc" = "The new Sense introduces improved sensors, and Voice — which lets you control Sense just by speaking to it. Purchase a Sense with Voice to upgrade.";
-"upgrade.new-sense.learn-more" = "Purchase Sense with Voice";
+"upgrade.new-sense.desc" = "The new Sense introduces improved sensors, and Voice — which lets you control Sense just by speaking to it. Buy a Sense with Voice to upgrade.";
+"upgrade.new-sense.learn-more" = "Buy Sense with Voice";
 "upgrade.new-sense.setup" = "Set up";
 "upgrade.pair-sense.title" = "Pairing your new Sense";
 "upgrade.pair-sense.desc" = "Sense should be plugged in, nearby, and glowing either blue or purple.";
@@ -939,6 +940,7 @@
 "room-conditions.pair-sense.button.title" = "Pair Sense";
 "room-conditions.pair-sense.message" = "You don't currently have a Sense paired to your account. Please pair with Sense to view current conditions.";
 "room-conditions.air-quality" = "Air quality";
+"room-conditions.status.calibrating" = "Calibrating";
 
 // sensors
 "sensor.scope.day" = "Last Day";
@@ -973,6 +975,7 @@
 "expansion.state.revoked" = "Disconnected";
 "expansion.state.connected-off" = "Disabled";
 "expansion.state.connected-on" = "Enabled";
+"expansion.state.not-available" = "Coming Soon";
 "expansion.state.not-configured" = "Configure";
 "expansion.action.permissions" = "Permissions";
 "expansion.action.enable" = "Enabled";

diff --git a/SleepModel/Base.lproj/Main.storyboard b/SleepModel/Base.lproj/Main.storyboard
@@ -3821,13 +3821,22 @@
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="zZH-FO-Vtj">
+                                                    <rect key="frame" x="260" y="11" width="80" height="80"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="80" id="3Ni-dR-5Hd"/>
+                                                        <constraint firstAttribute="height" constant="80" id="pPC-Yx-Oa8"/>
+                                                    </constraints>
+                                                </imageView>
                                             </subviews>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </view>
                                         <constraints>
                                             <constraint firstItem="C6H-EW-Ekd" firstAttribute="trailing" secondItem="1Yc-Fw-e2E" secondAttribute="trailing" id="39z-2W-YOr"/>
                                             <constraint firstItem="C6H-EW-Ekd" firstAttribute="leading" secondItem="1Yc-Fw-e2E" secondAttribute="leading" id="9D7-uI-VDY"/>
                                             <constraint firstItem="C6H-EW-Ekd" firstAttribute="top" secondItem="1Yc-Fw-e2E" secondAttribute="bottom" constant="5" id="TOP-rk-3Hp"/>
+                                            <constraint firstItem="zZH-FO-Vtj" firstAttribute="centerX" secondItem="b7a-DY-DJQ" secondAttribute="centerX" id="U63-xX-dJD"/>
+                                            <constraint firstItem="zZH-FO-Vtj" firstAttribute="bottom" secondItem="C6H-EW-Ekd" secondAttribute="top" constant="-15" id="Uej-LB-etV"/>
                                             <constraint firstItem="1Yc-Fw-e2E" firstAttribute="centerY" secondItem="b7a-DY-DJQ" secondAttribute="centerY" constant="-15" id="gaP-uv-60S"/>
                                             <constraint firstAttribute="trailing" secondItem="1Yc-Fw-e2E" secondAttribute="trailing" constant="8" id="hbz-s2-S0S"/>
                                             <constraint firstItem="1Yc-Fw-e2E" firstAttribute="leading" secondItem="b7a-DY-DJQ" secondAttribute="leading" constant="8" id="o2J-R0-nfa"/>
@@ -3836,6 +3845,7 @@
                                         <connections>
                                             <outlet property="messageLabel" destination="C6H-EW-Ekd" id="uAm-69-H8q"/>
                                             <outlet property="valueLabel" destination="1Yc-Fw-e2E" id="6cv-IE-1sc"/>
+                                            <outlet property="valueReplacementImageView" destination="zZH-FO-Vtj" id="o3T-Vx-jQA"/>
                                         </connections>
                                     </collectionViewCell>
                                     <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="chart" id="WY3-eO-8e2" customClass="HEMSensorChartCollectionViewCell">