diff --git a/app/src/main/java/com/example/countdowntimer/CountdownCanvasView.kt b/app/src/main/java/com/example/countdowntimer/CountdownCanvasView.kt
index 23c9373..05d82fd 100644
--- a/app/src/main/java/com/example/countdowntimer/CountdownCanvasView.kt
+++ b/app/src/main/java/com/example/countdowntimer/CountdownCanvasView.kt
@@ -24,12 +24,12 @@ class CountdownCanvasView @JvmOverloads constructor(
isFakeBoldText = false
}
private val ringPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
- color = Color.parseColor("#6750A4")
+ color = ContextCompat.getColor(context, R.color.md_color_ring_progress)
style = Paint.Style.STROKE
strokeWidth = 16f
}
private val ringBgPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
- color = Color.parseColor("#D0BCFF")
+ color = ContextCompat.getColor(context, R.color.md_color_ring_track)
style = Paint.Style.STROKE
strokeWidth = 16f
}
diff --git a/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt b/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt
index fc7391c..9283278 100644
--- a/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt
+++ b/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt
@@ -18,8 +18,8 @@ class CountdownDialog(
private val prefs: SharedPreferences
) : Dialog(context) {
private lateinit var cvCountdown: CountdownCanvasView
- private lateinit var btnStop: Button
- private lateinit var btnRestart: Button
+ private lateinit var btnStop: View
+ private lateinit var btnRestart: View
private lateinit var btnDismiss: Button
private var timer: CountDownTimer? = null
private var toneGenerator: ToneGenerator? = null
@@ -61,14 +61,10 @@ class CountdownDialog(
val progress = millisUntilFinished.toFloat() / durationMillis
cvCountdown.setProgress(progress)
- if (millisUntilFinished >= durationMillis) {
- cvCountdown.setText(context.getString(R.string.countdown_text))
- } else {
- val secondsLeft = (millisUntilFinished / 1000).toInt() + 1
- cvCountdown.setText(secondsLeft.toString())
- }
+ val secondsLeft = (millisUntilFinished / 1000).toInt() + 1
+ cvCountdown.setText(secondsLeft.toString())
- if (millisUntilFinished <= 3000 && millisUntilFinished > 1000) {
+ if (secondsLeft >= 1 && secondsLeft <= 3) {
playTone(ToneGenerator.TONE_PROP_BEEP)
if (prefs.getBoolean("vibration", true)) {
vibrator?.vibrate(50)
diff --git a/app/src/main/res/color/chip_duration_bg.xml b/app/src/main/res/color/chip_duration_bg.xml
new file mode 100644
index 0000000..bdc80ea
--- /dev/null
+++ b/app/src/main/res/color/chip_duration_bg.xml
@@ -0,0 +1,5 @@
+
+
+