diff --git a/app/src/main/java/com/example/countdowntimer/CountdownCanvasView.kt b/app/src/main/java/com/example/countdowntimer/CountdownCanvasView.kt index 19c5c14..636e5ab 100644 --- a/app/src/main/java/com/example/countdowntimer/CountdownCanvasView.kt +++ b/app/src/main/java/com/example/countdowntimer/CountdownCanvasView.kt @@ -1,10 +1,12 @@ package com.example.countdowntimer import android.content.Context +import androidx.core.content.ContextCompat import android.graphics.Canvas -import android.graphics.Color import android.graphics.Paint import android.graphics.RectF +import android.graphics.Color +import android.graphics.Paint import android.util.AttributeSet import android.view.View @@ -17,8 +19,8 @@ class CountdownCanvasView @JvmOverloads constructor( private var textToDraw: String = "" private var progressFraction: Float = 1.0f private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply { - color = Color.parseColor("#6750A4") - textSize = 180f + color = ContextCompat.getColor(context, R.color.md_theme_light_primary) + textSize = 180f // Roughly equivalent to 72sp depending on density textAlign = Paint.Align.CENTER isFakeBoldText = false } diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index c8199ae..685ae9d 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -1,5 +1,5 @@ - #2E1A47 - #1B0B2E + #1B3A1B + #0D1F0D diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 7e14ac6..7c0969e 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,8 +1,11 @@ + #A5D6A7 + #869F7C + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 184cac6..7d02a2b 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ - #F3E5F5 - #E1BEE7 - #6750A4 + #E8F5E9 + #C8E6C9 + #2E7D32 diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 3387b03..a36146a 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -6,7 +6,7 @@ true - #6750A4 - #625B71 - #FEF7FF + #2E7D32 + #4C6842 + #F1F8E9