Skip to content

Commit eb003fe

Browse files
Dr. Maxie Dion SchmidtDr. Maxie Dion Schmidt
authored andcommitted
A few added featrures - Release 1.4.0-beta
1 parent ed3030d commit eb003fe

File tree

7 files changed

+52
-18
lines changed

7 files changed

+52
-18
lines changed

AndroidFilePickerLightLibrary/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ android {
6464
targetSdkVersion 35
6565
compileSdkVersion 35
6666
compileSdk 35
67-
versionCode 32
68-
versionName "1.3.9-beta"
67+
versionCode 33
68+
versionName "1.4.0-beta"
6969
buildFeatures.buildConfig = true
7070
buildToolsVersion '35.0.1'
7171

AndroidFilePickerLightLibrary/build/generated/source/buildConfig/debug/com/maxieds/androidfilepickerlightlibrary/BuildConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ public final class BuildConfig {
88
public static final String LIBRARY_PACKAGE_NAME = "com.maxieds.androidfilepickerlightlibrary";
99
public static final String BUILD_TYPE = "debug";
1010
// Field from build type: debug
11-
public static final String BUILD_TIMESTAMP = "2026-03-28-045040";
11+
public static final String BUILD_TIMESTAMP = "2026-04-04-145211";
1212
// Field from build type: debug
1313
public static final String GIT_COMMIT_DATE = "";
1414
// Field from build type: debug
1515
public static final String GIT_COMMIT_HASH = "";
1616
// Field from build type: debug
17-
public static final long VERSION_CODE = 32L;
17+
public static final long VERSION_CODE = 33L;
1818
// Field from build type: debug
19-
public static final String VERSION_NAME = "1.3.9-beta";
19+
public static final String VERSION_NAME = "1.4.0-beta";
2020
}

AndroidFilePickerLightLibrary/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Sat Mar 28 04:50:42 CDT 2026
1+
#Sat Apr 04 14:52:15 CDT 2026
22
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
33
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
44
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

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

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ public CustomThemeBuilder(Activity activityCtxRef) {
6161
globalBackBtnIconResId = NULL_RESOURCE_ID;
6262
doneActionBtnIconResId = NULL_RESOURCE_ID;
6363
cancelActionBtnIconResId = NULL_RESOURCE_ID;
64+
useTintedDefaultIcons = false;
65+
tintColorResId = NULL_RESOURCE_ID;
6466
themeColorScheme = null;
6567
toolbarIconResId = NULL_RESOURCE_ID;
6668
useToolbarGradients = false;
@@ -112,9 +114,26 @@ public CustomThemeBuilder setCancelActionButtonText(@StringRes int btnTextResId)
112114
return this;
113115
}
114116

117+
private boolean useTintedDefaultIcons;
118+
private int tintColorResId;
119+
115120
private int globalBackBtnIconResId;
116121
private int doneActionBtnIconResId;
117122
private int cancelActionBtnIconResId;
123+
private int toolbarIconResId;
124+
125+
public CustomThemeBuilder setUseTintedDefaultIcons() {
126+
pickerTitleTextResId = NULL_RESOURCE_ID;
127+
navBarPrefixTextResId = NULL_RESOURCE_ID;
128+
doneActionBtnTextResId = NULL_RESOURCE_ID;
129+
cancelActionBtnTextResId = NULL_RESOURCE_ID;
130+
globalBackBtnIconResId = NULL_RESOURCE_ID;
131+
doneActionBtnIconResId = NULL_RESOURCE_ID;
132+
cancelActionBtnIconResId = NULL_RESOURCE_ID;
133+
useTintedDefaultIcons = true;
134+
tintColorResId = (activityCtx != null) ? DisplayUtils.getColorFromResource(activityCtx, R.color.__colorAccentMedium) : NULL_RESOURCE_ID;
135+
return this;
136+
}
118137

119138
public CustomThemeBuilder setGlobalBackButtonIcon(@DrawableRes int backIconResId) {
120139
globalBackBtnIconResId = backIconResId;
@@ -235,9 +254,6 @@ public static int[] GenerateThemeColorsList(Activity activityCtxRef, @ColorRes i
235254
private FileChooserColorScheme themeColorScheme;
236255

237256
public CustomThemeBuilder setThemeColors(@ColorRes int[] colorsList) {
238-
/*for(int cidx = 0; cidx < colorsList.length; cidx++) {
239-
colorsList[cidx] = DisplayUtils.resolveColorFromResId(activityCtx, colorsList[cidx]);
240-
}*/
241257
themeColorScheme = new FileChooserColorScheme(colorsList);
242258
return this;
243259
}
@@ -248,8 +264,6 @@ public CustomThemeBuilder generateThemeColors(@ColorRes int baseColorResId) {
248264
return this;
249265
}
250266

251-
private int toolbarIconResId;
252-
253267
public CustomThemeBuilder setActivityToolbarIcon(@DrawableRes int customIconResId) {
254268
toolbarIconResId = customIconResId;
255269
return this;
@@ -367,7 +381,7 @@ public FileChooserActivityMainLayoutStylizer createActivityMainLayoutStylizer()
367381
final boolean _useToolbarGradients = useToolbarGradients;
368382
final Drawable _toolbarLogoIconFinal = DisplayUtils.firstNonNull(
369383
DisplayUtils.resolveDrawableFromResId(activityCtx, toolbarIconResId),
370-
DisplayUtils.resolveDrawableFromResId(R.drawable.file_chooser_default_toolbar_icon48)
384+
DisplayUtils.resolveDrawableFromResId(activityCtx, R.drawable.file_chooser_default_toolbar_icon48, useTintedDefaultIcons, tintColorResId)
371385
);
372386
final String _pickerTitleTextFinal = DisplayUtils.firstNonNull(
373387
DisplayUtils.resolveStringFromResId(activityCtx, pickerTitleTextResId),
@@ -387,15 +401,15 @@ public FileChooserActivityMainLayoutStylizer createActivityMainLayoutStylizer()
387401
);
388402
final Drawable _globalBackBtnIconFinal = DisplayUtils.firstNonNull(
389403
DisplayUtils.resolveDrawableFromResId(activityCtx, globalBackBtnIconResId),
390-
DisplayUtils.resolveDrawableFromResId(R.drawable.nav_back_button_icon32)
404+
DisplayUtils.resolveDrawableFromResId(activityCtx, R.drawable.nav_back_button_icon32, useTintedDefaultIcons, tintColorResId)
391405
);
392406
final Drawable _doneActionBtnIconFinal = DisplayUtils.firstNonNull(
393407
DisplayUtils.resolveDrawableFromResId(activityCtx, doneActionBtnIconResId),
394-
DisplayUtils.resolveDrawableFromResId(R.drawable.done_button_check_icon24)
408+
DisplayUtils.resolveDrawableFromResId(activityCtx, R.drawable.done_button_check_icon24, useTintedDefaultIcons, tintColorResId)
395409
);
396410
final Drawable _cancelActionBtnIconFinal = DisplayUtils.firstNonNull(
397411
DisplayUtils.resolveDrawableFromResId(activityCtx, cancelActionBtnIconResId),
398-
DisplayUtils.resolveDrawableFromResId(R.drawable.cancel_button_x_icon24)
412+
DisplayUtils.resolveDrawableFromResId(activityCtx, R.drawable.cancel_button_x_icon24, useTintedDefaultIcons, tintColorResId)
399413
);
400414
if (activityCtx == null || themeColorScheme == null || _pickerTitleTextFinal == null ||
401415
_navBarPrefixTextFinal == null || _doneActionBtnTextFinal == null || _cancelActionBtnTextFinal == null ||

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ This program (the AndroidFilePickerLight library) is free software written by
1818
package com.maxieds.androidfilepickerlightlibrary;
1919

2020
import android.app.Activity;
21+
import android.content.Context;
2122
import android.graphics.Color;
2223
import android.graphics.PorterDuff;
2324
import android.graphics.Typeface;
@@ -36,8 +37,11 @@ This program (the AndroidFilePickerLight library) is free software written by
3637

3738
import androidx.annotation.ColorRes;
3839
import androidx.annotation.DrawableRes;
40+
import androidx.annotation.NonNull;
3941
import androidx.annotation.StringRes;
42+
import androidx.core.content.ContextCompat;
4043
import androidx.core.graphics.ColorUtils;
44+
import androidx.core.graphics.drawable.DrawableCompat;
4145

4246
import java.util.Locale;
4347

@@ -180,6 +184,13 @@ public static Drawable resolveDrawableFromResId(Activity activityCtxRef, @Drawab
180184
}
181185
}
182186

187+
public static Drawable resolveDrawableFromResId(Activity activityCtxRef, @DrawableRes int resId, boolean tintIcons, @ColorRes int tintColor) {
188+
if (!tintIcons) {
189+
return resolveDrawableFromResId(activityCtxRef, resId);
190+
}
191+
return tintDrawableIconByColor(activityCtxRef, resId, tintColor);
192+
}
193+
183194
public static Drawable resolveDrawableFromResId(@DrawableRes int resId) {
184195
return resolveDrawableFromResId(FileChooserActivity.getInstance(), resId);
185196
}
@@ -282,6 +293,15 @@ public static void displayToastMessageLong(String toastMsg) {
282293
displayToastMessageLong(FileChooserActivity.getInstance(), toastMsg, DisplayFragments.getInstance().getFileItemLayoutStylizer());
283294
}
284295

296+
public static Drawable tintDrawableIconByColor(@NonNull Context ctx, @DrawableRes int drId, @ColorRes int tintColor) {
297+
Drawable iconDrawable = ContextCompat.getDrawable(ctx, drId);
298+
iconDrawable = DrawableCompat.wrap(iconDrawable).mutate();
299+
/* First: Lighten the default icon: */
300+
DrawableCompat.setTint(iconDrawable, ContextCompat.getColor(ctx, R.color.__white));
301+
DrawableCompat.setTint(iconDrawable, ContextCompat.getColor(ctx, tintColor));
302+
return iconDrawable;
303+
}
304+
285305
private static int[] PROGRESS_BAR_VISUAL_MARKERS = new int[] {
286306
R.drawable.progressbar_0,
287307
R.drawable.progressbar_1,

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ android {
1010
applicationId "com.maxieds.androidfilepickerlight"
1111
minSdkVersion 29
1212
targetSdkVersion 35
13-
versionCode 13
14-
versionName "1.3.9-beta"
13+
versionCode 14
14+
versionName "1.4.0-beta"
1515
buildFeatures.buildConfig = true
1616
buildToolsVersion '35.0.1'
1717

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ afterEvaluate {
2323

2424
groupId 'com.maxieds.androidfilepickerlightlibrary'
2525
artifactId 'AndroidFilePickerLightLibrary'
26-
version '1.3.9-beta'
26+
version '1.4.0-beta'
2727

2828
}
2929

0 commit comments

Comments
 (0)