From b6027442d09b3da549081f2698caaa3b3842474a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Mon, 9 Oct 2023 11:58:47 +0200 Subject: [PATCH] Leave `android.nonTransitiveRClass` at default value --- gradle.properties | 1 - .../commons/samples/activities/MainActivity.kt | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7f9bdc81e..0daadec2a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,4 +16,3 @@ android.useAndroidX=true # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true org.gradle.jvmargs=-Xmx8192m -android.nonTransitiveRClass=false diff --git a/samples/src/main/kotlin/com/simplemobiletools/commons/samples/activities/MainActivity.kt b/samples/src/main/kotlin/com/simplemobiletools/commons/samples/activities/MainActivity.kt index 27381bea7..5abac52ca 100644 --- a/samples/src/main/kotlin/com/simplemobiletools/commons/samples/activities/MainActivity.kt +++ b/samples/src/main/kotlin/com/simplemobiletools/commons/samples/activities/MainActivity.kt @@ -61,14 +61,14 @@ class MainActivity : ComponentActivity() { actions = { val actionMenus = remember { val about = ActionItem( - R.string.about, + com.simplemobiletools.commons.R.string.about, icon = Icons.Outlined.Info, doAction = ::launchAbout, overflowMode = OverflowMode.NEVER_OVERFLOW ) val moreApps = ActionItem( - R.string.more_apps_from_us, + com.simplemobiletools.commons.R.string.more_apps_from_us, doAction = ::launchMoreAppsFromUsIntent, overflowMode = OverflowMode.ALWAYS_OVERFLOW ) @@ -98,7 +98,7 @@ class MainActivity : ComponentActivity() { Button( onClick = ::startCustomizationActivity ) { - Text(stringResource(id = R.string.color_customization)) + Text(stringResource(id = com.simplemobiletools.commons.R.string.color_customization)) } Button( onClick = ::launchAbout