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

Unverified Commit 4c122ab2 authored by solokot's avatar solokot Committed by GitHub
Browse files

Merge pull request #10 from SimpleMobileTools/master 

update
parents 236b9483 41c165b6

build.gradle

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

        propTargetSdkVersion = propCompileSdkVersion

        propVersionCode = 1

        propVersionName = '3.5.4'

        propVersionName = '3.6.15'

        kotlin_version = '1.2.10'

        support_libs = '27.0.2'

    }

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.4.0'

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

    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.4.0'

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

}



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

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

+2 −2
Original line number Diff line number Diff line
@@ -186,10 +186,10 @@ open class BaseSimpleActivity : AppCompatActivity() { 
                toast(R.string.copying)

                startCopyMove(files, destinationFolder, isCopyOperation, copyPhotoVideoOnly)

            } else {

                if (isPathOnSD(source) || isPathOnSD(destination) || files.first().isDirectory || isOreoPlus()) {

                if (isPathOnSD(source) || isPathOnSD(destination) || files.first().isDirectory || isNougatPlus()) {

                    handleSAFDialog(File(source)) {

                        toast(R.string.moving)

                        startCopyMove(files, destinationFolder, false, copyPhotoVideoOnly)

                        startCopyMove(files, destinationFolder, isCopyOperation, copyPhotoVideoOnly)

                    }

                } else {

                    toast(R.string.moving)

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

+5 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ import com.simplemobiletools.commons.views.MyRecyclerView 
import kotlinx.android.synthetic.main.filepicker_list_item.view.*



class FilepickerItemsAdapter(activity: BaseSimpleActivity, val fileDirItems: List<FileDirItem>, recyclerView: MyRecyclerView,

                             itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) {

                             itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) {



    private val folderDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_folder, textColor)

    private val fileDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_file, textColor)
@@ -54,7 +54,7 @@ class FilepickerItemsAdapter(activity: BaseSimpleActivity, val fileDirItems: Lis 
    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!!)

        }

    }
@@ -88,10 +88,12 @@ class FilepickerItemsAdapter(activity: BaseSimpleActivity, val fileDirItems: Lis 
                    path

                }



                if (context != null) {

                    Glide.with(context).load(itemToLoad).transition(withCrossFade()).apply(options).into(list_item_icon)

                }

            }

        }

    }



    private fun getChildrenCnt(item: FileDirItem): String {

        val children = item.children

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

+4 −2
Original line number Diff line number Diff line
@@ -15,11 +15,12 @@ import com.simplemobiletools.commons.R 
import com.simplemobiletools.commons.activities.BaseSimpleActivity

import com.simplemobiletools.commons.extensions.baseConfig

import com.simplemobiletools.commons.interfaces.MyAdapterListener

import com.simplemobiletools.commons.views.FastScroller

import com.simplemobiletools.commons.views.MyRecyclerView

import java.util.*



abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyclerView: MyRecyclerView, val itemClick: (Any) -> Unit)

    : RecyclerView.Adapter<MyRecyclerViewAdapter.ViewHolder>() {

abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyclerView: MyRecyclerView, val fastScroller: FastScroller? = null,

                                     val itemClick: (Any) -> Unit) : RecyclerView.Adapter<MyRecyclerViewAdapter.ViewHolder>() {

    val baseConfig = activity.baseConfig

    val resources = activity.resources!!

    val layoutInflater = activity.layoutInflater
@@ -233,6 +234,7 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc 


        itemViews = newItems

        finishActMode()

        fastScroller?.measureRecyclerView()

    }



    class ViewHolder(view: View, val adapterListener: MyAdapterListener, val activity: BaseSimpleActivity, val multiSelectorCallback: ModalMultiSelectorCallback,