Merge pull request #68 from SimpleMobileTools/master

upd
2019-07-31 22:49:16 +03:00 · 2019-07-31 22:49:16 +03:00 · 58b622edb6
commit 58b622edb6
parent 4db6af6d08 da72e1fb49
53 changed files with 213 additions and 69 deletions
--- a/build.gradle
+++ b/build.gradle
@ -7,7 +7,7 @@ buildscript {
        propMinSdkVersion = 21
        propTargetSdkVersion = propCompileSdkVersion
        propVersionCode = 1
-        propVersionName = '5.15.5'
+        propVersionName = '5.15.15'
        kotlin_version = '1.3.41'
    }

--- a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt
@ -2,29 +2,18 @@ package com.simplemobiletools.commons.activities

 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.simplemobiletools.commons.R
-import com.simplemobiletools.commons.extensions.baseConfig
-import com.simplemobiletools.commons.extensions.getSharedTheme
-import com.simplemobiletools.commons.extensions.isThankYouInstalled
-import com.simplemobiletools.commons.extensions.showSideloadingDialog
-import com.simplemobiletools.commons.helpers.SIDELOADING_FALSE
+import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.SIDELOADING_TRUE
 import com.simplemobiletools.commons.helpers.SIDELOADING_UNCHECKED

 abstract class BaseSplashActivity : AppCompatActivity() {
    abstract fun initActivity()

-    abstract fun getAppPackageName(): String
-
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

        if (baseConfig.appSideloadingStatus == SIDELOADING_UNCHECKED) {
-            val isSideloaded = isAppSideloaded()
-            baseConfig.appSideloadingStatus = if (isSideloaded) SIDELOADING_TRUE else SIDELOADING_FALSE
-            if (isSideloaded) {
-                baseConfig.appId = getAppPackageName()
-                showSideloadingDialog()
+            if (checkAppSideloading()) {
                return
            }
        } else if (baseConfig.appSideloadingStatus == SIDELOADING_TRUE) {
@ -53,13 +42,4 @@ abstract class BaseSplashActivity : AppCompatActivity() {
            initActivity()
        }
    }
-
-    private fun isAppSideloaded(): Boolean {
-        return try {
-            getDrawable(R.drawable.ic_camera)
-            false
-        } catch (e: Exception) {
-            true
-        }
-    }
 }
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt
@ -171,7 +171,6 @@ class CustomizationActivity : BaseSimpleActivity() {
    private fun updateColorTheme(themeId: Int, useStored: Boolean = false) {
        curSelectedThemeId = themeId
        customization_theme.text = getThemeText()
-        curNavigationBarColor = baseConfig.navigationBarColor

        resources.apply {
            if (curSelectedThemeId == THEME_CUSTOM) {
@ -415,10 +414,9 @@ class CustomizationActivity : BaseSimpleActivity() {
            updateNavigationBarColor(it)
        }, callback = { wasPositivePressed, color ->
            if (wasPositivePressed) {
-                if (hasColorChanged(curNavigationBarColor, color)) {
-                    setCurrentNavigationBarColor(color)
-                    colorChanged()
-                }
+                setCurrentNavigationBarColor(color)
+                colorChanged()
+                updateColorTheme(getUpdatedTheme())
            } else {
                updateNavigationBarColor(curNavigationBarColor)
            }
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt
@ -26,7 +26,7 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc
    protected var textColor = baseConfig.textColor
    protected var backgroundColor = baseConfig.backgroundColor
    protected var actModeCallback: MyActionModeCallback
-    protected var selectedKeys = HashSet<Int>()
+    protected var selectedKeys = LinkedHashSet<Int>()
    protected var positionOffset = 0

    private var actMode: ActionMode? = null
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt
@ -229,6 +229,8 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal
                bytes = inputStream.read(buffer)
            }

+            out?.flush()
+
            if (source.size == copiedSize && File(destination.path).exists()) {
                mTransferredFiles.add(source)
                if (activity.baseConfig.keepLastModified) {
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/AppSideloadedDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/AppSideloadedDialog.kt
@ -5,14 +5,14 @@ import android.text.Html
 import android.text.method.LinkMovementMethod
 import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.R
-import com.simplemobiletools.commons.extensions.baseConfig
+import com.simplemobiletools.commons.extensions.getStringsPackageName
 import com.simplemobiletools.commons.extensions.launchViewIntent
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import kotlinx.android.synthetic.main.dialog_textview.view.*

 class AppSideloadedDialog(val activity: Activity, val callback: () -> Unit) {
-    var dialog: AlertDialog
-    val url = "https://play.google.com/store/apps/details?id=${activity.baseConfig.appId.removeSuffix(".debug")}"
+    private var dialog: AlertDialog
+    private val url = "https://play.google.com/store/apps/details?id=${activity.getStringsPackageName()}"

    init {
        val view = activity.layoutInflater.inflate(R.layout.dialog_textview, null).apply {
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ColorPickerDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ColorPickerDialog.kt
@ -12,12 +12,11 @@ import android.widget.ImageView
 import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.INVALID_NAVIGATION_BAR_COLOR
 import com.simplemobiletools.commons.views.ColorPickerSquare
 import kotlinx.android.synthetic.main.dialog_color_picker.view.*

 // forked from https://github.com/yukuku/ambilwarna
-class ColorPickerDialog(val activity: Activity, color: Int, val removeDimmedBackground: Boolean = false, val showUseDefaultButton: Boolean = false,
+class ColorPickerDialog(val activity: Activity, color: Int, val removeDimmedBackground: Boolean = false, showUseDefaultButton: Boolean = false,
                        val currentColorCallback: ((color: Int) -> Unit)? = null, val callback: (wasPositivePressed: Boolean, color: Int) -> Unit) {
    lateinit var viewHue: View
    lateinit var viewSatVal: ColorPickerSquare
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
@ -899,6 +899,30 @@ fun BaseSimpleActivity.getAlarmSounds(type: Int, callback: (ArrayList<AlarmSound
    }
 }

+fun AppCompatActivity.checkAppSideloading(): Boolean {
+    val isSideloaded = when (baseConfig.appSideloadingStatus) {
+        SIDELOADING_TRUE -> true
+        SIDELOADING_FALSE -> false
+        else -> isAppSideloaded()
+    }
+
+    baseConfig.appSideloadingStatus = if (isSideloaded) SIDELOADING_TRUE else SIDELOADING_FALSE
+    if (isSideloaded) {
+        showSideloadingDialog()
+    }
+
+    return isSideloaded
+}
+
+fun AppCompatActivity.isAppSideloaded(): Boolean {
+    return try {
+        getDrawable(R.drawable.ic_camera)
+        false
+    } catch (e: Exception) {
+        true
+    }
+}
+
 fun AppCompatActivity.showSideloadingDialog() {
    AppSideloadedDialog(this) {
        finish()
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context-storage.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context-storage.kt
@ -215,13 +215,16 @@ fun Context.getDocumentFile(path: String): DocumentFile? {
        relativePath = relativePath.substring(1)
    }

-    var document = DocumentFile.fromTreeUri(applicationContext, Uri.parse(if (isOTG) baseConfig.OTGTreeUri else baseConfig.treeUri))
-    val parts = relativePath.split("/").filter { it.isNotEmpty() }
-    for (part in parts) {
-        document = document?.findFile(part)
+    return try {
+        var document = DocumentFile.fromTreeUri(applicationContext, Uri.parse(if (isOTG) baseConfig.OTGTreeUri else baseConfig.treeUri))
+        val parts = relativePath.split("/").filter { it.isNotEmpty() }
+        for (part in parts) {
+            document = document?.findFile(part)
+        }
+        return document
+    } catch (ignored: Exception) {
+        null
    }
-
-    return document
 }

 fun Context.getSomeDocumentFile(path: String) = getFastDocumentFile(path) ?: getDocumentFile(path)
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context.kt
@ -656,3 +656,5 @@ fun Context.getVideoResolution(path: String): Point? {

    return point
 }
+
+fun Context.getStringsPackageName() = getString(R.string.package_name)
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/File.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/File.kt
@ -1,9 +1,6 @@
 package com.simplemobiletools.commons.extensions

-import com.simplemobiletools.commons.helpers.audioExtensions
-import com.simplemobiletools.commons.helpers.photoExtensions
-import com.simplemobiletools.commons.helpers.rawExtensions
-import com.simplemobiletools.commons.helpers.videoExtensions
+import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.commons.models.FileDirItem
 import java.io.File

@ -77,3 +74,19 @@ private fun getDirectoryFileCount(dir: File, countHiddenItems: Boolean): Int {
 fun File.getDirectChildrenCount(countHiddenItems: Boolean) = listFiles()?.filter { if (countHiddenItems) true else !it.isHidden }?.size ?: 0

 fun File.toFileDirItem() = FileDirItem(absolutePath, name, File(absolutePath).isDirectory, 0, length(), lastModified())
+
+fun File.containsNoMedia() = isDirectory && File(this, NOMEDIA).exists()
+
+fun File.doesThisOrParentHaveNoMedia(): Boolean {
+    var curFile = this
+    while (true) {
+        if (curFile.containsNoMedia()) {
+            return true
+        }
+        curFile = curFile.parentFile ?: break
+        if (curFile.absolutePath == "/") {
+            break
+        }
+    }
+    return false
+}
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/String.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/String.kt
@ -77,6 +77,10 @@ fun String.getGenericMimeType(): String {

 fun String.getParentPath() = removeSuffix("/${getFilenameFromPath()}")

+fun String.containsNoMedia() = File(this).containsNoMedia()
+
+fun String.doesThisOrParentHaveNoMedia() = File(this).doesThisOrParentHaveNoMedia()
+
 fun String.getDuration() = getFileDurationSeconds()?.getFormattedDuration()

 fun String.getFileDurationSeconds(): Int? {
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt
@ -17,6 +17,7 @@ const val IS_FROM_GALLERY = "is_from_gallery"
 const val BROADCAST_REFRESH_MEDIA = "com.simplemobiletools.REFRESH_MEDIA"
 const val REFRESH_PATH = "refresh_path"
 const val IS_CUSTOMIZING_COLORS = "is_customizing_colors"
+const val NOMEDIA = ".nomedia"
 const val ALARM_SOUND_TYPE_ALARM = 1
 const val ALARM_SOUND_TYPE_NOTIFICATION = 2
 const val YOUR_ALARM_SOUNDS_MIN_ID = 1000
--- a/commons/src/main/res/values-ar/strings.xml
+++ b/commons/src/main/res/values-ar/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">ملف المصدر %s غير موجود</string>
    <string name="prepend_filenames">Prepend filenames</string>
    <string name="append_filenames">Append filenames</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-az/strings.xml
+++ b/commons/src/main/res/values-az/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Kök faylı %s yoxdur</string>
    <string name="prepend_filenames">Prepend filenames</string>
    <string name="append_filenames">Append filenames</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-br/strings.xml
+++ b/commons/src/main/res/values-br/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Source file %s doesn\'t exist</string>
    <string name="prepend_filenames">Prepend filenames</string>
    <string name="append_filenames">Append filenames</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-ca/strings.xml
+++ b/commons/src/main/res/values-ca/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">El fitxer %s no existeix</string>
    <string name="prepend_filenames">Posar abans noms de fitxer</string>
    <string name="append_filenames">Afegeix noms de fitxer</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - any\n%M - mes\n%D - dia\n%h - hora\n%m - minut\n%s - segon</string>

    <!-- Copy / Move -->
@ -176,8 +179,8 @@
    <string name="app_icon_color">Color de la icona d\'aplicació</string>
    <string name="bottom_navigation_bar_color">Color de la barra de navegació inferior</string>
    <string name="restore_defaults">Valors per defecte</string>
-    <string name="use_default">Use default</string>
-    <string name="default_color">Default</string>
+    <string name="use_default">Utilitzar per defecte</string>
+    <string name="default_color">Per defecte</string>
    <string name="change_color">Canviar de color</string>
    <string name="theme">Tema</string>
    <string name="changing_color_description">Canviar un color farà que canvii a tema personalitzat</string>
--- a/commons/src/main/res/values-cs/strings.xml
+++ b/commons/src/main/res/values-cs/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Zdrojový soubor %s neexistuje</string>
    <string name="prepend_filenames">Přidat před názvy souborů</string>
    <string name="append_filenames">Přidat za názvy souborů</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-cy/strings.xml
+++ b/commons/src/main/res/values-cy/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Dyw\'r ffeil tarddiad %s ddim yn bodoli</string>
    <string name="prepend_filenames">Rhagddodi enwau ffeiliau</string>
    <string name="append_filenames">Ôl-ddodi enwau ffeiliau</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-da/strings.xml
+++ b/commons/src/main/res/values-da/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Kildefilen %s eksisterer ikke</string>
    <string name="prepend_filenames">Tilføj forrest til filnavne</string>
    <string name="append_filenames">Tilføj bagerst til filnavne</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - år\n%M - måned\n%D - dag\n%h - time\n%m - minut\n%s - sekund</string>

    <!-- Copy / Move -->
@ -176,8 +179,8 @@
    <string name="app_icon_color">Farve til appens ikon</string>
    <string name="bottom_navigation_bar_color">Farve på nederste navigationslinje</string>
    <string name="restore_defaults">Gendan standarder</string>
-    <string name="use_default">Use default</string>
-    <string name="default_color">Default</string>
+    <string name="use_default">Anvend standard</string>
+    <string name="default_color">Standard</string>
    <string name="change_color">Skift farve</string>
    <string name="theme">Udseende</string>
    <string name="changing_color_description">Ændring af farve vil også medføre skift til tilpasset udseende</string>
--- a/commons/src/main/res/values-de/strings.xml
+++ b/commons/src/main/res/values-de/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Quelldatei %s existiert nicht</string>
    <string name="prepend_filenames">Dateinamen voranstellen</string>
    <string name="append_filenames">Dateinamen anhängen</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-el/strings.xml
+++ b/commons/src/main/res/values-el/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">To αρχείο προέλευσης %s δεν υπάρχει</string>
    <string name="prepend_filenames">Προεπιλεγμένα ονόματα αρχείων</string>
    <string name="append_filenames">Προσθέστε ονόματα αρχείων</string>
+    <string name="simple_renaming">Απλή μετονομασία</string>
+    <string name="pattern_renaming">Μοτίβο</string>
+    <string name="string_to_add">Συμβολοσειρά για προσθήκη</string>
    <string name="rename_date_time_pattern">%Y - έτος\n%M - μήνας\n%D - ημέρα\n%h - ώρα\n%m - λεπτό\n%s - δευτ/το</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-es/strings.xml
+++ b/commons/src/main/res/values-es/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">El archivo %s no existe</string>
    <string name="prepend_filenames">Preponer los nombres de archivo</string>
    <string name="append_filenames">Adjuntar nombres de archivos</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -176,8 +179,8 @@
    <string name="app_icon_color">Color del icono de la aplicación</string>
    <string name="bottom_navigation_bar_color">Color de la barra de navegación inferior</string>
    <string name="restore_defaults">Valores por defecto</string>
-    <string name="use_default">Use default</string>
-    <string name="default_color">Default</string>
+    <string name="use_default">Usar por defecto</string>
+    <string name="default_color">Por defecto</string>
    <string name="change_color">Cambiar de color</string>
    <string name="theme">Tema</string>
    <string name="changing_color_description">Cambiar un color hará que cambie a tema personalizado</string>
--- a/commons/src/main/res/values-fi/strings.xml
+++ b/commons/src/main/res/values-fi/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Lähdetiedostoa %s ei löydy</string>
    <string name="prepend_filenames">Prepend filenames</string>
    <string name="append_filenames">Append filenames</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-fr/strings.xml
+++ b/commons/src/main/res/values-fr/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Le fichier source %s n\'existe pas</string>
    <string name="prepend_filenames">Ajouter un préfixe aux noms de fichiers</string>
    <string name="append_filenames">Ajouter un suffixe aux noms de fichiers</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - année\n%M - mois\n%D - jour\n%h - heure\n%m - minute\n%s - seconde</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-gl/strings.xml
+++ b/commons/src/main/res/values-gl/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">El archivo %s no existe</string>
    <string name="prepend_filenames">Prepend filenames</string>
    <string name="append_filenames">Append filenames</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-hi-rIN/strings.xml
+++ b/commons/src/main/res/values-hi-rIN/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Source file %s doesn\'t exist</string>
    <string name="prepend_filenames">Prepend filenames</string>
    <string name="append_filenames">Append filenames</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-hr/strings.xml
+++ b/commons/src/main/res/values-hr/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Izvorišna datoteka %s ne postoji</string>
    <string name="prepend_filenames">Dodavanje na početak imena datoteke</string>
    <string name="append_filenames">Dodavanje naziva datoteka</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-hu/strings.xml
+++ b/commons/src/main/res/values-hu/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">A forrás fájl %s nem létezik</string>
    <string name="prepend_filenames">Fájlnevek megadása</string>
    <string name="append_filenames">Fájlnevek csatolása</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%É - év\\n%H - hónap\\n%N - nap\\n%ó - óra\\n%p - perc\\n%mp - másodperc</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-id/strings.xml
+++ b/commons/src/main/res/values-id/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Berkas sumber %s tidak ada</string>
    <string name="prepend_filenames">Tambah akhiran nama berkas</string>
    <string name="append_filenames">Tambah awalan nama berkas</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - tahun\n%M - bulan\n%D - hari\n%h - jam\n%m - menit\n%s - detik</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-in/strings.xml
+++ b/commons/src/main/res/values-in/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Berkas sumber %s tidak ada</string>
    <string name="prepend_filenames">Tambah akhiran nama berkas</string>
    <string name="append_filenames">Tambah awalan nama berkas</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - tahun\n%M - bulan\n%D - hari\n%h - jam\n%m - menit\n%s - detik</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-it/strings.xml
+++ b/commons/src/main/res/values-it/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Il file di origine %s non esiste</string>
    <string name="prepend_filenames">Anteponi i nomi dei file</string>
    <string name="append_filenames">Aggiungi i nomi dei file</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-iw/strings.xml
+++ b/commons/src/main/res/values-iw/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Source file %s doesn\'t exist</string>
    <string name="prepend_filenames">Prepend filenames</string>
    <string name="append_filenames">Append filenames</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-ja/strings.xml
+++ b/commons/src/main/res/values-ja/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">ソースファイル %s が存在しません</string>
    <string name="prepend_filenames">ファイル名の前に追加</string>
    <string name="append_filenames">ファイル名の後に追加</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-ko-rKR/strings.xml
+++ b/commons/src/main/res/values-ko-rKR/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Source file %s doesn\'t exist</string>
    <string name="prepend_filenames">Prepend filenames</string>
    <string name="append_filenames">Append filenames</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-lt/strings.xml
+++ b/commons/src/main/res/values-lt/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Šaltinio byla %s neegzistuoja</string>
    <string name="prepend_filenames">Prepend filenames</string>
    <string name="append_filenames">Append filenames</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-nb/strings.xml
+++ b/commons/src/main/res/values-nb/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Source file %s doesn\'t exist</string>
    <string name="prepend_filenames">Prepend filenames</string>
    <string name="append_filenames">Append filenames</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
@ -91,7 +94,7 @@
    <string name="saving">Lagrer…</string>
    <string name="could_not_create_folder">Kunne ikke opprette mappen %s</string>
    <string name="could_not_create_file">Kunne ikke opprette filen %s</string>
-    <string name="no_new_items">No new items have been found</string>
+    <string name="no_new_items">Ingen nye elementer er funnet</string>

    <!-- Create new -->
    <string name="create_new">Opprett ny</string>
@ -165,8 +168,8 @@
    <string name="camera">Kamera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Sangtittel</string>
-    <string name="gps_coordinates">GPS coordinates</string>
-    <string name="altitude">Altitude</string>
+    <string name="gps_coordinates">GPS-koordinater</string>
+    <string name="altitude">Høyde</string>

    <!-- Color customization -->
    <string name="background_color">Bakgrunnsfarge</string>
@ -174,10 +177,10 @@
    <string name="primary_color">Primærfarge</string>
    <string name="foreground_color">Forgrunnsfarge</string>
    <string name="app_icon_color">Farge for app-ikon</string>
-    <string name="bottom_navigation_bar_color">Bottom navigation bar color</string>
+    <string name="bottom_navigation_bar_color">Farge på nedre navigeringslinje</string>
    <string name="restore_defaults">Gjenopprett standard</string>
-    <string name="use_default">Use default</string>
-    <string name="default_color">Default</string>
+    <string name="use_default">Bruk standard</string>
+    <string name="default_color">Standard</string>
    <string name="change_color">Endre farge</string>
    <string name="theme">Tema</string>
    <string name="changing_color_description">Endring av farge vil gjøre at det skiftes til Tilpasset tema</string>
@ -227,7 +230,7 @@
    <string name="undo">Angre</string>
    <string name="redo">Annuler angre</string>
    <string name="print">Skriv ut</string>
-    <string name="create_shortcut">Create shortcut</string>
+    <string name="create_shortcut">Opprett snarvei</string>

    <!-- Sorting -->
    <string name="sort_by">Sorter etter</string>
--- a/commons/src/main/res/values-nl/strings.xml
+++ b/commons/src/main/res/values-nl/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Bronbestand %s bestaat niet</string>
    <string name="prepend_filenames">Voor bestandsnaam</string>
    <string name="append_filenames">Na bestandsnaam</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - jaar\n%M - maand\n%D - dag\n%h - uur\n%m - minuut\n%s - seconde</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-no/strings.xml
+++ b/commons/src/main/res/values-no/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Source file %s doesn\'t exist</string>
    <string name="prepend_filenames">Prepend filenames</string>
    <string name="append_filenames">Append filenames</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-pl/strings.xml
+++ b/commons/src/main/res/values-pl/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Plik źródłowy nie istnieje</string>
    <string name="prepend_filenames">Poprzedzaj nazwy plików</string>
    <string name="append_filenames">Dołączaj nazwy plików</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-pt-rBR/strings.xml
+++ b/commons/src/main/res/values-pt-rBR/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Arquivo de origem %s não existe</string>
    <string name="prepend_filenames">Adicionar ao início dos nomes</string>
    <string name="append_filenames">Adicionar ao fim dos nomes</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - ano\n%M - mês\n%D - dia\n%h - hora\n%m - minuto\n%s - segundo</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-pt/strings.xml
+++ b/commons/src/main/res/values-pt/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">O ficheiro de origem %s não existe</string>
    <string name="prepend_filenames">Introduzir antes do nome do ficheiro</string>
    <string name="append_filenames">Introduzir depois do nome do ficheiro</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - ano\n%M - mês\n%D - dia\n%h - horas\n%m - minutos\n%s - segundos</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-ru/strings.xml
+++ b/commons/src/main/res/values-ru/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Исходный файл \"%s\" не существует</string>
    <string name="prepend_filenames">Перед именем файла</string>
    <string name="append_filenames">После имени файла</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - год\n%M - месяц\n%D - день\n%h - час\n%m - минута\n%s - секунда</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-sk/strings.xml
+++ b/commons/src/main/res/values-sk/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Zdrojový súbor %s neexistuje</string>
    <string name="prepend_filenames">Pridať pred názvy súborov</string>
    <string name="append_filenames">Pridať za názvy súborov</string>
+    <string name="simple_renaming">Jednoduché premenovanie</string>
+    <string name="pattern_renaming">Vzor</string>
+    <string name="string_to_add">Reťazec na pridanie</string>
    <string name="rename_date_time_pattern">%Y - rok\n%M - mesiac\n%D - deň\n%h - hodina\n%m - minúta\n%s - sekunda</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-sl/strings.xml
+++ b/commons/src/main/res/values-sl/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Datoteka %s ne obstaja</string>
    <string name="prepend_filenames">Pripravi mena datotek</string>
    <string name="append_filenames">Dodaj imena datotek</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-sr/strings.xml
+++ b/commons/src/main/res/values-sr/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Изворни код датотеке %s не постоји</string>
    <string name="prepend_filenames">Додај префикс именима датотека</string>
    <string name="append_filenames">Додај суфикс именима датотека</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-sv/strings.xml
+++ b/commons/src/main/res/values-sv/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Källfilen %s finns inte</string>
    <string name="prepend_filenames">Lägg till före filnamnen</string>
    <string name="append_filenames">Lägg till efter filnamnen</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - år\n%M - månad\n%D - dag\n%h - timme\n%m - minut\n%s - sekund</string>

    <!-- Copy / Move -->
@ -165,8 +168,8 @@
    <string name="camera">Kamera</string>
    <string name="exif">EXIF</string>
    <string name="song_title">Låttitel</string>
-    <string name="gps_coordinates">GPS coordinates</string>
-    <string name="altitude">Altitude</string>
+    <string name="gps_coordinates">GPS-koordinater</string>
+    <string name="altitude">Höjd över havet</string>

    <!-- Color customization -->
    <string name="background_color">Bakgrundsfärg</string>
@ -176,8 +179,8 @@
    <string name="app_icon_color">Appikonens färg</string>
    <string name="bottom_navigation_bar_color">Navigeringsfältets färg</string>
    <string name="restore_defaults">Återställ standardfärger</string>
-    <string name="use_default">Use default</string>
-    <string name="default_color">Default</string>
+    <string name="use_default">Använd standard</string>
+    <string name="default_color">Standard</string>
    <string name="change_color">Ändra färg</string>
    <string name="theme">Tema</string>
    <string name="changing_color_description">Om du ändrar en färg, ändras temat till anpassat tema</string>
@ -565,11 +568,11 @@
    <string name="sunday_short">Sön</string>

    <!-- Pro version -->
-    <string name="upgrade_to_pro_long">This version of the app is no longer maintained. Please upgrade to the Pro version.</string>
-    <string name="it_is_free">It is free till: %s. If you download it till then, you will be able to use it for free forever.</string>
-    <string name="more_info">More info</string>
-    <string name="upgrade">Upgrade</string>
-    <string name="upgrade_calendar">You have to migrate locally stored events manually via exporting in an .ics file, then importing. You can find both export/import buttons at the main screen menu.</string>
+    <string name="upgrade_to_pro_long">Den här versionen av appen underhålls inte längre. Uppgradera till Pro-versionen.</string>
+    <string name="it_is_free">Den är gratis fram till: %s. Om du hämtar den innan dess, kan du använda den kostnadsfritt för all framtid.</string>
+    <string name="more_info">Mer information</string>
+    <string name="upgrade">Uppgradera</string>
+    <string name="upgrade_calendar">Lokalt sparade händelser kan bara migreras manuellt genom att exportera och importera dem till och från en .ics-fil. Du hittar knappar för både export och import i huvudvymenyn.</string>

    <!-- About -->
    <string name="about">Om</string>
@ -587,7 +590,7 @@
    <string name="donate_underlined"><u>Donera</u></string>
    <string name="follow_us">Följ oss</string>
    <string name="copyright">v %1$s\nCopyright © Simple Mobile Tools %2$d</string>
-    <string name="additional_info">Ytterligare info</string>
+    <string name="additional_info">Ytterligare information</string>
    <string name="app_version">Appversion: %s</string>
    <string name="device_os">Enhetens operativsystem: %s</string>
    <string name="donate_please">
--- a/commons/src/main/res/values-tr/strings.xml
+++ b/commons/src/main/res/values-tr/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">%s kaynak dosyası mevcut değil</string>
    <string name="prepend_filenames">Ön dosya adları</string>
    <string name="append_filenames">Dosya adlarını ekle</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-uk/strings.xml
+++ b/commons/src/main/res/values-uk/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Вихідний файл %s не існує</string>
    <string name="prepend_filenames">Префікс імен файлів</string>
    <string name="append_filenames">Суфікс імен файлів</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - рік\n%M - місяць\n%D - день\n%h - година\n%m - хвилина\n%s - секунда</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-zh-rCN/strings.xml
+++ b/commons/src/main/res/values-zh-rCN/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">原文件 %s 不存在</string>
    <string name="prepend_filenames">文件名前缀</string>
    <string name="append_filenames">文件名后缀</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - 年\n%M - 月\n%D - 日\n%h - 时\n%m - 分\n%s - 秒</string>

    <!-- Copy / Move -->
--- a/commons/src/main/res/values-zh-rTW/strings.xml
+++ b/commons/src/main/res/values-zh-rTW/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">原始檔案 %s 不存在</string>
    <string name="prepend_filenames">檔名前綴</string>
    <string name="append_filenames">附加檔名</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - 年\n%M - 月\n%D - 日\n%h - 小時\n%m - 分鐘\n%s - 秒鐘</string>

    <!-- Copy / Move -->
@ -173,8 +176,8 @@
    <string name="app_icon_color">應用程式圖標顏色</string>
    <string name="bottom_navigation_bar_color">底部導航列顏色</string>
    <string name="restore_defaults">恢復預設</string>
-    <string name="use_default">Use default</string>
-    <string name="default_color">Default</string>
+    <string name="use_default">使用預設</string>
+    <string name="default_color">預設</string>
    <string name="change_color">改變顏色</string>
    <string name="theme">主題</string>
    <string name="changing_color_description">改變顏色將切換成[自訂]主題</string>
--- a/commons/src/main/res/values/donottranslate.xml
+++ b/commons/src/main/res/values/donottranslate.xml
@ -1,4 +1,5 @@
 <resources>
+    <string name="package_name">com.simplemobiletools.commons</string>
    <string name="simple_commons">Simple Commons</string>
    <string name="progress">%1$s / %2$s</string>
    <string name="donate_url">https://simplemobiletools.com/donate</string>
--- a/commons/src/main/res/values/strings.xml
+++ b/commons/src/main/res/values/strings.xml
@ -64,6 +64,9 @@
    <string name="source_file_doesnt_exist">Source file %s doesn\'t exist</string>
    <string name="prepend_filenames">Prepend filenames</string>
    <string name="append_filenames">Append filenames</string>
+    <string name="simple_renaming">Simple renaming</string>
+    <string name="pattern_renaming">Pattern</string>
+    <string name="string_to_add">String to add</string>
    <string name="rename_date_time_pattern">%Y - year\n%M - month\n%D - day\n%h - hour\n%m - minute\n%s - second</string>

    <!-- Copy / Move -->