Request enum created instead of FILE and DIRECTORY requestCodes

this is better than duplicate requestCodes for each activity.

Author: meness

app/src/main/java/com/github/developerpaul123/filepickerlibrary/app/MainActivity.java

@@ -32,13 +32,16 @@
 import com.github.developerpaul123.filepickerlibrary.FilePicker;
 import com.github.developerpaul123.filepickerlibrary.FilePickerActivity;
 import com.github.developerpaul123.filepickerlibrary.FilePickerBuilder;
+import com.github.developerpaul123.filepickerlibrary.enums.Request;
 import com.github.developerpaul123.filepickerlibrary.enums.Scope;
 import com.github.developerpaul123.filepickerlibrary.enums.FileType;
 import com.github.developerpaul123.filepickerlibrary.enums.ThemeType;
 
 
 public class MainActivity extends AppCompatActivity {
 
+    private static int REQUEST_FILE = 10;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -154,18 +157,11 @@ public void onClick(View view) {
                 public void onClick(View view) {
 
                     new FilePickerBuilder(getActivity()).withColor(android.R.color.holo_blue_bright)
-                            .withRequestCode(FilePicker.REQUEST_FILE)
+                            .withRequest(Request.FILE)
                             .withScopeType(Scope.ALL)
                             .withMimeType(FileType.JPEG)
                             .useMaterialActivity(true)
-                            .launch(FilePicker.REQUEST_FILE);
-
-//                    Intent filePicker = new Intent(getActivity(), FilePicker.class);
-//                    filePicker.putExtra(FilePicker.SCOPE_TYPE, FileScopeType.ALL);
-//                    filePicker.putExtra(FilePicker.REQUEST_CODE, FilePicker.REQUEST_FILE);
-//                    filePicker.putExtra(FilePicker.INTENT_EXTRA_COLOR_ID, android.R.color.holo_green_dark);
-//                    filePicker.putExtra(FilePicker.MIME_TYPE, FileType.PNG);
-//                    startActivityForResult(filePicker, FilePicker.REQUEST_FILE);
+                            .launch(REQUEST_FILE);
                 }
             });
             return rootView;

library/src/main/java/com/github/developerpaul123/filepickerlibrary/FilePicker.java

@@ -33,8 +33,9 @@
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.github.developerpaul123.filepickerlibrary.adapter.FileRecyclerViewAdapter;
-import com.github.developerpaul123.filepickerlibrary.enums.Scope;
 import com.github.developerpaul123.filepickerlibrary.enums.FileType;
+import com.github.developerpaul123.filepickerlibrary.enums.Request;
+import com.github.developerpaul123.filepickerlibrary.enums.Scope;
 import com.github.developerpaul123.filepickerlibrary.enums.ThemeType;
 
 import java.io.File;
@@ -44,16 +45,6 @@
  */
 public class FilePicker extends AppCompatActivity implements NameFileDialogInterface {
 
-    /**
-     * Request code for when you want the file path to a directory.
-     */
-    public static final int REQUEST_DIRECTORY = 101;
-
-    /**
-     * Request code for when you want the file path to a specific file.
-     */
-    public static final int REQUEST_FILE = 102;
-
     /**
      * Constant value for adding the REQUEST_CODE int as an extra to the {@code FilePickerActivity}
      * {@code Intent}
@@ -294,7 +285,7 @@ public void onClick(View view) {
             //set default if it is null
             scopeType = Scope.ALL;
         }
-        requestCode = givenIntent.getIntExtra(REQUEST_CODE, REQUEST_DIRECTORY);
+        requestCode = givenIntent.getIntExtra(REQUEST_CODE, Request.DIRECTORY.ordinal());
 
         colorId = givenIntent.getIntExtra(INTENT_EXTRA_COLOR_ID, android.R.color.holo_blue_light);
         drawableId = givenIntent.getIntExtra(INTENT_EXTRA_DRAWABLE_ID, -1);
@@ -475,7 +466,7 @@ private void initializeViews() {
         selectButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (requestCode == REQUEST_DIRECTORY) {
+                if (requestCode == Request.DIRECTORY.ordinal()) {
                     if (currentFile.isDirectory()) {
                         curDirectory = currentFile;
                         data = new Intent();

library/src/main/java/com/github/developerpaul123/filepickerlibrary/FilePickerBuilder.java

@@ -6,6 +6,7 @@
 import android.support.annotation.ColorRes;
 
 import com.github.developerpaul123.filepickerlibrary.enums.FileType;
+import com.github.developerpaul123.filepickerlibrary.enums.Request;
 import com.github.developerpaul123.filepickerlibrary.enums.Scope;
 
 /**
@@ -16,7 +17,7 @@ public class FilePickerBuilder {
     private final Context mContext;
     private boolean useMaterial;
     private Scope mScope = Scope.ALL;
-    private int requestCode = FilePicker.REQUEST_FILE;
+    private Request requestCode = Request.FILE;
     private int color = android.R.color.holo_blue_bright;
     private FileType mimeType = FileType.NONE;
 
@@ -44,11 +45,11 @@ public FilePickerBuilder withScopeType(Scope type) {
      * Set the request code of this. You can request a path to a file or
      * a directory.
      *
-     * @param requestCode the request code can be FilePicker.DIRECTORY or FilePicker.FILE.
-     * @return current instance of the builder.
+     * @param request
+     * @return
      */
-    public FilePickerBuilder withRequestCode(int requestCode) {
-        this.requestCode = requestCode;
+    public FilePickerBuilder withRequest(Request request){
+        requestCode = request;
         return this;
     }
 
@@ -89,7 +90,7 @@ public FilePickerBuilder useMaterialActivity(boolean use) {
     @Deprecated
     public void launch() {
         Intent intent = build();
-        ((Activity) mContext).startActivityForResult(intent, requestCode);
+        ((Activity) mContext).startActivityForResult(intent, requestCode.ordinal());
     }
 
     /**

library/src/main/java/com/github/developerpaul123/filepickerlibrary/enums/Request.java

@@ -0,0 +1,8 @@
+package com.github.developerpaul123.filepickerlibrary.enums;
+
+/**
+ * Created by Alireza Eskandarpour Shoferi on 2/24/2016.
+ */
+public enum Request {
+    FILE, DIRECTORY
+}