From 392fe6fa329d84805f553986b8a338018ee2c095 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Fri, 4 Nov 2022 15:47:10 +0100
Subject: [PATCH] Transform TickListener to fun interface
---
.../vector/lib/attachmentviewer/VideoViewHolder.kt | 14 ++++++--------
.../im/vector/lib/core/utils/timer/CountUpTimer.kt | 2 +-
.../vector/app/features/call/webrtc/WebRtcCall.kt | 10 ++++------
.../room/detail/composer/AudioMessageHelper.kt | 12 ++----------
.../composer/voice/VoiceMessageRecorderView.kt | 8 +++-----
.../location/live/map/LiveLocationUserItem.kt | 6 ++----
.../listening/VoiceBroadcastPlayerImpl.kt | 6 +-----
7 files changed, 19 insertions(+), 39 deletions(-)
diff --git a/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
index 92d28d26c9..07c7b4588f 100644
--- a/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
+++ b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
@@ -103,14 +103,12 @@ class VideoViewHolder constructor(itemView: View) :
views.videoView.setOnPreparedListener {
stopTimer()
countUpTimer = CountUpTimer(100).also {
- it.tickListener = object : CountUpTimer.TickListener {
- override fun onTick(milliseconds: Long) {
- val duration = views.videoView.duration
- val progress = views.videoView.currentPosition
- val isPlaying = views.videoView.isPlaying
-// Log.v("FOO", "isPlaying $isPlaying $progress/$duration")
- eventListener?.get()?.onEvent(AttachmentEvents.VideoEvent(isPlaying, progress, duration))
- }
+ it.tickListener = CountUpTimer.TickListener {
+ val duration = views.videoView.duration
+ val progress = views.videoView.currentPosition
+ val isPlaying = views.videoView.isPlaying
+ // Log.v("FOO", "isPlaying $isPlaying $progress/$duration")
+ eventListener?.get()?.onEvent(AttachmentEvents.VideoEvent(isPlaying, progress, duration))
}
it.resume()
}
diff --git a/library/core-utils/src/main/java/im/vector/lib/core/utils/timer/CountUpTimer.kt b/library/core-utils/src/main/java/im/vector/lib/core/utils/timer/CountUpTimer.kt
index e9d311fe03..a4fd8bb4e1 100644
--- a/library/core-utils/src/main/java/im/vector/lib/core/utils/timer/CountUpTimer.kt
+++ b/library/core-utils/src/main/java/im/vector/lib/core/utils/timer/CountUpTimer.kt
@@ -66,7 +66,7 @@ class CountUpTimer(private val intervalInMs: Long = 1_000) {
coroutineScope.cancel()
}
- interface TickListener {
+ fun interface TickListener {
fun onTick(milliseconds: Long)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
index 00b9a76de7..0bf70690ba 100644
--- a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
@@ -167,12 +167,10 @@ class WebRtcCall(
private var screenSender: RtpSender? = null
private val timer = CountUpTimer(1000L).apply {
- tickListener = object : CountUpTimer.TickListener {
- override fun onTick(milliseconds: Long) {
- val formattedDuration = formatDuration(Duration.ofMillis(milliseconds))
- listeners.forEach {
- tryOrNull { it.onTick(formattedDuration) }
- }
+ tickListener = CountUpTimer.TickListener { milliseconds ->
+ val formattedDuration = formatDuration(Duration.ofMillis(milliseconds))
+ listeners.forEach {
+ tryOrNull { it.onTick(formattedDuration) }
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/AudioMessageHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/AudioMessageHelper.kt
index bede02c17f..eddfe500b3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/AudioMessageHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/AudioMessageHelper.kt
@@ -199,11 +199,7 @@ class AudioMessageHelper @Inject constructor(
private fun startRecordingAmplitudes() {
amplitudeTicker?.stop()
amplitudeTicker = CountUpTimer(50).apply {
- tickListener = object : CountUpTimer.TickListener {
- override fun onTick(milliseconds: Long) {
- onAmplitudeTick()
- }
- }
+ tickListener = CountUpTimer.TickListener { onAmplitudeTick() }
resume()
}
}
@@ -234,11 +230,7 @@ class AudioMessageHelper @Inject constructor(
private fun startPlaybackTicker(id: String) {
playbackTicker?.stop()
playbackTicker = CountUpTimer().apply {
- tickListener = object : CountUpTimer.TickListener {
- override fun onTick(milliseconds: Long) {
- onPlaybackTick(id)
- }
- }
+ tickListener = CountUpTimer.TickListener { onPlaybackTick(id) }
resume()
}
onPlaybackTick(id)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
index 13e0477ab6..a7b926f29a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
@@ -189,11 +189,9 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
val startMs = ((clock.epochMillis() - startAt)).coerceAtLeast(0)
recordingTicker?.stop()
recordingTicker = CountUpTimer().apply {
- tickListener = object : CountUpTimer.TickListener {
- override fun onTick(milliseconds: Long) {
- val isLocked = startFromLocked || lastKnownState is RecordingUiState.Locked
- onRecordingTick(isLocked, milliseconds + startMs)
- }
+ tickListener = CountUpTimer.TickListener { milliseconds ->
+ val isLocked = startFromLocked || lastKnownState is RecordingUiState.Locked
+ onRecordingTick(isLocked, milliseconds + startMs)
}
resume()
}
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt
index bab7f4c7f9..c108e83e76 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt
@@ -79,10 +79,8 @@ abstract class LiveLocationUserItem : VectorEpoxyModel<LiveLocationUserItem.Hold
}
}
- holder.timer.tickListener = object : CountUpTimer.TickListener {
- override fun onTick(milliseconds: Long) {
- holder.itemLastUpdatedAtTextView.text = getFormattedLastUpdatedAt(locationUpdateTimeMillis)
- }
+ holder.timer.tickListener = CountUpTimer.TickListener {
+ holder.itemLastUpdatedAtTextView.text = getFormattedLastUpdatedAt(locationUpdateTimeMillis)
}
holder.timer.resume()
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayerImpl.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayerImpl.kt
index 773883d81a..bf8ff11043 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayerImpl.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayerImpl.kt
@@ -362,11 +362,7 @@ class VoiceBroadcastPlayerImpl @Inject constructor(
fun startPlaybackTicker(id: String) {
playbackTicker?.stop()
playbackTicker = CountUpTimer().apply {
- tickListener = object : CountUpTimer.TickListener {
- override fun onTick(milliseconds: Long) {
- onPlaybackTick(id)
- }
- }
+ tickListener = CountUpTimer.TickListener { onPlaybackTick(id) }
resume()
}
onPlaybackTick(id)