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

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

Merge pull request #49 from SimpleMobileTools/master 

upd
parents fb5c147a cf5c342d

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

        kotlin_version = '1.3.0'

        propVersionName = '5.5.5'

        kotlin_version = '1.3.10'

    }



    repositories {

commons/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ android { 
}



dependencies {

    api 'androidx.appcompat:appcompat:1.0.0'

    api 'androidx.appcompat:appcompat:1.0.2'

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

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

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

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

+1 −2
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ abstract class BaseSplashActivity : AppCompatActivity() { 


    override fun onCreate(savedInstanceState: Bundle?) {

        super.onCreate(savedInstanceState)

        if (isThankYouInstalled() && (baseConfig.appRunCount == 0 || !baseConfig.wasSharedThemeAfterUpdateChecked)) {

            baseConfig.wasSharedThemeAfterUpdateChecked = true

        if (isThankYouInstalled() && baseConfig.appRunCount == 0) {

            getSharedTheme {

                if (it != null) {

                    baseConfig.apply {

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

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ import android.view.MenuItem 
import android.view.View

import android.view.ViewGroup

import android.widget.TextView

import androidx.appcompat.app.ActionBar

import androidx.appcompat.view.ActionMode

import androidx.recyclerview.widget.DividerItemDecoration

import androidx.recyclerview.widget.RecyclerView
@@ -61,6 +62,7 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc 
                isSelectable = true

                actMode = actionMode

                actBarTextView = layoutInflater.inflate(R.layout.actionbar_title, null) as TextView

                actBarTextView!!.layoutParams = ActionBar.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT)

                actMode!!.customView = actBarTextView

                actBarTextView!!.setOnClickListener {

                    if (getSelectableItemCount() == selectedKeys.size) {

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

+1 −3
Original line number Diff line number Diff line
@@ -267,10 +267,8 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal 
                }



                selectionArgs = arrayOf(destinationPath)

                activity.scanPathRecursively(destinationPath) {

                activity.applicationContext.contentResolver.update(uri, values, selection, selectionArgs)

            }

        }

    }

}
 
}