Refactor voice messages touch interaction (#1970)

* Remove enable/disable long press actions * Working poc * Refactor interaction in VoiceMessageRoomPlaybackView * Cleanup DateFormatter * Fix VoiceMessagePreviewComposer * Cleanup * Delete WaveformViewDragState * Refactor WaveformCursorView * Cleanup * Add WaveformInteractionModifier * Add selection hapitc feedback * Fix ComposerToolbar ZStack alignment * Refine cursor size * Remove haptic feedback * Fix preview test * Delete longPressDisabledItemID * Remove progress animation * Project file
2026-11-03 06:55:59 +00:00 · 2023-10-27 12:08:30 +02:00
parent 11563c6297
commit adfe855b99
15 changed files with 118 additions and 229 deletions
@@ -0,0 +1,65 @@
+//
+// Copyright 2023 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import SwiftUI
+
+extension View {
+    func waveformInteraction(isDragging: GestureState<Bool>, progress: Double, showCursor: Bool, onSeek: @escaping (Double) -> Void) -> some View {
+        modifier(WaveformInteractionModifier(isDragging: isDragging, progress: progress, showCursor: showCursor, onSeek: onSeek))
+    }
+}
+
+private struct WaveformInteractionModifier: ViewModifier {
+    let isDragging: GestureState<Bool>
+    let progress: Double
+    let showCursor: Bool
+    let onSeek: (Double) -> Void
+
+    @ScaledMetric private var cursorVisibleWidth = 2.0
+    @ScaledMetric private var cursorVisibleHeight = 24.0
+    private let cursorInteractiveSize: CGFloat = 50
+
+    func body(content: Content) -> some View {
+        GeometryReader { geometry in
+            content
+                .gesture(SpatialTapGesture()
+                    .onEnded { tapGesture in
+                        let progress = tapGesture.location.x / geometry.size.width
+                        onSeek(max(0, min(progress, 1.0)))
+                    })
+                .progressCursor(progress: progress) {
+                    WaveformCursorView(color: .compound.iconAccentTertiary)
+                        .frame(width: cursorVisibleWidth, height: cursorVisibleHeight)
+                        .opacity(showCursor ? 1 : 0)
+                        .frame(width: cursorInteractiveSize)
+                        .frame(maxHeight: cursorInteractiveSize)
+                        .contentShape(Rectangle())
+                        .gesture(DragGesture(coordinateSpace: .named(Self.namespaceName))
+                            .updating(isDragging) { dragGesture, isDragging, _ in
+                                isDragging = true
+                                let progress = dragGesture.location.x / geometry.size.width
+                                onSeek(max(0, min(progress, 1.0)))
+                            }
+                        )
+                        .offset(x: -cursorInteractiveSize / 2, y: 0)
+                }
+        }
+        .coordinateSpace(name: Self.namespaceName)
+        .animation(nil, value: progress)
+    }
+
+    private static let namespaceName = "voice-message-waveform"
+}
@@ -1,98 +0,0 @@
-//
-// Copyright 2023 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import DSWaveformImageViews
-import Foundation
-import SwiftUI
-
-struct WaveformViewDragGestureModifier: ViewModifier {
-    @GestureState private var dragGestureState = WaveformViewDragState.inactive
-    @Binding var dragState: WaveformViewDragState
-    
-    let minimumDragDistance: Double
-    
-    func body(content: Content) -> some View {
-        GeometryReader { geometry in
-            content
-                .gesture(SpatialTapGesture()
-                    .simultaneously(with: LongPressGesture())
-                    .sequenced(before: DragGesture(minimumDistance: minimumDragDistance, coordinateSpace: .local))
-                    .updating($dragGestureState) { value, state, _ in
-                        switch value {
-                        // (SpatialTap, LongPress) begins.
-                        case .first(let spatialLongPress):
-                            // Compute the progress with the spatialTap location
-                            let progress = (spatialLongPress.first?.location ?? .zero).x / geometry.size.width
-                            state = .pressing(progress: progress)
-                        // Long press confirmed, dragging may begin.
-                        case .second(let spatialLongPress, let drag) where spatialLongPress.second ?? false:
-                            var progress: Double = dragState.progress
-                            // Compute the progress with drag location
-                            if let location = drag?.location {
-                                progress = location.x / geometry.size.width
-                            }
-                            state = .dragging(progress: progress)
-                        // Dragging ended or the long press cancelled.
-                        default:
-                            state = .inactive
-                        }
-                    })
-        }
-        .onChange(of: dragGestureState) { value in
-            dragState = value
-        }
-    }
-}
-
-extension View {
-    func waveformDragGesture(_ dragState: Binding<WaveformViewDragState>, minimumDragDistance: Double = 0) -> some View {
-        modifier(WaveformViewDragGestureModifier(dragState: dragState,
-                                                 minimumDragDistance: minimumDragDistance))
-    }
-}
-
-enum WaveformViewDragState: Equatable {
-    case inactive
-    case pressing(progress: Double)
-    case dragging(progress: Double)
-    
-    var progress: Double {
-        switch self {
-        case .inactive:
-            return .zero
-        case .pressing(let progress), .dragging(let progress):
-            return progress
-        }
-    }
-    
-    var isActive: Bool {
-        switch self {
-        case .inactive:
-            return false
-        case .pressing, .dragging:
-            return true
-        }
-    }
-    
-    var isDragging: Bool {
-        switch self {
-        case .inactive, .pressing:
-            return false
-        case .dragging:
-            return true
-        }
-    }
-}