Merge pull request #9 from TouchInstinct/gradle_update

Gradle update

library/build.gradle

@@ -6,18 +6,15 @@ apply plugin: 'com.android.library'
  */
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion compileSdk
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 25
+        minSdkVersion 16
     }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
+    implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
+    implementation "com.android.support:support-v4:$supportLibraryVersion"
+    implementation "com.android.support:recyclerview-v7:$supportLibraryVersion"
 }

library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java

@@ -14,9 +14,10 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.StyleRes;
 import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.LoaderManager;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.content.Loader;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.util.SortedList;
@@ -116,54 +117,11 @@ public abstract class AbstractFilePickerFragment<T> extends DialogFragment
         return new FileItemAdapter<>(this);
     }
 
-    /**
-     * Set before making the fragment visible. This method will re-use the existing
-     * arguments bundle in the fragment if it exists so extra arguments will not
-     * be overwritten. This allows you to set any extra arguments in the fragment
-     * constructor if you wish.
-     * <p/>
-     * The key/value-pairs listed below will be overwritten however.
-     *
-     * @param startPath      path to directory the picker will show upon start
-     * @param mode           what is allowed to be selected (dirs, files, both)
-     * @param allowMultiple  selecting a single item or several?
-     * @param allowDirCreate can new directories be created?
-     * @param allowExistingFile if selecting a "new" file, can existing files be chosen
-     * @param singleClick    selecting an item does not require a press on OK
-     */
-    public void setArgs(@Nullable final String startPath, final int mode,
-                        final boolean allowMultiple, final boolean allowDirCreate,
-                        final boolean allowExistingFile, final boolean singleClick) {
-        // Validate some assumptions so users don't get surprised (or get surprised early)
-        if (mode == MODE_NEW_FILE && allowMultiple) {
-            throw new IllegalArgumentException(
-                    "MODE_NEW_FILE does not support 'allowMultiple'");
-        }
-        // Single click only makes sense if we are not selecting multiple items
-        if (singleClick && allowMultiple) {
-            throw new IllegalArgumentException("'singleClick' can not be used with 'allowMultiple'");
-        }
-        // There might have been arguments set elsewhere, if so do not overwrite them.
-        Bundle b = getArguments();
-        if (b == null) {
-            b = new Bundle();
-        }
-
-        if (startPath != null) {
-            b.putString(KEY_START_PATH, startPath);
-        }
-        b.putBoolean(KEY_ALLOW_DIR_CREATE, allowDirCreate);
-        b.putBoolean(KEY_ALLOW_MULTIPLE, allowMultiple);
-        b.putBoolean(KEY_ALLOW_EXISTING_FILE, allowExistingFile);
-        b.putBoolean(KEY_SINGLE_CLICK, singleClick);
-        b.putInt(KEY_MODE, mode);
-        setArguments(b);
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        final View view = inflateRootView(inflater, container);
+        getContext().getTheme().applyStyle(getStyleId(), true);
+        final View view = inflater.inflate(R.layout.nnf_fragment_filepicker, container, false);
 
         Toolbar toolbar = (Toolbar) view.findViewById(R.id.nnf_picker_toolbar);
         if (toolbar != null) {
@@ -192,11 +150,11 @@ public abstract class AbstractFilePickerFragment<T> extends DialogFragment
                 });
 
         view.findViewById(R.id.nnf_button_ok).setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(final View v) {
-                        onClickOk(v);
-                    }
-                });
+            @Override
+            public void onClick(final View v) {
+                onClickOk(v);
+            }
+        });
         view.findViewById(R.id.nnf_button_ok_newfile).setOnClickListener(
                 new View.OnClickListener() {
                     @Override
@@ -236,10 +194,6 @@ public abstract class AbstractFilePickerFragment<T> extends DialogFragment
         return view;
     }
 
-    protected View inflateRootView(LayoutInflater inflater, ViewGroup container) {
-        return inflater.inflate( R.layout.nnf_fragment_filepicker, container, false);
-    }
-
     /**
      * Checks if a divider drawable has been defined in the current theme. If it has, will apply
      * an item decoration with the divider. If no divider has been specified, then does nothing.
@@ -264,6 +218,7 @@ public abstract class AbstractFilePickerFragment<T> extends DialogFragment
     public void onClickCancel(@NonNull View view) {
         if (mListener != null) {
             mListener.onCancelled();
+            dismiss();
         }
     }
 
@@ -321,10 +276,10 @@ public abstract class AbstractFilePickerFragment<T> extends DialogFragment
                 mListener.onFilePicked(toUri(getFirstCheckedItem()));
             }
         }
+        dismiss();
     }
 
     /**
-     *
      * @return filename as entered/picked by the user for the new file
      */
     @NonNull
@@ -386,10 +341,15 @@ public abstract class AbstractFilePickerFragment<T> extends DialogFragment
         }
     }
 
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mListener = null;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         setHasOptionsMenu(true);
     }
 
@@ -409,6 +369,7 @@ public abstract class AbstractFilePickerFragment<T> extends DialogFragment
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
+
         // Only if we have no state
         if (mCurrentPath == null) {
             if (savedInstanceState != null) {
@@ -451,25 +412,27 @@ public abstract class AbstractFilePickerFragment<T> extends DialogFragment
             }
         }
 
-        setModeView();
+        setModeView(getView());
 
         // If still null
         if (mCurrentPath == null) {
             mCurrentPath = getRoot();
         }
         refresh(mCurrentPath);
+
     }
 
+
     /**
      * Hides/Shows appropriate views depending on mode
      */
-    protected void setModeView() {
+    protected void setModeView(@NonNull View view) {
         boolean nf = mode == MODE_NEW_FILE;
         mNewFileButtonContainer.setVisibility(nf ? View.VISIBLE : View.GONE);
         mRegularButtonContainer.setVisibility(nf ? View.GONE : View.VISIBLE);
 
         if (!nf && singleClick) {
-            getActivity().findViewById(R.id.nnf_button_ok).setVisibility(View.GONE);
+            view.findViewById(R.id.nnf_button_ok).setVisibility(View.GONE);
         }
     }
 
@@ -507,12 +470,6 @@ public abstract class AbstractFilePickerFragment<T> extends DialogFragment
         b.putInt(KEY_MODE, mode);
     }
 
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        mListener = null;
-    }
-
     /**
      * Refreshes the list. Call this when current path changes. This method also checks
      * if permissions are granted and requests them if necessary. See hasPermission()
@@ -628,6 +585,7 @@ public abstract class AbstractFilePickerFragment<T> extends DialogFragment
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View v;
+        getContext().getTheme().applyStyle(getStyleId(), true);
         switch (viewType) {
             case LogicHandler.VIEWTYPE_HEADER:
                 v = LayoutInflater.from(getActivity()).inflate(R.layout.nnf_filepicker_listitem_dir,
@@ -645,6 +603,9 @@ public abstract class AbstractFilePickerFragment<T> extends DialogFragment
         }
     }
 
+    @StyleRes
+    protected abstract int getStyleId();
+
     /**
      * @param vh       to bind data from either a file or directory
      * @param position 0 - n, where the header has been subtracted
@@ -866,6 +827,7 @@ public abstract class AbstractFilePickerFragment<T> extends DialogFragment
             v.setOnLongClickListener(this);
             icon = v.findViewById(R.id.item_icon);
             text = (TextView) v.findViewById(android.R.id.text1);
+            text.setTextColor(ContextCompat.getColor(getActivity(), android.R.color.white));
         }
 
         /**

library/src/main/java/com/nononsenseapps/filepicker/FilePickerActivity.java

@@ -1,33 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-package com.nononsenseapps.filepicker;
-
-import android.annotation.SuppressLint;
-import android.os.Environment;
-import android.support.annotation.Nullable;
-
-import java.io.File;
-
-@SuppressLint("Registered")
-public class FilePickerActivity extends AbstractFilePickerActivity<File> {
-
-    public FilePickerActivity() {
-        super();
-    }
-
-    @Override
-    protected AbstractFilePickerFragment<File> getFragment(
-            @Nullable final String startPath, final int mode, final boolean allowMultiple,
-            final boolean allowCreateDir, final boolean allowExistingFile,
-            final boolean singleClick) {
-        AbstractFilePickerFragment<File> fragment = new FilePickerFragment();
-        // startPath is allowed to be null. In that case, default folder should be SD-card and not "/"
-        fragment.setArgs(startPath != null ? startPath : Environment.getExternalStorageDirectory().getPath(),
-                mode, allowMultiple, allowCreateDir, allowExistingFile, singleClick);
-        return fragment;
-    }
-}

library/src/main/java/com/nononsenseapps/filepicker/FilePickerFragment.java

@@ -19,26 +19,27 @@ import android.support.v7.widget.util.SortedListAdapterCallback;
 import android.widget.Toast;
 
 import java.io.File;
+import java.util.Locale;
 
 /**
  * An implementation of the picker which allows you to select a file from the internal/external
  * storage (SD-card) on a device.
  */
-public class FilePickerFragment extends AbstractFilePickerFragment<File> {
+public abstract class FilePickerFragment extends AbstractFilePickerFragment<File> {
+
+    private static final String[] extensions = new String[]{".doc", ".docx", ".xlsx", ".xls", ".png", ".jpg",
+                                                            ".tif", ".tiff", ".pdf", ".jpeg", ".ppt", ".pptx"};
 
     protected static final int PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE = 1;
     protected boolean showHiddenItems = false;
     private File mRequestedPath = null;
 
-    public FilePickerFragment() {
-    }
-
     /**
      * This method is used to dictate whether hidden files and folders should be shown or not
      *
      * @param showHiddenItems whether hidden items should be shown or not
      */
-    public void showHiddenItems(boolean showHiddenItems){
+    public void showHiddenItems(boolean showHiddenItems) {
         this.showHiddenItems = showHiddenItems;
     }
 
@@ -48,7 +49,7 @@ public class FilePickerFragment extends AbstractFilePickerFragment<File> {
      * @return true if hidden items are shown, otherwise false
      */
 
-    public boolean areHiddenItemsShown(){
+    public boolean areHiddenItemsShown() {
         return showHiddenItems;
     }
 
@@ -95,6 +96,7 @@ public class FilePickerFragment extends AbstractFilePickerFragment<File> {
             // Treat this as a cancel press
             if (mListener != null) {
                 mListener.onCancelled();
+                dismiss();
             }
         } else { // if (requestCode == PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE) {
             if (PackageManager.PERMISSION_GRANTED == grantResults[0]) {
@@ -108,6 +110,7 @@ public class FilePickerFragment extends AbstractFilePickerFragment<File> {
                 // Treat this as a cancel press
                 if (mListener != null) {
                     mListener.onCancelled();
+                    dismiss();
                 }
             }
         }
@@ -236,7 +239,7 @@ public class FilePickerFragment extends AbstractFilePickerFragment<File> {
                 files.beginBatchedUpdates();
                 if (listFiles != null) {
                     for (java.io.File f : listFiles) {
-                        if (isItemVisible(f)) {
+                        if (isItemVisible(f) && directoryHasNeededFiles(f)) {
                             files.add(f);
                         }
                     }
@@ -292,6 +295,23 @@ public class FilePickerFragment extends AbstractFilePickerFragment<File> {
         };
     }
 
+    private boolean directoryHasNeededFiles(@NonNull final File file) {
+        final File[] fileList = file.listFiles();
+        if (fileList == null) {
+            return isNeededExtension(file.toString());
+        }
+        return true;
+    }
+
+    private boolean isNeededExtension(@NonNull final String fileName) {
+        for (final String extension : extensions) {
+            if (fileName.endsWith(extension) || fileName.endsWith(extension.toUpperCase(Locale.getDefault()))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Name is validated to be non-null, non-empty and not containing any
      * slashes.
@@ -348,4 +368,5 @@ public class FilePickerFragment extends AbstractFilePickerFragment<File> {
             return lhs.getName().compareToIgnoreCase(rhs.getName());
         }
     }
+
 }

library/src/main/res/layout/nnf_dialog_folder_name.xml

@@ -6,22 +6,23 @@
   -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content">
+
     <EditText
         android:id="@+id/edit_text"
+        style="?android:textAppearanceMedium"
         android:layout_width="match_parent"
         android:layout_height="48dp"
-        android:fontFamily="light"
-        android:padding="4dp"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
-        android:hint="@string/nnf_name"
+        android:fontFamily="light"
         android:maxLines="1"
         android:gravity="center_vertical"
+        android:hint="@string/nnf_name"
         android:imeOptions="actionDone"
-        style="?android:textAppearanceMedium"
         android:inputType="textAutoComplete|textAutoCorrect"
-        tools:ignore="UnusedAttribute" />
+        android:padding="4dp"
+        tools:ignore="UnusedAttribute"/>
 </FrameLayout>

library/src/main/res/layout/nnf_filepicker_listitem_checkable.xml

@@ -5,17 +5,17 @@
   ~ License, v. 2.0. If a copy of the MPL was not distributed with this
   ~ file, You can obtain one at http://mozilla.org/MPL/2.0/.
   -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/nnf_item_container"
-    android:layout_width="match_parent"
-    android:layout_height="?android:listPreferredItemHeight"
-    android:background="?selectableItemBackground"
-    android:focusable="true"
-    android:minHeight="?android:listPreferredItemHeight"
-    android:nextFocusLeft="@+id/nnf_button_cancel"
-    android:nextFocusRight="@id/checkbox"
-    android:orientation="horizontal">
+<LinearLayout android:id="@+id/nnf_item_container"
+              xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="?android:listPreferredItemHeight"
+              android:background="?selectableItemBackground"
+              android:focusable="true"
+              android:minHeight="?android:listPreferredItemHeight"
+              android:nextFocusLeft="@+id/nnf_button_cancel"
+              android:nextFocusRight="@id/checkbox"
+              android:orientation="horizontal">
 
 
     <!--suppress AndroidDomInspection -->
@@ -38,6 +38,7 @@
         android:layout_weight="1"
         android:ellipsize="end"
         android:gravity="center_vertical"
+        android:textColor="@android:color/black"
         android:maxLines="1"
         android:padding="8dp"
         android:text="@string/nnf_name" />
@@ -50,6 +51,6 @@
         android:nextFocusRight="@+id/nnf_button_ok"
         android:paddingEnd="8dp"
         android:paddingRight="8dp"
-        tools:ignore="RtlSymmetry" />
+        tools:ignore="RtlSymmetry"/>
 
 </LinearLayout>

library/src/main/res/layout/nnf_filepicker_listitem_dir.xml

@@ -5,17 +5,17 @@
   ~ License, v. 2.0. If a copy of the MPL was not distributed with this
   ~ file, You can obtain one at http://mozilla.org/MPL/2.0/.
   -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/nnf_item_container"
-    android:layout_width="match_parent"
-    android:layout_height="?android:listPreferredItemHeight"
-    android:background="?selectableItemBackground"
-    android:focusable="true"
-    android:minHeight="?android:listPreferredItemHeight"
-    android:nextFocusLeft="@+id/nnf_button_cancel"
-    android:nextFocusRight="@+id/nnf_button_ok"
-    android:orientation="horizontal">
+<LinearLayout android:id="@+id/nnf_item_container"
+              xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="?android:listPreferredItemHeight"
+              android:background="?selectableItemBackground"
+              android:focusable="true"
+              android:minHeight="?android:listPreferredItemHeight"
+              android:nextFocusLeft="@+id/nnf_button_cancel"
+              android:nextFocusRight="@+id/nnf_button_ok"
+              android:orientation="horizontal">
 
     <!--suppress AndroidDomInspection -->
     <ImageView
@@ -27,7 +27,7 @@
         android:src="@drawable/nnf_ic_folder_black_48dp"
         android:tint="?attr/nnf_dir_icon_color"
         android:visibility="visible"
-        tools:ignore="ContentDescription,VectorDrawableCompat" />
+        tools:ignore="ContentDescription,VectorDrawableCompat"/>
 
     <TextView
         android:id="@android:id/text1"
@@ -37,7 +37,8 @@
         android:layout_weight="1"
         android:ellipsize="end"
         android:gravity="center_vertical"
-        android:maxLines="1"
         android:padding="8dp"
-        android:text="@string/nnf_name" />
+        android:text="@string/nnf_name"
+        android:textColor="@android:color/white"/>
+
 </LinearLayout>

library/src/main/res/layout/nnf_fragment_filepicker.xml

@@ -7,10 +7,9 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".FilePickerActivity">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/nnf_picker_toolbar"
@@ -26,8 +25,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="start"
+            android:maxLines="1"
+            android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
-            android:maxLines="1"/>
+            tools:ignore="Deprecated"/>
+        <!--
+        suppressing deprecation of singleLine to fix crash related to ellipsize="start", see bug:
+        https://issuetracker.google.com/issues/36950033
+        -->
     </android.support.v7.widget.Toolbar>
 
     <android.support.v7.widget.RecyclerView
@@ -58,7 +63,8 @@
                 android:layout_width="0dp"
                 android:layout_height="48dp"
                 android:layout_weight="1"
-                android:text="@android:string/cancel"/>
+                android:text="@android:string/cancel"
+                android:textColor="@android:color/white"/>
 
             <Button
                 android:id="@+id/nnf_button_ok"
@@ -66,7 +72,8 @@
                 android:layout_width="0dp"
                 android:layout_height="48dp"
                 android:layout_weight="1"
-                android:text="@android:string/ok"/>
+                android:text="@android:string/ok"
+                android:textColor="@android:color/white"/>
 
         </LinearLayout>