From 5a60819fc754b44ef92e5973eda00b14c7b4693a Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 15 Oct 2020 16:06:39 -0500
Subject: [PATCH] Use clear button for deleting comments

---
 .../todoroo/astrid/notes/CommentsController.kt    |  8 ++++----
 app/src/main/res/layout/comment_adapter_row.xml   |  6 +++---
 .../main/res/layout/control_set_delete_button.xml | 15 ---------------
 3 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 app/src/main/res/layout/control_set_delete_button.xml

diff --git a/app/src/main/java/com/todoroo/astrid/notes/CommentsController.kt b/app/src/main/java/com/todoroo/astrid/notes/CommentsController.kt
index 1bd4f2778..a0f53f7d4 100644
--- a/app/src/main/java/com/todoroo/astrid/notes/CommentsController.kt
+++ b/app/src/main/java/com/todoroo/astrid/notes/CommentsController.kt
@@ -15,12 +15,13 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
-import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.todoroo.andlib.utility.DateUtilities
 import com.todoroo.astrid.data.Task
-import kotlinx.coroutines.*
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.tasks.R
 import org.tasks.data.UserActivity
 import org.tasks.data.UserActivityDao
@@ -31,7 +32,6 @@ import org.tasks.locale.Locale
 import org.tasks.preferences.Preferences
 import java.util.*
 import javax.inject.Inject
-import kotlin.coroutines.coroutineContext
 import kotlin.math.min
 
 class CommentsController @Inject constructor(
@@ -99,7 +99,7 @@ class CommentsController @Inject constructor(
         setupImagePopupForCommentView(view, commentPictureView, item.pictureUri, activity)
 
         // delete button
-        val deleteBtn = view.findViewById<ImageView>(R.id.delete)
+        val deleteBtn = view.findViewById<ImageView>(R.id.clear)
         deleteBtn.setOnClickListener(){
             val builder = AlertDialog.Builder(commentsContainer!!.context)
 
diff --git a/app/src/main/res/layout/comment_adapter_row.xml b/app/src/main/res/layout/comment_adapter_row.xml
index b5cc65986..cd1481004 100644
--- a/app/src/main/res/layout/comment_adapter_row.xml
+++ b/app/src/main/res/layout/comment_adapter_row.xml
@@ -8,9 +8,9 @@
     android:id="@+id/comment_row"
     style="@style/CommentsRow"
     android:background="?attr/selectableItemBackground"
-    android:paddingRight="@dimen/widget_padding">
+    android:padding="@dimen/keyline_first">
 
-    <include layout="@layout/control_set_delete_button" />
+    <include layout="@layout/control_set_clear_button" />
 
     <LinearLayout
       xmlns:tools="http://schemas.android.com/tools"
@@ -18,7 +18,7 @@
       android:layout_height="wrap_content"
       android:layout_alignParentStart="true"
       android:layout_toStartOf="@id/delete"
-      android:padding="@dimen/keyline_first"
+      android:paddingEnd="@dimen/keyline_first"
       android:background="?attr/selectableItemBackground"
       android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/control_set_delete_button.xml b/app/src/main/res/layout/control_set_delete_button.xml
deleted file mode 100644
index df5eed2e9..000000000
--- a/app/src/main/res/layout/control_set_delete_button.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:id="@+id/delete"
-  android:layout_width="wrap_content"
-  android:layout_height="wrap_content"
-  android:layout_weight="1"
-  android:layout_alignParentEnd="true"
-  android:layout_centerInParent="true"
-  android:alpha="@dimen/alpha_secondary"
-  android:background="?attr/selectableItemBackgroundBorderless"
-  android:src="@drawable/ic_outline_delete_24px"
-    android:padding="@dimen/widget_padding"
-  app:tint="@color/icon_tint"
-  android:clickable="true"  />
\ No newline at end of file