Clean up HapticManager (#678)

* Check for haptic capabilities

* Make manager do most of work

* ABC enum

* Fix spelling 😊

* Small tweak

IceCubesApp/App/IceCubesApp.swift

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

IceCubesApp/App/Tabs/Settings/SettingsTab.swift

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

Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift

@@ -38,9 +38,7 @@ public struct AppAccountsSelectorView: View {
       }
     }
     .onTapGesture {
-      if UserPreferences.shared.hapticButtonPressEnabled {
+      HapticManager.shared.fireHaptic(of: .buttonPress)
-        HapticManager.shared.impact()
-      }
     }
     .onAppear {
       refreshAccounts()
@@ -80,9 +78,7 @@ public struct AppAccountsSelectorView: View {
             appAccounts.currentAccount = viewModel.appAccount
           }
 
-          if UserPreferences.shared.hapticButtonPressEnabled {
+          HapticManager.shared.fireHaptic(of: .buttonPress)
-            HapticManager.shared.impact()
-          }
         } 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.fireHaptic(of: .buttonPress)
-          HapticManager.shared.impact()
-        }
         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.fireHaptic(of: .buttonPress)
-          HapticManager.shared.impact()
-        }
         routerPath.presentedSheet = .settings
       } label: {
         Label("tab.settings", systemImage: "gear")

Packages/DesignSystem/Sources/DesignSystem/Views/StatusEditorToolbarItem.swift

@@ -8,9 +8,7 @@ public extension View {
     ToolbarItem(placement: .navigationBarTrailing) {
       Button {
         routerPath.presentedSheet = .newStatusEditor(visibility: visibility)
-        if UserPreferences.shared.hapticButtonPressEnabled {
+        HapticManager.shared.fireHaptic(of: .buttonPress)
-          HapticManager.shared.impact()
-        }
       } 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.fireHaptic(of: .buttonPress)
-          HapticManager.shared.impact()
-        }
       } label: {
         Image(systemName: "square.and.pencil")
       }

Packages/Env/Sources/Env/HapticManager.swift

@@ -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() {
+  @MainActor
-    selectionGenerator.selectionChanged()
+  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() {
+  public var supportsHaptics: Bool {
-    impactGenerator.impactOccurred()
+    CHHapticEngine.capabilitiesForHardware().supportsHaptics
-  }
-
-  public func impact(intensity: CGFloat) {
-    impactGenerator.impactOccurred(intensity: intensity)
-  }
-
-  public func notification(type: UINotificationFeedbackGenerator.FeedbackType) {
-    notificationGenerator.notificationOccurred(type)
   }
 }

Packages/Status/Sources/Status/Editor/StatusEditorViewModel.swift

@@ -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.fireHaptic(of: .notification(.success))
-        HapticManager.shared.notification(type: .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.fireHaptic(of: .notification(.error))
-        HapticManager.shared.notification(type: .error)
-      }
       return nil
     }
   }

Packages/Status/Sources/Status/Row/StatusActionsView.swift

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

Packages/Status/Sources/Status/Row/StatusRowView.swift

@@ -425,9 +425,7 @@ public struct StatusRowView: View {
   private var trailinSwipeActions: some View {
     Button {
       Task {
-        if UserPreferences.shared.hapticButtonPressEnabled {
+        HapticManager.shared.fireHaptic(of: .notification(.success))
-          HapticManager.shared.notification(type: .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.fireHaptic(of: .notification(.success))
-          HapticManager.shared.notification(type: .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.fireHaptic(of: .notification(.success))
-        HapticManager.shared.notification(type: .success)
-      }
       routerPath.presentedSheet = .replyToStatusEditor(status: viewModel.status)
     } label: {
       Image(systemName: "arrowshape.turn.up.left")

Packages/Timeline/Sources/Timeline/PendingStatusesObserver.swift

@@ -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.fireHaptic(of: .timeline)
-        HapticManager.shared.selectionChanged()
-      }
     }
   }
 

Packages/Timeline/Sources/Timeline/TimelineView.swift

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