diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/AboutActivity.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/AboutActivity.kt index afbcb2822..d2d4751de 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/AboutActivity.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/AboutActivity.kt @@ -155,7 +155,7 @@ class AboutActivity : BaseSimpleActivity() { } private fun setupRateUs() { - if (resources.getBoolean(R.bool.hide_google_relations) || resources.getBoolean(R.bool.avoid_showing_rating_prompt)) { + if (resources.getBoolean(R.bool.hide_google_relations)) { about_rate_us_holder.beGone() } diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt index 90c7b8b36..10eb874c8 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt @@ -73,10 +73,8 @@ class CustomizationActivity : BaseSimpleActivity() { runOnUiThread { setupThemes() val hideGoogleRelations = resources.getBoolean(R.bool.hide_google_relations) - val hideSharedThemeButton = resources.getBoolean(R.bool.hide_shared_theme_button) apply_to_all_holder.beVisibleIf( - storedSharedTheme == null && curSelectedThemeId != THEME_AUTO && curSelectedThemeId != THEME_SYSTEM - && !hideGoogleRelations && !hideSharedThemeButton + storedSharedTheme == null && curSelectedThemeId != THEME_AUTO && curSelectedThemeId != THEME_SYSTEM && !hideGoogleRelations ) } } catch (e: Exception) { @@ -98,7 +96,7 @@ class CustomizationActivity : BaseSimpleActivity() { updateLabelColors(textColor) originalAppIconColor = baseConfig.appIconColor - if (resources.getBoolean(R.bool.hide_google_relations) || resources.getBoolean(R.bool.hide_shared_theme_button)) { + if (resources.getBoolean(R.bool.hide_google_relations)) { apply_to_all_holder.beGone() } } @@ -226,10 +224,8 @@ class CustomizationActivity : BaseSimpleActivity() { } val hideGoogleRelations = resources.getBoolean(R.bool.hide_google_relations) - val hideSharedThemeButton = resources.getBoolean(R.bool.hide_shared_theme_button) apply_to_all_holder.beVisibleIf( - curSelectedThemeId != THEME_AUTO && curSelectedThemeId != THEME_SYSTEM && curSelectedThemeId != THEME_SHARED - && !hideGoogleRelations && !hideSharedThemeButton + curSelectedThemeId != THEME_AUTO && curSelectedThemeId != THEME_SYSTEM && curSelectedThemeId != THEME_SHARED && !hideGoogleRelations ) updateMenuItemColors(menu, true, getCurrentStatusBarColor()) } diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt index 36cf098f6..501ebaee8 100644 --- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt +++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt @@ -111,7 +111,7 @@ fun Activity.appLaunched(appId: String) { } if (baseConfig.appRunCount % 40 == 0 && !baseConfig.wasAppRated) { - if (!resources.getBoolean(R.bool.hide_google_relations) && !resources.getBoolean(R.bool.avoid_showing_rating_prompt)) { + if (!resources.getBoolean(R.bool.hide_google_relations)) { RateStarsDialog(this) } } diff --git a/commons/src/main/res/values/bools.xml b/commons/src/main/res/values/bools.xml index ca3dfc9fc..530dab4ed 100644 --- a/commons/src/main/res/values/bools.xml +++ b/commons/src/main/res/values/bools.xml @@ -4,7 +4,5 @@ false false false - false false - false