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

Unverified Commit 0b38466a authored by solokot's avatar solokot Committed by GitHub
Browse files

Merge pull request #18 from SimpleMobileTools/master 

upd
parents c3c9fdd8 dbcc8021

build.gradle

+3 −3
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ buildscript { 
        propMinSdkVersion = 16

        propTargetSdkVersion = propCompileSdkVersion

        propVersionCode = 1

        propVersionName = '3.13.11'

        kotlin_version = '1.2.21'

        support_libs = '27.0.2'

        propVersionName = '3.14.12'

        kotlin_version = '1.2.30'

        support_libs = '27.1.0'

    }



    repositories {

commons/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -29,14 +29,14 @@ android { 
dependencies {

    compile "com.android.support:design:$support_libs"

    compile "com.android.support:appcompat-v7:$support_libs"

    compile 'com.github.bumptech.glide:glide:4.5.0'

    compile 'com.github.bumptech.glide:glide:4.6.1'

    compile 'com.booking:rtlviewpager:1.0.1'

    compile 'com.andrognito.patternlockview:patternlockview:1.0.0'

    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

    compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'

    compile 'com.github.ajalt.reprint:core:3.2.0@aar'



    kapt 'com.github.bumptech.glide:compiler:4.5.0'

    kapt 'com.github.bumptech.glide:compiler:4.6.1'

}



apply from: '../bintray-upload.gradle'

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

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ class AboutActivity : BaseSimpleActivity() { 
        val appVersion = String.format(getString(R.string.app_version, intent.getStringExtra(APP_VERSION_NAME)))

        val deviceOS = String.format(getString(R.string.device_os), Build.VERSION.RELEASE)

        val newline = "%0D%0A"

        val separator = "___________________"

        val body = "$newline$newline$newline$separator$newline${getString(R.string.additional_info)}:$newline$appVersion$newline$deviceOS"

        val separator = "-------------------"

        val body = "$appVersion$newline$deviceOS$newline$separator$newline$newline$newline"

        val href = "$label<br><a href=\"mailto:$email?subject=$appName&body=$body\">$email</a>"

        about_email.text = Html.fromHtml(href)

        about_email.movementMethod = LinkMovementMethod.getInstance()

commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class FilepickerItemsAdapter(activity: BaseSimpleActivity, val fileDirItems: Lis 


    override fun markItemSelection(select: Boolean, view: View?) {}



    override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int) = createViewHolder(R.layout.filepicker_list_item, parent)

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.filepicker_list_item, parent)



    override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) {

        val fileDirItem = fileDirItems[position]
@@ -51,10 +51,10 @@ class FilepickerItemsAdapter(activity: BaseSimpleActivity, val fileDirItems: Lis 


    override fun getSelectableItemCount() = fileDirItems.size



    override fun onViewRecycled(holder: MyRecyclerViewAdapter.ViewHolder?) {

    override fun onViewRecycled(holder: MyRecyclerViewAdapter.ViewHolder) {

        super.onViewRecycled(holder)

        if (!activity.isActivityDestroyed()) {

            Glide.with(activity).clear(holder?.itemView?.list_item_icon!!)

            Glide.with(activity).clear(holder.itemView?.list_item_icon!!)

        }

    }

commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt

+4 −6
Original line number Diff line number Diff line
@@ -103,8 +103,6 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal 
            activity.deleteFilesBg(mTransferredFiles) {}

        }



        val paths = mFiles.map { it.path } as ArrayList<String>

        activity.scanPaths(paths) {}

        return true

    }
@@ -242,10 +240,10 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal 


            if (source.size == copiedSize) {

                mTransferredFiles.add(source)

                activity.scanPath(destination.path) {

                    if (activity.baseConfig.keepLastModified) {

                        copyOldLastModified(source.path, destination.path)

                } else {

                    activity.scanPath(destination.path) {}

                    }

                }

            }

        } catch (e: Exception) {