Skip to content

Update Volumer.swift to fix detection bug #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WarnerBros144 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Volumer.swift to fix detection bug #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 13 additions & 25 deletions Source/Volumer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public enum Volume

private static var observer: Observer!

private static func setup()
public static func setup()
{
if self.hasSetup {
return
Expand All @@ -60,7 +60,7 @@ public enum Volume
for: .valueChanged)
}

private static func unsetup()
public static func unsetup()
{
if !self.hasSetup {
return
Expand Down Expand Up @@ -88,12 +88,7 @@ public enum Volume

@objc private class Observer: NSObject
{
private var initialValue: Float!
/*
Hacky way of preventing Volumer from firing its blocks when the MPVolumeView starts (and, for some reason, fires a .ValueChanged event twice)
Also, when moving from the background, MPVolumeView fires once more (for some reason)
*/
private var activationCount = 2
private var currentValue: Float?
private var notify = true

deinit {
Expand All @@ -104,42 +99,36 @@ public enum Volume
super.init()
NotificationCenter.default.addObserver(self,
selector: #selector(Observer.willBecomeInactive(_:)),
name: .UIApplicationWillResignActive,
name: UIApplication.willResignActiveNotification,
object: nil)
}

@objc fileprivate func sliderDidChange(_ sender: UISlider) {
activationCount -= 1
if activationCount > 0 {
if self.initialValue == nil {
self.initialValue = sender.value
}
return
}
if self.initialValue == nil {
if currentValue == nil {
currentValue = sender.value
return
}
if !notify {
notify = true
return
}
if sender.value == self.initialValue {
Volume.didChange(up: sender.value == 1.0)
} else {
Volume.didChange(up: sender.value > self.initialValue)
if sender.value == currentValue {
return
}
Volume.didChange(up: sender.value > currentValue!)
currentValue = sender.value
if Volume.keepIntact {
notify = false
sender.value = self.initialValue
sender.value = currentValue!
}
}

@objc fileprivate func willBecomeInactive(_ notification: NSNotification) {
activationCount = 1
self.initialValue = nil
currentValue = nil
}
}


private extension MPVolumeView
{
var slider: UISlider? {
Expand All @@ -153,4 +142,3 @@ private extension Bool
return self ? .up : .down
}
}