Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ede5203 authored by tibbi's avatar tibbi
Browse files

show a warning before changing the app icon color for the first time

parent adcf4f43

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ buildscript { 
        propMinSdkVersion = 21

        propTargetSdkVersion = propCompileSdkVersion

        propVersionCode = 1

        propVersionName = '5.5.20'

        propVersionName = '5.6.0'

        kotlin_version = '1.3.11'

    }

commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt

+34 −14
Original line number Diff line number Diff line
@@ -131,6 +131,18 @@ class CustomizationActivity : BaseSimpleActivity() { 
        curSelectedThemeId = getCurrentThemeId()

        customization_theme.text = getThemeText()

        customization_theme_holder.setOnClickListener {

            if (baseConfig.wasAppIconCustomizationWarningShown) {

                themePickerClicked()

            } else {

                ConfirmationDialog(this, "", R.string.app_icon_color_warning, R.string.ok, 0) {

                    baseConfig.wasAppIconCustomizationWarningShown = true

                    themePickerClicked()

                }

            }

        }

    }



    private fun themePickerClicked() {

        val items = arrayListOf<RadioItem>()

        for ((key, value) in predefinedThemes) {

            items.add(RadioItem(key, getString(value.nameId)))
@@ -149,7 +161,6 @@ class CustomizationActivity : BaseSimpleActivity() { 
            }

        }

    }

    }



    private fun updateColorTheme(themeId: Int, useStored: Boolean = false) {

        curSelectedThemeId = themeId
@@ -298,8 +309,17 @@ class CustomizationActivity : BaseSimpleActivity() { 
        customization_text_color_holder.setOnClickListener { pickTextColor() }

        customization_background_color_holder.setOnClickListener { pickBackgroundColor() }

        customization_primary_color_holder.setOnClickListener { pickPrimaryColor() }

        customization_app_icon_color_holder.setOnClickListener { pickAppIconColor() }

        apply_to_all_holder.setOnClickListener { applyToAll() }

        customization_app_icon_color_holder.setOnClickListener {

            if (baseConfig.wasAppIconCustomizationWarningShown) {

                pickAppIconColor()

            } else {

                ConfirmationDialog(this, "", R.string.app_icon_color_warning, R.string.ok, 0) {

                    baseConfig.wasAppIconCustomizationWarningShown = true

                    pickAppIconColor()

                }

            }

        }

    }



    private fun hasColorChanged(old: Int, new: Int) = Math.abs(old - new) > 1

commons/src/main/kotlin/com/simplemobiletools/commons/helpers/BaseConfig.kt

+4 −0
Original line number Diff line number Diff line
@@ -270,4 +270,8 @@ open class BaseConfig(val context: Context) { 
    var wasInitialUpgradeToProShown: Boolean

        get() = prefs.getBoolean(WAS_INITIAL_UPGRADE_TO_PRO_SHOWN, false)

        set(wasInitialUpgradeToProShown) = prefs.edit().putBoolean(WAS_INITIAL_UPGRADE_TO_PRO_SHOWN, wasInitialUpgradeToProShown).apply()



    var wasAppIconCustomizationWarningShown: Boolean

        get() = prefs.getBoolean(WAS_APP_ICON_CUSTOMIZATION_WARNING_SHOWN, false)

        set(wasAppIconCustomizationWarningShown) = prefs.edit().putBoolean(WAS_APP_ICON_CUSTOMIZATION_WARNING_SHOWN, wasAppIconCustomizationWarningShown).apply()

}

commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ const val WAS_ORANGE_ICON_CHECKED = "was_orange_icon_checked" 
const val WAS_APP_ON_SD_SHOWN = "was_app_on_sd_shown"

const val WAS_BEFORE_ASKING_SHOWN = "was_before_asking_shown"

const val WAS_INITIAL_UPGRADE_TO_PRO_SHOWN = "was_initial_upgrade_to_pro_shown"

const val WAS_APP_ICON_CUSTOMIZATION_WARNING_SHOWN = "was_app_icon_customization_warning_shown"



// licenses

internal const val LICENSE_KOTLIN = 1