generated from element-hq/.github
-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
1 parent
11563c6
commit adfe855
Showing
15 changed files
with
118 additions
and
229 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
ElementX/Sources/Other/VoiceMessage/WaveformInteractionModifier.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" | ||
| } |
98 changes: 0 additions & 98 deletions
98
ElementX/Sources/Other/VoiceMessage/WaveformViewDragGestureModifier.swift
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.