From c69635b5ae5a0c11fcfbfbe881531ad1a5fedb6c Mon Sep 17 00:00:00 2001 From: Amine Date: Sun, 9 Feb 2025 22:27:53 +0100 Subject: [PATCH] chore: non transiant R classes. --- .../amine/apps/readerforselfossv2/android/HomeActivityTest.kt | 2 +- .../readerforselfossv2/android/fragments/ArticleFragment.kt | 4 ++-- gradle.properties | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/HomeActivityTest.kt b/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/HomeActivityTest.kt index d52c4240..7330144a 100644 --- a/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/HomeActivityTest.kt +++ b/androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/HomeActivityTest.kt @@ -56,7 +56,7 @@ class HomeActivityTest { fun testMenuActions() { onView(withId(R.id.action_search)).perform(click()) onView( - withId(R.id.search_src_text), + withId(com.google.android.material.R.id.search_src_text), ).check(matches(isFocused())) onView(isRoot()).perform(ViewActions.pressBack()) 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 a4ef8f35..2093b6af 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 @@ -118,8 +118,8 @@ class ArticleFragment : e.sendSilentlyWithAcra() } - colorOnSurface = getColorFromAttr(R.attr.colorOnSurface) - colorSurface = getColorFromAttr(R.attr.colorSurface) + colorOnSurface = getColorFromAttr(com.google.android.material.R.attr.colorOnSurface) + colorSurface = getColorFromAttr(com.google.android.material.R.attr.colorSurface) contentText = item.content contentTitle = item.title.getHtmlDecoded() diff --git a/gradle.properties b/gradle.properties index e8881820..033e88c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,11 +19,11 @@ kotlin.code.style=official android.useAndroidX=true #android.nonTransitiveRClass=true android.enableJetifier=false -android.nonTransitiveRClass=false +android.nonTransitiveRClass=true #MPP kotlin.mpp.enableCInteropCommonization=true org.gradle.parallel=true org.gradle.caching=true ignoreGitVersion=false kotlin.native.cacheKind.iosX64=none -org.gradle.configureondemand=true \ No newline at end of file +org.gradle.configureondemand=true