Stashing incremental work to get the custom themes to work again in the demo app

Dr. Maxie Dion Schmidt · Dr. Maxie Dion Schmidt · commit 11cff2318037 · 2026-02-27T04:33:11.000-06:00
diff --git a/AndroidFilePickerLightLibrary/build.gradle b/AndroidFilePickerLightLibrary/build.gradle
@@ -46,8 +46,8 @@ android {
         targetSdkVersion 35
         compileSdkVersion 35
         compileSdk 35
-        versionCode 25
-        versionName "1.3.2-beta"
+        versionCode 26
+        versionName "1.3.3-beta"
         buildFeatures.buildConfig = true
         buildToolsVersion '35.0.1'
 
diff --git a/AndroidFilePickerLightLibrary/build/generated/source/buildConfig/debug/com/maxieds/androidfilepickerlightlibrary/BuildConfig.java b/AndroidFilePickerLightLibrary/build/generated/source/buildConfig/debug/com/maxieds/androidfilepickerlightlibrary/BuildConfig.java
@@ -8,13 +8,13 @@ public final class BuildConfig {
   public static final String LIBRARY_PACKAGE_NAME = "com.maxieds.androidfilepickerlightlibrary";
   public static final String BUILD_TYPE = "debug";
   // Field from build type: debug
-  public static final String BUILD_TIMESTAMP = "2026-02-26-233203";
+  public static final String BUILD_TIMESTAMP = "2026-02-27-042733";
   // Field from build type: debug
   public static final String GIT_COMMIT_DATE = "";
   // Field from build type: debug
   public static final String GIT_COMMIT_HASH = "";
   // Field from build type: debug
-  public static final long VERSION_CODE = 25L;
+  public static final long VERSION_CODE = 26L;
   // Field from build type: debug
-  public static final String VERSION_NAME = "1.3.2-beta";
+  public static final String VERSION_NAME = "1.3.3-beta";
 }
diff --git a/AndroidFilePickerLightLibrary/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/AndroidFilePickerLightLibrary/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Feb 26 23:32:04 CST 2026
+#Fri Feb 27 04:26:37 CST 2026
 com.maxieds.androidfilepickerlightlibrary.AndroidFilePickerLightLibrary-main-6\:/drawable/file_chooser_default_toolbar_icon48.webp=/Users/maxieds/AndroidFilePickerLight2-NewBuildScripts/AndroidFilePickerLightLibrary/build/intermediates/packaged_res/debug/packageDebugResources/drawable/file_chooser_default_toolbar_icon48.webp
 com.maxieds.androidfilepickerlightlibrary.AndroidFilePickerLightLibrary-main-6\:/layout/nav_folder_button_long_form.xml=/Users/maxieds/AndroidFilePickerLight2-NewBuildScripts/AndroidFilePickerLightLibrary/build/intermediates/packaged_res/debug/packageDebugResources/layout/nav_folder_button_long_form.xml
 com.maxieds.androidfilepickerlightlibrary.AndroidFilePickerLightLibrary-main-6\:/drawable/hidden_file_icon32.webp=/Users/maxieds/AndroidFilePickerLight2-NewBuildScripts/AndroidFilePickerLightLibrary/build/intermediates/packaged_res/debug/packageDebugResources/drawable/hidden_file_icon32.webp
diff --git a/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/CustomThemeBuilder.java b/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/CustomThemeBuilder.java
@@ -23,6 +23,7 @@ This program (the AndroidFilePickerLight library) is free software written by
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
+import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.Window;
@@ -207,9 +208,12 @@ public static int[] GenerateThemeColorsList(Activity activityCtxRef, @ColorRes i
             try {
                 resolvedColor =  DisplayUtils.getColorFromResource(activityCtxRef, baseColorResId);
             } catch(Exception ex) {
+                ex.printStackTrace();
                 try {
                     resolvedColor =  DisplayUtils.resolveColorFromAttribute(activityCtxRef, baseColorResId);
-                } catch (Exception ex2) {}
+                } catch (Exception ex2) {
+                    ex2.printStackTrace();
+                }
             }
             return new int[] {
                     resolvedColor,                                                   /* COLOR_PRIMARY */
@@ -231,9 +235,9 @@ public static int[] GenerateThemeColorsList(Activity activityCtxRef, @ColorRes i
     private FileChooserColorScheme themeColorScheme;
 
     public CustomThemeBuilder setThemeColors(@ColorRes int[] colorsList) {
-        for(int cidx = 0; cidx < colorsList.length; cidx++) {
+        /*for(int cidx = 0; cidx < colorsList.length; cidx++) {
             colorsList[cidx] = DisplayUtils.resolveColorFromResId(activityCtx, colorsList[cidx]);
-        }
+        }*/
         themeColorScheme = new FileChooserColorScheme(colorsList);
         return this;
     }
@@ -448,24 +452,27 @@ public boolean styleNavigationDisplayToolbar(Toolbar toolbar) {
             @Override
             public boolean styleDefaultPathNavigationButton(ImageButton dirNavBtn, FileChooserBuilder.DefaultNavFoldersType baseFolderBtnType) throws RuntimeException {
                 if(dirNavBtn == null || baseFolderBtnType == null) {
+                    Log.i(LOGTAG, "Path nav buttons are null ...");
                     return false;
                 }
-                dirNavBtn.setBackgroundColor(themeColorScheme.getColorToolbarNav());
+                dirNavBtn.setBackgroundColor(_themeColorScheme.getColorToolbarNav());
                 try {
                     boolean status = true;
                     Drawable navBtnIcon;
                     if (_navBtnIconResIdMap.get(baseFolderBtnType) != null) {
-                        navBtnIcon = DisplayUtils.resolveDrawableFromResId(_activityCtx, _navBtnIconResIdMap.get(baseFolderBtnType));
+                        navBtnIcon = DisplayUtils.getDrawableFromResource(_activityCtx, _navBtnIconResIdMap.get(baseFolderBtnType));
                     } else {
                         status = false;
                         int defaultIconResId = FileChooserBuilder.DefaultNavFoldersType.NAV_FOLDER_ICON_RESIDS_MAP.get(
                                 FileChooserBuilder.DefaultNavFoldersType.NAV_FOLDER_PATHS_REVMAP.get(baseFolderBtnType).ordinal()
                         ).intValue();
+                        Log.i(LOGTAG, "Having to use default nav icons ...");
                         navBtnIcon = DisplayUtils.resolveDrawableFromAttribute(defaultIconResId);
                     }
                     dirNavBtn.setImageDrawable(navBtnIcon);
                     return status;
                 } catch(NullPointerException npe) {
+                    npe.printStackTrace();
                     return false;
                 }
             }
diff --git a/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/DisplayUtils.java b/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/DisplayUtils.java
@@ -24,6 +24,7 @@ This program (the AndroidFilePickerLight library) is free software written by
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Handler;
+import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -42,7 +43,7 @@ This program (the AndroidFilePickerLight library) is free software written by
 
 public class DisplayUtils {
 
-    private static String LOGTAG = DisplayUtils.class.getSimpleName();
+    private static final String LOGTAG = DisplayUtils.class.getSimpleName();
 
     public static int getColorVariantFromTheme(Activity activityRef, int attrID) throws FileChooserException.InvalidActivityContextException {
         if(activityRef == null) {
@@ -210,9 +211,11 @@ public static boolean checkIconDimensions(Drawable iconInput, int dimsHW) {
 
     public static <T extends Object> T firstNonNull(T firstObj, T secondObj) {
         if(firstObj != null) {
+            Log.i(LOGTAG, "First object non-null");
             return firstObj;
         }
         else {
+            Log.i(LOGTAG, "Second object non-null");
             return secondObj;
         }
     }
diff --git a/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/FileChooserActivity.java b/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/FileChooserActivity.java
@@ -182,6 +182,13 @@ public void run() {
     }
 
     private static boolean appHasRequestedPerms = false;
+
+    private static FileChooserBuilder initialFileChooserBuilderInst = null;
+
+    public static void setInitialFileChooserBuilder(FileChooserBuilder fpInst) {
+        initialFileChooserBuilderInst = fpInst;
+    }
+
     @Override
     public void onCreate(Bundle lastSettingsBundle) {
 
@@ -210,7 +217,14 @@ public void onCreate(Bundle lastSettingsBundle) {
         BasicFileProvider.resetBasicFileProviderDefaults();
         cwdFolderCtx = null;
 
-        FileChooserBuilder fpConfig = new FileChooserBuilder(this);
+        FileChooserBuilder fpConfig;
+        if (initialFileChooserBuilderInst == null) {
+            fpConfig = new FileChooserBuilder(this);
+        }
+        else {
+            fpConfig = initialFileChooserBuilderInst;
+            fpConfig.resetActivityContext(this);
+        }
         if(fpConfig.getExternalFilesProvider() != null) {
             BasicFileProvider.setExternalDocumentsProvider(fpConfig.getExternalFilesProvider());
         }
@@ -453,7 +467,7 @@ else if(requestCode == PermissionsHandler.REQUEST_REQUIRED_PERMISSIONS_CODE) {
 
     @AfterPermissionGranted(PermissionsHandler.REQUEST_REQUIRED_PERMISSIONS_CODE)
     private void handleRequiredPermissionsGranted() {
-        String[] permsList = ACTIVITY_REQUIRED_PERMISSIONS;
+        String[] permsList = ACTIVITY_OPTIONAL_PERMISSIONS; // ACTIVITY_REQUIRED_PERMISSIONS;
         if (EasyPermissions.hasPermissions(this, permsList)) {}
         else {
             EasyPermissions.requestPermissions(this, getString(R.string.requiredPermsRationale),
diff --git a/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/FileChooserBuilder.java b/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/FileChooserBuilder.java
@@ -37,7 +37,7 @@ This program (the AndroidFilePickerLight library) is free software written by
 
 public class FileChooserBuilder implements Serializable {
 
-    private static String LOGTAG = FileChooserBuilder.class.getSimpleName();
+    private static final String LOGTAG = FileChooserBuilder.class.getSimpleName();
 
     public enum DefaultFileTypes {
 
@@ -224,7 +224,7 @@ public enum SelectionModeType {
     private FileFilter.FileFilterBase localFileFilter;
     private FileFilter.FileItemsSortFunc customSortFunc;
 
-    // Non-display type configuration:
+    /* Non-display type configuration: */
     private int recyclerViewStartBufferSize;
     private int recyclerViewNotVisibleBufferSize;
     private int recyclerViewLayoutFlingDampenThreshold;
@@ -281,6 +281,13 @@ public boolean allowSelectFolderItems() {
                 pathSelectMode.ordinal() != SelectionModeType.SELECT_FILE_ONLY.ordinal();
     }
 
+    public boolean resetActivityContext(Activity actContext) {
+        if (actContext == null) {
+            return false;
+        }
+        activityContextRef = new WeakReference<Activity>(actContext);
+        return true;
+    }
     public FileChooserBuilder setInitialPathAbsolute(String startPathAbs) {
         startPathRelative = null;
         startPathAbsolute = startPathAbs;
diff --git a/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/PermissionsHandler.java b/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/PermissionsHandler.java
@@ -74,13 +74,6 @@ public static String lookupPermissionRationale(String permID) {
     public static boolean obtainRequiredPermissions(Activity activityCtx, String[] permsList) {
         if(android.os.Build.VERSION.SDK_INT >= 23) {
              activityCtx.requestPermissions(permsList, REQUEST_REQUIRED_PERMISSIONS_CODE);
-             EasyPermissions.requestPermissions(
-                    new PermissionRequest.Builder(activityCtx, REQUEST_REQUIRED_PERMISSIONS_CODE, permsList)
-                            .setRationale(R.string.grantPermsDialogRationaleText)
-                            .setPositiveButtonText(R.string.grantPermsDialogOkBtnText)
-                            .setNegativeButtonText(R.string.grantPermsDialogCancelBtnText)
-                            .setTheme(R.style.LibraryDefaultTheme)
-                            .build());
         }
         for(int pidx = 0; pidx < permsList.length; pidx++) {
             if(!hasAccessPermission(activityCtx, permsList[pidx])) {
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.maxieds.androidfilepickerlight"
         minSdkVersion 29
         targetSdkVersion 35
-        versionCode 6
-        versionName "1.3.2-beta"
+        versionCode 7
+        versionName "1.3.3-beta"
         buildFeatures.buildConfig = true
         buildToolsVersion '35.0.1'
 
diff --git a/app/src/main/java/com/maxieds/androidfilepickerlight/AndroidFilePickerLightExampleActivity.java b/app/src/main/java/com/maxieds/androidfilepickerlight/AndroidFilePickerLightExampleActivity.java
@@ -96,7 +96,7 @@ public void showFileChooserResultsDialog(List<String> fileItemsList, String onEr
             errorRationaleDisplayText.setTextColor(getColor(R.color.colorOnErrorDisplayText));
             errorRationaleDisplayText.setText(errorDisplayText.toString());
             adBuilder.setView(errorRationaleDisplayText);
-            adBuilder.setNegativeButton("[X] That bytes, boo.", null);
+            adBuilder.setNegativeButton("[X] That bytes, BOO :(", null);
             adBuilder.create().show();
             return;
         }
@@ -114,6 +114,7 @@ public void showFileChooserResultsDialog(List<String> fileItemsList, String onEr
                 displayText.append(" • " + fileItem + "\n");
             }
         } catch(Exception emptyFilesListError) {
+            /* The next code should never get run: */
             emptyFilesListError.printStackTrace();
             displayText.append(" • [ ]\n");
         }
@@ -170,14 +171,6 @@ public void actionButtonLaunchOmnivorousMultiPickerActivity(View btnView) {
 
     public void actionButtonLaunchMultiPickerActivityNewThemeGreen(View btnView) {
 
-        FileChooserBuilder fpInst = new FileChooserBuilder(this);
-        fpInst.setSelectionMode(FileChooserBuilder.SelectionModeType.SELECT_OMNIVORE);
-        fpInst.setSelectMultiple(5);
-        fpInst.setActionCode(FileChooserBuilder.ACTIVITY_CODE_SELECT_MULTIPLE_FILES);
-        fpInst.setNavigationLongForm(false);
-        fpInst.showHidden(true);
-        fpInst.setInitialPath(FileChooserBuilder.BaseFolderPathType.BASE_PATH_DEFAULT);
-
         CustomThemeBuilder customThemeBuilder = new CustomThemeBuilder(this)
                 .setPickerTitleText(R.string.picker_title_text)
                 .setNavBarPrefixText(R.string.navbar_prefix_text)
@@ -202,7 +195,15 @@ public void actionButtonLaunchMultiPickerActivityNewThemeGreen(View btnView) {
                 .setDefaultFolderIcon(R.drawable.greentheme_folder_icon32)
                 .setFileItemMetaDataPermissionsDisplayStyle(CustomThemeBuilder.FileItemPermissionsDisplayStyle.PERMISSIONS_DISPLAY_POSIX_STYLE);
 
-        fpInst.setCustomThemeStylizerConfig(customThemeBuilder);
+        FileChooserBuilder fpInst = new FileChooserBuilder(this)
+                .setSelectionMode(FileChooserBuilder.SelectionModeType.SELECT_OMNIVORE)
+                .setSelectMultiple(5)
+                .setActionCode(FileChooserBuilder.ACTIVITY_CODE_SELECT_MULTIPLE_FILES)
+                .setNavigationLongForm(false)
+                .showHidden(true)
+                .setInitialPath(FileChooserBuilder.BaseFolderPathType.BASE_PATH_DEFAULT)
+                .setCustomThemeStylizerConfig(customThemeBuilder);
+        FileChooserActivity.setInitialFileChooserBuilder(fpInst);
         fpInst.launchFilePicker();
 
     }
@@ -241,6 +242,7 @@ public void actionButtonLaunchMultiPickerActivityNewThemeOrange(View btnView) {
                 .setDefaultFolderIcon(R.drawable.orangetheme_folder_icon32);
 
         fpInst.setCustomThemeStylizerConfig(customThemeBuilder);
+        FileChooserActivity.setInitialFileChooserBuilder(fpInst);
         fpInst.launchFilePicker();
 
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#Thu Feb 26 23:32:04 CST 2026`
	`1`	`+#Fri Feb 27 04:26:37 CST 2026`
`2`	`2`	`com.maxieds.androidfilepickerlightlibrary.AndroidFilePickerLightLibrary-main-6\:/drawable/file_chooser_default_toolbar_icon48.webp=/Users/maxieds/AndroidFilePickerLight2-NewBuildScripts/AndroidFilePickerLightLibrary/build/intermediates/packaged_res/debug/packageDebugResources/drawable/file_chooser_default_toolbar_icon48.webp`
`3`	`3`	`com.maxieds.androidfilepickerlightlibrary.AndroidFilePickerLightLibrary-main-6\:/layout/nav_folder_button_long_form.xml=/Users/maxieds/AndroidFilePickerLight2-NewBuildScripts/AndroidFilePickerLightLibrary/build/intermediates/packaged_res/debug/packageDebugResources/layout/nav_folder_button_long_form.xml`
`4`	`4`	`com.maxieds.androidfilepickerlightlibrary.AndroidFilePickerLightLibrary-main-6\:/drawable/hidden_file_icon32.webp=/Users/maxieds/AndroidFilePickerLight2-NewBuildScripts/AndroidFilePickerLightLibrary/build/intermediates/packaged_res/debug/packageDebugResources/drawable/hidden_file_icon32.webp`