Skip to content

likorn / quick_max

Go to a project
Commit 48834e53 by likorn
Options

Minor refactoring

parent 1752e93b
Inline Side-by-side
Showing with 10 additions and 6 deletions
app/src/main/java/com/example/quickmax/TaskActivity.kt
...@@ -66,12 +66,12 @@ class TaskActivity : AppCompatActivity() { ...@@ -66,12 +66,12 @@ class TaskActivity : AppCompatActivity() {
if (answer.correct) { if (answer.correct) {
tv_timer.text = resources.getString(R.string.response_correct) tv_timer.text = resources.getString(R.string.response_correct)
answer.card.setCardBackgroundColor(resources.getColor(R.color.colorAccent)) answer.card.setCardBackgroundColor(resources.getColor(R.color.colorAccent))
btn_next.background.setColorFilter(resources.getColor(R.color.colorAccent), PorterDuff.Mode.MULTIPLY) btn_next.background.setColorFilter(color(R.color.colorAccent), PorterDuff.Mode.MULTIPLY)
btn_next.setTextColor(resources.getColor(R.color.transparent_dark_black)) btn_next.setTextColor(color(R.color.transparent_dark_black))
} else { } else {
tv_timer.text = resources.getString(R.string.response_wrong) tv_timer.text = resources.getString(R.string.response_wrong)
answer.card.setCardBackgroundColor(resources.getColor(R.color.colorPrimary)) answer.card.setCardBackgroundColor(color(R.color.colorPrimary))
btn_next.background.setColorFilter(resources.getColor(R.color.colorPrimary), PorterDuff.Mode.MULTIPLY) btn_next.background.setColorFilter(color(R.color.colorPrimary), PorterDuff.Mode.MULTIPLY)
(answer.card.getChildAt(0) as TextView).setTextColor(Color.WHITE) (answer.card.getChildAt(0) as TextView).setTextColor(Color.WHITE)
} }
} }
...@@ -84,12 +84,12 @@ class TaskActivity : AppCompatActivity() { ...@@ -84,12 +84,12 @@ class TaskActivity : AppCompatActivity() {
private fun startProgressBarAnimation() { private fun startProgressBarAnimation() {
val colorFrom = Color.TRANSPARENT val colorFrom = Color.TRANSPARENT
val colorTo = ContextCompat.getColor(this, R.color.transparent_red) val colorTo = color(R.color.transparent_red)
colorAnimation = ValueAnimator.ofObject(ArgbEvaluator(), colorFrom, colorTo) colorAnimation = ValueAnimator.ofObject(ArgbEvaluator(), colorFrom, colorTo)
colorAnimation.duration = millisToSolve colorAnimation.duration = millisToSolve
colorAnimation.addUpdateListener { animator -> colorAnimation.addUpdateListener { animator ->
layout_gradient.background.setColorFilter(animator.animatedValue as Int, layout_gradient.background.setColorFilter(animator.animatedValue as Int,
android.graphics.PorterDuff.Mode.SRC_ATOP) PorterDuff.Mode.SRC_ATOP)
} }
colorAnimation.start() colorAnimation.start()
} }
...@@ -110,4 +110,8 @@ class TaskActivity : AppCompatActivity() { ...@@ -110,4 +110,8 @@ class TaskActivity : AppCompatActivity() {
} }
} }
} }
private fun color(id: Int): Int {
return ContextCompat.getColor(this, id)
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment