Skip to content

Commit 8e67b54

Browse files
menessmeness
committed
bug fix + FileType class name changed to MimeType
1 parent fa3bb6c commit 8e67b54

File tree

5 files changed

+56
-50
lines changed

5 files changed

+56
-50
lines changed

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import com.devpaul.materiallibrary.views.MaterialFlatButton;
3232
import com.github.developerpaul123.filepickerlibrary.FilePickerActivity;
3333
import com.github.developerpaul123.filepickerlibrary.FilePickerBuilder;
34-
import com.github.developerpaul123.filepickerlibrary.enums.FileType;
34+
import com.github.developerpaul123.filepickerlibrary.enums.MimeType;
3535
import com.github.developerpaul123.filepickerlibrary.enums.Request;
3636
import com.github.developerpaul123.filepickerlibrary.enums.Scope;
3737
import com.github.developerpaul123.filepickerlibrary.enums.ThemeType;
@@ -83,17 +83,17 @@ public PlaceholderFragment() {
8383

8484
@Override
8585
public void onActivityResult(int requestCode, int resultCode, Intent data) {
86+
super.onActivityResult(requestCode, resultCode, data);
8687

87-
if (requestCode == REQUEST_DIRECTORY && resultCode == RESULT_OK) {
88-
Toast.makeText(getActivity(), "File Selected: " + data
88+
if ((requestCode == REQUEST_DIRECTORY) && (resultCode == RESULT_OK)) {
89+
Toast.makeText(getActivity(), "Directory Selected: " + data
8990
.getStringExtra(FilePickerActivity.FILE_EXTRA_DATA_PATH),
9091
Toast.LENGTH_LONG).show();
91-
} else if (requestCode == REQUEST_FILE && resultCode == RESULT_OK) {
92+
} else if ((requestCode == REQUEST_FILE) && (resultCode == RESULT_OK)) {
9293
Toast.makeText(getActivity(), "File Selected: " + data
9394
.getStringExtra(FilePickerActivity.FILE_EXTRA_DATA_PATH),
9495
Toast.LENGTH_LONG).show();
9596
}
96-
super.onActivityResult(requestCode, resultCode, data);
9797
}
9898

9999
@Override
@@ -107,8 +107,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
107107
@Override
108108
public void onClick(View view) {
109109
Intent filePickerActivity = new Intent(getActivity(), FilePickerActivity.class);
110-
filePickerActivity.putExtra(FilePickerActivity.SCOPE_TYPE, Scope.ALL);
111-
filePickerActivity.putExtra(FilePickerActivity.REQUEST_CODE, Request.DIRECTORY);
110+
filePickerActivity.putExtra(FilePickerActivity.SCOPE, Scope.ALL);
111+
filePickerActivity.putExtra(FilePickerActivity.REQUEST, Request.DIRECTORY);
112112
filePickerActivity.putExtra(FilePickerActivity.INTENT_EXTRA_FAB_COLOR_ID, android.R.color.holo_green_dark);
113113
startActivityForResult(filePickerActivity, REQUEST_DIRECTORY);
114114
}
@@ -120,10 +120,10 @@ public void onClick(View view) {
120120
@Override
121121
public void onClick(View view) {
122122
Intent filePicker = new Intent(getActivity(), FilePickerActivity.class);
123-
filePicker.putExtra(FilePickerActivity.SCOPE_TYPE, Scope.ALL);
124-
filePicker.putExtra(FilePickerActivity.REQUEST_CODE, FilePickerActivity.REQUEST_FILE);
123+
filePicker.putExtra(FilePickerActivity.SCOPE, Scope.ALL);
124+
filePicker.putExtra(FilePickerActivity.REQUEST, Request.FILE);
125125
filePicker.putExtra(FilePickerActivity.INTENT_EXTRA_COLOR_ID, android.R.color.holo_orange_dark);
126-
startActivityForResult(filePicker, FilePickerActivity.REQUEST_FILE);
126+
startActivityForResult(filePicker, REQUEST_FILE);
127127
}
128128
});
129129

@@ -133,8 +133,8 @@ public void onClick(View view) {
133133
public void onClick(View view) {
134134
Intent filePickerDialogIntent = new Intent(getActivity(), FilePickerActivity.class);
135135
filePickerDialogIntent.putExtra(FilePickerActivity.THEME_TYPE, ThemeType.DIALOG);
136-
filePickerDialogIntent.putExtra(FilePickerActivity.REQUEST_CODE, FilePickerActivity.REQUEST_FILE);
137-
startActivityForResult(filePickerDialogIntent, FilePickerActivity.REQUEST_FILE);
136+
filePickerDialogIntent.putExtra(FilePickerActivity.REQUEST, Request.FILE);
137+
startActivityForResult(filePickerDialogIntent, REQUEST_FILE);
138138
}
139139
});
140140

@@ -143,11 +143,11 @@ public void onClick(View view) {
143143
@Override
144144
public void onClick(View view) {
145145
Intent filePicker = new Intent(getActivity(), FilePickerActivity.class);
146-
filePicker.putExtra(FilePickerActivity.SCOPE_TYPE, Scope.ALL);
147-
filePicker.putExtra(FilePickerActivity.REQUEST_CODE, FilePickerActivity.REQUEST_FILE);
146+
filePicker.putExtra(FilePickerActivity.SCOPE, Scope.ALL);
147+
filePicker.putExtra(FilePickerActivity.REQUEST, Request.FILE);
148148
filePicker.putExtra(FilePickerActivity.INTENT_EXTRA_COLOR_ID, android.R.color.holo_green_dark);
149-
filePicker.putExtra(FilePickerActivity.MIME_TYPE, FileType.PNG);
150-
startActivityForResult(filePicker, FilePickerActivity.REQUEST_FILE);
149+
filePicker.putExtra(FilePickerActivity.MIME_TYPE, MimeType.PNG);
150+
startActivityForResult(filePicker, REQUEST_FILE);
151151
}
152152
});
153153

@@ -158,8 +158,8 @@ public void onClick(View view) {
158158

159159
new FilePickerBuilder(getActivity()).withColor(android.R.color.holo_blue_bright)
160160
.withRequest(Request.FILE)
161-
.withScopeType(Scope.ALL)
162-
.withMimeType(FileType.JPEG)
161+
.withScope(Scope.ALL)
162+
.withMimeType(MimeType.JPEG)
163163
.useMaterialActivity(true)
164164
.launch(REQUEST_FILE);
165165
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
import com.afollestad.materialdialogs.MaterialDialog;
3535
import com.github.developerpaul123.filepickerlibrary.adapter.FileRecyclerViewAdapter;
36-
import com.github.developerpaul123.filepickerlibrary.enums.FileType;
36+
import com.github.developerpaul123.filepickerlibrary.enums.MimeType;
3737
import com.github.developerpaul123.filepickerlibrary.enums.Request;
3838
import com.github.developerpaul123.filepickerlibrary.enums.Scope;
3939
import com.github.developerpaul123.filepickerlibrary.enums.ThemeType;
@@ -46,17 +46,17 @@
4646
public class FilePicker extends AppCompatActivity implements NameFileDialogInterface {
4747

4848
/**
49-
* Constant value for adding the REQUEST_CODE int as an extra to the {@code FilePickerActivity}
49+
* Constant value for adding the REQUEST int as an extra to the {@code FilePickerActivity}
5050
* {@code Intent}
5151
*/
52-
public static final String REQUEST_CODE = "requestCode";
52+
public static final String REQUEST = "request";
5353

5454
/**
55-
* Constant value for adding the SCOPE_TYPE enum as an extra to the {@code FilePickerActivity}
55+
* Constant value for adding the SCOPE enum as an extra to the {@code FilePickerActivity}
5656
* {@code Intent} The default is {@code FileType.ALL} see
5757
* {@link Scope} for other types.
5858
*/
59-
public static final String SCOPE_TYPE = "scopeType";
59+
public static final String SCOPE = "scope";
6060

6161
/**
6262
* Constant label value for sending a color id extra in the calling intent for this
@@ -267,8 +267,8 @@ public void onClick(View view) {
267267
Object rawMimeTypeParameter = getIntent().getExtras().get(MIME_TYPE);
268268
if (rawMimeTypeParameter instanceof String) {
269269
mimeType = (String) rawMimeTypeParameter;
270-
} else if (rawMimeTypeParameter instanceof FileType) {
271-
mimeType = ((FileType) rawMimeTypeParameter).getMimeType();
270+
} else if (rawMimeTypeParameter instanceof MimeType) {
271+
mimeType = ((MimeType) rawMimeTypeParameter).getMimeType();
272272
} else {
273273
mimeType = null;
274274
}
@@ -280,12 +280,12 @@ public void onClick(View view) {
280280

281281
//get the scope type and request code. Defaults are all files and request of a directory
282282
//path.
283-
scopeType = (Scope) givenIntent.getSerializableExtra(SCOPE_TYPE);
283+
scopeType = (Scope) givenIntent.getSerializableExtra(SCOPE);
284284
if (scopeType == null) {
285285
//set default if it is null
286286
scopeType = Scope.ALL;
287287
}
288-
requestCode = (Request) givenIntent.getSerializableExtra(REQUEST_CODE);
288+
requestCode = (Request) givenIntent.getSerializableExtra(REQUEST);
289289

290290
colorId = givenIntent.getIntExtra(INTENT_EXTRA_COLOR_ID, android.R.color.holo_blue_light);
291291
drawableId = givenIntent.getIntExtra(INTENT_EXTRA_DRAWABLE_ID, -1);

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import com.afollestad.materialdialogs.MaterialDialog;
5050
import com.devpaul.materiallibrary.views.MaterialFloatingActionButton;
5151
import com.github.developerpaul123.filepickerlibrary.adapter.FileListAdapter;
52-
import com.github.developerpaul123.filepickerlibrary.enums.FileType;
52+
import com.github.developerpaul123.filepickerlibrary.enums.MimeType;
5353
import com.github.developerpaul123.filepickerlibrary.enums.Request;
5454
import com.github.developerpaul123.filepickerlibrary.enums.Scope;
5555
import com.github.developerpaul123.filepickerlibrary.enums.ThemeType;
@@ -69,17 +69,17 @@ public class FilePickerActivity extends ListActivity implements NameFileDialogIn
6969
public static final int REQUEST_FILE = 102;
7070

7171
/**
72-
* Constant value for adding the REQUEST_CODE int as an extra to the {@code FilePickerActivity}
72+
* Constant value for adding the REQUEST int as an extra to the {@code FilePickerActivity}
7373
* {@code Intent}
7474
*/
75-
public static final String REQUEST_CODE = "requestCode";
75+
public static final String REQUEST = "request";
7676

7777
/**
78-
* Constant value for adding the SCOPE_TYPE enum as an extra to the {@code FilePickerActivity}
78+
* Constant value for adding the SCOPE enum as an extra to the {@code FilePickerActivity}
7979
* {@code Intent} The default is {@code FileType.ALL} see
8080
* {@link Scope} for other types.
8181
*/
82-
public static final String SCOPE_TYPE = "scopeType";
82+
public static final String SCOPE = "scope";
8383

8484
/**
8585
* Constant label value for sending a color id extra in the calling intent for this
@@ -262,8 +262,8 @@ protected void onCreate(Bundle savedInstanceState) {
262262
Object rawMimeTypeParameter = getIntent().getExtras().get(MIME_TYPE);
263263
if (rawMimeTypeParameter instanceof String) {
264264
mimeType = (String) rawMimeTypeParameter;
265-
} else if (rawMimeTypeParameter instanceof FileType) {
266-
mimeType = ((FileType) rawMimeTypeParameter).getMimeType();
265+
} else if (rawMimeTypeParameter instanceof MimeType) {
266+
mimeType = ((MimeType) rawMimeTypeParameter).getMimeType();
267267
} else {
268268
mimeType = null;
269269
}
@@ -275,12 +275,12 @@ protected void onCreate(Bundle savedInstanceState) {
275275

276276
//get the scope type and request code. Defaults are all files and request of a directory
277277
//path.
278-
scopeType = (Scope) givenIntent.getSerializableExtra(SCOPE_TYPE);
278+
scopeType = (Scope) givenIntent.getSerializableExtra(SCOPE);
279279
if (scopeType == null) {
280280
//set default if it is null
281281
scopeType = Scope.ALL;
282282
}
283-
requestCode = (Request) givenIntent.getSerializableExtra(REQUEST_CODE);
283+
requestCode = (Request) givenIntent.getSerializableExtra(REQUEST);
284284

285285
colorId = givenIntent.getIntExtra(INTENT_EXTRA_COLOR_ID, android.R.color.holo_blue_light);
286286
drawableId = givenIntent.getIntExtra(INTENT_EXTRA_DRAWABLE_ID, -1);
@@ -463,7 +463,7 @@ public void onClick(View view) {
463463
curDirectory = currentFile;
464464
new UpdateFilesTask(FilePickerActivity.this).execute(curDirectory);
465465
} else {
466-
if (mimeType != null && !mimeType.equalsIgnoreCase(FileType.NONE.getMimeType())) {
466+
if (mimeType != null && !mimeType.equalsIgnoreCase(MimeType.NONE.getMimeType())) {
467467
MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
468468
String requiredExtension = "." + mimeTypeMap.getExtensionFromMimeType(mimeType);
469469
if (requiredExtension.equalsIgnoreCase(fileExt(currentFile.toString()))) {

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import android.content.Intent;
66
import android.support.annotation.ColorRes;
77

8-
import com.github.developerpaul123.filepickerlibrary.enums.FileType;
8+
import com.github.developerpaul123.filepickerlibrary.enums.MimeType;
99
import com.github.developerpaul123.filepickerlibrary.enums.Request;
1010
import com.github.developerpaul123.filepickerlibrary.enums.Scope;
1111

@@ -19,7 +19,7 @@ public class FilePickerBuilder {
1919
private Scope mScope = Scope.ALL;
2020
private Request requestCode = Request.FILE;
2121
private int color = android.R.color.holo_blue_bright;
22-
private FileType mimeType = FileType.NONE;
22+
private MimeType mimeType = MimeType.NONE;
2323

2424
/**
2525
* Builder class to build a filepicker activity.
@@ -30,13 +30,19 @@ public FilePickerBuilder(Context context) {
3030
mContext = context;
3131
}
3232

33+
@Deprecated
34+
public FilePickerBuilder withScopeType(Scope type) {
35+
mScope = type;
36+
return this;
37+
}
38+
3339
/**
3440
* Set the scopetype of the file picker.
3541
*
3642
* @param type scope type. Can be DIRECTORIES or ALL.
3743
* @return the current builder instance.
3844
*/
39-
public FilePickerBuilder withScopeType(Scope type) {
45+
public FilePickerBuilder withScope(Scope type) {
4046
mScope = type;
4147
return this;
4248
}
@@ -48,7 +54,7 @@ public FilePickerBuilder withScopeType(Scope type) {
4854
* @param request
4955
* @return
5056
*/
51-
public FilePickerBuilder withRequest(Request request){
57+
public FilePickerBuilder withRequest(Request request) {
5258
requestCode = request;
5359
return this;
5460
}
@@ -71,7 +77,7 @@ public FilePickerBuilder withColor(@ColorRes int color) {
7177
* @param type the mime type.
7278
* @return current instance of the builder.
7379
*/
74-
public FilePickerBuilder withMimeType(FileType type) {
80+
public FilePickerBuilder withMimeType(MimeType type) {
7581
mimeType = type;
7682
return this;
7783
}
@@ -100,8 +106,8 @@ public void launch() {
100106
*/
101107
public Intent build() {
102108
Intent filePicker = new Intent(mContext, useMaterial ? FilePicker.class : FilePickerActivity.class);
103-
filePicker.putExtra(FilePicker.SCOPE_TYPE, mScope);
104-
filePicker.putExtra(FilePicker.REQUEST_CODE, requestCode);
109+
filePicker.putExtra(FilePicker.SCOPE, mScope);
110+
filePicker.putExtra(FilePicker.REQUEST, requestCode);
105111
filePicker.putExtra(FilePicker.INTENT_EXTRA_COLOR_ID, color);
106112
filePicker.putExtra(FilePicker.MIME_TYPE, mimeType);
107113
return filePicker;

‎library/src/main/java/com/github/developerpaul123/filepickerlibrary/enums/FileType.java‎ renamed to ‎library/src/main/java/com/github/developerpaul123/filepickerlibrary/enums/MimeType.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
/**
2020
* Created by Paul Tsouchlos
2121
*/
22-
public enum FileType {
22+
public enum MimeType {
2323
NONE(""), JPEG("image/jpeg"), PNG("image/png"), XML("application/xml"),
2424
XLS("application/vnd.ms-excel"), XLSX("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"),
2525
DOC("application/msword"), DOCX("application/vnd.openxmlformats-officedocument.wordprocessingml.document"),
26-
HTML("text/html"), TXT("text/plain"), PDF("application/pdf"), ;
26+
HTML("text/html"), TXT("text/plain"), PDF("application/pdf");
2727

28-
private final String mimeType;
28+
private final String mMimeType;
2929

30-
FileType(String mimeType) {
31-
this.mimeType = mimeType;
30+
MimeType(String mimeType) {
31+
mMimeType = mimeType;
3232
}
3333

3434
public String getMimeType() {
35-
return mimeType;
35+
return mMimeType;
3636
}
3737
}

0 commit comments

Comments
 (0)