diff --git a/app/src/main/java/swati4star/createpdf/adapter/ViewFilesAdapter.java b/app/src/main/java/swati4star/createpdf/adapter/ViewFilesAdapter.java index efa7b5df6..4999f7e2a 100644 --- a/app/src/main/java/swati4star/createpdf/adapter/ViewFilesAdapter.java +++ b/app/src/main/java/swati4star/createpdf/adapter/ViewFilesAdapter.java @@ -49,8 +49,8 @@ public class ViewFilesAdapter extends RecyclerView.Adapter getSelectedFilePath() { ArrayList filePathList = new ArrayList<>(); for (int position : mDeleteNames) { @@ -240,7 +248,7 @@ public void deleteFiles() { public void shareFiles() { ArrayList files = new ArrayList<>(); - for (int position: mDeleteNames) { + for (int position : mDeleteNames) { files.add(mFileList.get(position)); } mFileUtils.shareMultipleFiles(files); @@ -259,7 +267,7 @@ public void onInput(@NonNull MaterialDialog dialog, CharSequence input) { Snackbar.LENGTH_LONG).show(); } else { File oldfile = mFileList.get(position); - String oldPath = mFileList.get(position).getPath(); + String oldPath = mFileList.get(position).getPath(); int index = oldPath.lastIndexOf('/'); String newfilename = oldPath.substring(0, index) + "/" + input.toString() + mActivity.getString(R.string.pdf_ext); diff --git a/app/src/main/java/swati4star/createpdf/fragment/HomeFragment.java b/app/src/main/java/swati4star/createpdf/fragment/HomeFragment.java index 8ffeb366f..f44ffe0b9 100755 --- a/app/src/main/java/swati4star/createpdf/fragment/HomeFragment.java +++ b/app/src/main/java/swati4star/createpdf/fragment/HomeFragment.java @@ -386,7 +386,7 @@ public List getEnhancementOptions() { getResources().getString(R.string.edit_images_text))); mEnhancementOptionsEntityArrayList.add( - new EnhancementOptionsEntity(getResources().getDrawable(R.drawable.pdf_compress), + new EnhancementOptionsEntity(getResources().getDrawable(R.drawable.ic_compress_image), getString(R.string.compress_image) + " " + mSharedPreferences.getInt(DEFAULT_COMPRESSION, 30) + "%)")); mEnhancementOptionsEntityArrayList.add( diff --git a/app/src/main/java/swati4star/createpdf/fragment/ViewFilesFragment.java b/app/src/main/java/swati4star/createpdf/fragment/ViewFilesFragment.java index d8d6d9707..3105c9f07 100644 --- a/app/src/main/java/swati4star/createpdf/fragment/ViewFilesFragment.java +++ b/app/src/main/java/swati4star/createpdf/fragment/ViewFilesFragment.java @@ -74,6 +74,7 @@ public class ViewFilesFragment extends Fragment @BindView(R.id.swipe) SwipeRefreshLayout mSwipeView; private Menu mMenuIcons; + private MenuItem mMenuItem; private Activity mActivity; private ViewFilesAdapter mViewFilesAdapter; private final DialogInterface.OnClickListener mDialogClickListener = new DialogInterface.OnClickListener() { @@ -94,6 +95,7 @@ public void onClick(DialogInterface dialog, int which) { private SearchView mSearchView; private int mCurrentSortingIndex; private SharedPreferences mSharedPreferences; + private boolean mIsChecked = false; //When the "GET STARTED" button is clicked, the user is taken to home @OnClick(R.id.getStarted) @@ -149,6 +151,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, populatePdfList(); return root; } + @OnClick(R.id.new_dir) void moveToNewDirectory() { if (mViewFilesAdapter.areItemsSelected()) { @@ -157,6 +160,7 @@ void moveToNewDirectory() { showSnack(R.string.snackbar_no_pdfs_selected); } } + @OnClick(R.id.move_to_dir) void moveToDirectory() { if (mViewFilesAdapter.areItemsSelected()) { @@ -165,12 +169,14 @@ void moveToDirectory() { showSnack(R.string.snackbar_no_pdfs_selected); } } + @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.activity_view_files_actions, menu); mMenuIcons = menu; MenuItem item = menu.findItem(R.id.action_search); + mMenuItem = menu.findItem(R.id.select_all); mSearchView = (SearchView) item.getActionView(); mSearchView.setQueryHint(getString(R.string.search_hint)); mSearchView.setSubmitButtonEnabled(true); @@ -227,7 +233,15 @@ public boolean onOptionsItemSelected(final MenuItem item) { } break; case R.id.select_all: - mViewFilesAdapter.checkAll(); + if (mIsChecked) { + mViewFilesAdapter.unCheckAll(); + mMenuItem.setIcon(R.drawable.ic_check_box_outline_blank_24dp); + mIsChecked = false; + } else { + mViewFilesAdapter.checkAll(); + mMenuItem.setIcon(R.drawable.ic_check_box_24dp); + mIsChecked = true; + } break; default: break; @@ -333,6 +347,7 @@ public void onClick(DialogInterface dialog, int i) { /** * Moves files from one directory to another + * * @param operation - type of operation to be performed * (create new Directory or move to an existing directory) */ diff --git a/app/src/main/res/drawable/ic_check_box_24dp.xml b/app/src/main/res/drawable/ic_check_box_24dp.xml new file mode 100644 index 000000000..b56de11f8 --- /dev/null +++ b/app/src/main/res/drawable/ic_check_box_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/pdf_compress.xml b/app/src/main/res/drawable/ic_check_box_outline_blank_24dp.xml similarity index 52% rename from app/src/main/res/drawable/pdf_compress.xml rename to app/src/main/res/drawable/ic_check_box_outline_blank_24dp.xml index b2018595e..ec42e2fa1 100644 --- a/app/src/main/res/drawable/pdf_compress.xml +++ b/app/src/main/res/drawable/ic_check_box_outline_blank_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> + android:fillColor="#FFFFFF" + android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z" /> diff --git a/app/src/main/res/drawable/ic_compress_image.xml b/app/src/main/res/drawable/ic_compress_image.xml new file mode 100644 index 000000000..f26034e01 --- /dev/null +++ b/app/src/main/res/drawable/ic_compress_image.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/menu/activity_view_files_actions.xml b/app/src/main/res/menu/activity_view_files_actions.xml index 3579f0fe7..9aa61d9dd 100644 --- a/app/src/main/res/menu/activity_view_files_actions.xml +++ b/app/src/main/res/menu/activity_view_files_actions.xml @@ -1,6 +1,6 @@ + xmlns:app="http://schemas.android.com/apk/res-auto">