FileScopeType class name changed to Scope

Author: meness

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

@@ -32,7 +32,7 @@
 import com.github.developerpaul123.filepickerlibrary.FilePicker;
 import com.github.developerpaul123.filepickerlibrary.FilePickerActivity;
 import com.github.developerpaul123.filepickerlibrary.FilePickerBuilder;
-import com.github.developerpaul123.filepickerlibrary.enums.FileScopeType;
+import com.github.developerpaul123.filepickerlibrary.enums.Scope;
 import com.github.developerpaul123.filepickerlibrary.enums.FileType;
 import com.github.developerpaul123.filepickerlibrary.enums.ThemeType;
 
@@ -104,7 +104,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
  @Override
  public void onClick(View view) {
  Intent filePickerActivity = new Intent(getActivity(), FilePickerActivity.class);
- filePickerActivity.putExtra(FilePickerActivity.SCOPE_TYPE, FileScopeType.ALL);
+ filePickerActivity.putExtra(FilePickerActivity.SCOPE_TYPE, Scope.ALL);
  filePickerActivity.putExtra(FilePickerActivity.REQUEST_CODE, FilePickerActivity.REQUEST_DIRECTORY);
  filePickerActivity.putExtra(FilePickerActivity.INTENT_EXTRA_FAB_COLOR_ID, android.R.color.holo_green_dark);
  startActivityForResult(filePickerActivity, FilePickerActivity.REQUEST_DIRECTORY);
@@ -117,7 +117,7 @@ public void onClick(View view) {
  @Override
  public void onClick(View view) {
  Intent filePicker = new Intent(getActivity(), FilePickerActivity.class);
- filePicker.putExtra(FilePickerActivity.SCOPE_TYPE, FileScopeType.ALL);
+ filePicker.putExtra(FilePickerActivity.SCOPE_TYPE, Scope.ALL);
  filePicker.putExtra(FilePickerActivity.REQUEST_CODE, FilePickerActivity.REQUEST_FILE);
  filePicker.putExtra(FilePickerActivity.INTENT_EXTRA_COLOR_ID, android.R.color.holo_orange_dark);
  startActivityForResult(filePicker, FilePickerActivity.REQUEST_FILE);
@@ -140,7 +140,7 @@ public void onClick(View view) {
  @Override
  public void onClick(View view) {
  Intent filePicker = new Intent(getActivity(), FilePickerActivity.class);
- filePicker.putExtra(FilePickerActivity.SCOPE_TYPE, FileScopeType.ALL);
+ filePicker.putExtra(FilePickerActivity.SCOPE_TYPE, Scope.ALL);
  filePicker.putExtra(FilePickerActivity.REQUEST_CODE, FilePickerActivity.REQUEST_FILE);
  filePicker.putExtra(FilePickerActivity.INTENT_EXTRA_COLOR_ID, android.R.color.holo_green_dark);
  filePicker.putExtra(FilePickerActivity.MIME_TYPE, FileType.PNG);
@@ -155,7 +155,7 @@ public void onClick(View view) {
 
  new FilePickerBuilder(getActivity()).withColor(android.R.color.holo_blue_bright)
  .withRequestCode(FilePicker.REQUEST_FILE)
- .withScopeType(FileScopeType.ALL)
+ .withScopeType(Scope.ALL)
  .withMimeType(FileType.JPEG)
  .useMaterialActivity(true)
  .launch();

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

@@ -33,7 +33,7 @@
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.github.developerpaul123.filepickerlibrary.adapter.FileRecyclerViewAdapter;
-import com.github.developerpaul123.filepickerlibrary.enums.FileScopeType;
+import com.github.developerpaul123.filepickerlibrary.enums.Scope;
 import com.github.developerpaul123.filepickerlibrary.enums.FileType;
 import com.github.developerpaul123.filepickerlibrary.enums.ThemeType;
 
@@ -63,7 +63,7 @@ public class FilePicker extends AppCompatActivity implements NameFileDialogInter
  /**
  * Constant value for adding the SCOPE_TYPE enum as an extra to the {@code FilePickerActivity}
  * {@code Intent} The default is {@code FileType.ALL} see
- * {@link FileScopeType} for other types.
+ * {@link Scope} for other types.
  */
  public static final String SCOPE_TYPE = "scopeType";
 
@@ -200,9 +200,9 @@ public void onItemClicked(View item, int position) {
  }
  };
  /**
- * {@link FileScopeType} enum
+ * {@link Scope} enum
  */
- private FileScopeType scopeType;
+ private Scope scopeType;
  /**
  * {@link ThemeType} enum for the type of them for this
  * activity.
@@ -289,10 +289,10 @@ public void onClick(View view) {
 
  //get the scope type and request code. Defaults are all files and request of a directory
  //path.
- scopeType = (FileScopeType) givenIntent.getSerializableExtra(SCOPE_TYPE);
+ scopeType = (Scope) givenIntent.getSerializableExtra(SCOPE_TYPE);
  if (scopeType == null) {
  //set default if it is null
- scopeType = FileScopeType.ALL;
+ scopeType = Scope.ALL;
  }
  requestCode = givenIntent.getIntExtra(REQUEST_CODE, REQUEST_DIRECTORY);
 

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

@@ -49,7 +49,7 @@
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.devpaul.materiallibrary.views.MaterialFloatingActionButton;
 import com.github.developerpaul123.filepickerlibrary.adapter.FileListAdapter;
-import com.github.developerpaul123.filepickerlibrary.enums.FileScopeType;
+import com.github.developerpaul123.filepickerlibrary.enums.Scope;
 import com.github.developerpaul123.filepickerlibrary.enums.FileType;
 import com.github.developerpaul123.filepickerlibrary.enums.ThemeType;
 
@@ -81,7 +81,7 @@ public class FilePickerActivity extends ListActivity implements NameFileDialogIn
  /**
  * Constant value for adding the SCOPE_TYPE enum as an extra to the {@code FilePickerActivity}
  * {@code Intent} The default is {@code FileType.ALL} see
- * {@link FileScopeType} for other types.
+ * {@link Scope} for other types.
  */
  public static final String SCOPE_TYPE = "scopeType";
 
@@ -195,9 +195,9 @@ public class FilePickerActivity extends ListActivity implements NameFileDialogIn
  private File currentFile;
  private boolean areButtonsShowing;
  /**
- * {@link FileScopeType} enum
+ * {@link Scope} enum
  */
- private FileScopeType scopeType;
+ private Scope scopeType;
  /**
  * {@link ThemeType} enum for the type of them for this
  * activity.
@@ -279,10 +279,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
  //get the scope type and request code. Defaults are all files and request of a directory
  //path.
- scopeType = (FileScopeType) givenIntent.getSerializableExtra(SCOPE_TYPE);
+ scopeType = (Scope) givenIntent.getSerializableExtra(SCOPE_TYPE);
  if (scopeType == null) {
  //set default if it is null
- scopeType = FileScopeType.ALL;
+ scopeType = Scope.ALL;
  }
  requestCode = givenIntent.getIntExtra(REQUEST_CODE, REQUEST_DIRECTORY);
 

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

@@ -4,7 +4,7 @@
 import android.content.Intent;
 import android.support.annotation.ColorRes;
 
-import com.github.developerpaul123.filepickerlibrary.enums.FileScopeType;
+import com.github.developerpaul123.filepickerlibrary.enums.Scope;
 import com.github.developerpaul123.filepickerlibrary.enums.FileType;
 
 /**
@@ -14,7 +14,7 @@ public class FilePickerBuilder {
 
  private final Activity mActivity;
  boolean useMaterial;
- private FileScopeType mType;
+ private Scope mType;
  private int requestCode;
  private int color;
  private FileType mimeType;
@@ -26,7 +26,7 @@ public class FilePickerBuilder {
  */
  public FilePickerBuilder(Activity activity) {
  color = android.R.color.holo_blue_bright;
- mType = FileScopeType.ALL;
+ mType = Scope.ALL;
  mimeType = FileType.NONE;
  requestCode = FilePicker.REQUEST_FILE;
  mActivity = activity;
@@ -39,7 +39,7 @@ public FilePickerBuilder(Activity activity) {
  * @param type scope type. Can be DIRECTORIES or ALL.
  * @return the current builder instance.
  */
- public FilePickerBuilder withScopeType(FileScopeType type) {
+ public FilePickerBuilder withScopeType(Scope type) {
  mType = type;
  return this;
  }

library/src/main/java/com/github/developerpaul123/filepickerlibrary/adapter/FileListAdapter.java

@@ -31,7 +31,7 @@
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.github.developerpaul123.filepickerlibrary.R;
-import com.github.developerpaul123.filepickerlibrary.enums.FileScopeType;
+import com.github.developerpaul123.filepickerlibrary.enums.Scope;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -55,17 +55,17 @@ public class FileListAdapter extends BaseAdapter {
  private final float iconPadding;
  private final Drawable folderDrawable;
 
- private final FileScopeType mFileType;
+ private final Scope mFileType;
 
- public FileListAdapter(Context context, File[] fileArray, FileScopeType type) {
+ public FileListAdapter(Context context, File[] fileArray, Scope type) {
  mContext = context;
  fileList = new ArrayList<File>(Arrays.asList(fileArray));
  inflater = LayoutInflater.from(mContext);
  mFileType = type;
  selectedPos = -1;
  folderDrawable = mContext.getResources().getDrawable(R.drawable.fplib_ic_folder);
  iconPadding = mContext.getResources().getDimension(R.dimen.file_picker_lib_default_icon_padding);
- if (mFileType == FileScopeType.DIRECTORIES) {
+ if (mFileType == Scope.DIRECTORIES) {
  for (int i = 0; i < fileList.size(); i++) {
  String extension = fileExt(fileList.get(i).getPath());
  if (extension != null) {
@@ -226,7 +226,7 @@ public void onClick(View v) {
  }
  });
 
- if (mFileType == FileScopeType.ALL) {
+ if (mFileType == Scope.ALL) {
  viewHolder.fileTitle.setText(fileList.get(i).getName());
  if (!fileList.get(i).isDirectory()) {
  viewHolder.fileInfo.setText(String.format(mContext.getString(R.string.file_picker_adapter_file_size_only_string), fileList.get(i).length()));
@@ -270,7 +270,7 @@ public void onClick(View v) {
  }
  }
  }
- } else if (mFileType == FileScopeType.DIRECTORIES) {
+ } else if (mFileType == Scope.DIRECTORIES) {
  if (fileList.get(i).isDirectory()) {
  viewHolder.fileImage.setBackgroundDrawable(folderDrawable);
  viewHolder.fileTitle.setText(fileList.get(i).getName());

library/src/main/java/com/github/developerpaul123/filepickerlibrary/adapter/FileRecyclerViewAdapter.java

@@ -16,7 +16,7 @@
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.Theme;
 import com.github.developerpaul123.filepickerlibrary.R;
-import com.github.developerpaul123.filepickerlibrary.enums.FileScopeType;
+import com.github.developerpaul123.filepickerlibrary.enums.Scope;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -39,7 +39,7 @@ public class FileRecyclerViewAdapter extends RecyclerView.Adapter {
  private final Drawable folderDrawable;
  private int selectedPosition;
  private final float iconPadding;
- private final FileScopeType mFileType;
+ private final Scope mFileType;
  private final File[] mFiles;
  private final FileRecyclerViewAdapter.Callback mCallback;
  private final View.OnClickListener viewClickListener = new View.OnClickListener() {
@@ -54,15 +54,15 @@ public void onClick(View view) {
  private final List<File> fileList;
  private final Context context;
 
- public FileRecyclerViewAdapter(Context context, File[] files, FileScopeType scopeType, FileRecyclerViewAdapter.Callback callback) {
+ public FileRecyclerViewAdapter(Context context, File[] files, Scope scopeType, FileRecyclerViewAdapter.Callback callback) {
  this.context = context;
  mFiles = files;
  iconPadding = context.getResources().getDimension(R.dimen.file_picker_lib_default_icon_padding);
  mFileType = scopeType;
  selectedPosition = -1;
  folderDrawable = context.getResources().getDrawable(R.drawable.fplib_ic_folder);
  fileList = new ArrayList<>(Arrays.asList(files));
- if (mFileType == FileScopeType.DIRECTORIES) {
+ if (mFileType == Scope.DIRECTORIES) {
  for (int i = 0; i < fileList.size(); i++) {
  String extension = fileExt(fileList.get(i).getPath());
  if (extension != null) {
@@ -222,7 +222,7 @@ public void onClick(View v) {
  }
  });
 
- if (mFileType == FileScopeType.ALL) {
+ if (mFileType == Scope.ALL) {
  viewHolder.fileTitle.setText(fileList.get(i).getName());
  if (!fileList.get(i).isDirectory()) {
  viewHolder.fileInfo.setText(String.format(context.getString(R.string.file_picker_adapter_file_size_only_string),
@@ -267,7 +267,7 @@ public void onClick(View v) {
  }
  }
  }
- } else if (mFileType == FileScopeType.DIRECTORIES) {
+ } else if (mFileType == Scope.DIRECTORIES) {
  if (fileList.get(i).isDirectory()) {
  viewHolder.fileImage.setBackgroundDrawable(folderDrawable);
  viewHolder.fileTitle.setText(fileList.get(i).getName());

library/src/main/java/com/github/developerpaul123/filepickerlibrary/enums/FileScopeType.java renamed to library/src/main/java/com/github/developerpaul123/filepickerlibrary/enums/Scope.java

@@ -19,7 +19,6 @@
 /**
  * An enum that has two possible values, {@code ALL} or {@code DIRECTORIES}
  */
-public enum FileScopeType {
-
+public enum Scope {
  ALL, DIRECTORIES
 }