rename haptic classes, no change in functionality

pull/2/head
Michael Kirk 6 years ago
parent 7d72244315
commit 6ccd73837c

@ -1,24 +1,37 @@
// //
// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // Copyright (c) 2019 Open Whisper Systems. All rights reserved.
// //
import Foundation import Foundation
protocol HapticAdapter { protocol SelectionHapticFeedbackAdapter {
func selectionChanged() func selectionChanged()
} }
class LegacyHapticAdapter: NSObject, HapticAdapter { class SelectionHapticFeedback: SelectionHapticFeedbackAdapter {
let adapter: SelectionHapticFeedbackAdapter
// MARK: HapticAdapter init() {
if #available(iOS 10, *) {
adapter = ModernSelectionHapticFeedbackAdapter()
} else {
adapter = LegacySelectionHapticFeedbackAdapter()
}
}
func selectionChanged() {
adapter.selectionChanged()
}
}
class LegacySelectionHapticFeedbackAdapter: NSObject, SelectionHapticFeedbackAdapter {
func selectionChanged() { func selectionChanged() {
// do nothing // do nothing
} }
} }
@available(iOS 10, *) @available(iOS 10, *)
class FeedbackGeneratorHapticAdapter: NSObject, HapticAdapter { class ModernSelectionHapticFeedbackAdapter: NSObject, SelectionHapticFeedbackAdapter {
let selectionFeedbackGenerator: UISelectionFeedbackGenerator let selectionFeedbackGenerator: UISelectionFeedbackGenerator
override init() { override init() {
@ -33,19 +46,3 @@ class FeedbackGeneratorHapticAdapter: NSObject, HapticAdapter {
selectionFeedbackGenerator.prepare() selectionFeedbackGenerator.prepare()
} }
} }
class HapticFeedback: HapticAdapter {
let adapter: HapticAdapter
init() {
if #available(iOS 10, *) {
adapter = FeedbackGeneratorHapticAdapter()
} else {
adapter = LegacyHapticAdapter()
}
}
func selectionChanged() {
adapter.selectionChanged()
}
}

@ -245,7 +245,7 @@ class MenuActionSheetView: UIView, MenuActionViewDelegate {
private let actionStackView: UIStackView private let actionStackView: UIStackView
private var actions: [MenuAction] private var actions: [MenuAction]
private var actionViews: [MenuActionView] private var actionViews: [MenuActionView]
private var hapticFeedback: HapticFeedback private var hapticFeedback: SelectionHapticFeedback
private var hasEverHighlightedAction = false private var hasEverHighlightedAction = false
weak var delegate: MenuActionSheetDelegate? weak var delegate: MenuActionSheetDelegate?
@ -268,7 +268,7 @@ class MenuActionSheetView: UIView, MenuActionViewDelegate {
actions = [] actions = []
actionViews = [] actionViews = []
hapticFeedback = HapticFeedback() hapticFeedback = SelectionHapticFeedback()
super.init(frame: frame) super.init(frame: frame)

Loading…
Cancel
Save