Skip to content

Commit b6d0b1e

Browse files
TutorialsAndroidTutorialsAndroid
committed
Removed Unused Imports
1 parent 344a9f6 commit b6d0b1e

File tree

10 files changed

+82
-56
lines changed

10 files changed

+82
-56
lines changed

‎library/src/main/java/com/developer/filepicker/controller/adapters/FileListAdapter.java‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@
2828
* @author akshay sunil masram
2929
*/
3030
public class FileListAdapter extends BaseAdapter {
31+
3132
private ArrayList<FileListItem> listItem;
3233
private Context context;
3334
private DialogProperties properties;
3435
private NotifyItemChecked notifyItemChecked;
3536

36-
public FileListAdapter(ArrayList<FileListItem> listItem, Context context, DialogProperties properties) {
37+
public FileListAdapter(ArrayList<FileListItem> listItem, Context context,
38+
DialogProperties properties) {
3739
this.listItem = listItem;
3840
this.context = context;
3941
this.properties = properties;
@@ -58,43 +60,50 @@ public long getItemId(int i) {
5860
public View getView(final int i, View view, ViewGroup viewGroup) {
5961
final ViewHolder holder;
6062
if (view == null) {
61-
view = LayoutInflater.from(context).inflate(R.layout.dialog_file_list_item, viewGroup, false);
63+
view = LayoutInflater.from(context).inflate(R.layout.dialog_file_list_item,
64+
viewGroup, false);
6265
holder = new ViewHolder(view);
6366
view.setTag(holder);
6467
} else {
6568
holder = (ViewHolder) view.getTag();
6669
}
6770
final FileListItem item = listItem.get(i);
6871
if (MarkedItemList.hasItem(item.getLocation())) {
69-
Animation animation = AnimationUtils.loadAnimation(context, R.anim.marked_item_animation);
72+
Animation animation = AnimationUtils.loadAnimation(context,
73+
R.anim.marked_item_animation);
7074
view.setAnimation(animation);
7175
} else {
72-
Animation animation = AnimationUtils.loadAnimation(context, R.anim.unmarked_item_animation);
76+
Animation animation = AnimationUtils.loadAnimation(context,
77+
R.anim.unmarked_item_animation);
7378
view.setAnimation(animation);
7479
}
7580
if (item.isDirectory()) {
7681
holder.type_icon.setImageResource(R.mipmap.ic_type_folder);
7782
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
78-
holder.type_icon.setColorFilter(context.getResources().getColor(R.color.colorPrimary, context.getTheme()));
83+
holder.type_icon.setColorFilter(context.getResources()
84+
.getColor(R.color.colorPrimary, context.getTheme()));
7985
} else {
80-
holder.type_icon.setColorFilter(context.getResources().getColor(R.color.colorPrimary));
86+
holder.type_icon.setColorFilter(context.getResources()
87+
.getColor(R.color.colorPrimary));
8188
}
8289
if (properties.selection_type == DialogConfigs.FILE_SELECT) {
83-
holder.fmark.setVisibility(View.INVISIBLE);
90+
holder.checkbox.setVisibility(View.INVISIBLE);
8491
} else {
85-
holder.fmark.setVisibility(View.VISIBLE);
92+
holder.checkbox.setVisibility(View.VISIBLE);
8693
}
8794
} else {
8895
holder.type_icon.setImageResource(R.mipmap.ic_type_file);
8996
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
90-
holder.type_icon.setColorFilter(context.getResources().getColor(R.color.colorAccent, context.getTheme()));
97+
holder.type_icon.setColorFilter(context.getResources()
98+
.getColor(R.color.colorAccent, context.getTheme()));
9199
} else {
92-
holder.type_icon.setColorFilter(context.getResources().getColor(R.color.colorAccent));
100+
holder.type_icon.setColorFilter(context.getResources()
101+
.getColor(R.color.colorAccent));
93102
}
94103
if (properties.selection_type == DialogConfigs.DIR_SELECT) {
95-
holder.fmark.setVisibility(View.INVISIBLE);
104+
holder.checkbox.setVisibility(View.INVISIBLE);
96105
} else {
97-
holder.fmark.setVisibility(View.VISIBLE);
106+
holder.checkbox.setVisibility(View.VISIBLE);
98107
}
99108
}
100109
holder.type_icon.setContentDescription(item.getFilename());
@@ -105,20 +114,21 @@ public View getView(final int i, View view, ViewGroup viewGroup) {
105114
if (i == 0 && item.getFilename().startsWith(context.getString(R.string.label_parent_dir))) {
106115
holder.type.setText(R.string.label_parent_directory);
107116
} else {
108-
holder.type.setText(String.format(context.getString(R.string.last_edit), dateFormatter.format(date), timeFormatter.format(date)));
117+
holder.type.setText(String.format(context.getString(R.string.last_edit),
118+
dateFormatter.format(date), timeFormatter.format(date)));
109119
}
110-
if (holder.fmark.getVisibility() == View.VISIBLE) {
120+
if (holder.checkbox.getVisibility() == View.VISIBLE) {
111121
if (i == 0 && item.getFilename().startsWith(context.getString(R.string.label_parent_dir))) {
112-
holder.fmark.setVisibility(View.INVISIBLE);
122+
holder.checkbox.setVisibility(View.INVISIBLE);
113123
}
114124
if (MarkedItemList.hasItem(item.getLocation())) {
115-
holder.fmark.setChecked(true);
125+
holder.checkbox.setChecked(true);
116126
} else {
117-
holder.fmark.setChecked(false);
127+
holder.checkbox.setChecked(false);
118128
}
119129
}
120130

121-
holder.fmark.setOnCheckedChangedListener(new OnCheckedChangeListener() {
131+
holder.checkbox.setOnCheckedChangedListener(new OnCheckedChangeListener() {
122132
@Override
123133
public void onCheckedChanged(MaterialCheckbox checkbox, boolean isChecked) {
124134
item.setMarked(isChecked);
@@ -140,13 +150,13 @@ public void onCheckedChanged(MaterialCheckbox checkbox, boolean isChecked) {
140150
private class ViewHolder {
141151
ImageView type_icon;
142152
TextView name, type;
143-
MaterialCheckbox fmark;
153+
MaterialCheckbox checkbox;
144154

145155
ViewHolder(View itemView) {
146156
name = itemView.findViewById(R.id.fname);
147157
type = itemView.findViewById(R.id.ftype);
148158
type_icon = itemView.findViewById(R.id.image_type);
149-
fmark = itemView.findViewById(R.id.file_mark);
159+
checkbox = itemView.findViewById(R.id.file_mark);
150160
}
151161
}
152162

‎library/src/main/java/com/developer/filepicker/model/DialogConfigs.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@
44
* @author akshay sunil masram
55
*/
66
public abstract class DialogConfigs {
7+
78
public static final int SINGLE_MODE = 0;
89
public static final int MULTI_MODE = 1;
910
public static final int FILE_SELECT = 0;
1011
public static final int DIR_SELECT = 1;
1112
public static final int FILE_AND_DIR_SELECT = 2;
1213

1314
/* PARENT_DIRECTORY*/
14-
public static final String DIRECTORY_SEPERATOR = "/";
15-
public static final String STORAGE_DIR = "mnt";
15+
private static final String DIRECTORY_SEPARATOR = "/";
16+
private static final String STORAGE_DIR = "mnt";
1617

1718
/* DEFAULT_DIR is the default mount point of the SDCARD. It is the default
1819
* mount point.
1920
*/
20-
public static final String DEFAULT_DIR = DIRECTORY_SEPERATOR + STORAGE_DIR;
21+
public static final String DEFAULT_DIR = DIRECTORY_SEPARATOR + STORAGE_DIR;
2122
}

‎library/src/main/java/com/developer/filepicker/model/DialogProperties.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* @author akshay sunil masram
77
*/
88
public class DialogProperties {
9+
910
public int selection_mode;
1011
public int selection_type;
1112
public File root;

‎library/src/main/java/com/developer/filepicker/model/FileListItem.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* @author akshay sunil masram
77
*/
88
public class FileListItem implements Comparable<FileListItem> {
9+
910
private String filename,location;
1011
private boolean directory,marked;
1112
private long time;

‎library/src/main/java/com/developer/filepicker/model/MarkedItemList.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* @author akshay sunil masram
88
*/
99
public class MarkedItemList {
10+
1011
private static HashMap<String,FileListItem> ourInstance = new HashMap<>();
1112

1213
public static void addSelectedItem(FileListItem item) {
@@ -32,12 +33,12 @@ public static void addSingleFile(FileListItem item) {
3233

3334
public static String[] getSelectedPaths() {
3435
Set<String> paths = ourInstance.keySet();
35-
String[] fpaths = new String[paths.size()];
36+
String[] strings = new String[paths.size()];
3637
int i=0;
3738
for(String path:paths)
38-
{ fpaths[i++]=path;
39+
{ strings[i++]=path;
3940
}
40-
return fpaths;
41+
return strings;
4142
}
4243

4344
public static int getFileCount() {

‎library/src/main/java/com/developer/filepicker/utils/ExtensionFilter.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* @author akshay sunil masram
1111
*/
1212
public class ExtensionFilter implements FileFilter {
13+
1314
private final String[] validExtensions;
1415
private DialogProperties properties;
1516

@@ -22,6 +23,7 @@ public ExtensionFilter(DialogProperties properties) {
2223
}
2324
this.properties=properties;
2425
}
26+
2527
@Override
2628
public boolean accept(File file) {
2729
if (file.isDirectory()&&file.canRead())
@@ -40,4 +42,4 @@ else if(properties.selection_type== DialogConfigs.DIR_SELECT) {
4042
}
4143
return false;
4244
}
43-
}
45+
}

‎library/src/main/java/com/developer/filepicker/utils/Utility.java‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.io.File;
99
import java.util.ArrayList;
1010
import java.util.Collections;
11+
import java.util.Objects;
1112

1213
/**
1314
* @author akshay sunil masram
@@ -25,9 +26,11 @@ public static boolean checkStorageAccessPermissions(Context context) {
2526
}
2627
}
2728

28-
public static ArrayList<FileListItem> prepareFileListEntries(ArrayList<FileListItem> internalList, File inter, ExtensionFilter filter, boolean show_hidden_files) {
29+
public static ArrayList<FileListItem>
30+
prepareFileListEntries(ArrayList<FileListItem> internalList, File inter,
31+
ExtensionFilter filter, boolean show_hidden_files) {
2932
try {
30-
for (File name : inter.listFiles(filter)) {
33+
for (File name : Objects.requireNonNull(inter.listFiles(filter))) {
3134
if (name.canRead()) {
3235
if(name.getName().startsWith(".") && !show_hidden_files) continue;
3336
FileListItem item = new FileListItem();
@@ -46,14 +49,4 @@ public static ArrayList<FileListItem> prepareFileListEntries(ArrayList<FileListI
4649
}
4750
return internalList;
4851
}
49-
50-
private boolean hasSupportLibraryInClasspath() {
51-
try {
52-
Class.forName("com.android.support:appcompat-v7");
53-
return true;
54-
} catch (ClassNotFoundException ex) {
55-
ex.printStackTrace();
56-
}
57-
return false;
58-
}
5952
}

‎library/src/main/java/com/developer/filepicker/view/FilePickerDialog.java‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@
3030
import java.io.File;
3131
import java.util.ArrayList;
3232
import java.util.List;
33+
import java.util.Objects;
3334

3435
/**
3536
* @author akshay sunil masram
3637
*/
38+
@SuppressWarnings("unused")
3739
public class FilePickerDialog extends Dialog implements AdapterView.OnItemClickListener {
3840

3941
private final Context context;
@@ -59,16 +61,16 @@ public FilePickerDialog(Context context) {
5961
internalList = new ArrayList<>();
6062
}
6163

62-
public FilePickerDialog(Context context, DialogProperties properties) {
63-
super(context);
64+
public FilePickerDialog(Context context, DialogProperties properties, int themeResId) {
65+
super(context, themeResId);
6466
this.context = context;
6567
this.properties = properties;
6668
filter = new ExtensionFilter(properties);
6769
internalList = new ArrayList<>();
6870
}
6971

70-
public FilePickerDialog(Context context, DialogProperties properties, int themeResId) {
71-
super(context, themeResId);
72+
public FilePickerDialog(Context context, DialogProperties properties) {
73+
super(context);
7274
this.context = context;
7375
this.properties = properties;
7476
filter = new ExtensionFilter(properties);
@@ -78,6 +80,7 @@ public FilePickerDialog(Context context, DialogProperties properties, int themeR
7880
@Override
7981
protected void onCreate(Bundle savedInstanceState) {
8082
super.onCreate(savedInstanceState);
83+
8184
requestWindowFeature(Window.FEATURE_NO_TITLE);
8285
setContentView(R.layout.dialog_main);
8386
listView = findViewById(R.id.fileList);
@@ -91,7 +94,8 @@ protected void onCreate(Bundle savedInstanceState) {
9194
} else {
9295
color = context.getResources().getColor(R.color.colorAccent);
9396
}
94-
select.setTextColor(Color.argb(128, Color.red(color), Color.green(color), Color.blue(color)));
97+
select.setTextColor(Color.argb(128, Color.red(color), Color.green(color),
98+
Color.blue(color)));
9599
}
96100
dname = findViewById(R.id.dname);
97101
title = findViewById(R.id.title);
@@ -127,17 +131,20 @@ public void notifyCheckBoxIsClicked() {
127131
select.setEnabled(false);
128132
int color;
129133
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
130-
color = context.getResources().getColor(R.color.colorAccent, context.getTheme());
134+
color = context.getResources().getColor(R.color.colorAccent,
135+
context.getTheme());
131136
} else {
132137
color = context.getResources().getColor(R.color.colorAccent);
133138
}
134-
select.setTextColor(Color.argb(128, Color.red(color), Color.green(color), Color.blue(color)));
139+
select.setTextColor(Color.argb(128, Color.red(color), Color.green(color),
140+
Color.blue(color)));
135141
select.setText(positiveBtnNameStr);
136142
} else {
137143
select.setEnabled(true);
138144
int color;
139145
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
140-
color = context.getResources().getColor(R.color.colorAccent, context.getTheme());
146+
color = context.getResources().getColor(R.color.colorAccent,
147+
context.getTheme());
141148
} else {
142149
color = context.getResources().getColor(R.color.colorAccent);
143150
}
@@ -198,7 +205,8 @@ protected void onStart() {
198205
FileListItem parent = new FileListItem();
199206
parent.setFilename(context.getString(R.string.label_parent_dir));
200207
parent.setDirectory(true);
201-
parent.setLocation(currLoc.getParentFile().getAbsolutePath());
208+
parent.setLocation(Objects.requireNonNull(currLoc.getParentFile())
209+
.getAbsolutePath());
202210
parent.setTime(currLoc.lastModified());
203211
internalList.add(parent);
204212
} else if (properties.root.exists() && properties.root.isDirectory()) {
@@ -209,7 +217,8 @@ protected void onStart() {
209217
dname.setText(currLoc.getName());
210218
dir_path.setText(currLoc.getAbsolutePath());
211219
setTitle();
212-
internalList = Utility.prepareFileListEntries(internalList, currLoc, filter, properties.show_hidden_files);
220+
internalList = Utility.prepareFileListEntries(internalList, currLoc, filter,
221+
properties.show_hidden_files);
213222
mFileListAdapter.notifyDataSetChanged();
214223
listView.setOnItemClickListener(this);
215224
}
@@ -236,14 +245,17 @@ public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
236245
FileListItem parent = new FileListItem();
237246
parent.setFilename(context.getString(R.string.label_parent_dir));
238247
parent.setDirectory(true);
239-
parent.setLocation(currLoc.getParentFile().getAbsolutePath());
248+
parent.setLocation(Objects.requireNonNull(currLoc
249+
.getParentFile()).getAbsolutePath());
240250
parent.setTime(currLoc.lastModified());
241251
internalList.add(parent);
242252
}
243-
internalList = Utility.prepareFileListEntries(internalList, currLoc, filter, properties.show_hidden_files);
253+
internalList = Utility.prepareFileListEntries(internalList, currLoc, filter,
254+
properties.show_hidden_files);
244255
mFileListAdapter.notifyDataSetChanged();
245256
} else {
246-
Toast.makeText(context, R.string.error_dir_access, Toast.LENGTH_SHORT).show();
257+
Toast.makeText(context, R.string.error_dir_access,
258+
Toast.LENGTH_SHORT).show();
247259
}
248260
} else {
249261
MaterialCheckbox fmark = view.findViewById(R.id.file_mark);
@@ -383,7 +395,8 @@ public void markFiles(List<String> paths) {
383395
public void show() {
384396
if (!Utility.checkStorageAccessPermissions(context)) {
385397
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
386-
((Activity) context).requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, EXTERNAL_READ_PERMISSION_GRANT);
398+
((Activity) context).requestPermissions(new String[]{Manifest.permission
399+
.READ_EXTERNAL_STORAGE}, EXTERNAL_READ_PERMISSION_GRANT);
387400
}
388401
} else {
389402
super.show();
@@ -418,11 +431,13 @@ public void onBackPressed() {
418431
FileListItem parent = new FileListItem();
419432
parent.setFilename(context.getString(R.string.label_parent_dir));
420433
parent.setDirectory(true);
421-
parent.setLocation(currLoc.getParentFile().getAbsolutePath());
434+
parent.setLocation(Objects.requireNonNull(currLoc.getParentFile())
435+
.getAbsolutePath());
422436
parent.setTime(currLoc.lastModified());
423437
internalList.add(parent);
424438
}
425-
internalList = Utility.prepareFileListEntries(internalList, currLoc, filter, properties.show_hidden_files);
439+
internalList = Utility.prepareFileListEntries(internalList, currLoc, filter,
440+
properties.show_hidden_files);
426441
mFileListAdapter.notifyDataSetChanged();
427442
}
428443
setTitle();

‎library/src/main/java/com/developer/filepicker/widget/MaterialCheckbox.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* @author akshay sunil masram
1717
*/
1818
public class MaterialCheckbox extends View {
19+
1920
private Context context;
2021
private int minDim;
2122
private Paint paint;

0 commit comments

Comments
 (0)