audio fixes

sh-khashimov · Nov 12, 2020 · 7cd965b · 7cd965b
1 parent eeb446e
commit 7cd965b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 48 deletions.
diff --git a/...S/SwiftFortuneWheelDemo-iOS/ViewControllers/SoundExample/SoundExampleViewController.swift b/...S/SwiftFortuneWheelDemo-iOS/ViewControllers/SoundExample/SoundExampleViewController.swift
@@ -62,14 +62,16 @@ class SoundExampleViewController: UIViewController {
     }
 
     func rotate() {
-        fortuneWheel.startRotationAnimation(finishIndex: 0, continuousRotationTime: 5, nil)
+        fortuneWheel.startRotationAnimation(finishIndex: 0, continuousRotationTime: 2, nil)
     }
 
     @IBAction func impactFeedbackValueChanged(_ sender: UISwitch) {
         fortuneWheel.impactFeedbackOn = impactFeedbackSwitch.isOn
     }
 
     @IBAction func soundEffectTypeValueChanged(_ sender: UISegmentedControl) {
+        fortuneWheel.stopRotation()
+
         fortuneWheel.edgeCollisionDetectionOn = soundEffectTypeSegmentedControl.selectedSegmentIndex == 0
 
         fortuneWheel.centerCollisionDetectionOn = soundEffectTypeSegmentedControl.selectedSegmentIndex == 1

diff --git a/Sources/SwiftFortuneWheel/SwiftFortuneWheel.swift b/Sources/SwiftFortuneWheel/SwiftFortuneWheel.swift
@@ -103,7 +103,7 @@ public class SwiftFortuneWheel: SFWControl {
     private(set) lazy var audioPlayerManager = AudioPlayerManager()
 
     #if os(iOS)
-    @available(iOSApplicationExtension 10.0, *)
+    @available(iOS 10.0, iOSApplicationExtension 10.0, *)
     private(set) lazy var impactFeedbackgenerator = UIImpactFeedbackGenerator(style: .light)
     #endif
 

diff --git a/Sources/SwiftFortuneWheel/Utils/Audio/AudioPlayer.swift b/Sources/SwiftFortuneWheel/Utils/Audio/AudioPlayer.swift
@@ -19,7 +19,7 @@ class AudioPlayer {
     ///   - file: Audio file that will be played
     ///   - identifier: Sound identifier which is will start to play
     func play(_ file: AVAudioFile, identifier: SoundIdentifier) {
-        if #available(iOSApplicationExtension 11.0, OSXApplicationExtension 10.13, tvOSApplicationExtension 11.0, *) {
+        if #available(iOS 11.0, iOSApplicationExtension 11.0, OSX 10.13, OSXApplicationExtension 10.13, tvOS 11.0, tvOSApplicationExtension 11.0, *) {
             node.scheduleFile(file, at: nil, completionCallbackType: .dataPlayedBack) {
                 [weak self] callbackType in
                 self?.didCompletePlayback(for: identifier)

diff --git a/Sources/SwiftFortuneWheel/Utils/Audio/ImpactFeedbackable.swift b/Sources/SwiftFortuneWheel/Utils/Audio/ImpactFeedbackable.swift
@@ -17,7 +17,7 @@ import UIKit
 #if os(iOS)
 /// The protocol that adds support for the impact feedback
 protocol ImpactFeedbackable {
-    @available(iOSApplicationExtension 10.0, *)
+    @available(iOS 10.0, iOSApplicationExtension 10.0, *)
     /// Use impact feedback to indicate that an impact has occurred
     var impactFeedbackgenerator: UIImpactFeedbackGenerator { get }
     /// Impact feedback on or off
@@ -27,7 +27,7 @@ protocol ImpactFeedbackable {
 extension ImpactFeedbackable {
     /// Prepare impact feedback if needed
     func prepareImpactFeedbackIfNeeded() {
-        if #available(iOSApplicationExtension 10.0, *) {
+        if #available(iOS 10.0, iOSApplicationExtension 10.0, *) {
             guard impactFeedbackOn == true else { return }
             impactFeedbackgenerator.prepare()
         } else {
@@ -37,7 +37,7 @@ extension ImpactFeedbackable {
 
     /// Generates impact feedback
     func impactFeedback() {
-        if #available(iOSApplicationExtension 10.0, *) {
+        if #available(iOS 10.0, iOSApplicationExtension 10.0, *) {
             if impactFeedbackOn {
                 impactFeedbackgenerator.impactOccurred()
             }

diff --git a/Sources/SwiftFortuneWheel/Utils/Audio/ImpactFeedbacking.swift b/Sources/SwiftFortuneWheel/Utils/Audio/ImpactFeedbacking.swift