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

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

Merge pull request #50 from SimpleMobileTools/master 

upd
parents f2eefbd6 8ed4fdd3

build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ buildscript { 
        propMinSdkVersion = 21

        propTargetSdkVersion = propCompileSdkVersion

        propVersionCode = 1

        propVersionName = '5.5.5'

        kotlin_version = '1.3.10'

        propVersionName = '5.5.18'

        kotlin_version = '1.3.11'

    }



    repositories {

commons/build.gradle

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


dependencies {

    api 'androidx.appcompat:appcompat:1.0.2'

    api 'com.github.ajalt.reprint:core:3.2.1@aar'

    api 'com.github.ajalt.reprint:core:3.3.0@aar'

    implementation 'com.google.android.material:material:1.0.0'

    implementation 'com.github.bumptech.glide:glide:4.8.0'

    implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

    implementation 'com.google.code.gson:gson:2.8.2'

    implementation 'com.google.code.gson:gson:2.8.5'

    implementation 'com.duolingo.open:rtl-viewpager:1.0.3'



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

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

+3 −3
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ abstract class BaseSimpleActivity : AppCompatActivity() { 
        if (requestCode == OPEN_DOCUMENT_TREE && resultCode == Activity.RESULT_OK && resultData != null) {

            if (isProperSDFolder(resultData.data)) {

                if (resultData.dataString == baseConfig.OTGTreeUri) {

                    toast(R.string.sd_card_otg_same)

                    toast(R.string.sd_card_usb_same)

                    return

                }

                saveTreeUri(resultData)
@@ -163,7 +163,7 @@ abstract class BaseSimpleActivity : AppCompatActivity() { 
            if (isProperOTGFolder(resultData.data)) {

                if (resultData.dataString == baseConfig.treeUri) {

                    funAfterOTGPermission?.invoke(false)

                    toast(R.string.sd_card_otg_same)

                    toast(R.string.sd_card_usb_same)

                    return

                }

                baseConfig.OTGTreeUri = resultData.dataString
@@ -172,7 +172,7 @@ abstract class BaseSimpleActivity : AppCompatActivity() { 
                funAfterOTGPermission?.invoke(true)

                funAfterOTGPermission = null

            } else {

                toast(R.string.wrong_root_selected_otg)

                toast(R.string.wrong_root_selected_usb)

                val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)

                startActivityForResult(intent, requestCode)

            }

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

+3 −1
Original line number Diff line number Diff line
@@ -184,8 +184,10 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc 


                override fun selectRange(initialSelection: Int, lastDraggedIndex: Int, minReached: Int, maxReached: Int) {

                    selectItemRange(initialSelection, Math.max(0, lastDraggedIndex - positionOffset), Math.max(0, minReached - positionOffset), maxReached - positionOffset)

                    if (minReached != maxReached) {

                        lastLongPressedItem = -1

                    }

                }

            })

        } else {

            recyclerView.setupDragListener(null)

commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/StoragePickerDialog.kt

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ class StoragePickerDialog(val activity: BaseSimpleActivity, currPath: String, va 
            val otgButton = inflater.inflate(R.layout.radio_button, null) as RadioButton

            otgButton.apply {

                id = ID_OTG

                text = resources.getString(R.string.otg)

                text = resources.getString(R.string.usb)

                isChecked = basePath == OTG_PATH

                setOnClickListener { otgPicked() }

                if (isChecked) {