Updating the layout styles and some bug fixes

Author: maxieds

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

@@ -49,6 +49,23 @@ public class DisplayFragments {
     public static  List<DisplayTypes.FileType> activeSelectionsList = new ArrayList<DisplayTypes.FileType>();
     private static List<String> fileItemBasePathsList = new ArrayList<String>();
 
+    public static void initializeRecyclerViewLayout(RecyclerView rview) {
+        if(!recyclerViewAdapterInit) {
+            mainFileListRecyclerView = rview;
+            LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT
+            );
+            mainFileListRecyclerView.setLayoutParams(layoutParams);
+            rvLayoutManager = new LinearLayoutManager(FileChooserActivity.getInstance());
+            rvLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+            mainFileListRecyclerView.setLayoutManager(rvLayoutManager);
+            rvAdapter = new DisplayAdapters.FileListAdapter(fileItemBasePathsList);
+            mainFileListRecyclerView.setAdapter(rvAdapter);
+            recyclerViewAdapterInit = true;
+        }
+    }
+
     public static FileFilter.FileFilterInterface localFilesListFilter = null;
     public static FileFilter.FileItemsListSortFunc localFilesListSortFunc = null;
 
@@ -75,15 +92,7 @@ public static void initiateNewFolderLoad(FileChooserBuilder.BaseFolderPathType i
     public static void displayNextDirectoryFilesList(List<DisplayTypes.FileType> workingDirContentsList) {
 
         if(!recyclerViewAdapterInit) {
-            LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                                                         ViewGroup.LayoutParams.WRAP_CONTENT);
-            mainFileListRecyclerView.setLayoutParams(layoutParams);
-            rvLayoutManager = new LinearLayoutManager(FileChooserActivity.getInstance());
-            rvLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
-            mainFileListRecyclerView.setLayoutManager(rvLayoutManager);
-            rvAdapter = new DisplayAdapters.FileListAdapter(fileItemBasePathsList);
-            mainFileListRecyclerView.setAdapter(rvAdapter);
-            recyclerViewAdapterInit = true;
+            initializeRecyclerViewLayout(mainFileListRecyclerView);
         }
         DisplayFragments.FolderNavigationFragment.dirsOneBackText.setText("----");
         DisplayFragments.FolderNavigationFragment.dirsTwoBackText.setText("----");
@@ -121,13 +130,6 @@ public FileListItemFragment(DisplayTypes.FileType fileItem, int displayPosition)
             resetLayout(fileItem, displayPositionIndex);
         }
 
-        public static void configureStaticInstanceMembers(View mainContainerLayout) {
-            RecyclerView recyclerViewDisplay = (RecyclerView) FileChooserActivity.getInstance().findViewById(R.id.mainRecyclerViewContainer);
-            mainFileListRecyclerView = recyclerViewDisplay;
-            rvLayoutManager = new LinearLayoutManager(FileChooserActivity.getInstance());
-            recyclerViewDisplay.setLayoutManager(rvLayoutManager);
-        }
-
         public void resetLayout(DisplayTypes.FileType fileItem, int displayPosition) {
             displayPositionIndex = displayPosition;
             ImageView fileTypeIcon = layoutContainer.findViewById(R.id.fileTypeIcon);

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

@@ -20,6 +20,7 @@ This program (the AndroidFilePickerLight library) is free software written by
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.View;
@@ -41,14 +42,14 @@ This program (the AndroidFilePickerLight library) is free software written by
 
 import pub.devrel.easypermissions.AfterPermissionGranted;
 import pub.devrel.easypermissions.AppSettingsDialog;
-import pub.devrel.easypermissions.BuildConfig;
+import com.maxieds.androidfilepickerlightlibrary.BuildConfig;
 import pub.devrel.easypermissions.EasyPermissions;
 
 public class FileChooserActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks {
 
     private static String LOGTAG = FileChooserActivity.class.getSimpleName();
 
-    public static FileChooserActivity staticRunningInst = null;
+    private static FileChooserActivity staticRunningInst = null;
     public static FileChooserActivity getInstance() { return staticRunningInst; }
 
     public static Stack<FileChooserBuilder> activityBuilderLaunchedRefs = new Stack<FileChooserBuilder>();
@@ -93,6 +94,7 @@ public void onCreate(Bundle lastSettingsBundle) {
 
         setTheme(R.style.LibraryDefaultTheme);
         setContentView(R.layout.main_picker_activity_base_layout);
+        configureInitialMainLayout(fpConfig);
 
         // Keep the app from crashing when the screen rotates:
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
@@ -124,7 +126,7 @@ public void run() {
         Runnable execDelayedFileProviderInitRunner = new Runnable() {
             @Override
             public void run() {
-                configureInitialMainLayout(fpConfig);
+                //configureInitialMainLayout(fpCfgConst);
                 BasicFileProvider.getInstance().selectBaseDirectoryByType(fpConfig.getInitialBaseFolder());
             }
         };
@@ -136,12 +138,31 @@ private void configureInitialMainLayout(FileChooserBuilder fpConfig) {
 
         /* Setup the toolbar first: */
         Toolbar actionBar = (Toolbar) findViewById(R.id.mainLayoutToolbarActionBar);
-        actionBar.setTitle(String.format(Locale.getDefault(), "%s | v%s", getString(R.string.libraryName), String.valueOf(BuildConfig.VERSION_NAME)));
-        actionBar.setSubtitle(getString(R.string.filePickerTitleText));
+        actionBar.setTitle(String.format(Locale.getDefault(), "  %s | v%s", getString(R.string.libraryName), String.valueOf(BuildConfig.VERSION_NAME)));
+        actionBar.setSubtitle(String.format(Locale.getDefault(), " ⇤%s⇥", getString(R.string.filePickerTitleText)));
+        actionBar.setTitleTextColor(getColor(R.color.colorMainToolbarForegroundText));
+        actionBar.setSubtitleTextColor(getColor(R.color.colorMainToolbarForegroundText));
+        actionBar.setTitleMargin(0, 5, 5, 5);
+        actionBar.setPadding(5, 8, 5, 6);
+        actionBar.setElevation(1.25f);
+        GradientDrawable chooserToolbarGradientBg = new GradientDrawableFactory.Builder()
+                .setGradientAngle(64.0f)
+                .setGradientType(GradientDrawableFactory.GradientMethodSpec.GRADIENT_METHOD_LINEAR)
+                .setFillStyle(GradientDrawableFactory.GradientTypeSpec.GRADIENT_FILL_TYPE_LEFT_RIGHT)
+                .setBorderColor(getColor(R.color.__colorTransparent))
+                .setBorderStyle(GradientDrawableFactory.BorderStyleSpec.BORDER_STYLE_NONE)
+                .setColorsArray(new int[] {
+                        GradientDrawableFactory.resolveColorFromAttribute(R.attr.mainToolbarBackgroundColor),
+                        GradientDrawableFactory.resolveColorFromAttribute(R.attr.mainToolbarBackgroundColor2),
+                        GradientDrawableFactory.resolveColorFromAttribute(R.attr.mainToolbarBackgroundColor3),
+                        GradientDrawableFactory.resolveColorFromAttribute(R.attr.mainToolbarBackgroundColor4),
+                })
+                .make();
+        actionBar.setBackgroundDrawable(chooserToolbarGradientBg);
+        actionBar.setLogo(getDrawable(R.drawable.file_chooser_default_toolbar_icon48));
         getWindow().setTitleColor(getColorVariantFromTheme(R.attr.mainToolbarBackgroundColor));
         getWindow().setStatusBarColor(getColorVariantFromTheme(R.attr.colorPrimaryDark));
         getWindow().setNavigationBarColor(getColorVariantFromTheme(R.attr.colorPrimaryDark));
-        //setSupportActionBar(actionBar);
 
         /* Initialize the next level of nav for the default folder paths selection buttons: */
         List<FileChooserBuilder.DefaultNavFoldersType> defaultDirNavFolders = fpConfig.getNavigationFoldersList();
@@ -203,16 +224,16 @@ public void onClick(View btnView) {
          * empty, this action is handled the same way as a cancel button press by the user.
          */
         LinearLayout dirHistoryNavContainer = (LinearLayout) findViewById(R.id.mainDirPrevPathsNavContainer);
-        dirHistoryNavContainer.setBackground(GradientDrawableFactory.generateNamedGradientType(
-                GradientDrawableFactory.BorderStyleSpec.BORDER_STYLE_DASHED_SHORT,
+        dirHistoryNavContainer.setBackgroundDrawable(GradientDrawableFactory.generateNamedGradientType(
+                GradientDrawableFactory.BorderStyleSpec.BORDER_STYLE_NONE,
                 GradientDrawableFactory.NamedGradientColorThemes.NAMED_COLOR_SCHEME_STEEL_BLUE
                 )
         );
         DisplayFragments.mainFolderNavFragment = DisplayFragments.FolderNavigationFragment.createNewFolderNavFragment(dirHistoryNavContainer);
 
         /* Setup some theme related styling on the main file list container: */
         RecyclerView mainFileListContainer = findViewById(R.id.mainRecyclerViewContainer);
-        mainFileListContainer.setBackground(GradientDrawableFactory.generateNamedGradientType(
+        mainFileListContainer.setBackgroundDrawable(GradientDrawableFactory.generateNamedGradientType(
                      GradientDrawableFactory.GradientMethodSpec.GRADIENT_METHOD_LINEAR,
                      GradientDrawableFactory.GradientTypeSpec.GRADIENT_FILL_TYPE_BL_TR,
                      GradientDrawableFactory.BorderStyleSpec.BORDER_STYLE_NONE,
@@ -225,7 +246,7 @@ public void onClick(View btnView) {
                      }
                 )
         );
-        DisplayFragments.FileListItemFragment.configureStaticInstanceMembers(mainFileListContainer);
+        DisplayFragments.initializeRecyclerViewLayout(mainFileListContainer);
         DisplayFragments.initiateNewFolderLoad(fpConfig.getInitialBaseFolder());
 
     }

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

@@ -215,6 +215,7 @@ public int getFileSelectionModeMask(SelectionModeType selectMode) {
     private FileFilter.FileItemsListSortFunc customSortFunc;
 
     public static final long NO_ABORT_TIMEOUT = -1;
+    public static final long DEFAULT_TIMEOUT = 100 * 1000;
     public static final int DEFAULT_MAX_SELECTED_FILES = 10;
 
     public FileChooserBuilder(Activity activityContextInst) {
@@ -229,7 +230,7 @@ public FileChooserBuilder(Activity activityContextInst) {
         initFolderBasePathType = BaseFolderPathType.getInstanceByName(BaseFolderPathType.BASE_PATH_TYPE_FILES_DIR);
         pathSelectMode = SelectionModeType.SELECT_OMNIVORE;
         externalFilesProvider = null;
-        idleTimeoutMillis = NO_ABORT_TIMEOUT;
+        idleTimeoutMillis = DEFAULT_TIMEOUT;
         localFileFilter = null;
     }
 

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

@@ -171,7 +171,7 @@ else if(borderStyleSpec == BorderStyleSpec.BORDER_STYLE_DASHED_LONG)
             gradientDrawObj.setStroke(borderWidth, borderColor, 25, 10);
         else if(borderStyleSpec == BorderStyleSpec.BORDER_STYLE_DASHED_SHORT)
             gradientDrawObj.setStroke(borderWidth, borderColor, 4, 10);
-        gradientDrawObj.setUseLevel(true);
+        //gradientDrawObj.setUseLevel(true);
         return gradientDrawObj;
     }
 
@@ -325,7 +325,7 @@ public Builder setBorderStyle(BorderStyleSpec bdrStyle) {
             return this;
         }
 
-        public Builder setFileStyle(GradientTypeSpec gradFillStyle) {
+        public Builder setFillStyle(GradientTypeSpec gradFillStyle) {
             gradientFillStyle = gradFillStyle;
             return this;
         }

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

@@ -34,5 +34,7 @@ public static ThemesConfigInterface getDefaultsInstance() {
     // the GradientDrawableFactory.Builder class ...
     // setup / configure the stock directory path nav btn icons
     // reset the default file type and directory folder display icons
+    // toolbar bgcolors (0-3)
+    // toolbar icon
 
 }

AndroidFilePickerLightLibrary/src/main/res/drawable/apk_file_icon32.png

@@ -25,19 +25,19 @@
         android:startColor="#3F51B5"
         android:centerColor="#477C9C"
         android:endColor="#03A9F4"
-        android:angle="45"/>
+        android:angle="32"/>
 
     <corners
-        android:radius="10dp"
+        android:radius="6dp"
         />
 
     <padding
-        android:left="10dp"
-        android:top="10dp"
-        android:right="10dp"
-        android:bottom="10dp"
+        android:left="2dp"
+        android:top="2dp"
+        android:right="2dp"
+        android:bottom="2dp"
         />
 
-    <stroke android:width="6dp" android:color="#3F51B5"/>
+    <stroke android:width="2dp" android:color="#3F51B5"/>
 
 </shape>