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

Unverified Commit 9259ee2d authored by Phoenix1747's avatar Phoenix1747
Browse files

Merge branch 'SimpleMobileTools-master' 

Fixed a conflict, ugh git please.
parents fe05fd97 b2f8d322

commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt

+2 −1
Original line number Diff line number Diff line
@@ -290,8 +290,9 @@ fun BaseSimpleActivity.checkWhatsNew(releases: List<Release>, currVersion: Int) 
    val newReleases = arrayListOf<Release>()

    releases.filterTo(newReleases) { it.id > baseConfig.lastVersion }



    if (newReleases.isNotEmpty())

    if (newReleases.isNotEmpty() && !baseConfig.avoidWhatsNew) {

        WhatsNewDialog(this, newReleases)

    }



    baseConfig.lastVersion = currVersion

}

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

+4 −0
Original line number Diff line number Diff line
@@ -139,4 +139,8 @@ open class BaseConfig(val context: Context) { 
    var lastConflictResolution: Int

        get() = prefs.getInt(LAST_CONFLICT_RESOLUTION, CONFLICT_SKIP)

        set(lastConflictResolution) = prefs.edit().putInt(LAST_CONFLICT_RESOLUTION, lastConflictResolution).apply()



    var avoidWhatsNew: Boolean

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

        set(avoidWhatsNew) = prefs.edit().putBoolean(AVOID_WHATS_NEW, avoidWhatsNew).apply()

}

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

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ const val SHOW_INFO_BUBBLE = "show_info_bubble" 
const val SORTING = "sorting"

const val LAST_CONFLICT_RESOLUTION = "last_conflict_resolution"

const val LAST_CONFLICT_APPLY_TO_ALL = "last_conflict_apply_to_all"

const val AVOID_WHATS_NEW = "avoid_whats_new"



// licenses

const val LICENSE_KOTLIN = 1

commons/src/main/res/values-ca/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ 
    <string name="settings">Ajustaments</string>

    <string name="customize_colors">Canviar colors</string>

    <string name="use_english_language">Usar l’idioma Anglès</string>

    <string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>

    <string name="show_hidden_items">Mostra elements ocults</string>

    <string name="font_size">Mida de la font</string>

    <string name="small">Petita</string>

commons/src/main/res/values-cs/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ 
    <string name="settings">Nastavení</string>

    <string name="customize_colors">Přizpůsobit barvy</string>

    <string name="use_english_language">Use English language</string>

    <string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>

    <string name="show_hidden_items">Zobrazit skryté položky</string>

    <string name="font_size">Font size</string>

    <string name="small">Small</string>