diff --git a/app/src/main/java/io/heckel/ntfy/app/Application.kt b/app/src/main/java/io/heckel/ntfy/app/Application.kt index 657e729f..605a2e90 100644 --- a/app/src/main/java/io/heckel/ntfy/app/Application.kt +++ b/app/src/main/java/io/heckel/ntfy/app/Application.kt @@ -15,9 +15,9 @@ class Application : Application() { } override fun onCreate() { + super.onCreate() if (repository.getDynamicColorsEnabled()) { DynamicColors.applyToActivitiesIfAvailable(this) } - super.onCreate() } } diff --git a/app/src/main/java/io/heckel/ntfy/ui/Colors.kt b/app/src/main/java/io/heckel/ntfy/ui/Colors.kt index b76bade5..5f815241 100644 --- a/app/src/main/java/io/heckel/ntfy/ui/Colors.kt +++ b/app/src/main/java/io/heckel/ntfy/ui/Colors.kt @@ -12,6 +12,10 @@ class Colors { return MaterialColors.getColor(context, R.attr.colorPrimary, Color.GREEN) } + fun linkColor(context: Context): Int { + return MaterialColors.getColor(context, R.attr.colorPrimary, Color.GREEN) + } + fun itemSelectedBackground(context: Context): Int { return SurfaceColors.getColorForElevation(context, 10f) } diff --git a/app/src/main/java/io/heckel/ntfy/util/MarkwonFactory.kt b/app/src/main/java/io/heckel/ntfy/util/MarkwonFactory.kt index c9630683..65b6aaef 100644 --- a/app/src/main/java/io/heckel/ntfy/util/MarkwonFactory.kt +++ b/app/src/main/java/io/heckel/ntfy/util/MarkwonFactory.kt @@ -1,12 +1,10 @@ package io.heckel.ntfy.util import android.content.Context -import android.graphics.Paint import android.graphics.Typeface import android.text.style.* import android.text.util.Linkify -import androidx.core.content.ContextCompat -import io.heckel.ntfy.R +import io.heckel.ntfy.ui.Colors import io.noties.markwon.* import io.noties.markwon.core.CorePlugin import io.noties.markwon.core.CoreProps @@ -36,7 +34,7 @@ internal object MarkwonFactory { .usePlugin(object : AbstractMarkwonPlugin() { override fun configureTheme(builder: MarkwonTheme.Builder) { builder - .linkColor(ContextCompat.getColor(context, R.color.teal)) + .linkColor(Colors.linkColor(context)) .isLinkUnderlined(true) } diff --git a/gradle.properties b/gradle.properties index 3b8190da..a997da7f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,3 +14,4 @@ org.gradle.jvmargs=-Xmx1536m android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official +android.nonTransitiveRClass=false