* Fix height of settings view upgrade text in iOS 8.4

* Fix bug when returning to Grid View from settings view when no photos are available for the date. * Bump version to 1.1.2, build to 17 for App Store.
mluisbrown · Apr 28, 2016 · a891f39 · a891f39
1 parent c1491fd
commit a891f39
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/Memories/Grid View/GridViewController.swift b/Memories/Grid View/GridViewController.swift
@@ -151,6 +151,8 @@ class GridViewController: UICollectionViewController, UICollectionViewDelegateFl
     override func viewDidAppear(animated: Bool) {
         super.viewDidAppear(animated)
         updateCachedAssets()
+
+        guard noPhotosLabel.text == nil else { return }
         showHideNoPhotosLabel(NSLocalizedString("Loading...", comment: ""))
     }
 

diff --git a/Memories/Settings/SettingsViewController.swift b/Memories/Settings/SettingsViewController.swift
@@ -140,7 +140,7 @@ class SettingsViewController: UITableViewController, MFMailComposeViewController
             break
         case upgradeIndexPath:
             let attributedString = NSAttributedString(string: upgradeLabel.text!, attributes: [NSFontAttributeName : UIFont.systemFontOfSize(14)])
-            let rect = attributedString.boundingRectWithSize(CGSizeMake(upgradeCell.frame.width - 32, CGFloat.max)
+            let rect = attributedString.boundingRectWithSize(CGSize(width: tableView.bounds.width - 32, height: CGFloat.max)
                 , options: [.UsesLineFragmentOrigin, .UsesFontLeading]
                 , context: nil)
 

diff --git a/Memories/Supporting Files/Info.plist b/Memories/Supporting Files/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>16</string>
+	<string>17</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>itms-apps</string>

diff --git a/Photo Widget/Info.plist b/Photo Widget/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>16</string>
+	<string>17</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>