Skip to content

likorn / quick_max

Go to a project
Commit 2a6b1943 by likorn
Options

Moved buttonNext style logic to ButtonNext class

parent a9f9c93d
Inline Side-by-side
Showing with 48 additions and 18 deletions
app/src/main/java/com/paktalin/quickmax/ButtonNext.kt 0 → 100644
package com.paktalin.quickmax
import android.content.Context
import android.graphics.Color
import android.util.AttributeSet
import android.view.View
import androidx.core.content.ContextCompat
import com.google.android.material.button.MaterialButton
class ButtonNext: MaterialButton {
constructor(context: Context) : super(context)
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
context,
attrs,
defStyleAttr
)
fun initial() {
visibility = View.INVISIBLE
}
fun correct(context: Context) {
visibility = View.VISIBLE
backgroundTintList = ContextCompat.getColorStateList(context, R.color.colorAccent)
setTextColor(color(context, R.color.transparent_dark_black))
}
fun incorrect(context: Context) {
visibility = View.VISIBLE
backgroundTintList = ContextCompat.getColorStateList(context, R.color.colorPrimary)
setTextColor(Color.WHITE)
}
}
app/src/main/java/com/paktalin/quickmax/TaskActivity.kt
...@@ -8,7 +8,6 @@ import android.graphics.PorterDuff ...@@ -8,7 +8,6 @@ import android.graphics.PorterDuff
import android.os.Bundle import android.os.Bundle
import android.os.CountDownTimer import android.os.CountDownTimer
import android.util.TypedValue import android.util.TypedValue
import android.view.View
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.paktalin.quickmax.answers.Answer import com.paktalin.quickmax.answers.Answer
...@@ -40,7 +39,7 @@ class TaskActivity : AppCompatActivity() { ...@@ -40,7 +39,7 @@ class TaskActivity : AppCompatActivity() {
) )
setUpCards() setUpCards()
timer.start() timer.start()
startProgressBarAnimation() startColorAnimation()
} }
private fun retrieveExtras() { private fun retrieveExtras() {
...@@ -49,14 +48,14 @@ class TaskActivity : AppCompatActivity() { ...@@ -49,14 +48,14 @@ class TaskActivity : AppCompatActivity() {
} }
private fun setUpCards() { private fun setUpCards() {
answerSet.forEach {answer -> answerSet.forEach { answer ->
answer.card.setOnCheckedChangeListener { _, isChecked -> if (isChecked) processAnswer(answer) } answer.card.setOnCheckedChangeListener { _, isChecked -> if (isChecked) processAnswer(answer) }
answer.card.initial(this@TaskActivity, answer.value) answer.card.initial(this@TaskActivity, answer.value)
} }
btn_back.setOnClickListener { startActivity(Intent(this@TaskActivity, MainActivity::class.java)) } btn_back.setOnClickListener { startActivity(Intent(this@TaskActivity, MainActivity::class.java)) }
btn_next.apply { btn_next.apply {
setOnClickListener { startNewRound() } setOnClickListener { startNewRound() }
visibility = View.INVISIBLE initial()
} }
} }
...@@ -69,27 +68,23 @@ class TaskActivity : AppCompatActivity() { ...@@ -69,27 +68,23 @@ class TaskActivity : AppCompatActivity() {
private fun setResponseText(answer: Answer) { private fun setResponseText(answer: Answer) {
tv_response.setTextSize(TypedValue.COMPLEX_UNIT_SP, resources.getDimension(R.dimen.response_text_size)) tv_response.setTextSize(TypedValue.COMPLEX_UNIT_SP, resources.getDimension(R.dimen.response_text_size))
btn_next.visibility = View.VISIBLE
if (answer.correct) { if (answer.correct) {
answer.card.markCorrect(this@TaskActivity) answer.card.markCorrect(this@TaskActivity)
tv_response.text = resources.getString(R.string.response_correct) tv_response.text = resources.getString(R.string.response_correct)
btn_next.backgroundTintList = ContextCompat.getColorStateList(this, R.color.colorAccent) btn_next.correct(this@TaskActivity)
btn_next.setTextColor(color(this, R.color.transparent_dark_black))
} else { } else {
answer.card.markWrong(this@TaskActivity) answer.card.markWrong(this@TaskActivity)
tv_response.text = resources.getString(R.string.response_wrong) tv_response.text = resources.getString(R.string.response_wrong)
btn_next.backgroundTintList = ContextCompat.getColorStateList(this, R.color.colorPrimary) btn_next.incorrect(this@TaskActivity)
btn_next.setTextColor(Color.WHITE)
} }
} }
private fun startProgressBarAnimation() { private fun startColorAnimation() {
val colorFrom = Color.TRANSPARENT val colorFrom = Color.TRANSPARENT
val colorTo = val colorTo = color(this, R.color.transparent_red)
color(this, R.color.transparent_red)
colorAnimation = ValueAnimator.ofObject(ArgbEvaluator(), colorFrom, colorTo) colorAnimation = ValueAnimator.ofObject(ArgbEvaluator(), colorFrom, colorTo)
colorAnimation.duration = millisToSolve .apply { duration = millisToSolve }
colorAnimation.addUpdateListener { animator -> colorAnimation.addUpdateListener { animator ->
layout_gradient.background.setColorFilter(animator.animatedValue as Int, layout_gradient.background.setColorFilter(animator.animatedValue as Int,
PorterDuff.Mode.SRC_ATOP) PorterDuff.Mode.SRC_ATOP)
...@@ -106,9 +101,7 @@ class TaskActivity : AppCompatActivity() { ...@@ -106,9 +101,7 @@ class TaskActivity : AppCompatActivity() {
override fun onFinish() { override fun onFinish() {
tv_response.setTextSize(TypedValue.COMPLEX_UNIT_SP, resources.getDimension(R.dimen.response_text_size)) tv_response.setTextSize(TypedValue.COMPLEX_UNIT_SP, resources.getDimension(R.dimen.response_text_size))
tv_response.text = resources.getString(R.string.time_is_over) tv_response.text = resources.getString(R.string.time_is_over)
btn_next.backgroundTintList = ContextCompat.getColorStateList(this@TaskActivity, R.color.colorPrimary) btn_next.incorrect(this@TaskActivity)
btn_next.setTextColor(Color.WHITE)
btn_next.visibility = View.VISIBLE
answerSet.forEach { answer -> answer.card.disable()} answerSet.forEach { answer -> answer.card.disable()}
} }
} }
......
app/src/main/res/layout-land/activity_task.xml
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
</com.paktalin.quickmax.AnswerCardView> </com.paktalin.quickmax.AnswerCardView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.button.MaterialButton <com.paktalin.quickmax.ButtonNext
android:id="@+id/btn_next" android:id="@+id/btn_next"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
app/src/main/res/layout/activity_task.xml
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
</com.paktalin.quickmax.AnswerCardView> </com.paktalin.quickmax.AnswerCardView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.button.MaterialButton <com.paktalin.quickmax.ButtonNext
android:id="@+id/btn_next" android:id="@+id/btn_next"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
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