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

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

Merge pull request #33 from SimpleMobileTools/master 

upd
parents 8da9ac59 ec10a6b7

build.gradle

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

        propTargetSdkVersion = propCompileSdkVersion

        propVersionCode = 1

        propVersionName = '4.2.8'

        propVersionName = '4.2.10'

        kotlin_version = '1.2.50'

        support_libs = '27.1.1'

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ class FilepickerItemsAdapter(activity: BaseSimpleActivity, val fileDirItems: Lis 


    override fun getSelectableItemCount() = fileDirItems.size



    override fun getIsItemSelectable(position: Int) = false



    override fun onViewRecycled(holder: MyRecyclerViewAdapter.ViewHolder) {

        super.onViewRecycled(holder)

        if (!activity.isActivityDestroyed()) {

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

+10 −2
Original line number Diff line number Diff line
@@ -49,9 +49,15 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc 


    abstract fun getSelectableItemCount(): Int



    abstract fun getIsItemSelectable(position: Int): Boolean



    protected fun isOneItemSelected() = selectedPositions.size == 1



    protected fun toggleItemSelection(select: Boolean, pos: Int) {

        if (select && !getIsItemSelectable(pos)) {

            return

        }



        if (select) {

            if (viewHolders[pos] != null) {

                prepareItemSelection(viewHolders[pos])
@@ -85,9 +91,11 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc 
    protected fun selectAll() {

        val cnt = itemCount - positionOffset

        for (i in 0 until cnt) {

            if (getIsItemSelectable(i)) {

                selectedPositions.add(i)

                notifyItemChanged(i + positionOffset)

            }

        }

        updateTitle(cnt)

        lastLongPressedItem = -1

    }

commons/src/main/res/values-nl/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


    <!-- Favorites -->

    <string name="favorites">Favorieten</string>

    <string name="add_favorites">Add favorites</string>

    <string name="add_favorites">Favorieten toevoegen</string>

    <string name="add_to_favorites">Aan favorieten toevoegen</string>

    <string name="remove_from_favorites">Uit favorieten verwijderen</string>

commons/src/main/res/values-pt-rBR/strings.xml

+115 −116

File changed.

Preview size limit exceeded, changes collapsed.