From da35581c540e304c344c6920864a83a21529235a Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Thu, 21 Mar 2019 10:44:50 -0700
Subject: [PATCH] For #1072: Fixes nits

---
 .../quickactionsheet/QuickActionSheet.kt      | 21 ++++---
 .../res/layout/layout_quick_action_sheet.xml  | 61 +++----------------
 2 files changed, 19 insertions(+), 63 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionSheet.kt b/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionSheet.kt
index 5630791e3..f08ea8c56 100644
--- a/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionSheet.kt
+++ b/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionSheet.kt
@@ -62,18 +62,19 @@ class QuickActionSheet @JvmOverloads constructor(
         val peakHeightMultiplier = if (duration == demoBounceAnimationLength)
             demoBounceAnimationPeekHeightMultiplier else bounceAnimationPeekHeightMultiplier
 
-        val valueAnimator = ValueAnimator.ofFloat(normalPeekHeight.toFloat(),
-            normalPeekHeight * peakHeightMultiplier)
+        ValueAnimator.ofFloat(normalPeekHeight.toFloat(),
+            normalPeekHeight * peakHeightMultiplier)?.let {
 
-        valueAnimator.addUpdateListener {
-            quickActionSheetBehavior.peekHeight = (it.animatedValue as Float).toInt()
+            it.addUpdateListener {
+                quickActionSheetBehavior.peekHeight = (it.animatedValue as Float).toInt()
+            }
+
+            it.repeatMode = ValueAnimator.REVERSE
+            it.repeatCount = 1
+            it.interpolator = FastOutSlowInInterpolator()
+            it.duration = duration
+            it.start()
         }
-
-        valueAnimator.repeatMode = ValueAnimator.REVERSE
-        valueAnimator.repeatCount = 1
-        valueAnimator.interpolator = FastOutSlowInInterpolator()
-        valueAnimator.duration = duration
-        valueAnimator.start()
     }
 
     companion object {
diff --git a/app/src/main/res/layout/layout_quick_action_sheet.xml b/app/src/main/res/layout/layout_quick_action_sheet.xml
index c79323004..6a15349c9 100644
--- a/app/src/main/res/layout/layout_quick_action_sheet.xml
+++ b/app/src/main/res/layout/layout_quick_action_sheet.xml
@@ -20,59 +20,6 @@
         android:background="?attr/quickActionPullTabColor"
         android:src="@drawable/ic_drawer_pull_tab"/>
 
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_gravity="bottom"
-        android:layout_width="match_parent"
-        android:layout_marginBottom="3dp"
-        android:layout_height="wrap_content"
-        android:background="?attr/toolbarColor">
-
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:layout_weight="1"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_gravity="center_vertical"
-            android:contentDescription="@string/quick_action_share"
-            android:src="@drawable/quick_action_icon_share"
-            android:background="?attr/toolbarColor"/>
-
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:layout_weight="1"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_gravity="center_vertical"
-            android:contentDescription="@string/quick_action_download"
-            android:src="@drawable/library_icon_downloads_circle_background"
-            android:background="?attr/toolbarColor"/>
-
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:layout_weight="1"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_gravity="center_vertical"
-            android:contentDescription="@string/quick_action_favorite"
-            android:src="@drawable/library_icon_favorites_circle_background"
-            android:background="?attr/toolbarColor"/>
-
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:layout_weight="1"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_gravity="center_vertical"
-            android:contentDescription="@string/quick_action_read"
-            android:src="@drawable/quick_action_icon_read"
-            android:background="?attr/toolbarColor"/>
-    </LinearLayout>
-
     <LinearLayout
         android:orientation="horizontal"
         android:layout_gravity="bottom"
@@ -84,6 +31,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_width="0dp"
+            android:drawableTop="@drawable/quick_action_icon_share"
+            android:drawablePadding="5dp"
             android:textAlignment="center"
             android:textSize="12sp"
             android:textColor="?attr/toolbarTextColor"
@@ -93,6 +42,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_width="0dp"
+            android:drawableTop="@drawable/library_icon_downloads_circle_background"
+            android:drawablePadding="5dp"
             android:textAlignment="center"
             android:textSize="12sp"
             android:textColor="?attr/toolbarTextColor"
@@ -102,6 +53,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_width="0dp"
+            android:drawableTop="@drawable/library_icon_favorites_circle_background"
+            android:drawablePadding="5dp"
             android:textAlignment="center"
             android:textSize="12sp"
             android:textColor="?attr/toolbarTextColor"
@@ -111,6 +64,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_width="0dp"
+            android:drawableTop="@drawable/quick_action_icon_read"
+            android:drawablePadding="5dp"
             android:textAlignment="center"
             android:textSize="12sp"
             android:textColor="?attr/toolbarTextColor"