felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 17:12:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify scrubbing and reset to stopped if scrub to start/end

Browse Source
This commit is contained in:
David Langley
2021-09-22 11:12:45 +01:00
parent 187d1d316c
commit d3c3643098
4 changed files with 27 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/VoiceMessages/VoiceMessagePlaybackView.swift
+15 -41
View File
@@ -21,7 +21,6 @@ import MatrixSDK
protocol VoiceMessagePlaybackViewDelegate: AnyObject {
func voiceMessagePlaybackViewDidRequestPlaybackToggle()
func voiceMessagePlaybackViewRequestedFormattedTimestamp(for progress: CGFloat) -> String?
func voiceMessagePlaybackViewDidRequestSeek(to progress: CGFloat)
func voiceMessagePlaybackViewDidChangeWidth()
}
@@ -44,12 +43,7 @@ class VoiceMessagePlaybackView: UIView, NibLoadable, Themable {
private var _waveformView: VoiceMessageWaveformView!
private var currentTheme: Theme?
private var scrubProgress: CGFloat? {
didSet {
MXLog.debug("change progress \(scrubProgress)")
}
}
private var scrubProgress: CGFloat?
@IBOutlet private var backgroundView: UIView!
@IBOutlet private var recordingIcon: UIView!
@@ -105,17 +99,19 @@ class VoiceMessagePlaybackView: UIView, NibLoadable, Themable {
}
if details.loading {
elapsedTimeLabel.text = "--:--"
_waveformView.progress = 0
_waveformView.samples = []
_waveformView.alpha = 0.3
} else {
elapsedTimeLabel.text = details.currentTime
_waveformView.progress = details.progress
_waveformView.samples = details.samples
_waveformView.alpha = 1.0
}
self.details = details
updateElapsedTime()
guard let theme = currentTheme else {
return
}
@@ -129,20 +125,6 @@ class VoiceMessagePlaybackView: UIView, NibLoadable, Themable {
elapsedTimeLabel.textColor = theme.colors.tertiaryContent
}
private func updateElapsedTime() {
guard let details = details,
!details.loading else {
elapsedTimeLabel.text = "--:--"
return
}
if let scrubProgress = scrubProgress,
let scrubTime = delegate?.voiceMessagePlaybackViewRequestedFormattedTimestamp(for: scrubProgress) {
elapsedTimeLabel.text = scrubTime
} else {
elapsedTimeLabel.text = details.currentTime
}
}
func getRequiredNumberOfSamples() -> Int {
_waveformView.setNeedsLayout()
_waveformView.layoutIfNeeded()
@@ -168,24 +150,16 @@ class VoiceMessagePlaybackView: UIView, NibLoadable, Themable {
let seekPoint = progress == 1 ? 0 : progress
delegate?.voiceMessagePlaybackViewDidRequestSeek(to: seekPoint)
}
@IBAction private func pan(gestureRecognizer: UIPanGestureRecognizer) {
switch gestureRecognizer.state {
case .possible, .cancelled, .failed:
scrubProgress = nil
case .began, .changed:
let x = gestureRecognizer.location(in: waveformContainerView).x.clamped(to: 0...waveformContainerView.bounds.width)
scrubProgress = x / waveformContainerView.bounds.width
case .ended:
let seekPoint = scrubProgress == 1 ? 0 : scrubProgress ?? 0
MXLog.debug("progress end seekPoint --->\(seekPoint)")
delegate?.voiceMessagePlaybackViewDidRequestSeek(to: seekPoint)
scrubProgress = nil
@unknown default:
break
}
updateElapsedTime()
}
@IBAction private func pan(gestureRecognizer: UIPanGestureRecognizer) {
switch gestureRecognizer.state {
case .began, .changed:
let x = gestureRecognizer.location(in: waveformContainerView).x.clamped(to: 0...waveformContainerView.bounds.width)
scrubProgress = x / waveformContainerView.bounds.width
let seekPoint = scrubProgress == 1 ? 0 : scrubProgress ?? 0
delegate?.voiceMessagePlaybackViewDidRequestSeek(to: seekPoint)
default:
scrubProgress = nil
}
}
}