mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-12-23 07:36:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up HapticManager (#678)

Browse source 
* Check for haptic capabilities

* Make manager do most of work

* ABC enum

* Fix spelling 😊

* Small tweak
This commit is contained in:
Sean Goldin 2023-02-06 10:53:27 -06:00 committed by GitHub
parent 2f5e170983
commit 90ec3d419c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 60 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
IceCubesApp/App/IceCubesApp.swift
View file

@ -140,9 +140,7 @@ struct IceCubesApp: App {
}
}
selectedTab = newTab
if userPreferences.hapticTabSelectionEnabled {
HapticManager.shared.selectionChanged()
}
HapticManager.shared.fireHaptic(of: .tabSelection)
})) {
ForEach(availableTabs) { tab in
tab.makeContentView(popToRootTab: $popToRootTab)

8
IceCubesApp/App/Tabs/Settings/SettingsTab.swift
View file

@ -102,9 +102,11 @@ struct SettingsTabs: View {
NavigationLink(destination: DisplaySettingsView()) {
Label("settings.general.display", systemImage: "paintpalette")
}
NavigationLink(destination: HapticSettingsView()) {
Label("settings.general.haptic", systemImage: "waveform.path")
}
if HapticManager.shared.supportsHaptics {
NavigationLink(destination: HapticSettingsView()) {
Label("settings.general.haptic", systemImage: "waveform.path")
}
}
NavigationLink(destination: remoteLocalTimelinesView) {
Label("settings.general.remote-timelines", systemImage: "dot.radiowaves.right")
}

16
Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift
View file

@ -38,9 +38,7 @@ public struct AppAccountsSelectorView: View {
}
}
.onTapGesture {
if UserPreferences.shared.hapticButtonPressEnabled {
HapticManager.shared.impact()
}
HapticManager.shared.fireHaptic(of: .buttonPress)
}
.onAppear {
refreshAccounts()
@ -80,9 +78,7 @@ public struct AppAccountsSelectorView: View {
appAccounts.currentAccount = viewModel.appAccount
}
if UserPreferences.shared.hapticButtonPressEnabled {
HapticManager.shared.impact()
}
HapticManager.shared.fireHaptic(of: .buttonPress)
} label: {
HStack {
if viewModel.account?.id == currentAccount.account?.id {
@ -96,9 +92,7 @@ public struct AppAccountsSelectorView: View {
if accountCreationEnabled {
Divider()
Button {
if UserPreferences.shared.hapticButtonPressEnabled {
HapticManager.shared.impact()
}
HapticManager.shared.fireHaptic(of: .buttonPress)
routerPath.presentedSheet = .addAccount
} label: {
Label("app-account.button.add", systemImage: "person.badge.plus")
@ -108,9 +102,7 @@ public struct AppAccountsSelectorView: View {
if UIDevice.current.userInterfaceIdiom == .phone {
Divider()
Button {
if UserPreferences.shared.hapticButtonPressEnabled {
HapticManager.shared.impact()
}
HapticManager.shared.fireHaptic(of: .buttonPress)
routerPath.presentedSheet = .settings
} label: {
Label("tab.settings", systemImage: "gear")

8
Packages/DesignSystem/Sources/DesignSystem/Views/StatusEditorToolbarItem.swift
View file

@ -8,9 +8,7 @@ public extension View {
ToolbarItem(placement: .navigationBarTrailing) {
Button {
routerPath.presentedSheet = .newStatusEditor(visibility: visibility)
if UserPreferences.shared.hapticButtonPressEnabled {
HapticManager.shared.impact()
}
HapticManager.shared.fireHaptic(of: .buttonPress)
} label: {
Image(systemName: "square.and.pencil")
}
@ -31,9 +29,7 @@ public struct StatusEditorToolbarItem: ToolbarContent {
ToolbarItem(placement: .navigationBarTrailing) {
Button {
routerPath.presentedSheet = .newStatusEditor(visibility: visibility)
if UserPreferences.shared.hapticButtonPressEnabled {
HapticManager.shared.impact()
}
HapticManager.shared.fireHaptic(of: .buttonPress)
} label: {
Image(systemName: "square.and.pencil")
}

51
Packages/Env/Sources/Env/HapticManager.swift
View file

@ -1,30 +1,57 @@
import CoreHaptics
import UIKit
public class HapticManager {
public static let shared: HapticManager = .init()
public enum HapticType {
case buttonPress
case dataRefresh(intensity: CGFloat)
case notification(_ type: UINotificationFeedbackGenerator.FeedbackType)
case tabSelection
case timeline
}
private let selectionGenerator = UISelectionFeedbackGenerator()
private let impactGenerator = UIImpactFeedbackGenerator(style: .heavy)
private let notificationGenerator = UINotificationFeedbackGenerator()
private let userPreferences = UserPreferences.shared
private init() {
selectionGenerator.prepare()
impactGenerator.prepare()
}
public func selectionChanged() {
selectionGenerator.selectionChanged()
@MainActor
public func fireHaptic(of type: HapticType) {
guard supportsHaptics else { return }
switch type {
case .buttonPress:
if userPreferences.hapticButtonPressEnabled {
impactGenerator.impactOccurred()
}
case let .dataRefresh(intensity):
if userPreferences.hapticTimelineEnabled {
impactGenerator.impactOccurred(intensity: intensity)
}
case let .notification(type):
if userPreferences.hapticButtonPressEnabled {
notificationGenerator.notificationOccurred(type)
}
case .tabSelection:
if userPreferences.hapticTabSelectionEnabled {
selectionGenerator.selectionChanged()
}
case .timeline:
if userPreferences.hapticTimelineEnabled {
selectionGenerator.selectionChanged()
}
}
}
public func impact() {
impactGenerator.impactOccurred()
}
public func impact(intensity: CGFloat) {
impactGenerator.impactOccurred(intensity: intensity)
}
public func notification(type: UINotificationFeedbackGenerator.FeedbackType) {
notificationGenerator.notificationOccurred(type)
public var supportsHaptics: Bool {
CHHapticEngine.capabilitiesForHardware().supportsHaptics
}
}

8
Packages/Status/Sources/Status/Editor/StatusEditorViewModel.swift
View file

@ -174,9 +174,7 @@ public class StatusEditorViewModel: ObservableObject {
case let .edit(status):
postStatus = try await client.put(endpoint: Statuses.editStatus(id: status.id, json: data))
}
if UserPreferences.shared.hapticButtonPressEnabled {
HapticManager.shared.notification(type: .success)
}
HapticManager.shared.fireHaptic(of: .notification(.success))
if hasExplicitlySelectedLanguage, let selectedLanguage {
preferences?.markLanguageAsSelected(isoCode: selectedLanguage)
}
@ -188,9 +186,7 @@ public class StatusEditorViewModel: ObservableObject {
showPostingErrorAlert = true
}
isPosting = false
if UserPreferences.shared.hapticButtonPressEnabled {
HapticManager.shared.notification(type: .error)
}
HapticManager.shared.fireHaptic(of: .notification(.error))
return nil
}
}

4
Packages/Status/Sources/Status/Row/StatusActionsView.swift
View file

@ -179,9 +179,7 @@ struct StatusActionsView: View {
private func handleAction(action: Actions) {
Task {
if UserPreferences.shared.hapticButtonPressEnabled {
HapticManager.shared.notification(type: .success)
}
HapticManager.shared.fireHaptic(of: .notification(.success))
switch action {
case .respond:
routerPath.presentedSheet = .replyToStatusEditor(status: viewModel.status)

12
Packages/Status/Sources/Status/Row/StatusRowView.swift
View file

@ -425,9 +425,7 @@ public struct StatusRowView: View {
private var trailinSwipeActions: some View {
Button {
Task {
if UserPreferences.shared.hapticButtonPressEnabled {
HapticManager.shared.notification(type: .success)
}
HapticManager.shared.fireHaptic(of: .notification(.success))
if viewModel.isFavorited {
await viewModel.unFavorite()
} else {
@ -440,9 +438,7 @@ public struct StatusRowView: View {
.tint(.yellow)
Button {
Task {
if UserPreferences.shared.hapticButtonPressEnabled {
HapticManager.shared.notification(type: .success)
}
HapticManager.shared.fireHaptic(of: .notification(.success))
if viewModel.isReblogged {
await viewModel.unReblog()
} else {
@ -458,9 +454,7 @@ public struct StatusRowView: View {
@ViewBuilder
private var leadingSwipeActions: some View {
Button {
if UserPreferences.shared.hapticButtonPressEnabled {
HapticManager.shared.notification(type: .success)
}
HapticManager.shared.fireHaptic(of: .notification(.success))
routerPath.presentedSheet = .replyToStatusEditor(status: viewModel.status)
} label: {
Image(systemName: "arrowshape.turn.up.left")

4
Packages/Timeline/Sources/Timeline/PendingStatusesObserver.swift
View file

@ -19,9 +19,7 @@ class PendingStatusesObserver: ObservableObject {
func removeStatus(status: Status) {
if !disableUpdate, let index = pendingStatuses.firstIndex(of: status.id) {
pendingStatuses.removeSubrange(index ... (pendingStatuses.count - 1))
if UserPreferences.shared.hapticTimelineEnabled {
HapticManager.shared.selectionChanged()
}
HapticManager.shared.fireHaptic(of: .timeline)
}
}

8
Packages/Timeline/Sources/Timeline/TimelineView.swift
View file

@ -112,13 +112,9 @@ public struct TimelineView: View {
viewModel.isTimelineVisible = false
}
.refreshable {
if UserPreferences.shared.hapticTimelineEnabled {
HapticManager.shared.impact(intensity: 0.3)
}
HapticManager.shared.fireHaptic(of: .dataRefresh(intensity: 0.3))
await viewModel.fetchStatuses()
if UserPreferences.shared.hapticTimelineEnabled {
HapticManager.shared.impact(intensity: 0.7)
}
HapticManager.shared.fireHaptic(of: .dataRefresh(intensity: 0.7))
}
.onChange(of: watcher.latestEvent?.id) { _ in
if let latestEvent = watcher.latestEvent {