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.

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

Delete messages by swiping and add snackbar for undoing deletion. #99

Merged
merged 13 commits into from
Feb 18, 2020
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,15 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
leopoldsedev marked this conversation as resolved.
Show resolved Hide resolved
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import com.github.gotify.R;
import com.github.gotify.Settings;
import com.github.gotify.Utils;
import com.github.gotify.client.model.Message;
import com.github.gotify.messages.provider.MessageWithImage;
import com.squareup.picasso.Picasso;
import io.noties.markwon.Markwon;
Expand All @@ -25,27 +23,21 @@
import io.noties.markwon.movement.MovementMethodPlugin;
import java.util.List;

public class ListMessageAdapter extends BaseAdapter {
public class ListMessageAdapter extends RecyclerView.Adapter<ListMessageAdapter.ViewHolder> {

private Context content;
private Picasso picasso;
private List<MessageWithImage> items;
private Delete delete;
private Settings settings;
private Markwon markwon;

ListMessageAdapter(
Context context,
Settings settings,
Picasso picasso,
List<MessageWithImage> items,
Delete delete) {
Context context, Settings settings, Picasso picasso, List<MessageWithImage> items) {
super();
this.content = context;
this.settings = settings;
this.picasso = picasso;
this.items = items;
this.delete = delete;

this.markwon =
Markwon.builder(context)
Expand All @@ -56,34 +48,25 @@ public class ListMessageAdapter extends BaseAdapter {
.build();
}

void items(List<MessageWithImage> items) {
this.items = items;
public List<MessageWithImage> getItems() {
return items;
}

@Override
public int getCount() {
return items.size();
public void setItems(List<MessageWithImage> items) {
this.items = items;
}

@NonNull
@Override
public MessageWithImage getItem(int position) {
return items.get(position);
}
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = LayoutInflater.from(content).inflate(R.layout.message_item, parent, false);

@Override
public long getItemId(int position) {
return getItem(position).message.getId();
ViewHolder holder = new ViewHolder(view);
return holder;
}

@Override
public View getView(int position, View convertView, ViewGroup parent) {
final View view;
if (convertView == null) {
view = LayoutInflater.from(content).inflate(R.layout.message_item, parent, false);
} else {
view = convertView;
}
ViewHolder holder = new ViewHolder(view);
public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
final MessageWithImage message = items.get(position);
if (Extras.useMarkdown(message.message)) {
holder.message.setAutoLinkMask(0);
Expand All @@ -101,9 +84,17 @@ public View getView(int position, View convertView, ViewGroup parent) {
message.message.getDate() != null
? Utils.dateToRelative(message.message.getDate())
: "?");
holder.delete.setOnClickListener((ignored) -> delete.delete(message.message));
}

@Override
public int getItemCount() {
return items.size();
}

return view;
@Override
public long getItemId(int position) {
MessageWithImage currentItem = items.get(position);
return currentItem.message.getId();
}

static class ViewHolder extends RecyclerView.ViewHolder {
Expand All @@ -119,16 +110,9 @@ static class ViewHolder extends RecyclerView.ViewHolder {
@BindView(R.id.message_date)
TextView date;

@BindView(R.id.message_delete)
ImageButton delete;

ViewHolder(final View view) {
super(view);
ButterKnife.bind(this, view);
}
}

public interface Delete {
void delete(Message message);
}
}