kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Remove message delete button."

Browse Source 
This reverts commit b0e85623861e48abb1c6fb49800234f453fc82ee.
This commit is contained in:
leopoldsedev
2020-02-15 19:15:46 +01:00
committed by Jannis Mattheis
parent 8d4a331bba
commit f49900e0ef
3 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java
View File

@@ -5,6 +5,7 @@ import android.text.util.Linkify;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -14,6 +15,7 @@ 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;
@@ -28,16 +30,22 @@ public class ListMessageAdapter extends RecyclerView.Adapter<ListMessageAdapter.
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) {
Context context,
Settings settings,
Picasso picasso,
List<MessageWithImage> items,
Delete delete) {
super();
this.content = context;
this.settings = settings;
this.picasso = picasso;
this.items = items;
this.delete = delete;
this.markwon =
Markwon.builder(context)
@@ -84,6 +92,7 @@ public class ListMessageAdapter extends RecyclerView.Adapter<ListMessageAdapter.
message.message.getDate() != null
? Utils.dateToRelative(message.message.getDate())
: "?");
holder.delete.setOnClickListener((ignored) -> delete.delete(message.message));
}
@Override
@@ -110,9 +119,16 @@ public class ListMessageAdapter extends RecyclerView.Adapter<ListMessageAdapter.
@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);
}
}

3
app/src/main/java/com/github/gotify/messages/MessagesActivity.java
View File

@@ -152,7 +152,8 @@ public class MessagesActivity extends AppCompatActivity
DividerItemDecoration dividerItemDecoration =
new DividerItemDecoration(
messagesView.getContext(), layoutManager.getOrientation());
ListMessageAdapter adapter = new ListMessageAdapter(this, settings, picasso, emptyList());
ListMessageAdapter adapter =
new ListMessageAdapter(this, settings, picasso, emptyList(), this::delete);
messagesView.addItemDecoration(dividerItemDecoration);
messagesView.setHasFixedSize(true);

15
app/src/main/res/layout/message_item.xml
View File

@@ -13,7 +13,7 @@
android:layout_height="20dp"
android:layout_marginEnd="8dp"
android:text=""
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toStartOf="@+id/message_delete"
app:layout_constraintTop_toTopOf="parent" />
<TextView
@@ -52,4 +52,15 @@
app:layout_constraintStart_toEndOf="@+id/message_image"
app:layout_constraintTop_toBottomOf="@+id/message_title" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageButton
android:id="@+id/message_delete"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="30dp"
android:layout_height="30dp"
android:contentDescription="@string/delete_message"
app:layout_constraintBottom_toBottomOf="@+id/message_date"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_delete" />
</androidx.constraintlayout.widget.ConstraintLayout>