#431 - chceckbox added before each file in merge files fragment (#521)

Author: sc450ew

app/src/main/java/swati4star/createpdf/adapter/MergeFilesAdapter.java

@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
+import android.support.v7.widget.AppCompatCheckBox;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,6 +14,7 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 import swati4star.createpdf.R;
 import swati4star.createpdf.util.FileUtils;
 import swati4star.createpdf.util.PDFUtils;
@@ -24,13 +26,16 @@ public class MergeFilesAdapter extends RecyclerView.Adapter<MergeFilesAdapter.Vi
     private final FileUtils mFileUtils;
     private final OnClickListener mOnClickListener;
     private final PDFUtils mPDFUtils;
+    private final boolean mIsMergeFragment;
 
-    public MergeFilesAdapter(Activity mContext, ArrayList<String> mFilePaths, OnClickListener mOnClickListener) {
+    public MergeFilesAdapter(Activity mContext, ArrayList<String> mFilePaths,
+                             boolean mIsMergeFragment, OnClickListener mOnClickListener) {
         this.mContext = mContext;
         this.mFilePaths = mFilePaths;
         mFileUtils = new FileUtils(mContext);
         this.mOnClickListener = mOnClickListener;
         mPDFUtils = new PDFUtils(mContext);
+        this.mIsMergeFragment = mIsMergeFragment;
     }
 
     @NonNull
@@ -46,6 +51,7 @@ public void onBindViewHolder(@NonNull ViewMergeFilesHolder holder, int position)
         boolean isEncrypted = mPDFUtils.isPDFEncrypted(mFilePaths.get(position));
         holder.mFileName.setText(mFileUtils.getFileName(mFilePaths.get(position)));
         holder.mEncryptionImage.setVisibility(isEncrypted ? View.VISIBLE : View.INVISIBLE);
+
     }
 
     @Override
@@ -58,17 +64,28 @@ public class ViewMergeFilesHolder extends RecyclerView.ViewHolder implements Vie
         TextView mFileName;
         @BindView(R.id.encryptionImage)
         ImageView mEncryptionImage;
+        @BindView(R.id.itemMerge_checkbox)
+        AppCompatCheckBox mCheckbox;
 
         ViewMergeFilesHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, itemView);
             mFileName.setOnClickListener(this);
+            if (mIsMergeFragment) mCheckbox.setVisibility(View.VISIBLE);
+            else mCheckbox.setVisibility(View.GONE);
         }
 
         @Override
         public void onClick(View view) {
+            if (mIsMergeFragment) mCheckbox.toggle();
             mOnClickListener.onItemClick(mFilePaths.get(getAdapterPosition()));
         }
+
+        @OnClick(R.id.itemMerge_checkbox)
+        public void onCheckboxClick() {
+            mOnClickListener.onItemClick(mFilePaths.get(getAdapterPosition()));
+        }
+
     }
 
     public interface OnClickListener {

app/src/main/java/swati4star/createpdf/fragment/ExtractImagesFragment.java

@@ -206,7 +206,7 @@ public void onPopulate(ArrayList<String> paths) {
             // Init recycler view
             mRecyclerViewFiles.setVisibility(View.VISIBLE);
             MergeFilesAdapter mergeFilesAdapter = new MergeFilesAdapter(mActivity,
-                    paths, this);
+                    paths, false, this);
             RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(mActivity);
             mRecyclerViewFiles.setLayoutManager(mLayoutManager);
             mRecyclerViewFiles.setAdapter(mergeFilesAdapter);

app/src/main/java/swati4star/createpdf/fragment/MergeFilesFragment.java

@@ -292,11 +292,20 @@ public void onAttach(Context context) {
 
     @Override
     public void onItemClick(String path) {
-        mFilePaths.add(path);
+        if (mFilePaths.contains(path)) {
+            mFilePaths.remove(path);
+            showSnackbar(mActivity, getString(R.string.pdf_removed_from_list));
+        } else {
+            mFilePaths.add(path);
+            showSnackbar(mActivity, getString(R.string.pdf_added_to_list));
+        }
+
         mMergeSelectedFilesAdapter.notifyDataSetChanged();
-        if (mFilePaths.size() > 1 && !mergeBtn.isEnabled())
-            setMorphingButtonState(true);
-        showSnackbar(mActivity, getString(R.string.pdf_added_to_list));
+        if (mFilePaths.size() > 1) {
+            if (!mergeBtn.isEnabled()) setMorphingButtonState(true);
+        } else {
+            if (mergeBtn.isEnabled()) setMorphingButtonState(false);
+        }
     }
 
     /**
@@ -368,7 +377,7 @@ public void onPopulate(ArrayList<String> paths) {
             // Init recycler view
             mRecyclerViewFiles.setVisibility(View.VISIBLE);
             MergeFilesAdapter mergeFilesAdapter = new MergeFilesAdapter(mActivity,
-                    paths, this);
+                    paths, true, this);
             RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(mActivity);
             mRecyclerViewFiles.setLayoutManager(mLayoutManager);
             mRecyclerViewFiles.setAdapter(mergeFilesAdapter);

app/src/main/java/swati4star/createpdf/fragment/PdfToImageFragment.java

@@ -264,8 +264,7 @@ public void onPopulate(ArrayList<String> paths) {
         } else {
             // init recycler view for bottom sheet
             mRecyclerViewFiles.setVisibility(View.VISIBLE);
-            MergeFilesAdapter mergeFilesAdapter = new MergeFilesAdapter(mActivity,
-                    paths, this);
+            MergeFilesAdapter mergeFilesAdapter = new MergeFilesAdapter(mActivity, paths, false, this);
             RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(mActivity);
             mRecyclerViewFiles.setLayoutManager(mLayoutManager);
             // set up adapter

app/src/main/java/swati4star/createpdf/fragment/RemovePagesFragment.java

@@ -333,7 +333,7 @@ public void onPopulate(ArrayList<String> paths) {
             // Init recycler view
             mRecyclerViewFiles.setVisibility(View.VISIBLE);
             MergeFilesAdapter mergeFilesAdapter = new MergeFilesAdapter(mActivity,
-                    paths, this);
+                    paths, false, this);
             RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(mActivity);
             mRecyclerViewFiles.setLayoutManager(mLayoutManager);
             mRecyclerViewFiles.setAdapter(mergeFilesAdapter);

app/src/main/java/swati4star/createpdf/fragment/SettingsFragment.java

@@ -289,4 +289,4 @@ public void setTheme() {
         rb.setChecked(true);
         materialDialog.show();
     }
-}
+}

app/src/main/java/swati4star/createpdf/fragment/SplitFilesFragment.java

@@ -169,8 +169,7 @@ public void onPopulate(ArrayList<String> paths) {
         } else {
             // Init recycler view
             mRecyclerViewFiles.setVisibility(View.VISIBLE);
-            MergeFilesAdapter mergeFilesAdapter = new MergeFilesAdapter(mActivity,
-                    paths, this);
+            MergeFilesAdapter mergeFilesAdapter = new MergeFilesAdapter(mActivity, paths, false, this);
             RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(mActivity);
             mRecyclerViewFiles.setLayoutManager(mLayoutManager);
             mRecyclerViewFiles.setAdapter(mergeFilesAdapter);

app/src/main/res/layout/item_merge_files.xml

@@ -4,15 +4,26 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
+    <android.support.v7.widget.AppCompatCheckBox
+        android:id="@+id/itemMerge_checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_centerVertical="true"
+        android:visibility="gone"/>
+
     <com.balysv.materialripple.MaterialRippleLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true">
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="8dp"
+        android:layout_toEndOf="@id/itemMerge_checkbox">
 
         <TextView
             android:id="@+id/fileName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:padding="12dp"
             android:textSize="16sp"
             android:textStyle="bold" />