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

Commit 5e55b034 authored by tibbi's avatar tibbi
Browse files

make sure we check for Shared Theme usage after updating the apps too

parent c7e94102

build.gradle

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

        propTargetSdkVersion = propCompileSdkVersion

        propVersionCode = 1

        propVersionName = '2.42.8'

        propVersionName = '2.42.9'

        kotlin_version = '1.2.0'

        support_libs = '27.0.1'

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ abstract class BaseSplashActivity : AppCompatActivity() { 


    override fun onCreate(savedInstanceState: Bundle?) {

        super.onCreate(savedInstanceState)

        if (baseConfig.appRunCount == 0 && isThankYouInstalled()) {

        if ((baseConfig.appRunCount == 0 || !baseConfig.wasSharedThemeAfterUpdateChecked) && isThankYouInstalled()) {

            baseConfig.wasSharedThemeAfterUpdateChecked = true

            getSharedTheme {

                if (it != null) {

                    baseConfig.apply {

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

+5 −0
Original line number Diff line number Diff line
@@ -120,4 +120,9 @@ open class BaseConfig(val context: Context) { 
    var wasSharedThemeForced: Boolean

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

        set(wasSharedThemeForced) = prefs.edit().putBoolean(WAS_SHARED_THEME_FORCED, wasSharedThemeForced).apply()



    // used only for checking shared theme after updating to 3.0.0 from some previous version

    var wasSharedThemeAfterUpdateChecked: Boolean

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

        set(wasSharedThemeAfterUpdateChecked) = prefs.edit().putBoolean(WAS_SHARED_THEME_AFTER_UPDATE_CHECKED, wasSharedThemeAfterUpdateChecked).apply()

}

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

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ val WAS_SHARED_THEME_EVER_ACTIVATED = "was_shared_theme_ever_activated" 
val IS_USING_SHARED_THEME = "is_using_shared_theme"

val WAS_SHARED_THEME_FORCED = "was_shared_theme_forced"

val WAS_CUSTOM_THEME_SWITCH_DESCRIPTION_SHOWN = "was_custom_theme_switch_description_shown"

val WAS_SHARED_THEME_AFTER_UPDATE_CHECKED = "was_shared_theme_after_update_checked"



// licenses

val LICENSE_KOTLIN = 1