TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-30 10:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix timer icon flashes expired

Browse Source
This commit is contained in:
andrew 2023-11-15 12:02:15 +10:30
parent fc9ea46ed8
commit 725ad43b1d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/ExpirationTimerView.kt
View File

@ -3,17 +3,19 @@ package org.thoughtcrime.securesms.conversation.v2.components
import android.content.Context import android.content.Context
import android.graphics.drawable.AnimationDrawable import android.graphics.drawable.AnimationDrawable
import android.util.AttributeSet import android.util.AttributeSet
import android.util.Log
import android.widget.ImageView import android.widget.ImageView
import androidx.appcompat.widget.AppCompatImageView
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import network.loki.messenger.R import network.loki.messenger.R
import org.session.libsession.snode.SnodeAPI.nowWithOffset import org.session.libsession.snode.SnodeAPI.nowWithOffset
import kotlin.math.round import kotlin.math.round
class ExpirationTimerView @JvmOverloads constructor( class ExpirationTimerView @JvmOverloads constructor(
context: Context?, context: Context,
attrs: AttributeSet? = null, attrs: AttributeSet? = null,
defStyleAttr: Int = 0 defStyleAttr: Int = 0
) : ImageView(context, attrs, defStyleAttr) { ) : AppCompatImageView(context, attrs, defStyleAttr) {
private val frames = intArrayOf( private val frames = intArrayOf(
R.drawable.timer00, R.drawable.timer00,
R.drawable.timer05, R.drawable.timer05,
@ -36,6 +38,12 @@ class ExpirationTimerView @JvmOverloads constructor(
return return
} }
if (startedAt == 0L) {
// timer has not started
setImageResource(R.drawable.timer60)
return
}
val elapsedTime = nowWithOffset - startedAt val elapsedTime = nowWithOffset - startedAt
val remainingTime = expiresIn - elapsedTime val remainingTime = expiresIn - elapsedTime
val remainingPercent = (remainingTime / expiresIn.toFloat()).coerceIn(0f, 1f) val remainingPercent = (remainingTime / expiresIn.toFloat()).coerceIn(0f, 1f)