sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 11:46:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1957 from shane-tang/shane-tang/fix-IndeterminateProgressView

Browse source 
Fix IndeterminateProgressView not removing (WearOS)
This commit is contained in:
Fiz 2023-05-01 01:05:24 -04:00 committed by GitHub
commit e8bd8231fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
View file

@ -76,11 +76,12 @@ abstract class BaseActivity<B : ViewBinding, VM : BaseViewModel> : ComponentActi
fun stopAnimatingProgress() {
if (progressView != null) {
progressView?.stopAnimation()
progressView?.post {
wrapperBinding.root.removeView(progressView)
progressView?.stopAnimation {
progressView?.post {
wrapperBinding.root.removeView(progressView)
progressView = null
}
}
progressView = null
} else {
wrapperBinding.root.children.forEach {
if (it is IndeterminateProgressView) {

22
wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/IndeterminateProgressView.kt
View file

@ -10,9 +10,11 @@ import android.util.AttributeSet
import android.view.View
import android.view.animation.Animation
import android.view.animation.LinearInterpolator
import androidx.core.animation.doOnEnd
import androidx.core.content.ContextCompat
import com.habitrpg.android.habitica.R
import com.habitrpg.common.habitica.extensions.dpToPx
import kotlin.math.min
class IndeterminateProgressView @JvmOverloads constructor(
context: Context,
@ -20,7 +22,8 @@ class IndeterminateProgressView @JvmOverloads constructor(
defStyleAttr: Int = 0
) : View(context, attrs, defStyleAttr) {
var progressBarWidth = 6f.dpToPx(context)
private val progressBarWidth = 6f.dpToPx(context)
private val revealDuration = 200L
private val rainbow = listOf(
ContextCompat.getColor(context, R.color.black),
@ -37,7 +40,7 @@ class IndeterminateProgressView @JvmOverloads constructor(
private val isCircular: Boolean
private val cornerRadius = 12f.dpToPx(context)
private var currentAngle = 0f
private val currentAngle = 0f
init {
paint.style = Paint.Style.STROKE
@ -65,15 +68,22 @@ class IndeterminateProgressView @JvmOverloads constructor(
start()
}
ValueAnimator.ofFloat(0f, progressBarWidth).apply {
duration = 200
duration = revealDuration
addUpdateListener { paint.strokeWidth = it.animatedValue as Float }
start()
}
}
fun stopAnimation() {
animator?.end()
animator = null
fun stopAnimation(onAnimationEnd: () -> Unit) {
val hideDuration = min(revealDuration, animator?.currentPlayTime ?: revealDuration)
ValueAnimator.ofFloat(paint.strokeWidth, 0f).apply {
duration = hideDuration
addUpdateListener { paint.strokeWidth = it.animatedValue as Float }
start()
}.doOnEnd {
animator = null
onAnimationEnd()
}
}
override fun onDraw(canvas: Canvas?) {