- Ability to enable / disable directory selection

- Back button leading to empty fragment (BUGFIX)

Author: BalioFVFX

simplefileexplorer/src/main/java/com/example/simplefileexplorer/SimpleFileExplorerActivity.java

@@ -5,29 +5,26 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Environment;
-import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
-import android.widget.Toast;
-
-import java.util.List;
 
 
 public class SimpleFileExplorerActivity extends AppCompatActivity implements ActivityListener{
 
 
     private String STACK_KEY = "FRAGMENT_STACK_KEY";
+    public static String ENABLE_DIRECTORY_SELECT_KEY = "DIRECTORY_SELECT_KEY";
     public static String ON_ACTIVITY_RESULT_KEY = "ABSOLUTE_PATH_KEY";
 
 
     private Button selectButton;
     private ImageView fileTypeImageView;
     private String selectedAbsolutePath;
-
+    private boolean isDirectorySelectEnabled;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -36,9 +33,10 @@ protected void onCreate(Bundle savedInstanceState) {
         checkPermission();
         this.initViews();
         this.setSelectButtonClickListener();
+        this.configureButtonFromUserPreferences();
         SimpleFileExplorerFragment fragment = new SimpleFileExplorerFragment();
         fragment.setListeners(this);
-        getSupportFragmentManager().beginTransaction().add(R.id.frame_layout, fragment).addToBackStack(STACK_KEY).commit();
+        getSupportFragmentManager().beginTransaction().add(R.id.frame_layout, fragment).commit();
         this.selectedAbsolutePath = Environment.getExternalStorageDirectory().getAbsolutePath();
     }
 
@@ -71,6 +69,7 @@ public void onClick(View v) {
     @Override
     public void onDirectoryChanged(String absolutePath) {
         this.selectedAbsolutePath = absolutePath;
+        this.updateButtonSelectStateOnDirectory();
         SimpleFileExplorerFragment fragment = new SimpleFileExplorerFragment();
         fragment.setListeners(this);
         fragment.setDirectory(absolutePath);
@@ -82,10 +81,12 @@ public void onFileSelect(FileModel fileModel) {
         if(fileModel.isSelected()){
             this.selectedAbsolutePath = fileModel.getAbsolutePath();
             this.fileTypeImageView.setImageResource(R.drawable.ic_file);
+            this.selectButton.setEnabled(true);
         }
         else{
             this.selectedAbsolutePath = fileModel.getDirectoryPath();
             this.fileTypeImageView.setImageResource(R.drawable.ic_folder);
+            this.updateButtonSelectStateOnDirectory();
         }
 
     }
@@ -103,5 +104,23 @@ private void checkPermission(){
         }
     }
 
+    private void configureButtonFromUserPreferences(){
+        Intent intent = getIntent();
+        if(intent.hasExtra(ENABLE_DIRECTORY_SELECT_KEY)){
+            this.isDirectorySelectEnabled = intent.getBooleanExtra(ENABLE_DIRECTORY_SELECT_KEY, true);
+        }
+        else{
+            this.isDirectorySelectEnabled = true;
+        }
+        this.selectButton.setEnabled(this.isDirectorySelectEnabled);
+    }
 
+    private void updateButtonSelectStateOnDirectory(){
+        if(this.isDirectorySelectEnabled){
+            this.selectButton.setEnabled(true);
+        }
+        else{
+            this.selectButton.setEnabled(false);
+        }
+    }
 }

simplefileexplorer/src/main/java/com/example/simplefileexplorer/SimpleFileResources.java

@@ -7,4 +7,5 @@ public class SimpleFileResources {
 
     static int defaultImageFileId = R.drawable.ic_file;
     static int defaultImageDirectoryId = R.drawable.ic_folder;
+
 }