Directory descend, up, movement (back button) and nav buttons to load stock paths working

Author: maxieds

AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/BasicFileProvider.java

@@ -143,7 +143,7 @@ public void selectBaseDirectoryByType(FileChooserBuilder.BaseFolderPathType base
                 break;
             case BASE_PATH_TYPE_EXTERNAL_FILES_DOWNLOADS:
                 baseDirPath = appCtx.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
-                setLegacyBaseFolderByName("Downloads");
+                setLegacyBaseFolderByName("Download");
                 break;
             case BASE_PATH_TYPE_EXTERNAL_FILES_MOVIES:
                 baseDirPath = appCtx.getExternalFilesDir(Environment.DIRECTORY_MOVIES);

AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/DisplayAdapters.java

@@ -206,26 +206,11 @@ public boolean onLongClick(View v) {
                 }
                 int fileItemPosIndex = getPositionForView(v);
                 DisplayTypes.DirectoryResultContext workingFolder;
-                if(DisplayFragments.getInstance().pathHistoryStack.empty()) {
-                    workingFolder = null;
-                }
-                else {
-                    workingFolder = DisplayFragments.getInstance().pathHistoryStack.peek();
-                }
                 nextFolderParent.clearDirectoryContentsList();
                 DisplayFragments.getInstance().pathHistoryStack.push(nextFolderParent);
-                if(workingFolder == null) {
-                    DisplayTypes.DirectoryResultContext nextFolder = nextFolderParent.loadNextFolderAtIndex(fileItemPosIndex, true);
-                    DisplayFragments.getInstance().pathHistoryStack.push(nextFolder);
-                    Log.i(LOGTAG, "CASE I: next foldr cwd = " + nextFolder.getCWDBasePath());
-                    DisplayFragments.getInstance().descendIntoNextDirectory(true);
-                }
-                else {
-                    DisplayTypes.DirectoryResultContext nextFolder = nextFolderParent.loadNextFolderAtIndex(fileItemPosIndex, false);
-                    DisplayFragments.getInstance().pathHistoryStack.push(nextFolder);
-                    Log.i(LOGTAG, "CASE II: next foldr cwd = " + nextFolder.getCWDBasePath());
-                    DisplayFragments.getInstance().descendIntoNextDirectory(false);
-                }
+                DisplayTypes.DirectoryResultContext nextFolder = nextFolderParent.loadNextFolderAtIndex(fileItemPosIndex, true);
+                DisplayFragments.getInstance().pathHistoryStack.push(nextFolder);
+                DisplayFragments.getInstance().descendIntoNextDirectory(false);
                 String displayRecurseMsg = String.format(Locale.getDefault(), "Descending recursively into DIR \"%s\".", fileItem.getBaseName());
                 DisplayUtils.displayToastMessageShort(displayRecurseMsg);
                 return true;

AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/DisplayFragments.java

@@ -98,17 +98,19 @@ private void setViewportMaxFilesCount(int viewportFilesCap) {
 
     public boolean resetViewportMaxFilesCount(View parentViewContainer) {
         if(!viewportCapacityMesaured) {
+
             int viewportDisplayHeight = parentViewContainer.getMeasuredHeight();
             if(fileItemDisplayHeight == 0 || viewportDisplayHeight == 0) {
                 return false;
             }
             setViewportMaxFilesCount((int) Math.floor((double) viewportDisplayHeight / fileItemDisplayHeight));
             Log.i(LOGTAG, String.format("DELAYED RESPONSE: VP Height = %d, FItemDisp Height = %d   ====>  %d",
                     viewportDisplayHeight, fileItemDisplayHeight, getViewportMaxFilesCount()));
-            getMainRecyclerView().setItemViewCacheSize(2 * getViewportMaxFilesCount());
+            getMainRecyclerView().setItemViewCacheSize(getViewportMaxFilesCount());
             getMainRecyclerView().setDrawingCacheEnabled(true);
             getMainRecyclerView().setDrawingCacheQuality(View.DRAWING_CACHE_QUALITY_HIGH);
             viewportCapacityMesaured = true;
+
         }
         return true;
     }
@@ -170,10 +172,6 @@ public void descendIntoNextDirectory(boolean initNewFileTree) {
             FileChooserActivity.getInstance().stopPrefetchFileUpdatesThread();
             clearExistingRecyclerViewLayout();
             updateFolderHistoryPaths(FileUtils.getFileBaseNameFromPath(nextFolder.getCWDBasePath()), initNewFileTree);
-            DisplayFragments.FolderNavigationFragment.dirsOneBackText.setText(folderHistoryOneBackPath);
-            DisplayFragments.FolderNavigationFragment.dirsTwoBackText.setText(folderHistoryTwoBackPath);
-
-            // ??? TODO: Later, may want to display a loading notice if initializing a new directory is sluggish ???
 
             // Descend into the next directory:
             lastFileDataStartIndex = 0;
@@ -200,15 +198,14 @@ public void initiateNewFolderLoad(FileChooserBuilder.BaseFolderPathType initBase
         clearExistingRecyclerViewLayout();
         FileChooserActivity.getInstance().setTopLevelBaseFolder(initBaseFolder);
         DisplayTypes.DirectoryResultContext cwdFolderContext = DisplayTypes.DirectoryResultContext.probeAtCursoryFolderQuery(initBaseFolder);
+        cwdFolderContext.setTopLevelFolder(true); // cannot go up higher in the filesystem from here
         setCwdFolderContext(cwdFolderContext);
         pathHistoryStack.clear();
         lastFileDataStartIndex = 0;
         lastFileDataEndIndex = Math.min(Math.max(0, cwdFolderContext.getFolderChildCount() - 1), lastFileDataStartIndex + getViewportMaxFilesCount() - 1);
         getCwdFolderContext().computeDirectoryContents(lastFileDataStartIndex, lastFileDataEndIndex);
         displayNextDirectoryFilesList(getCwdFolderContext().getWorkingDirectoryContents());
         updateFolderHistoryPaths(FileUtils.getFileBaseNameFromPath(getCwdFolderContext().getCWDBasePath()), true);
-        DisplayFragments.FolderNavigationFragment.dirsOneBackText.setText(folderHistoryOneBackPath);
-        DisplayFragments.FolderNavigationFragment.dirsTwoBackText.setText(folderHistoryTwoBackPath);
     }
 
     public void displayNextDirectoryFilesList(List<DisplayTypes.FileType> workingDirContentsList, boolean notifyAdapter) {
@@ -281,7 +278,7 @@ public static void resetLayout(View layoutContainer, DisplayTypes.FileType fileI
 
     }
 
-    private static final String EMPTY_FOLDER_HISTORY_PATH = "➤ ---- ";
+    private static final String EMPTY_FOLDER_HISTORY_PATH = "";
     private static String folderHistoryOneBackPath = EMPTY_FOLDER_HISTORY_PATH;
     private static String folderHistoryTwoBackPath = EMPTY_FOLDER_HISTORY_PATH;
 
@@ -305,14 +302,26 @@ public static void updateFolderHistoryPaths(String nextFolderEntryPointPath, boo
         if(nextFolderEntryPointPath == null || nextFolderEntryPointPath.equals("")) {
             nextFolderEntryPointPath = EMPTY_FOLDER_HISTORY_PATH;
         }
+        else {
+            nextFolderEntryPointPath = String.format(Locale.getDefault(), "➤  %s", nextFolderEntryPointPath);
+        }
         if(initNewFileTree) {
             folderHistoryTwoBackPath = EMPTY_FOLDER_HISTORY_PATH;
-            folderHistoryOneBackPath = String.format(Locale.getDefault(), "➤ %s", nextFolderEntryPointPath);
+            folderHistoryOneBackPath = nextFolderEntryPointPath;
         }
         else {
             folderHistoryTwoBackPath = folderHistoryOneBackPath;
-            folderHistoryOneBackPath = String.format(Locale.getDefault(), "➤ %s", nextFolderEntryPointPath);
+            folderHistoryOneBackPath = nextFolderEntryPointPath;
         }
+        DisplayFragments.FolderNavigationFragment.dirsOneBackText.setText(folderHistoryOneBackPath);
+        //DisplayFragments.FolderNavigationFragment.dirsTwoBackText.setText(folderHistoryTwoBackPath);
+    }
+
+    public static void backupFolderHistoryPaths() {
+        folderHistoryOneBackPath = folderHistoryTwoBackPath;
+        folderHistoryTwoBackPath = EMPTY_FOLDER_HISTORY_PATH;
+        DisplayFragments.FolderNavigationFragment.dirsOneBackText.setText(folderHistoryOneBackPath);
+        //DisplayFragments.FolderNavigationFragment.dirsTwoBackText.setText(folderHistoryTwoBackPath);
     }
 
     public void cancelAllOperationsInProgress() {

AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/DisplayTypes.java

@@ -44,6 +44,7 @@ public static class DirectoryResultContext {
         private String parentDocId;
         private String activeCWDAbsPath;
         private int folderMaxChildCount;
+        private boolean isTopLevelFolder;
 
         public DirectoryResultContext(MatrixCursor mcResult, String parentFolderDocId, String parentFolderAbsPath) {
             directoryContentsList = new ArrayList<FileType>();
@@ -59,6 +60,7 @@ public DirectoryResultContext(MatrixCursor mcResult, String parentFolderDocId, S
                 nfe.printStackTrace();
                 folderMaxChildCount = 0;
             }
+            isTopLevelFolder = false;
             Log.i(LOGTAG, String.format(Locale.getDefault(), "Initializing new folder at path: \"%s\" ... ", activeCWDAbsPath));
         }
 
@@ -68,6 +70,9 @@ public DirectoryResultContext(MatrixCursor mcResult, String parentFolderDocId, S
 
         public int getFolderChildCount() { return folderMaxChildCount; }
 
+        public boolean isTopLevelFolder() { return isTopLevelFolder; }
+        public void setTopLevelFolder(boolean topLevel) { isTopLevelFolder = topLevel; }
+
         public String getCWDBasePath() {
             return FileUtils.getFileBaseNameFromPath(activeCWDAbsPath);
         }

AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/FileChooserActivity.java

@@ -189,14 +189,17 @@ public void onClick(View btnView) {
             @Override
             public void onClick(View view) {
                 DisplayFragments displayCtx = DisplayFragments.getInstance();
-                if(displayCtx.pathHistoryStack.empty()) {
+                if(displayCtx.pathHistoryStack.empty() || displayCtx.getCwdFolderContext().isTopLevelFolder()) {
                     getInstance().postSelectedFilesActivityResult(new FileChooserException.CommunicateNoDataException());
                     return;
                 }
                 String displayAscendingPrecurseMsg = String.format(Locale.getDefault(), "Ascending back upwards into DIR \"%s\".",
                         displayCtx.pathHistoryStack.peek().getCWDBasePath());
                 DisplayUtils.displayToastMessageShort(displayAscendingPrecurseMsg);
-                displayCtx.descendIntoNextDirectory(false);
+                DisplayTypes.DirectoryResultContext priorFolder = DisplayTypes.DirectoryResultContext.probePreviousFolder(1);
+                DisplayFragments.getInstance().pathHistoryStack.push(priorFolder);
+                DisplayFragments.getInstance().descendIntoNextDirectory(displayCtx.pathHistoryStack.pop().isTopLevelFolder());
+                DisplayFragments.backupFolderHistoryPaths();
             }
         });
         LinearLayout dirHistoryNavContainer = (LinearLayout) findViewById(R.id.mainDirPrevPathsNavContainer);

AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/PrefetchFilesUpdater.java

@@ -30,7 +30,7 @@ This program (the AndroidFilePickerLight library) is free software written by
  * The logic in this class should be the reason the scolling action
  * in the RecyclerView used to display the files listings graphically works well.
  * The idea and problem is the following: In a large directory of image screenshots
- * (several GB worth, and spread across ~100 entries), it is infeasible to load all of the
+ * (several GB worth, and spread across ~4x100 entries), it is infeasible to load all of the
  * files to list into the UI layout views at once. The standard solution for this on
  * Android is approximated by the use of a RecyclerView. The semi non-standard usage of this
  * functionality requires fast, fling-based scrolling through the large file list.
@@ -271,13 +271,6 @@ protected void onPreExecute() {
 
             displayCtx = DisplayFragments.getInstance();
 
-            // In the meantime, display a quick positional status Toast message to the user since
-            // scrollbars do not indicate the number of files left to view very well:
-            //DisplayUtils.displayFolderScrollContents(
-            //        displayCtx.lastFileDataStartIndex + 1,
-            //        displayCtx.getCwdFolderContext().getFolderChildCount()
-            //);
-
         }
 
         protected void onProgressUpdate(Integer... progress) {

AndroidFilePickerLightLibrary/src/main/res/layout/main_picker_activity_base_layout.xml

@@ -144,9 +144,9 @@
                 android:gravity="left|center_vertical"
                 android:layout_gravity="left|center_vertical"
                 android:paddingBottom="2dp"
-                android:text="---"
+                android:text=""
                 android:textColor="?__colorPrimaryDark"
-                android:textSize="12sp"
+                android:textSize="15sp"
                 android:textStyle="normal|bold"
                 android:typeface="serif"
                 />
@@ -157,11 +157,12 @@
                 android:layout_height="wrap_content"
                 android:gravity="left|center_vertical"
                 android:layout_gravity="left|center_vertical"
-                android:text="---"
+                android:text=""
                 android:textColor="?__colorPrimaryDark"
-                android:textSize="12sp"
+                android:textSize="14sp"
                 android:textStyle="normal|bold"
                 android:typeface="serif"
+                android:visibility="gone"
                 />
 
         </LinearLayout>
@@ -183,7 +184,7 @@
         android:layout_gravity="center_horizontal|top"
         android:gravity="center_horizontal|top"
         android:background="?__colorPrimary"
-        android:orientation="horizontal"
+        android:orientation="vertical"
         android:clickable="true"
         >
 

AndroidFilePickerLightLibrary/src/main/res/xml/file_provider_paths_base.xml

@@ -30,7 +30,7 @@
         <external-cache-path name="external_cache" path="." />
 
         <external-files name="/storage/self/primary" path="."/>
-        <external-files name="Downloads" path="Download/" />
+        <external-files name="Download" path="Download/" />
         <external-files name="Movies" path="./Movies/" />
         <external-files name="Music" path="./Music" />
         <external-files name="Pictures" path="./Pictures/" />
@@ -39,7 +39,7 @@
         <external-files name="Camera" path="./DCIM/Camera/" />
 
         <external-files-path name="/storage/self/primary" path="."/>
-        <external-files-path name="Downloads" path="Download/" />
+        <external-files-path name="Download" path="Download/" />
         <external-files-path name="Movies" path="Movies/" />
         <external-files-path name="Music" path="Music" />
         <external-files-path name="Pictures" path="Pictures/" />