diff --git a/BookPlayer/Extensions/UIView+BookPlayer.swift b/BookPlayer/Extensions/UIView+BookPlayer.swift index 01bf5831f..cd60fdb4b 100644 --- a/BookPlayer/Extensions/UIView+BookPlayer.swift +++ b/BookPlayer/Extensions/UIView+BookPlayer.swift @@ -29,13 +29,14 @@ extension UIView { self.layer.anchorPoint = anchorPoint } - func addLayerMask(_ name: String, backgroundColor: UIColor) { + func addLayerMask(_ name: String, backgroundColor: UIColor, opacity: Float = 1.0) { guard let image = UIImage(named: name), let maskImage = image.cgImage else { return } let layer = CALayer() layer.frame = self.bounds layer.backgroundColor = backgroundColor.cgColor + layer.opacity = opacity let mask = CALayer(layer: maskImage) mask.frame = self.bounds diff --git a/BookPlayer/Info.plist b/BookPlayer/Info.plist index dc108acf3..f66d380fb 100644 --- a/BookPlayer/Info.plist +++ b/BookPlayer/Info.plist @@ -25,6 +25,8 @@ CFBundleTypeName Audiobook Archive + LSHandlerRank + Default LSItemContentTypes com.pkware.zip-archive @@ -187,7 +189,7 @@ CFBundleVersion - 1 + 3 LSRequiresIPhoneOS LSSupportsOpeningDocumentsInPlace diff --git a/BookPlayer/Player/Containers/PlayerControlsViewController.swift b/BookPlayer/Player/Containers/PlayerControlsViewController.swift index af1e2617b..f49e16e0a 100644 --- a/BookPlayer/Player/Containers/PlayerControlsViewController.swift +++ b/BookPlayer/Player/Containers/PlayerControlsViewController.swift @@ -283,7 +283,6 @@ extension PlayerControlsViewController: Themeable { self.progressSlider.maximumTrackTintColor = theme.lightHighlightColor self.artworkControl.iconColor = .white - self.artworkControl.borderColor = theme.highlightColor self.currentTimeLabel.textColor = theme.primaryColor self.maxTimeButton.setTitleColor(theme.primaryColor, for: .normal) diff --git a/BookPlayer/Player/Views/ArtworkControl.swift b/BookPlayer/Player/Views/ArtworkControl.swift index 2111f4ca3..a5c02dd5d 100644 --- a/BookPlayer/Player/Views/ArtworkControl.swift +++ b/BookPlayer/Player/Views/ArtworkControl.swift @@ -42,16 +42,6 @@ class ArtworkControl: UIView, UIGestureRecognizerDelegate { } } - var borderColor: UIColor { - get { - return UIColor(cgColor: self.artworkImage.layer.borderColor!) - } - - set { - self.artworkImage.layer.borderColor = newValue.withAlphaComponent(0.2).cgColor - } - } - var artwork: UIImage? { get { return self.artworkImage.image @@ -138,6 +128,7 @@ class ArtworkControl: UIView, UIGestureRecognizerDelegate { self.artworkImage.contentMode = .scaleAspectFit self.artworkImage.layer.cornerRadius = 6.0 self.artworkImage.layer.masksToBounds = true + self.artworkImage.layer.borderColor = UIColor.clear.cgColor self.artworkOverlay.clipsToBounds = false self.artworkOverlay.contentMode = .scaleAspectFit diff --git a/BookPlayer/Player/Views/PlayerJumpIcon.swift b/BookPlayer/Player/Views/PlayerJumpIcon.swift index 2f7a31786..983de91b0 100644 --- a/BookPlayer/Player/Views/PlayerJumpIcon.swift +++ b/BookPlayer/Player/Views/PlayerJumpIcon.swift @@ -78,7 +78,7 @@ class PlayerJumpIconForward: PlayerJumpIcon { override func setup() { super.setup() - self.backgroundImageView.addLayerMask("playerIconShadow", backgroundColor: .playerControlsShadowColor) + self.backgroundImageView.addLayerMask("playerIconShadow", backgroundColor: .playerControlsShadowColor, opacity: 0.5) self.backgroundImageView.addLayerMask("playerIconForwardArrowShadow", backgroundColor: .black) self.backgroundImageView.addLayerMask("playerIconForward", backgroundColor: .white) self.title = "+\(Int(PlayerManager.shared.forwardInterval.rounded()))s" @@ -98,7 +98,7 @@ class PlayerJumpIconRewind: PlayerJumpIcon { override func setup() { super.setup() - self.backgroundImageView.addLayerMask("playerIconShadow", backgroundColor: .playerControlsShadowColor) + self.backgroundImageView.addLayerMask("playerIconShadow", backgroundColor: .playerControlsShadowColor, opacity: 0.5) self.backgroundImageView.addLayerMask("playerIconRewindArrowShadow", backgroundColor: .black) self.backgroundImageView.addLayerMask("playerIconRewind", backgroundColor: .white) self.title = "−\(Int(PlayerManager.shared.rewindInterval.rounded()))s" diff --git a/BookPlayerWatch Extension/Info.plist b/BookPlayerWatch Extension/Info.plist index 84b808d07..466479645 100644 --- a/BookPlayerWatch Extension/Info.plist +++ b/BookPlayerWatch Extension/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 3.3.1 + 3.4.0 CFBundleVersion - 2 + 3 CLKComplicationPrincipalClass $(PRODUCT_MODULE_NAME).ComplicationController CLKComplicationSupportedFamilies diff --git a/BookPlayerWatch/Info.plist b/BookPlayerWatch/Info.plist index a0eacbbb8..6e985ccc1 100644 --- a/BookPlayerWatch/Info.plist +++ b/BookPlayerWatch/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 3.4.0 CFBundleVersion - 1 + 3 UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/BookPlayerWidget/Info.plist b/BookPlayerWidget/Info.plist index 053ddcb58..c7f635a2a 100644 --- a/BookPlayerWidget/Info.plist +++ b/BookPlayerWidget/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.0 + 3.4.0 CFBundleVersion - 1 + 3 NSExtension NSExtensionMainStoryboard