From d5089057f3996caad8736b1e8c9620098b4f080a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Thu, 23 Jan 2025 16:37:41 +0100
Subject: [PATCH] added timing to the fade in

---
 .../app/browser/omnibar/OmnibarLayout.kt        |  4 +++-
 .../main/res/layout/view_new_omnibar_bottom.xml | 11 +++++++----
 .../duckduckgo/common/ui/view/ViewExtension.kt  | 17 +++++++++--------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarLayout.kt b/app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarLayout.kt
index 0c98c00e79c9..e343f22b812a 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarLayout.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarLayout.kt
@@ -469,13 +469,15 @@ class OmnibarLayout @JvmOverloads constructor(
     }
 
     private fun renderButtons(viewState: ViewState) {
-        clearTextButton.isVisible = viewState.showClearButton
+        // clearTextButton.isVisible = viewState.showClearButton
         voiceSearchButton.isVisible = viewState.showVoiceSearch
         spacer.isVisible = viewState.showVoiceSearch && viewState.showClearButton
 
         tabsMenu.animateVisibility(viewState.showTabsMenu)
         fireIconMenu.animateVisibility(viewState.showFireIcon)
         browserMenu.animateVisibility(viewState.showBrowserMenu)
+
+        clearTextButton.animateVisibility(viewState.showClearButton, 600)
         aiChatMenu.animateVisibility(viewState.showChatMenu)
 
         // clearTextButton.isVisible = viewState.showClearButton
diff --git a/app/src/main/res/layout/view_new_omnibar_bottom.xml b/app/src/main/res/layout/view_new_omnibar_bottom.xml
index ca88bb68b40d..c3cd12d4a10d 100644
--- a/app/src/main/res/layout/view_new_omnibar_bottom.xml
+++ b/app/src/main/res/layout/view_new_omnibar_bottom.xml
@@ -270,14 +270,17 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:visibility="visible">
 
-            <ImageView
+            <com.duckduckgo.common.ui.view.text.DaxTextView
                 android:id="@+id/aiChatIconImageView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/browserPopupMenu"
-                android:src="@drawable/ic_ai_chat_outline_24" />
+                android:drawableStart="@drawable/ic_ai_chat_outline_24"
+                android:drawablePadding="@dimen/keyline_1"
+                app:typography="body1_bold"
+                android:text="Ask"
+                android:background="?attr/selectableItemBackgroundBorderless" />
+
         </FrameLayout>
 
         <FrameLayout
diff --git a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/ViewExtension.kt b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/ViewExtension.kt
index 64ad20cca7ef..c4154efb9a12 100644
--- a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/ViewExtension.kt
+++ b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/ViewExtension.kt
@@ -61,10 +61,10 @@ fun View.gone(): View {
     return this
 }
 
-fun View.animateVisibility(visible: Boolean) {
+fun View.animateVisibility(visible: Boolean, duration: Long = 350) {
     if (visible) {
         if (!isVisible) {
-            fadeIn()
+            fadeIn(duration)
         }
     } else {
         if (isVisible) {
@@ -73,21 +73,22 @@ fun View.animateVisibility(visible: Boolean) {
     }
 }
 
-fun View.fadeIn() {
+fun View.fadeIn(duration: Long = 350) {
     visibility = View.VISIBLE
     val fadeIn = ObjectAnimator.ofFloat(this, "alpha", 0f, 1f)
-    fadeIn.duration = 350 // Duration in milliseconds
+    fadeIn.duration = duration
     fadeIn.start()
 }
 
-fun View.fadeOut() {
+fun View.fadeOut(duration: Long = 200) {
     val fadeOut = ObjectAnimator.ofFloat(this, "alpha", 1f, 0f)
-    fadeOut.duration = 100 // Duration in milliseconds
+    fadeOut.duration = duration // Duration in milliseconds
     fadeOut.addListener(object : AnimatorListenerAdapter() {
         override fun onAnimationEnd(animation: Animator) {
-            visibility = View.GONE // Set visibility to gone after fade out
+            visibility = View.GONE
         }
-    },)
+    },
+    )
     fadeOut.start()
 }