From f82e6fc49c053b2a819f9712d92235f95e459508 Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Mon, 22 Apr 2019 17:06:58 -0700
Subject: [PATCH] [fenix] Closes
 https://github.com/mozilla-mobile/fenix/issues/1912 - Quick action bottom
 sheet should fade in

---
 .../quickactionsheet/QuickActionUIView.kt     |  11 +-
 .../res/layout/layout_quick_action_sheet.xml  | 161 ++++++++++--------
 2 files changed, 96 insertions(+), 76 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionUIView.kt b/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionUIView.kt
index 7a7d26a334..88e8084a9f 100644
--- a/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/quickactionsheet/QuickActionUIView.kt
@@ -14,6 +14,7 @@ import io.reactivex.Observable
 import io.reactivex.Observer
 import io.reactivex.functions.Consumer
 import kotlinx.android.synthetic.main.fragment_browser.*
+import kotlinx.android.synthetic.main.layout_quick_action_sheet.*
 import kotlinx.android.synthetic.main.layout_quick_action_sheet.view.*
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.metrics.Event
@@ -45,7 +46,8 @@ class QuickActionUIView(
                 }
             }
 
-            override fun onSlide(p0: View, p1: Float) {
+            override fun onSlide(bottomSheet: View, slideOffset: Float) {
+                animateOverlay(slideOffset)
             }
         })
 
@@ -69,6 +71,13 @@ class QuickActionUIView(
         }
     }
 
+    /**
+     * Changes alpha of overlay based on new offset of this sheet within [-1,1] range.
+     */
+    private fun animateOverlay(offset: Float) {
+        overlay.alpha = (1 - offset)
+    }
+
     private fun updateImportantForAccessibility(state: Int) {
         view.findViewById<LinearLayout>(R.id.quick_action_buttons_layout).importantForAccessibility =
                 if (state == BottomSheetBehavior.STATE_COLLAPSED || state == BottomSheetBehavior.STATE_HIDDEN)
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 283135e724..1abfb0a2ff 100644
--- a/app/src/main/res/layout/layout_quick_action_sheet.xml
+++ b/app/src/main/res/layout/layout_quick_action_sheet.xml
@@ -2,90 +2,101 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/quick_action_sheet"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?foundation"
-    android:orientation="vertical">
-
-    <View
-        android:focusable="false"
-        android:background="?attr/neutral"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"/>
-
-    <ImageButton
-        android:paddingTop="7dp"
-        android:id="@+id/quick_action_sheet_handle"
-        android:layout_width="match_parent"
-        android:layout_height="12dp"
-        android:background="@null"
-        android:contentDescription="@string/quick_action_sheet_handle"
-        android:src="@drawable/ic_drawer_pull_tab" />
+    android:layout_height="wrap_content">
 
     <LinearLayout
-        android:id="@+id/quick_action_buttons_layout"
-        android:layout_marginBottom="12dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:background="@null"
-        android:orientation="horizontal">
+        android:background="?foundation"
+        android:orientation="vertical">
 
-        <Button
-            android:id="@+id/quick_action_share"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="?selectableItemBackgroundBorderless"
-            android:drawableTop="@drawable/quick_action_icon_share"
-            android:drawablePadding="5dp"
-            android:text="@string/quick_action_share"
-            android:textAllCaps="false"
-            android:textColor="?primaryText"
-            android:textSize="12sp" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?attr/neutral"
+            android:focusable="false" />
 
-        <Button
-            android:id="@+id/quick_action_downloads"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="?selectableItemBackgroundBorderless"
-            android:drawableTop="@drawable/library_icon_downloads_circle_background"
-            android:drawablePadding="5dp"
-            android:text="@string/quick_action_download"
-            android:textAllCaps="false"
-            android:textColor="?primaryText"
-            android:textSize="12sp"
-            android:visibility="gone" />
+        <ImageButton
+            android:id="@+id/quick_action_sheet_handle"
+            android:layout_width="match_parent"
+            android:layout_height="12dp"
+            android:background="@null"
+            android:contentDescription="@string/quick_action_sheet_handle"
+            android:paddingTop="7dp"
+            android:src="@drawable/ic_drawer_pull_tab" />
 
-        <Button
-            android:id="@+id/quick_action_bookmark"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:id="@+id/quick_action_buttons_layout"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="?selectableItemBackgroundBorderless"
-            android:drawableTop="@drawable/library_icon_bookmarks_circle_background"
-            android:drawablePadding="5dp"
-            android:text="@string/quick_action_bookmark"
-            android:textAllCaps="false"
-            android:textColor="?primaryText"
-            android:textSize="12sp" />
+            android:layout_gravity="bottom"
+            android:layout_marginBottom="12dp"
+            android:background="@null"
+            android:orientation="horizontal">
 
-        <Button
-            android:id="@+id/quick_action_read"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="?selectableItemBackgroundBorderless"
-            android:drawableTop="@drawable/quick_action_icon_read"
-            android:drawablePadding="5dp"
-            android:text="@string/quick_action_read"
-            android:textAllCaps="false"
-            android:textColor="?primaryText"
-            android:textSize="12sp"
-            android:visibility="gone" />
+            <Button
+                android:id="@+id/quick_action_share"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="?selectableItemBackgroundBorderless"
+                android:drawableTop="@drawable/quick_action_icon_share"
+                android:drawablePadding="5dp"
+                android:text="@string/quick_action_share"
+                android:textAllCaps="false"
+                android:textColor="?primaryText"
+                android:textSize="12sp" />
+
+            <Button
+                android:id="@+id/quick_action_downloads"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="?selectableItemBackgroundBorderless"
+                android:drawableTop="@drawable/library_icon_downloads_circle_background"
+                android:drawablePadding="5dp"
+                android:text="@string/quick_action_download"
+                android:textAllCaps="false"
+                android:textColor="?primaryText"
+                android:textSize="12sp"
+                android:visibility="gone" />
+
+            <Button
+                android:id="@+id/quick_action_bookmark"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="?selectableItemBackgroundBorderless"
+                android:drawableTop="@drawable/library_icon_bookmarks_circle_background"
+                android:drawablePadding="5dp"
+                android:text="@string/quick_action_bookmark"
+                android:textAllCaps="false"
+                android:textColor="?primaryText"
+                android:textSize="12sp" />
+
+            <Button
+                android:id="@+id/quick_action_read"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="?selectableItemBackgroundBorderless"
+                android:drawableTop="@drawable/quick_action_icon_read"
+                android:drawablePadding="5dp"
+                android:text="@string/quick_action_read"
+                android:textAllCaps="false"
+                android:textColor="?primaryText"
+                android:textSize="12sp"
+                android:visibility="gone" />
+        </LinearLayout>
     </LinearLayout>
-</LinearLayout>
+
+    <View
+        android:id="@+id/overlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:alpha="1.0"
+        android:background="?foundation" />
+</FrameLayout>