Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed issue #283 #286

Merged
merged 3 commits into from
Jul 27, 2018
Merged

fixed issue #283 #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23d286a
fixed issue #283
vyankatesh24 Jul 27, 2018
25fcac0
fixed issue #283
vyankatesh24 Jul 27, 2018
b86965d
fixed issue #283
vyankatesh24 Jul 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions app/src/main/java/swati4star/createpdf/adapter/HistoryAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@ public class HistoryAdapter extends RecyclerView.Adapter<HistoryAdapter.ViewHist

private final List<History> mHistoryList;
private final Activity mActivity;
private final OnClickListener mOnClickListener;

public HistoryAdapter(Activity mActivity, List<History> mHistoryList) {

public HistoryAdapter(Activity mActivity, List<History> mHistoryList, OnClickListener mOnClickListener) {
this.mHistoryList = mHistoryList;
this.mActivity = mActivity;
this.mOnClickListener = mOnClickListener;
}

@NonNull
Expand Down Expand Up @@ -56,7 +59,7 @@ public int getItemCount() {
return mHistoryList == null ? 0 : mHistoryList.size();
}

public class ViewHistoryHolder extends RecyclerView.ViewHolder {
public class ViewHistoryHolder extends RecyclerView.ViewHolder implements View.OnClickListener {

@BindView(R.id.fileName)
TextView mFilename;
Expand All @@ -68,6 +71,16 @@ public class ViewHistoryHolder extends RecyclerView.ViewHolder {
ViewHistoryHolder(View itemView) {
super(itemView);
ButterKnife.bind(this, itemView);
itemView.setOnClickListener(this);
}

@Override
public void onClick(View view) {
mOnClickListener.onItemClick(mHistoryList.get(getAdapterPosition()).getFilePath());
}
}

public interface OnClickListener {
void onItemClick(String path);
}
}
21 changes: 19 additions & 2 deletions app/src/main/java/swati4star/createpdf/fragment/HistoryFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.constraint.ConstraintLayout;
import android.support.design.widget.Snackbar;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v7.widget.LinearLayoutManager;
Expand All @@ -22,7 +23,9 @@
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;

import java.io.File;
import java.util.List;
import java.util.Objects;

import butterknife.BindView;
import butterknife.ButterKnife;
Expand All @@ -31,9 +34,10 @@
import swati4star.createpdf.adapter.HistoryAdapter;
import swati4star.createpdf.database.AppDatabase;
import swati4star.createpdf.database.History;
import swati4star.createpdf.util.FileUtils;
import swati4star.createpdf.util.ViewFilesDividerItemDecoration;

public class HistoryFragment extends Fragment {
public class HistoryFragment extends Fragment implements HistoryAdapter.OnClickListener {

@BindView(R.id.emptyStatusView)
ConstraintLayout mEmptyStatusLayout;
Expand Down Expand Up @@ -106,6 +110,19 @@ public void loadHome() {
fragmentManager.beginTransaction().replace(R.id.content, fragment).commit();
}

@Override
public void onItemClick(String path) {
FileUtils fileUtils = new FileUtils(mActivity);
File file = new File(path);
if (file.exists()) {
fileUtils.openFile(path);
} else {
Snackbar.make(Objects.requireNonNull(mActivity).findViewById(android.R.id.content),
R.string.pdf_does_not_exist_message,
Snackbar.LENGTH_LONG).show();
}
}

@SuppressLint("StaticFieldLeak")
private class LoadHistory extends AsyncTask<Void, Void, Void> {
private final Context mContext;
Expand All @@ -126,7 +143,7 @@ protected Void doInBackground(Void... voids) {
protected void onPostExecute(Void aVoid) {
if (mHistoryList != null && !mHistoryList.isEmpty()) {
mEmptyStatusLayout.setVisibility(View.GONE);
mHistoryAdapter = new HistoryAdapter(mActivity, mHistoryList);
mHistoryAdapter = new HistoryAdapter(mActivity, mHistoryList, HistoryFragment.this);
RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(mContext);
mHistoryRecyclerView.setLayoutManager(mLayoutManager);
mHistoryRecyclerView.setAdapter(mHistoryAdapter);
Expand Down
79 changes: 42 additions & 37 deletions app/src/main/res/layout/layout_item_history.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.balysv.materialripple.MaterialRippleLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:orientation="horizontal"
android:weightSum="7">
android:layout_height="wrap_content">

<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:gravity="center_vertical"
android:orientation="vertical">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:orientation="horizontal"
android:weightSum="7">

<TextView
android:id="@+id/fileName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:padding="8dp"
android:textSize="18sp" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:gravity="center_vertical"
android:orientation="vertical">

<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2"
android:orientation="vertical"
android:weightSum="2">
<TextView
android:id="@+id/fileName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:padding="8dp"
android:textSize="18sp" />
</LinearLayout>

<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2"
android:orientation="vertical"
android:weightSum="2">

<TextView
android:id="@+id/operationDate"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:padding="8dp" />
<TextView
android:id="@+id/operationDate"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:padding="8dp" />

<TextView
android:id="@+id/operationType"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:padding="8dp" />
<TextView
android:id="@+id/operationType"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:padding="8dp" />

</LinearLayout>
</LinearLayout>
</LinearLayout>
</com.balysv.materialripple.MaterialRippleLayout>
1 change: 1 addition & 0 deletions app/src/main/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,4 +241,5 @@
<string name="arrow_down">Arrow Down</string>
<string name="rearrange_images">Rearrange Images</string>
<string name="rearrange_text">Rearrange</string>
<string name="pdf_does_not_exist_message">The PDF doesn\'t exist.</string>
</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,4 +242,5 @@
<string name="arrow_down">Arrow Down</string>
<string name="rearrange_images">Rearrange Images</string>
<string name="rearrange_text">Rearrange</string>
<string name="pdf_does_not_exist_message">The PDF doesn\'t exist.</string>
</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values-ja/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,4 +240,5 @@
<string name="arrow_down">Arrow Down</string>
<string name="rearrange_images">Rearrange Images</string>
<string name="rearrange_text">Rearrange</string>
<string name="pdf_does_not_exist_message">The PDF doesn\'t exist.</string>
</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,5 +299,6 @@
<string name="arrow_down">Arrow Down</string>
<string name="rearrange_images">Rearrange Images</string>
<string name="rearrange_text">Rearrange</string>
<string name="pdf_does_not_exist_message">The PDF doesn\'t exist.</string>

</resources>