From dcb9b1cb1f2fcdb47ddb3fed44f4784ebca0e5e0 Mon Sep 17 00:00:00 2001 From: davidoskky Date: Mon, 11 Sep 2023 23:26:48 +0200 Subject: [PATCH] Enable non transitive R class --- .../android/fragments/ArticleFragment.kt | 12 ++++++++++-- gradle.properties | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt index b51a0bd..e497f9c 100644 --- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt +++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt @@ -403,10 +403,18 @@ class ArticleFragment : Fragment(), DIAware { binding.webcontent.visibility = View.VISIBLE val colorOnSurface = TypedValue() - requireContext().theme.resolveAttribute(R.attr.colorOnSurface, colorOnSurface, true) + requireContext().theme.resolveAttribute( + com.google.android.material.R.attr.colorOnSurface, + colorOnSurface, + true + ) val colorSurface = TypedValue() - requireContext().theme.resolveAttribute(R.attr.colorSurface, colorSurface, true) + requireContext().theme.resolveAttribute( + com.google.android.material.R.attr.colorSurface, + colorSurface, + true + ) binding.webcontent.settings.useWideViewPort = true binding.webcontent.settings.loadWithOverviewMode = true diff --git a/gradle.properties b/gradle.properties index 4bc8df2..27133c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ kotlin.code.style=official android.useAndroidX=true #android.nonTransitiveRClass=true android.enableJetifier=true -android.nonTransitiveRClass=false +android.nonTransitiveRClass=true #MPP kotlin.mpp.enableCInteropCommonization=true org.gradle.parallel=true