...

app/src/main/java/com/base/browserwhite/ui/activity/search/SearchActivity.kt

@@ -21,7 +21,6 @@ import com.base.browserwhite.databinding.ActivitySearchBinding
 import com.base.browserwhite.help.SearchTipUtils.getSearchTip
 import com.base.browserwhite.ui.activity.BaseActivity
 import com.base.browserwhite.ui.activity.webbrowser.WebBrowserActivity
-import com.base.browserwhite.utils.BarUtils.getStatusBarHeight
 import com.base.browserwhite.utils.BarUtils.setStatusBarColor
 import com.base.browserwhite.utils.BarUtils.setStatusBarLightMode
 import com.base.browserwhite.utils.LinkSearchUtils
@@ -79,21 +78,28 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
             if (it.isNullOrEmpty()) {
                 binding.llFastInput2.visibility = View.GONE
                 binding.llFastInput1.visibility = View.VISIBLE
+                binding.tvCancel.visibility = View.VISIBLE
+                binding.ivClear.visibility = View.GONE
+                binding.tvSearch.visibility = View.GONE
                 return@addTextChangedListener
             }
-            binding.flSearch.isVisible = it.toString().isNotEmpty()
+            binding.tvCancel.visibility = View.GONE
+            binding.ivClear.visibility = View.VISIBLE
+            binding.tvSearch.visibility = View.VISIBLE
+
             searchAdapter.submitList(listOf())
             querySearchTip(it.toString())
         }
 
         binding.editWeb.setOnClickListener {
-//            aaa()
             binding.editWeb.selectAll()
         }
         binding.ivClear.setOnClickListener {
             binding.editWeb.setText("")
-            binding.flSearch.visibility = View.GONE
             searchAdapter.submitList(listOf())
+            binding.ivClear.visibility = View.GONE
+            binding.tvSearch.visibility = View.GONE
+            binding.tvCancel.visibility = View.VISIBLE
         }
         binding.tvSearch.setOnClickListener {
             val content = binding.editWeb.text.toString()
@@ -114,6 +120,9 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
                 binding.editWeb.append((textView as TextView).text)
             }
         }
+        binding.tvCancel.setOnClickListener {
+            onBackPressed()
+        }
     }
 
     private fun querySearchTip(query: String) {

app/src/main/java/com/base/browserwhite/ui/fragment/HomeFragment.kt

@@ -5,6 +5,7 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.text.TextUtils
 import android.view.KeyEvent
+import android.view.View
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
 import android.widget.TextView
 import android.widget.Toast
@@ -187,6 +188,8 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
         }
         y = binding.searchLayout.translationY
         binding.editWeb.setOnClickListener {
+            binding.tvCancel.visibility = View.VISIBLE
+            binding.flScan.visibility = View.GONE
             SearchActivity.startActivityWithButtonAnimation(requireActivity(), binding.searchLayout, verticalOffset)
         }
         requestMore()
@@ -227,6 +230,8 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
         )
         animator.setDuration(500)
         animator.start()
+        binding.tvCancel.visibility = View.GONE
+        binding.flScan.visibility = View.VISIBLE
     }
 
     override fun onResume() {

app/src/main/res/layout/activity_search.xml

@@ -74,11 +74,10 @@
             android:id="@+id/fl_search"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="10dp"
+            android:layout_marginEnd="9.5dp"
             android:background="?android:attr/selectableItemBackground"
             android:orientation="horizontal"
             android:padding="5dp"
-            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -89,7 +88,8 @@
                 android:id="@+id/iv_clear"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@mipmap/s_guanbi" />
+                android:src="@mipmap/s_guanbi"
+                android:visibility="gone" />
 
             <TextView
                 android:id="@+id/tv_search"
@@ -100,6 +100,17 @@
                 android:text="Search"
                 android:textColor="#0571ED"
                 android:textSize="16sp"
+                android:visibility="gone"
+                tools:ignore="HardcodedText" />
+
+            <TextView
+                android:id="@+id/tv_cancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="Cancel"
+                android:textColor="#0571ED"
+                android:textSize="16sp"
                 tools:ignore="HardcodedText" />
         </LinearLayout>
 

app/src/main/res/layout/fragment_home.xml

@@ -84,8 +84,8 @@
             android:id="@+id/searchLayout"
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:background="@color/white"
             android:layout_marginTop="16dp"
+            android:background="@color/white"
             android:gravity="center"
             android:orientation="horizontal">
 
@@ -147,7 +147,7 @@
                     android:textSize="14sp"
                     app:layout_constraintEnd_toStartOf="@id/fl_scan"
                     app:layout_constraintStart_toEndOf="@id/fl_search_engine"
-                    tools:ignore="Autofill,HardcodedText,TextFields" />
+                    tools:ignore="Autofill,HardcodedText,TextFields,TextViewEdits" />
 
                 <FrameLayout
                     android:id="@+id/fl_scan"
@@ -167,7 +167,24 @@
                         android:src="@mipmap/saoyisao" />
 
                 </FrameLayout>
+
+                <TextView
+                    android:layout_marginEnd="15dp"
+                    android:id="@+id/tv_cancel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Cancel"
+                    android:textColor="#0571ED"
+                    android:textSize="16sp"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:ignore="HardcodedText" />
+
             </androidx.constraintlayout.widget.ConstraintLayout>
+
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </com.google.android.material.appbar.AppBarLayout>