wbrawner/Simple-Commons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removing some new booleans, hide all Google relations in foss variants

Browse source
This commit is contained in:
tibbi 2022-05-20 20:23:02 +02:00
parent 106be9169e
commit bc0d61dacb
4 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commons/src/main/kotlin/com/simplemobiletools/commons/activities/AboutActivity.kt
View file

@ -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()
}

10
commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt
View file

@ -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())
}

2
commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
View file

@ -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)
}
}

2
commons/src/main/res/values/bools.xml
View file

@ -4,7 +4,5 @@
<bool name="show_donate_in_about">false</bool>
<bool name="hide_google_relations">false</bool>
<bool name="hide_all_external_links">false</bool>
<bool name="avoid_showing_rating_prompt">false</bool>
<bool name="pretend_thank_you_installed">false</bool>
<bool name="hide_shared_theme_button">false</bool>
</resources>