Correct calculation of days to next birthday

Steve Trease · Steve Trease · commit b9fcc9551e7d · 2017-06-03T13:38:10.000+01:00
diff --git a/build b/build
@@ -1 +1 @@
-527
+531
diff --git a/iOS Steps Today/Info.plist b/iOS Steps Today/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>527</string>
+	<string>531</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>
diff --git a/iOS Steps Watch Extension/Info.plist b/iOS Steps Watch Extension/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>527</string>
+	<string>531</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/iOS Steps Watch/Info.plist b/iOS Steps Watch/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>527</string>
+	<string>531</string>
 	<key>UIBackgroundModes</key>
 	<array/>
 	<key>UISupportedInterfaceOrientations</key>
diff --git a/iOS Steps/BackViewController.swift b/iOS Steps/BackViewController.swift
@@ -59,7 +59,7 @@ class BackViewController: UIViewController {
             nextBirthdayLabel.isHidden = true
         } else {
             ageFormatter.allowedUnits = [.day]
-            timeToNextBirthdayDaysLabel.text = ageFormatter.string(from: Date(), to: nextBirthday)
+            timeToNextBirthdayDaysLabel.text = ageFormatter.string(from: Date(), to:  cal.date(byAdding: .day, value: 1, to: nextBirthday)!)
             nextBirthdayLabel.isHidden = false
             nextBirthdayLabel.text = dateFormatter.string(from: nextBirthday)
         }
diff --git a/iOS Steps/Base.lproj/LaunchScreen.storyboard b/iOS Steps/Base.lproj/LaunchScreen.storyboard
@@ -21,7 +21,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Build: 527 (0f3e2f0)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhA-lX-4Of" userLabel="APP_VERSION">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Build: 531 (9b51e3f)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhA-lX-4Of" userLabel="APP_VERSION">
                                 <rect key="frame" x="132.5" y="527" width="55.5" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
diff --git a/iOS Steps/Base.lproj/LaunchScreen.storyboardbak b/iOS Steps/Base.lproj/LaunchScreen.storyboardbak
@@ -21,7 +21,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Build: 526 (0f3e2f0)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhA-lX-4Of" userLabel="APP_VERSION">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Build: 530 (9b51e3f)" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yhA-lX-4Of" userLabel="APP_VERSION">
                                 <rect key="frame" x="132.5" y="527" width="55.5" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
diff --git a/iOS Steps/Info.plist b/iOS Steps/Info.plist
@@ -28,7 +28,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>527</string>
+	<string>531</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSHealthShareUsageDescription</key>

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class BackViewController: UIViewController {`
`59`	`59`	`nextBirthdayLabel.isHidden = true`
`60`	`60`	`} else {`
`61`	`61`	`ageFormatter.allowedUnits = [.day]`
`62`		`- timeToNextBirthdayDaysLabel.text = ageFormatter.string(from: Date(), to: nextBirthday)`
	`62`	`+ timeToNextBirthdayDaysLabel.text = ageFormatter.string(from: Date(), to: cal.date(byAdding: .day, value: 1, to: nextBirthday)!)`
`63`	`63`	`nextBirthdayLabel.isHidden = false`
`64`	`64`	`nextBirthdayLabel.text = dateFormatter.string(from: nextBirthday)`
`65`	`65`	`}`