v1.1.1

ctdewaters · May 30, 2018 · 442e6ff · 442e6ff
1 parent 97e47cd
commit 442e6ff
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 77 deletions.
diff --git a/...c Memories.xcodeproj/xcuserdata/ctdewaters.xcuserdatad/xcschemes/xcschememanagement.plist b/...c Memories.xcodeproj/xcuserdata/ctdewaters.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,12 +12,12 @@
 		<key>MemoriesKit.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>11</integer>
+			<integer>12</integer>
 		</dict>
 		<key>MemoriesKit_watchOS.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>12</integer>
+			<integer>13</integer>
 		</dict>
 		<key>Music Memories (watchOS).xcscheme</key>
 		<dict>
@@ -32,7 +32,7 @@
 		<key>Music Memories-watchOS.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>13</integer>
+			<integer>1</integer>
 		</dict>
 		<key>Music Memories.xcscheme</key>
 		<dict>

diff --git a/Podfile.lock b/Podfile.lock
@@ -19,7 +19,7 @@ DEPENDENCIES:
   - "UITextView+Placeholder (~> 1.2)"
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
+  https://github.com/cocoapods/specs.git:
     - BSGridCollectionViewLayout
     - BSImagePicker
     - DeviceKit
@@ -41,4 +41,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: e59b8871a4bd02b795dda668837937d9d177f06b
 
-COCOAPODS: 1.5.0
+COCOAPODS: 1.5.3
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pods/Pods.xcodeproj/xcuserdata/ctdewaters.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/ctdewaters.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/Pods/Target Support Files/Pods-Music Memories/Pods-Music Memories-resources.sh b/Pods/Target Support Files/Pods-Music Memories/Pods-Music Memories-resources.sh
diff --git a/iOS/Home/HomeViewController.swift b/iOS/Home/HomeViewController.swift
@@ -284,7 +284,7 @@ extension HomeViewController: UIViewControllerPreviewingDelegate {
     //Peek
     func previewingContext(_ previewingContext: UIViewControllerPreviewing, viewControllerForLocation location: CGPoint) -> UIViewController? {
         //Get the index path for the cell at the passed point.
-        guard let indexPath = collectionView?.indexPathForItem(at: location) else {
+        guard let indexPath = collectionView?.indexPathForItem(at: location), indexPath.item > 0 else {
             return nil
         }
 

diff --git a/iOS/Info.plist b/iOS/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1</string>
+	<string>1.1.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/iOS/Memory View Controller/Collection View/Item Cell/MemoryItemCollectionViewCell.swift b/iOS/Memory View Controller/Collection View/Item Cell/MemoryItemCollectionViewCell.swift
@@ -192,7 +192,7 @@ class MemoryItemCollectionViewCell: UICollectionViewCell {
 
             //Set up the now playing indicator.
             self.nowPlayingIndicator = ESTMusicIndicatorView(frame: .zero)
-            self.nowPlayingIndicator?.tintColor = Settings.shared.textColor
+            self.nowPlayingIndicator?.tintColor = .themeColor
             self.nowPlayingIndicator?.sizeToFit()
             self.nowPlayingIndicator?.alpha = 0
             self.nowPlayingIndicator?.center = CGPoint(x: self.nowPlayingBlur!.frame.width / 2, y: self.nowPlayingBlur!.frame.height / 2)

diff --git a/iOS/watchOS/Music Memories-watchOS Extension/Info.plist b/iOS/watchOS/Music Memories-watchOS Extension/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1</string>
+	<string>1.1.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CLKComplicationSupportedFamilies</key>

diff --git a/iOS/watchOS/Music Memories-watchOS/Info.plist b/iOS/watchOS/Music Memories-watchOS/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1</string>
+	<string>1.1.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>UISupportedInterfaceOrientations</key>