From 1d0ec1fe3057035a26a25fe2119dc74e43520791 Mon Sep 17 00:00:00 2001
From: leopoldsedev <christian@leopoldse.dev>
Date: Tue, 11 Feb 2020 23:10:01 +0100
Subject: [PATCH] Remove message delete button.

---
 .../gotify/messages/ListMessageAdapter.java    | 18 +-----------------
 .../gotify/messages/MessagesActivity.java      |  3 +--
 app/src/main/res/layout/message_item.xml       | 15 ++-------------
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java b/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java
index 2d50570..ce30792 100644
--- a/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java
+++ b/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java
@@ -5,7 +5,6 @@ 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;
@@ -15,7 +14,6 @@ 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;
@@ -30,22 +28,16 @@ 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,
-            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)
@@ -92,7 +84,6 @@ 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
@@ -119,16 +110,9 @@ 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);
-    }
 }
diff --git a/app/src/main/java/com/github/gotify/messages/MessagesActivity.java b/app/src/main/java/com/github/gotify/messages/MessagesActivity.java
index d009ed9..9e16370 100644
--- a/app/src/main/java/com/github/gotify/messages/MessagesActivity.java
+++ b/app/src/main/java/com/github/gotify/messages/MessagesActivity.java
@@ -149,8 +149,7 @@ public class MessagesActivity extends AppCompatActivity
         DividerItemDecoration dividerItemDecoration =
                 new DividerItemDecoration(
                         messagesView.getContext(), layoutManager.getOrientation());
-        ListMessageAdapter adapter =
-                new ListMessageAdapter(this, settings, picasso, emptyList(), this::delete);
+        ListMessageAdapter adapter = new ListMessageAdapter(this, settings, picasso, emptyList());
 
         messagesView.addItemDecoration(dividerItemDecoration);
         messagesView.setHasFixedSize(true);
diff --git a/app/src/main/res/layout/message_item.xml b/app/src/main/res/layout/message_item.xml
index eb97462..d803682 100644
--- a/app/src/main/res/layout/message_item.xml
+++ b/app/src/main/res/layout/message_item.xml
@@ -13,7 +13,7 @@
         android:layout_height="20dp"
         android:layout_marginEnd="8dp"
         android:text=""
-        app:layout_constraintEnd_toStartOf="@+id/message_delete"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
@@ -52,15 +52,4 @@
         app:layout_constraintStart_toEndOf="@+id/message_image"
         app:layout_constraintTop_toBottomOf="@+id/message_title" />
 
-    <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>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>