Skip to content

Commit 6b5f2e3

Browse files
adityak368adityak368
committed
v1.1 to library
1 parent 7c77079 commit 6b5f2e3

File tree

6 files changed

+61
-78
lines changed

6 files changed

+61
-78
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
apply plugin: 'com.android.application'
1+
apply plugin: 'com.android.library'
22

33
android {
44
compileSdkVersion 25
55
buildToolsVersion "25.0.2"
66

77
defaultConfig {
8-
applicationId "com.aditya.filebrowser"
8+
//applicationId "com.aditya.filebrowser"
99
minSdkVersion 15
1010
targetSdkVersion 25
1111
versionCode 1

‎app/src/main/java/com/aditya/filebrowser/FileBrowser.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,16 +135,15 @@ public boolean onCreateOptionsMenu(Menu menu) {
135135

136136
@Override
137137
public boolean onOptionsItemSelected(MenuItem item) {
138-
switch (item.getItemId()) {
139-
case R.id.action_showfoldersizes: {
138+
139+
if(item.getItemId()== R.id.action_showfoldersizes) {
140140
if (AssortedUtils.GetPrefs(Constants.SHOW_FOLDER_SIZE, mContext).equalsIgnoreCase("true"))
141141
AssortedUtils.SavePrefs(Constants.SHOW_FOLDER_SIZE, "false", mContext);
142142
else
143143
AssortedUtils.SavePrefs(Constants.SHOW_FOLDER_SIZE, "true", mContext);
144144
updateUI(null,false);
145145
}
146-
break;
147-
case R.id.action_newfolder: {
146+
else if (item.getItemId()== R.id.action_newfolder) {
148147
UIUtils.showEditTextDialog(this, "Folder Name", "" , new FuncPtr(){
149148
@Override
150149
public void execute(final String val) {
@@ -157,8 +156,7 @@ public void execute(final String val) {
157156
});
158157
updateUI(null,true);
159158
}
160-
break;
161-
case R.id.action_paste: {
159+
else if(item.getItemId()== R.id.action_paste) {
162160
if (op.getOperation() == Operations.FILE_OPERATIONS.NONE) {
163161
UIUtils.ShowToast("No operation selected", mContext);
164162
return false;
@@ -173,8 +171,6 @@ public void execute(final String val) {
173171
UIUtils.ShowToast("No Write permissions for the paste directory",mContext);
174172
updateUI(null,true);
175173
}
176-
break;
177-
}
178174
return false;
179175
}
180176

‎app/src/main/java/com/aditya/filebrowser/FileBrowserWithCustomHandler.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,14 @@ public boolean onCreateOptionsMenu(Menu menu) {
124124

125125
@Override
126126
public boolean onOptionsItemSelected(MenuItem item) {
127-
switch (item.getItemId()) {
128-
case R.id.action_showfoldersizes: {
127+
if(item.getItemId()==R.id.action_showfoldersizes) {
129128
if (AssortedUtils.GetPrefs(Constants.SHOW_FOLDER_SIZE, mContext).equalsIgnoreCase("true"))
130129
AssortedUtils.SavePrefs(Constants.SHOW_FOLDER_SIZE, "false", mContext);
131130
else
132131
AssortedUtils.SavePrefs(Constants.SHOW_FOLDER_SIZE, "true", mContext);
133132
updateUI(null,false);
134133
}
135-
break;
136-
case R.id.action_newfolder: {
134+
else if(item.getItemId()==R.id.action_newfolder) {
137135
UIUtils.showEditTextDialog(this, "Folder Name", "" , new FuncPtr(){
138136
@Override
139137
public void execute(final String val) {
@@ -146,8 +144,7 @@ public void execute(final String val) {
146144
});
147145
updateUI(null,true);
148146
}
149-
break;
150-
case R.id.action_paste: {
147+
else if(item.getItemId()==R.id.action_paste) {
151148
if (op.getOperation() == Operations.FILE_OPERATIONS.NONE) {
152149
UIUtils.ShowToast("No operation selected", mContext);
153150
return false;
@@ -162,8 +159,6 @@ public void execute(final String val) {
162159
UIUtils.ShowToast("No Write permissions for the paste directory",mContext);
163160
updateUI(null,true);
164161
}
165-
break;
166-
}
167162
return false;
168163
}
169164

‎app/src/main/java/com/aditya/filebrowser/FileChooser.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,12 @@ public boolean onCreateOptionsMenu(Menu menu) {
126126

127127
@Override
128128
public boolean onOptionsItemSelected(MenuItem item) {
129-
switch (item.getItemId()) {
130-
case R.id.action_showfoldersizes: {
129+
if(item.getItemId()==R.id.action_showfoldersizes) {
131130
if (AssortedUtils.GetPrefs(Constants.SHOW_FOLDER_SIZE, mContext).equalsIgnoreCase("true"))
132131
AssortedUtils.SavePrefs(Constants.SHOW_FOLDER_SIZE, "false", mContext);
133132
else
134133
AssortedUtils.SavePrefs(Constants.SHOW_FOLDER_SIZE, "true", mContext);
135134
updateUI(null,false);
136-
}
137-
break;
138135
}
139136
return false;
140137
}

‎app/src/main/java/com/aditya/filebrowser/listeners/TabChangeListener.java‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -59,72 +59,70 @@ public void onTabReSelected(@IdRes int tabId) {
5959
}
6060

6161
private void handleTabChange(int tabId) {
62-
switch (tabId) {
63-
case R.id.menu_back:
62+
63+
if(tabId==R.id.menu_back) {
6464
mNavigationHelper.navigateBack();
65-
break;
66-
case R.id.menu_internal_storage:
65+
}
66+
else if(tabId==R.id.menu_internal_storage) {
6767
mNavigationHelper.navigateToInternalStorage();
68-
break;
69-
case R.id.menu_external_storage:
68+
}
69+
else if(tabId==R.id.menu_external_storage) {
7070
mNavigationHelper.navigateToExternalStorage();
71-
break;
72-
case R.id.menu_refresh:
73-
mOnChangeDirectoryListener.updateUI(null,true);
74-
break;
75-
case R.id.menu_filter:
71+
}
72+
else if(tabId==R.id.menu_refresh) {
73+
mOnChangeDirectoryListener.updateUI(null, true);
74+
}
75+
else if(tabId==R.id.menu_filter) {
7676
UIUtils.showRadioButtonDialog(mActivity, mActivity.getResources().getStringArray(R.array.filter_options), "Filter Only", new RadioGroup.OnCheckedChangeListener() {
7777
@Override
7878
public void onCheckedChanged(RadioGroup radioGroup, int position) {
7979
mNavigationHelper.filter(Constants.FILTER_OPTIONS.values()[position]);
8080
}
8181
});
82-
break;
83-
case R.id.menu_sort:
82+
}
83+
else if(tabId==R.id.menu_sort) {
8484
UIUtils.showRadioButtonDialog(mActivity, mActivity.getResources().getStringArray(R.array.sort_options), "Sort By", new RadioGroup.OnCheckedChangeListener() {
8585
@Override
8686
public void onCheckedChanged(RadioGroup radioGroup, int position) {
8787
mNavigationHelper.sortBy(Constants.SORT_OPTIONS.values()[position]);
8888
}
8989
});
90-
break;
91-
case R.id.menu_delete:
90+
}
91+
else if(tabId==R.id.menu_delete) {
9292
List<FileItem> selectedItems = mAdapter.getSelectedItems();
93-
if(io!=null) {
93+
if (io != null) {
9494
io.deleteItems(selectedItems);
9595
mContextSwitcher.switchMode(Constants.CHOICE_MODE.SINGLE_CHOICE);
9696
}
97-
break;
98-
case R.id.menu_copy:
99-
if(op!=null) {
97+
}
98+
else if(tabId==R.id.menu_copy) {
99+
if (op != null) {
100100
op.setOperation(Operations.FILE_OPERATIONS.COPY);
101101
op.setSelectedFiles(mAdapter.getSelectedItems());
102102
mContextSwitcher.switchMode(Constants.CHOICE_MODE.SINGLE_CHOICE);
103103
}
104-
break;
105-
case R.id.menu_cut:
106-
if(op!=null) {
104+
}
105+
else if(tabId==R.id.menu_cut) {
106+
if (op != null) {
107107
op.setOperation(Operations.FILE_OPERATIONS.CUT);
108108
op.setSelectedFiles(mAdapter.getSelectedItems());
109109
mContextSwitcher.switchMode(Constants.CHOICE_MODE.SINGLE_CHOICE);
110110
}
111-
break;
112-
case R.id.menu_chooseitems:
111+
}
112+
else if(tabId==R.id.menu_chooseitems) {
113113
{
114114
List<FileItem> selItems = getmAdapter().getSelectedItems();
115115
ArrayList<Uri> chosenItems = new ArrayList<>();
116-
for(int i=0;i<selItems.size();i++) {
116+
for (int i = 0; i < selItems.size(); i++) {
117117
chosenItems.add(Uri.fromFile(selItems.get(i).getFile()));
118118
}
119119
mContextSwitcher.switchMode(Constants.CHOICE_MODE.SINGLE_CHOICE);
120120
Intent data = new Intent();
121-
data.putParcelableArrayListExtra(Constants.SELECTED_ITEMS,chosenItems);
121+
data.putParcelableArrayListExtra(Constants.SELECTED_ITEMS, chosenItems);
122122
mActivity.setResult(Activity.RESULT_OK, data);
123123
mActivity.finish();
124124
}
125-
break;
126-
default:
127-
}
125+
}
128126
}
129127

130128
public CustomAdapter getmAdapter() {

‎app/src/main/java/com/aditya/filebrowser/utils/ToolbarActionMode.java‎

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -61,33 +61,30 @@ public void onDestroyActionMode(ActionMode mode) {
6161
@Override
6262
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
6363
List<FileItem> selectedItems = mAdapter.getSelectedItems();;
64-
switch (item.getItemId()) {
65-
case R.id.action_properties:
66-
if(io!=null)
67-
io.getProperties(selectedItems);
68-
mode.finish();
69-
break;
70-
case R.id.action_share:
71-
if(io!=null)
72-
io.shareMultipleFiles(selectedItems);
73-
mode.finish();//Finish action mode
74-
break;
75-
case R.id.action_rename:
76-
if(selectedItems.size()!=1){
77-
UIUtils.ShowToast("Please select a single item",mContext);
78-
return false;
79-
}
80-
if (!selectedItems.get(0).getFile().canWrite()) {
81-
UIUtils.ShowToast("No write permission available", mContext);
82-
return false;
83-
}
84-
io.renameFile(selectedItems.get(0));
85-
mode.finish();//Finish action mode
86-
break;
87-
case R.id.action_selectall:
88-
mAdapter.selectAll();
89-
break;
90-
64+
if(item.getItemId()==R.id.action_properties) {
65+
if (io != null)
66+
io.getProperties(selectedItems);
67+
mode.finish();
68+
}
69+
else if(item.getItemId()==R.id.action_share) {
70+
if (io != null)
71+
io.shareMultipleFiles(selectedItems);
72+
mode.finish();//Finish action mode
73+
}
74+
else if(item.getItemId()==R.id.action_rename) {
75+
if (selectedItems.size() != 1) {
76+
UIUtils.ShowToast("Please select a single item", mContext);
77+
return false;
78+
}
79+
if (!selectedItems.get(0).getFile().canWrite()) {
80+
UIUtils.ShowToast("No write permission available", mContext);
81+
return false;
82+
}
83+
io.renameFile(selectedItems.get(0));
84+
mode.finish();//Finish action mode
85+
}
86+
else if(item.getItemId()==R.id.action_selectall) {
87+
mAdapter.selectAll();
9188
}
9289
return false;
9390
}

0 commit comments

Comments
 (0)