Leave android.nonTransitiveRClass
at default value
This commit is contained in:
parent
0c87d876b5
commit
b6027442d0
2 changed files with 3 additions and 4 deletions
|
@ -16,4 +16,3 @@ android.useAndroidX=true
|
||||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||||
# org.gradle.parallel=true
|
# org.gradle.parallel=true
|
||||||
org.gradle.jvmargs=-Xmx8192m
|
org.gradle.jvmargs=-Xmx8192m
|
||||||
android.nonTransitiveRClass=false
|
|
||||||
|
|
|
@ -61,14 +61,14 @@ class MainActivity : ComponentActivity() {
|
||||||
actions = {
|
actions = {
|
||||||
val actionMenus = remember {
|
val actionMenus = remember {
|
||||||
val about = ActionItem(
|
val about = ActionItem(
|
||||||
R.string.about,
|
com.simplemobiletools.commons.R.string.about,
|
||||||
icon = Icons.Outlined.Info,
|
icon = Icons.Outlined.Info,
|
||||||
doAction = ::launchAbout,
|
doAction = ::launchAbout,
|
||||||
overflowMode = OverflowMode.NEVER_OVERFLOW
|
overflowMode = OverflowMode.NEVER_OVERFLOW
|
||||||
)
|
)
|
||||||
val moreApps =
|
val moreApps =
|
||||||
ActionItem(
|
ActionItem(
|
||||||
R.string.more_apps_from_us,
|
com.simplemobiletools.commons.R.string.more_apps_from_us,
|
||||||
doAction = ::launchMoreAppsFromUsIntent,
|
doAction = ::launchMoreAppsFromUsIntent,
|
||||||
overflowMode = OverflowMode.ALWAYS_OVERFLOW
|
overflowMode = OverflowMode.ALWAYS_OVERFLOW
|
||||||
)
|
)
|
||||||
|
@ -98,7 +98,7 @@ class MainActivity : ComponentActivity() {
|
||||||
Button(
|
Button(
|
||||||
onClick = ::startCustomizationActivity
|
onClick = ::startCustomizationActivity
|
||||||
) {
|
) {
|
||||||
Text(stringResource(id = R.string.color_customization))
|
Text(stringResource(id = com.simplemobiletools.commons.R.string.color_customization))
|
||||||
}
|
}
|
||||||
Button(
|
Button(
|
||||||
onClick = ::launchAbout
|
onClick = ::launchAbout
|
||||||
|
|
Loading…
Reference in a new issue