filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Transform TickListener to fun interface

This commit is contained in:
Florian Renaud 2022-11-04 15:47:10 +01:00
parent d89ef6988b
commit 392fe6fa32
7 changed files with 19 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
View File

@ -103,14 +103,12 @@ class VideoViewHolder constructor(itemView: View) :
views.videoView.setOnPreparedListener { views.videoView.setOnPreparedListener {
stopTimer() stopTimer()
countUpTimer = CountUpTimer(100).also { countUpTimer = CountUpTimer(100).also {
it.tickListener = object : CountUpTimer.TickListener { it.tickListener = CountUpTimer.TickListener {
override fun onTick(milliseconds: Long) { val duration = views.videoView.duration
val duration = views.videoView.duration val progress = views.videoView.currentPosition
val progress = views.videoView.currentPosition val isPlaying = views.videoView.isPlaying
val isPlaying = views.videoView.isPlaying // Log.v("FOO", "isPlaying $isPlaying $progress/$duration")
// Log.v("FOO", "isPlaying $isPlaying $progress/$duration") eventListener?.get()?.onEvent(AttachmentEvents.VideoEvent(isPlaying, progress, duration))
eventListener?.get()?.onEvent(AttachmentEvents.VideoEvent(isPlaying, progress, duration))
}
} }
it.resume() it.resume()
} }

2
library/core-utils/src/main/java/im/vector/lib/core/utils/timer/CountUpTimer.kt
View File

@ -66,7 +66,7 @@ class CountUpTimer(private val intervalInMs: Long = 1_000) {
coroutineScope.cancel() coroutineScope.cancel()
} }
interface TickListener { fun interface TickListener {
fun onTick(milliseconds: Long) fun onTick(milliseconds: Long)
} }
} }

10
vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
View File

@ -167,12 +167,10 @@ class WebRtcCall(
private var screenSender: RtpSender? = null private var screenSender: RtpSender? = null
private val timer = CountUpTimer(1000L).apply { private val timer = CountUpTimer(1000L).apply {
tickListener = object : CountUpTimer.TickListener { tickListener = CountUpTimer.TickListener { milliseconds ->
override fun onTick(milliseconds: Long) { val formattedDuration = formatDuration(Duration.ofMillis(milliseconds))
val formattedDuration = formatDuration(Duration.ofMillis(milliseconds)) listeners.forEach {
listeners.forEach { tryOrNull { it.onTick(formattedDuration) }
tryOrNull { it.onTick(formattedDuration) }
}
} }
} }
} }

12
vector/src/main/java/im/vector/app/features/home/room/detail/composer/AudioMessageHelper.kt
View File

@ -199,11 +199,7 @@ class AudioMessageHelper @Inject constructor(
private fun startRecordingAmplitudes() { private fun startRecordingAmplitudes() {
amplitudeTicker?.stop() amplitudeTicker?.stop()
amplitudeTicker = CountUpTimer(50).apply { amplitudeTicker = CountUpTimer(50).apply {
tickListener = object : CountUpTimer.TickListener { tickListener = CountUpTimer.TickListener { onAmplitudeTick() }
override fun onTick(milliseconds: Long) {
onAmplitudeTick()
}
}
resume() resume()
} }
} }
@ -234,11 +230,7 @@ class AudioMessageHelper @Inject constructor(
private fun startPlaybackTicker(id: String) { private fun startPlaybackTicker(id: String) {
playbackTicker?.stop() playbackTicker?.stop()
playbackTicker = CountUpTimer().apply { playbackTicker = CountUpTimer().apply {
tickListener = object : CountUpTimer.TickListener { tickListener = CountUpTimer.TickListener { onPlaybackTick(id) }
override fun onTick(milliseconds: Long) {
onPlaybackTick(id)
}
}
resume() resume()
} }
onPlaybackTick(id) onPlaybackTick(id)

8
vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
View File

@ -189,11 +189,9 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
val startMs = ((clock.epochMillis() - startAt)).coerceAtLeast(0) val startMs = ((clock.epochMillis() - startAt)).coerceAtLeast(0)
recordingTicker?.stop() recordingTicker?.stop()
recordingTicker = CountUpTimer().apply { recordingTicker = CountUpTimer().apply {
tickListener = object : CountUpTimer.TickListener { tickListener = CountUpTimer.TickListener { milliseconds ->
override fun onTick(milliseconds: Long) { val isLocked = startFromLocked || lastKnownState is RecordingUiState.Locked
val isLocked = startFromLocked || lastKnownState is RecordingUiState.Locked onRecordingTick(isLocked, milliseconds + startMs)
onRecordingTick(isLocked, milliseconds + startMs)
}
} }
resume() resume()
} }

6
vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt
View File

@ -79,10 +79,8 @@ abstract class LiveLocationUserItem : VectorEpoxyModel<LiveLocationUserItem.Hold
} }
} }
holder.timer.tickListener = object : CountUpTimer.TickListener { holder.timer.tickListener = CountUpTimer.TickListener {
override fun onTick(milliseconds: Long) { holder.itemLastUpdatedAtTextView.text = getFormattedLastUpdatedAt(locationUpdateTimeMillis)
holder.itemLastUpdatedAtTextView.text = getFormattedLastUpdatedAt(locationUpdateTimeMillis)
}
} }
holder.timer.resume() holder.timer.resume()

6
vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayerImpl.kt
View File

@ -362,11 +362,7 @@ class VoiceBroadcastPlayerImpl @Inject constructor(
fun startPlaybackTicker(id: String) { fun startPlaybackTicker(id: String) {
playbackTicker?.stop() playbackTicker?.stop()
playbackTicker = CountUpTimer().apply { playbackTicker = CountUpTimer().apply {
tickListener = object : CountUpTimer.TickListener { tickListener = CountUpTimer.TickListener { onPlaybackTick(id) }
override fun onTick(milliseconds: Long) {
onPlaybackTick(id)
}
}
resume() resume()
} }
onPlaybackTick(id) onPlaybackTick(id)