From d1c2ed205212741f113eaa862f8c7f14d4220c3c Mon Sep 17 00:00:00 2001
From: ekager <emilykager@gmail.com>
Date: Fri, 19 Apr 2019 10:07:00 -0700
Subject: [PATCH] Closes #1803: remove text for swipe delete

---
 .../sessioncontrol/SwipeToDeleteCallback.kt   | 30 +++----------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt
index 0077feca2..a8732cc86 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt
@@ -4,17 +4,15 @@
 
 package org.mozilla.fenix.home.sessioncontrol
 
-import android.content.Context
 import android.content.res.Resources
 import android.graphics.Canvas
-import android.graphics.Paint
+import android.graphics.drawable.Drawable
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import io.reactivex.Observer
 import org.mozilla.fenix.R
 import org.mozilla.fenix.home.sessioncontrol.viewholders.TabViewHolder
-import android.graphics.drawable.Drawable
 
 class SwipeToDeleteCallback(
     val actionEmitter: Observer<SessionControlAction>
@@ -72,7 +70,7 @@ class SwipeToDeleteCallback(
                             itemView.bottom
                         )
                         icon.setBounds(iconLeft, iconTop, iconRight, iconBottom)
-                        draw(background, icon, c, recyclerView.context, iconLeft, iconBottom)
+                        draw(background, icon, c)
                     }
                     dX < 0 -> { // Swiping to the left
                         iconLeft = itemView.right - margin - iconWidth
@@ -82,7 +80,7 @@ class SwipeToDeleteCallback(
                             itemView.top, itemView.right, itemView.bottom
                         )
                         icon.setBounds(iconLeft, iconTop, iconRight, iconBottom)
-                        draw(background, icon, c, recyclerView.context, iconLeft, iconBottom)
+                        draw(background, icon, c)
                     }
                     else -> { // View not swiped
                         background.setBounds(0, 0, 0, 0)
@@ -105,36 +103,16 @@ class SwipeToDeleteCallback(
     companion object {
         const val BACKGROUND_CORNER_OFFSET = 40
         const val MARGIN = 32
-        const val TEXT_MARGIN = 12
-        const val TEXT_SIZE = 36f
-        const val TEXT_MARGIN_X = 14
         const val DENSITY_CONVERSION = 160f
 
         @Suppress("LongParameterList")
         private fun draw(
             background: Drawable,
             icon: Drawable,
-            c: Canvas,
-            context: Context,
-            iconLeft: Int,
-            iconBottom: Int
+            c: Canvas
         ) {
             background.draw(c)
             icon.draw(c)
-            val textPaint = Paint()
-            textPaint.color = ContextCompat.getColor(
-                context,
-                R.color.delete_color
-            )
-            textPaint.textSize = TEXT_SIZE
-            val textX = iconLeft - TEXT_MARGIN_X
-            val textY = iconBottom + convertDpToPixel(TEXT_MARGIN.toFloat())
-            c.drawText(
-                context.getString(R.string.current_session_delete),
-                textX.toFloat(),
-                textY.toFloat(),
-                textPaint
-            )
         }
 
         private fun convertDpToPixel(dp: Float): Int {