Merge branch 'dev'

ddddxxx · Mar 17, 2020 · e909e75 · e909e75
2 parents c8fa02f + 10f04ee
commit e909e75
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/LyricsX.xcodeproj/project.pbxproj b/LyricsX.xcodeproj/project.pbxproj
@@ -1387,23 +1387,23 @@
 			repositoryURL = "https://github.com/ddddxxx/SwiftCF.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 0.1.0;
+				minimumVersion = 0.1.1;
 			};
 		};
 		BB350ABC23D0613D00500146 /* XCRemoteSwiftPackageReference "CXExtensions" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/cx-org/CXExtensions";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 0.2.0;
+				minimumVersion = 0.2.1;
 			};
 		};
 		BB9C3D8123435A5700860698 /* XCRemoteSwiftPackageReference "MusicPlayer" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/ddddxxx/MusicPlayer";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 0.6.5;
+				minimumVersion = 0.6.7;
 			};
 		};
 		BBB03F2B232FB3AF00A3879E /* XCRemoteSwiftPackageReference "GenericID" */ = {

diff --git a/LyricsX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LyricsX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/cx-org/CXExtensions",
         "state": {
           "branch": null,
-          "revision": "384ff4dc35e719d187b1bbe424c644b303d05cda",
-          "version": "0.2.0"
+          "revision": "8bb587d419d34c0e5224f5e173a12337904d7e5c",
+          "version": "0.2.1"
         }
       },
       {
@@ -51,8 +51,8 @@
         "repositoryURL": "https://github.com/ddddxxx/MusicPlayer",
         "state": {
           "branch": null,
-          "revision": "2c56ad6167ebf83dd5861249d6f4fec113e8145b",
-          "version": "0.6.5"
+          "revision": "071683a5aa023300262764c266affa2062cad9bd",
+          "version": "0.6.7"
         }
       },
       {
@@ -96,8 +96,8 @@
         "repositoryURL": "https://github.com/ddddxxx/SwiftCF.git",
         "state": {
           "branch": null,
-          "revision": "97d353849f530d6c3df47f5e429e021514edce2d",
-          "version": "0.1.0"
+          "revision": "1d0af3a0a2fce803e8f51a033847cf3c70e4e8ad",
+          "version": "0.1.1"
         }
       },
       {

diff --git a/LyricsX/Base.lproj/Preferences.storyboard b/LyricsX/Base.lproj/Preferences.storyboard
@@ -295,6 +295,7 @@
                                     </subviews>
                                     <constraints>
                                         <constraint firstItem="5xx-Ht-pau" firstAttribute="top" secondItem="r1e-Ln-LSb" secondAttribute="top" id="0Fe-gL-MER"/>
+                                        <constraint firstItem="5xx-Ht-pau" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="r1e-Ln-LSb" secondAttribute="leading" constant="8" id="1Gi-OJ-Aoz"/>
                                         <constraint firstAttribute="bottom" secondItem="5xx-Ht-pau" secondAttribute="bottom" id="MtA-FF-p49"/>
                                         <constraint firstItem="5xx-Ht-pau" firstAttribute="centerX" secondItem="r1e-Ln-LSb" secondAttribute="centerX" id="PDG-4t-SNq"/>
                                     </constraints>

diff --git a/LyricsX/Component/AppController.swift b/LyricsX/Component/AppController.swift
@@ -129,7 +129,7 @@ class AppController: NSObject {
         currentLyrics = nil
         currentLineIndex = nil
         searchCanceller?.cancel()
-        guard let track = MusicPlayers.Selected.shared.currentTrack else {
+        guard let track = selectedPlayer.currentTrack else {
             return
         }
         // FIXME: deal with optional value

diff --git a/LyricsX/Supporting Files/Info.plist b/LyricsX/Supporting Files/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.2-rc</string>
+	<string>1.5.2</string>
 	<key>CFBundleVersion</key>
-	<string>2263</string>
+	<string>2271</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>
@@ -43,7 +43,7 @@
 	<key>LSUIElement</key>
 	<true/>
 	<key>LX_BUILD_TIME</key>
-	<integer>1582947593</integer>
+	<integer>1584431808</integer>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSExceptionDomains</key>
@@ -128,7 +128,7 @@
 		</dict>
 	</dict>
 	<key>NSAppleEventsUsageDescription</key>
-	<string>LyricsX needs to know what song you're currently playing, to show lyrics accordingly.</string>
+	<string>LyricsX needs to know what song you&apos;re currently playing, to show lyrics accordingly.</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2017-2020 Xander Deng. All rights reserved.</string>
 	<key>NSMainStoryboardFile</key>

diff --git a/LyricsX/View/KaraokeLabel.swift b/LyricsX/View/KaraokeLabel.swift
@@ -94,7 +94,7 @@ class KaraokeLabel: NSTextField {
         }
         layoutSubtreeIfNeeded()
         let progression: CTFrameProgression = isVertical ? .rightToLeft : .topToBottom
-        let frameAttr: [CTFrame.AttributeKey: Any] = [.progression: progression]
+        let frameAttr: [CTFrame.AttributeKey: Any] = [.progression: progression.rawValue as NSNumber]
         let framesetter = CTFramesetter.create(attributedString: attrString)
         let (suggestSize, fitRange) = framesetter.suggestFrameSize(constraints: bounds.size, frameAttributes: frameAttr)
         let path = CGPath(rect: CGRect(origin: .zero, size: suggestSize), transform: nil)
@@ -105,7 +105,7 @@ class KaraokeLabel: NSTextField {
 
     override var intrinsicContentSize: NSSize {
         let progression: CTFrameProgression = isVertical ? .rightToLeft : .topToBottom
-        let frameAttr: [CTFrame.AttributeKey: Any] = [.progression: progression]
+        let frameAttr: [CTFrame.AttributeKey: Any] = [.progression: progression.rawValue as NSNumber]
         let framesetter = CTFramesetter.create(attributedString: attrString)
         let constraints = CGSize(width: CGFloat.infinity, height: .infinity)
         return framesetter.suggestFrameSize(constraints: constraints, frameAttributes: frameAttr).size