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

Commit 75473986 authored by tibbi's avatar tibbi
Browse files

add a Show Hidden button at the filepicker when appropriate

parent 278bf0e2

build.gradle

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

        propTargetSdkVersion = propCompileSdkVersion

        propVersionCode = 1

        propVersionName = '5.1.4'

        propVersionName = '5.1.5'

        kotlin_version = '1.2.71'

    }

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

+16 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import android.os.Environment 
import android.os.Parcelable

import android.view.KeyEvent

import androidx.appcompat.app.AlertDialog

import androidx.coordinatorlayout.widget.CoordinatorLayout

import androidx.recyclerview.widget.LinearLayoutManager

import com.simplemobiletools.commons.R

import com.simplemobiletools.commons.activities.BaseSimpleActivity
@@ -30,8 +31,9 @@ import java.util.* 
class FilePickerDialog(val activity: BaseSimpleActivity,

                       var currPath: String = Environment.getExternalStorageDirectory().toString(),

                       val pickFile: Boolean = true,

                       val showHidden: Boolean = false,

                       var showHidden: Boolean = false,

                       val showFAB: Boolean = false,

                       val canAddShowHiddenButton: Boolean = false,

                       val callback: (pickedPath: String) -> Unit) : Breadcrumbs.BreadcrumbsListener {



    private var mFirstUpdate = true
@@ -82,6 +84,19 @@ class FilePickerDialog(val activity: BaseSimpleActivity, 
                beVisible()

                setOnClickListener { createNewFolder() }

            }



            val secondaryFabBottomMargin = activity.resources.getDimension(R.dimen.secondary_fab_bottom_margin).toInt()

            mDialogView.filepicker_fab_show_hidden.apply {

                beVisibleIf(!showHidden && canAddShowHiddenButton)

                (layoutParams as CoordinatorLayout.LayoutParams).bottomMargin = secondaryFabBottomMargin

                setOnClickListener {

                    activity.handleHiddenFolderPasswordProtection {

                        beGone()

                        showHidden = true

                        tryUpdateItems()

                    }

                }

            }

        }



        mDialog = builder.create().apply {

commons/src/main/res/layout/dialog_filepicker.xml

+16 −7
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
            android:id="@+id/filepicker_breadcrumbs"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingBottom="@dimen/medium_margin"

            android:paddingLeft="@dimen/activity_margin"

            android:paddingTop="@dimen/activity_margin"

            android:paddingRight="@dimen/activity_margin"

            android:paddingTop="@dimen/activity_margin"/>

            android:paddingBottom="@dimen/medium_margin"/>



        <com.simplemobiletools.commons.views.MyRecyclerView

            android:id="@+id/filepicker_list"
@@ -32,22 +32,31 @@ 
            android:id="@+id/filepicker_fastscroller"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_alignTop="@+id/filepicker_list"

            android:layout_alignBottom="@+id/filepicker_list"

            android:layout_alignParentEnd="true"

            android:layout_alignParentRight="true"

            android:layout_alignTop="@+id/filepicker_list"

            android:paddingLeft="@dimen/normal_margin"

            android:paddingStart="@dimen/normal_margin">

            android:paddingStart="@dimen/normal_margin"

            android:paddingLeft="@dimen/normal_margin">



            <include layout="@layout/fastscroller_handle_vertical"/>



        </com.simplemobiletools.commons.views.FastScroller>

    </RelativeLayout>



    <com.simplemobiletools.commons.views.MyFloatingActionButton

        android:id="@+id/filepicker_fab_show_hidden"

        android:layout_width="@dimen/fab_size"

        android:layout_height="@dimen/fab_size"

        android:layout_gravity="bottom|end"

        android:layout_marginRight="@dimen/activity_margin"

        android:layout_marginBottom="@dimen/activity_margin"

        android:src="@drawable/ic_unhide"/>



    <com.simplemobiletools.commons.views.MyFloatingActionButton

        android:id="@+id/filepicker_fab"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_width="@dimen/fab_size"

        android:layout_height="@dimen/fab_size"

        android:layout_gravity="bottom|end"

        android:layout_margin="@dimen/activity_margin"

        android:src="@drawable/ic_plus"

commons/src/main/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
    <dimen name="fastscroll_height">40dp</dimen>

    <dimen name="fingerprint_icon_size">72dp</dimen>

    <dimen name="fastscroll_bubble_offset">30dp</dimen>

    <dimen name="fab_size">56dp</dimen>

    <dimen name="secondary_fab_bottom_margin">92dp</dimen>



    <dimen name="dragselect_hotspot_height">56dp</dimen>

    <dimen name="selection_check_size">26dp</dimen>