From cfe4f118649f81bb4123713092aa2efc3a78f868 Mon Sep 17 00:00:00 2001
From: mcarare <“mihai.carare.dev@gmail.com”>
Date: Mon, 2 Mar 2020 10:27:34 +0200
Subject: [PATCH] For #6607 Update button theming in no tab pane

---
 .../NoContentMessageWithActionViewHolder.kt   | 12 +++--
 .../layout/no_content_message_with_action.xml | 49 ++++++-------------
 2 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/NoContentMessageWithActionViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/NoContentMessageWithActionViewHolder.kt
index d84393010..746ad9beb 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/NoContentMessageWithActionViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/NoContentMessageWithActionViewHolder.kt
@@ -36,11 +36,13 @@ class NoContentMessageWithActionViewHolder(
         with(view.context) {
 
             if (buttonIcon != 0 || buttonText != 0) {
-                view.button_layout.isVisible = true
-                view.button_icon.setImageDrawable(getDrawable(buttonIcon))
-                view.button_text.text = getString(buttonText)
-                view.button_layout.setOnClickListener {
-                    listener?.invoke()
+                view.add_tab_button.apply {
+                    isVisible = true
+                    setIcon(getDrawable(buttonIcon))
+                    text = getString(buttonText)
+                    setOnClickListener {
+                        listener?.invoke()
+                    }
                 }
             }
         }
diff --git a/app/src/main/res/layout/no_content_message_with_action.xml b/app/src/main/res/layout/no_content_message_with_action.xml
index 728c1b548..5ef4ad519 100644
--- a/app/src/main/res/layout/no_content_message_with_action.xml
+++ b/app/src/main/res/layout/no_content_message_with_action.xml
@@ -36,42 +36,21 @@
         android:textStyle="normal"
         tools:text="@tools:sample/lorem" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/button_layout"
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/add_tab_button"
+        style="@style/ThemeIndependentMaterialGreyButton"
         android:layout_width="match_parent"
-        android:layout_height="36dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:layout_marginTop="6dp"
-        android:layout_marginBottom="4dp"
-        android:background="@drawable/button_background_grey"
-        android:clickable="true"
-        android:focusable="true"
+        android:paddingStart="0dp"
+        android:paddingEnd="12dp"
+        android:textColor="?primaryText"
+        android:textSize="14sp"
         android:visibility="gone"
-        tools:visibility="visible">
-
-        <ImageView
-            android:id="@+id/button_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            android:importantForAccessibility="no"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/button_text"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:srcCompat="@drawable/ic_new" />
-
-        <TextView
-            android:id="@+id/button_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:importantForAccessibility="no"
-            android:textColor="?primaryText"
-            android:textSize="14sp"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="@string/home_screen_shortcut_open_new_tab_2" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
+        app:iconGravity="textStart"
+        app:iconTint="?primaryText"
+        tools:icon="@drawable/ic_new"
+        tools:text="@string/home_screen_shortcut_open_new_tab_2"
+        tools:visibility="visible" />
 </LinearLayout>
\ No newline at end of file