diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt index 40458b5025..eda22a6105 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt @@ -21,8 +21,9 @@ class DownloadButton @JvmOverloads constructor(context: Context, attrs: Attribut R.color.divider) private val disabledColor = ContextCompat.getColor(context, R.color.material_on_surface_disabled) + private val primaryColor = context.getResourceColor(android.R.attr.textColorPrimaryInverse) private val downloadedColor = ContextCompat.getColor(context, - R.color.material_green_800) + R.color.download) private val errorColor = ContextCompat.getColor(context, R.color.red_error) private val filledCircle = ContextCompat.getDrawable(context, @@ -94,7 +95,7 @@ class DownloadButton @JvmOverloads constructor(context: Context, attrs: Attribut download_progress_indeterminate.gone() download_border.setImageDrawable(filledCircle) download_border.drawable.setTint(downloadedColor) - download_icon.drawable.setTint(Color.WHITE) + download_icon.drawable.setTint(primaryColor) } Download.ERROR -> { download_progress.gone() diff --git a/app/src/main/res/layout/download_button.xml b/app/src/main/res/layout/download_button.xml index 91a3de6c53..724388b25e 100644 --- a/app/src/main/res/layout/download_button.xml +++ b/app/src/main/res/layout/download_button.xml @@ -33,7 +33,7 @@ style="?android:attr/progressBarStyleHorizontal" android:progressDrawable="@drawable/circle_progress" android:layout_gravity="center" - android:progressTint="@color/colorAccent" + android:progressTint="@color/download" android:progressBackgroundTint="@color/material_on_surface_disabled"/> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 4104ec4d96..615f3a8ff6 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -25,6 +25,7 @@ @color/md_white_1000_50 @color/md_black_1000_38 @color/md_white_1000_12 + @color/material_green_700 #1C1C1D #212121 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index bce3196c48..d07c6a6494 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -37,6 +37,7 @@ @color/md_black_1000_12 #B3FFFFFF @color/material_red_accent_700 + @color/material_green_800 @color/colorAccent #212121