The checkbox selection method works for files

maxieds · maxieds · commit 2de26c92ed33 · 2020-11-12T19:22:37.000-05:00
diff --git a/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/DisplayAdapters.java b/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/DisplayAdapters.java
@@ -253,21 +253,25 @@ public static boolean performNewFileItemClick(CheckBox cbView, DisplayTypes.File
             if(!isDir && !DisplayFragments.getInstance().allowSelectFiles) {
                 Log.i(LOGTAG, "Blocking FILE item selection I");
                 cbView.setChecked(false);
+                cbView.jumpDrawablesToCurrentState(); // No animations
                 return false;
             }
             else if(isDir && !DisplayFragments.getInstance().allowSelectFolders) {
                 Log.i(LOGTAG, "Blocking DIR item selection II");
                 cbView.setChecked(false);
+                cbView.jumpDrawablesToCurrentState();
                 return false;
             }
             if(!cbView.isEnabled()) {
                 cbView.setChecked(false);
+                cbView.jumpDrawablesToCurrentState();
                 return false;
             }
             if(fileItem.isChecked()) {
                 // Deselect: uncheck GUI widget item and remove the fileItem from the active selections list:
-                fileItem.setChecked(false);
                 cbView.setChecked(false);
+                cbView.jumpDrawablesToCurrentState();
+                fileItem.setChecked(false);
                 cbView.setEnabled(true);
                 DisplayFragments.getInstance().activeSelectionsList.remove(fileItem);
                 DisplayFragments.getInstance().curSelectionCount--;
@@ -280,8 +284,9 @@ else if(DisplayFragments.getInstance().curSelectionCount >= DisplayFragments.get
                 cbView.setChecked(false);
                 return false;
             }
-            fileItem.setChecked(true);
             cbView.setChecked(true);
+            cbView.jumpDrawablesToCurrentState();
+            fileItem.setChecked(true);
             cbView.setEnabled(true);
             DisplayFragments.getInstance().activeSelectionsList.add(fileItem);
             DisplayFragments.getInstance().curSelectionCount++;
@@ -293,8 +298,9 @@ else if(DisplayFragments.getInstance().curSelectionCount >= DisplayFragments.get
 
         @Override
         public void onCheckedChanged(CompoundButton btnView, boolean isChecked) {
+            btnView.jumpDrawablesToCurrentState();
             CheckBox cbView = (CheckBox) btnView;
-            DisplayTypes.FileType fileItem = BaseViewHolder.getFileItemForView((View) btnView.getParent());
+            DisplayTypes.FileType fileItem = BaseViewHolder.getFileItemForView((View) btnView.getParent().getParent());
             if(fileItem != null) {
                 performNewFileItemClick(cbView, fileItem);
             }
diff --git a/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/DisplayFragments.java b/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/DisplayFragments.java
@@ -266,6 +266,7 @@ public static void resetLayout(View layoutContainer, DisplayTypes.FileType fileI
             selectionBox.setTag(displayPosition);
             selectionBox.setOnCheckedChangeListener(new DisplayAdapters.OnSelectListener());
 
+
         }
 
     }
diff --git a/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/FileChooserActivity.java b/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/FileChooserActivity.java
@@ -278,6 +278,7 @@ public Intent getSelectedFilesActivityResultIntent() {
         String[] filePathsList = new String[selectedFilesCount];
         for(int fileIndex = 0; fileIndex < selectedFilesCount; fileIndex++) {
             filePathsList[fileIndex] = getDisplayFragmentsInstance().activeSelectionsList.get(fileIndex).getAbsolutePath();
+            Log.i(LOGTAG, "RETURNING SELECTION : " + filePathsList[fileIndex]);
         }
         resultIntent.putStringArrayListExtra(FileChooserBuilder.FILE_PICKER_INTENT_DATA_PAYLOAD_KEY, new ArrayList<String>(Arrays.asList(filePathsList)));
         return resultIntent;
@@ -287,7 +288,6 @@ public void postSelectedFilesActivityResult() {
         Intent filesResultIntent = getSelectedFilesActivityResultIntent();
         setResult(Activity.RESULT_OK, filesResultIntent);
         finish();
-        getDisplayFragmentsInstance().resetRecyclerViewLayoutContext();
         //System.exit(0); // ??? TODO ???
     }
 
@@ -301,7 +301,6 @@ public void postSelectedFilesActivityResult(Exception runtimeExcpt) {
         }
         setResult(Activity.RESULT_CANCELED, filesResultIntent);
         finish();
-        getDisplayFragmentsInstance().resetRecyclerViewLayoutContext();
         //ActivityCompat.finishAffinity(this);
         //System.exit(0); // ??? TODO ???
     }
diff --git a/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/FileChooserBuilder.java b/AndroidFilePickerLightLibrary/src/main/java/com/maxieds/androidfilepickerlightlibrary/FileChooserBuilder.java
@@ -26,6 +26,7 @@ This program (the AndroidFilePickerLight library) is free software written by
 import java.io.Serializable;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -406,6 +407,7 @@ public void launchFilePicker() throws FileChooserException.AndroidFilePickerLigh
     public static final int ACTIVITY_CODE_SELECT_FILE = 1;
     public static final int ACTIVITY_CODE_SELECT_DIRECTORY_ONLY = 2;
     public static final int ACTIVITY_CODE_SELECT_MULTIPLE_FILES = 3;
+    public static final int ACTIVITY_CODE_BRING_TO_FRONT = 4;
 
     /* Client code should call this method in their main Activity's onActivityResult function
      * to handle the logic there when the activity was created as a file picker instance:
@@ -420,14 +422,13 @@ public static List<String> handleActivityResult(Activity activityInst, int reque
             case ACTIVITY_CODE_SELECT_DIRECTORY_ONLY:
             case ACTIVITY_CODE_SELECT_MULTIPLE_FILES:
                 if(resultCode == RESULT_OK) {
-                    FileChooserException.AndroidFilePickerLightException resultOKException = new FileChooserException.CommunicateSelectionDataException();
-                    List<String> selectedDataItems = resultOKException.packageDataItemsFromIntent(data);
+                    List<String> selectedDataItems = Arrays.asList(data.getStringArrayExtra(FileChooserBuilder.FILE_PICKER_INTENT_DATA_PAYLOAD_KEY));
                     finishActivityResultHandler(activityInst);
                     return selectedDataItems;
                 }
                 try {
                     String getExitErrorMsg = data.getStringExtra(FILE_PICKER_EXCEPTION_MESSAGE_KEY);
-                    finishActivityResultHandler(activityInst); // ???
+                    finishActivityResultHandler(activityInst);
                     throw FileChooserException.getExceptionForExitCause(data.getStringExtra(FILE_PICKER_EXCEPTION_CAUSE_KEY), getExitErrorMsg);
                 } catch(NullPointerException npe) {}
                 break;
@@ -437,7 +438,7 @@ public static List<String> handleActivityResult(Activity activityInst, int reque
         }
         FileChooserException.AndroidFilePickerLightException resultNotOKException = new FileChooserException.GenericRuntimeErrorException();
         resultNotOKException.packageDataItemsFromIntent(data);
-        finishActivityResultHandler(activityInst); // ???
+        finishActivityResultHandler(activityInst);
         throw resultNotOKException;
     }
 
@@ -448,7 +449,7 @@ public static void finishActivityResultHandler(Activity activityInst) {
         activityInst.moveTaskToBack(false);
         Intent bringToFrontIntent = new Intent(activityInst, activityInst.getClass());
         bringToFrontIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-        FileChooserActivity.getInstance().startActivity(bringToFrontIntent);
+        activityInst.startActivity(bringToFrontIntent);
     }
 
     public StringBuilder readFileContentsAsString() {
diff --git a/AndroidFilePickerLightLibrary/src/main/res/drawable/nav_back_button_icon32.webp b/AndroidFilePickerLightLibrary/src/main/res/drawable/nav_back_button_icon32.webp
diff --git a/AndroidFilePickerLightLibrary/src/main/res/layout/single_file_entry_item.xml b/AndroidFilePickerLightLibrary/src/main/res/layout/single_file_entry_item.xml
@@ -42,6 +42,7 @@
         >
 
         <CheckBox
+            style="@style/FileItemSelectionBoxTheme"
             android:theme="@style/SelectionCheckBoxStyle"
             android:id="@+id/fileSelectCheckBox"
             android:layout_width="wrap_content"
diff --git a/AndroidFilePickerLightLibrary/src/main/res/values/styles.xml b/AndroidFilePickerLightLibrary/src/main/res/values/styles.xml
@@ -75,4 +75,10 @@
         <item name="android:paddingLeft">10sp</item>
     </style>
 
+    <style name="FileItemSelectionBoxTheme" parent="LibraryDefaultTheme">
+        <item name="colorControlNormal">?__colorPrimaryDark</item>
+        <item name="colorControlActivated">?__colorPrimaryDark</item>
+        <item name="buttonTint">?__colorPrimaryDark</item>
+    </style>
+
 </resources>
diff --git a/app/src/main/java/com/maxieds/androidfilepickerlight/AndroidFilePickerLightExampleActivity.java b/app/src/main/java/com/maxieds/androidfilepickerlight/AndroidFilePickerLightExampleActivity.java
@@ -29,6 +29,7 @@ This program (the AndroidFilePickerLight library) is free software written by
 import androidx.appcompat.widget.Toolbar;
 
 import android.os.Handler;
+import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
@@ -60,7 +61,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
     public void showFileChooserResultsDialog(List<String> fileItemsList, String onErrorMsg) {
         AlertDialog.Builder adBuilder = new AlertDialog.Builder(this);
-        boolean resultIsError = onErrorMsg == null;
+        boolean resultIsError = onErrorMsg != null;
         if(resultIsError) {
             adBuilder.setIcon(R.drawable.file_picker_error);
             adBuilder.setTitle("Unfortunately the file picker has failed :(");
@@ -90,22 +91,25 @@ public void showFileChooserResultsDialog(List<String> fileItemsList, String onEr
         adBuilder.create().show();
     }
 
+    private static String rteErrorMsg = null;
+    private static  List<String> selectedFilePaths =  new ArrayList<String>();
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         try {
-            List<String> selectedFilePaths = FileChooserBuilder.handleActivityResult(this, requestCode, resultCode, data);
-            showFileChooserResultsDialog(selectedFilePaths, null);
-        } catch(RuntimeException rte) {
-            String errorExitMsg = null;
-            if(data != null) {
-                errorExitMsg = data.getStringExtra(FileChooserBuilder.FILE_PICKER_EXCEPTION_MESSAGE_KEY);
+            selectedFilePaths = FileChooserBuilder.handleActivityResult(this, requestCode, resultCode, data);
+        } catch (RuntimeException rte) {
+            if (data != null) {
+                rteErrorMsg = rte.getMessage();
             }
-            if(errorExitMsg == null) {
-                errorExitMsg = "Unknown reason for exception.";
+            if (rteErrorMsg == null) {
+                rteErrorMsg = "Unknown reason for exception.";
             }
-            showFileChooserResultsDialog(new ArrayList<String>(), errorExitMsg);
         }
+        showFileChooserResultsDialog(selectedFilePaths, rteErrorMsg);
+        selectedFilePaths = new ArrayList<String>();
+        rteErrorMsg = null;
     }
 
     public void actionButtonLaunchSingleFilePickerActivity(View btnView) {

Original file line number	Diff line number	Diff line change
`@@ -266,6 +266,7 @@ public static void resetLayout(View layoutContainer, DisplayTypes.FileType fileI`
`266`	`266`	`selectionBox.setTag(displayPosition);`
`267`	`267`	`selectionBox.setOnCheckedChangeListener(new DisplayAdapters.OnSelectListener());`
`268`	`268`
	`269`	`+`
`269`	`270`	`}`
`270`	`271`
`271`	`272`	`}`
Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,7 @@ public Intent getSelectedFilesActivityResultIntent() {`
`278`	`278`	`String[] filePathsList = new String[selectedFilesCount];`
`279`	`279`	`for(int fileIndex = 0; fileIndex < selectedFilesCount; fileIndex++) {`
`280`	`280`	`filePathsList[fileIndex] = getDisplayFragmentsInstance().activeSelectionsList.get(fileIndex).getAbsolutePath();`
	`281`	`+ Log.i(LOGTAG, "RETURNING SELECTION : " + filePathsList[fileIndex]);`
`281`	`282`	`}`
`282`	`283`	`resultIntent.putStringArrayListExtra(FileChooserBuilder.FILE_PICKER_INTENT_DATA_PAYLOAD_KEY, new ArrayList<String>(Arrays.asList(filePathsList)));`
`283`	`284`	`return resultIntent;`
`@@ -287,7 +288,6 @@ public void postSelectedFilesActivityResult() {`
`287`	`288`	`Intent filesResultIntent = getSelectedFilesActivityResultIntent();`
`288`	`289`	`setResult(Activity.RESULT_OK, filesResultIntent);`
`289`	`290`	`finish();`
`290`		`- getDisplayFragmentsInstance().resetRecyclerViewLayoutContext();`
`291`	`291`	`//System.exit(0); // ??? TODO ???`
`292`	`292`	`}`
`293`	`293`
`@@ -301,7 +301,6 @@ public void postSelectedFilesActivityResult(Exception runtimeExcpt) {`
`301`	`301`	`}`
`302`	`302`	`setResult(Activity.RESULT_CANCELED, filesResultIntent);`
`303`	`303`	`finish();`
`304`		`- getDisplayFragmentsInstance().resetRecyclerViewLayoutContext();`
`305`	`304`	`//ActivityCompat.finishAffinity(this);`
`306`	`305`	`//System.exit(0); // ??? TODO ???`
`307`	`306`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@`
`42`	`42`	`>`
`43`	`43`
`44`	`44`	`<CheckBox`
	`45`	`+ style="@style/FileItemSelectionBoxTheme"`
`45`	`46`	`android:theme="@style/SelectionCheckBoxStyle"`
`46`	`47`	`android:id="@+id/fileSelectCheckBox"`
`47`	`48`	`android:layout_width="wrap_content"`