Commit 9a090134 authored by wanglei's avatar wanglei

...

parent e6b293fc
......@@ -356,9 +356,17 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
},
offAction = {
finishToMain()
},
pageSearchAction = {
binding.clBottom.visibility = View.GONE
binding.llPageSearch.visibility = View.VISIBLE
}
)
}
binding.ivPageSearchClose.setOnClickListener {
binding.llPageSearch.visibility = View.GONE
binding.clBottom.visibility = View.VISIBLE
}
}
......
......@@ -343,6 +343,7 @@ object DialogViews {
settingAction: (() -> Unit)? = null,
offAction: (() -> Unit)? = null,
privacyAction: (() -> Unit)? = null,//隐私模式
pageSearchAction: (() -> Unit)? = null,//页内搜索
) {
val dialog = BottomSheetDialog(this, R.style.BottomSheetDialog)
......@@ -412,6 +413,10 @@ object DialogViews {
}
privacyAction?.invoke()
}
binding.clInsideSearch.setOnClickListener {
dialog.dismiss()
pageSearchAction?.invoke()
}
}
fun Context.showAddRootBookmarkDialog(editAction: () -> Unit): BottomSheetDialog {
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1.5dp"
android:color="#070709" />
<corners android:radius="20dp" />
</shape>
\ No newline at end of file
......@@ -193,6 +193,7 @@
<LinearLayout
android:visibility="gone"
android:id="@+id/ll_page_search"
android:layout_width="match_parent"
android:layout_height="56dp"
......@@ -200,23 +201,67 @@
app:layout_constraintBottom_toBottomOf="parent">
<ImageView
android:id="@+id/iv_page_search_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="15dp"
android:src="@mipmap/guanbi_page_search" />
android:src="@mipmap/guanbi_page_search"
tools:ignore="ContentDescription" />
<FrameLayout
<LinearLayout
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_gravity="center_vertical"
android:layout_weight="1" >
android:layout_marginStart="5dp"
android:layout_weight="1"
android:background="@drawable/bg_storke_070709_20"
android:orientation="horizontal">
<EditText
android:id="@+id/edit_page_search"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginHorizontal="15dp"
android:layout_weight="1"
android:background="@null"
android:drawableStart="@mipmap/sousuoicon_page_search"
android:drawablePadding="5dp"
android:hint="Search"
android:singleLine="true"
android:textSize="16sp"
tools:ignore="Autofill,HardcodedText,NestedWeights,TextFields" />
</FrameLayout>
<TextView
android:id="@+id/tv_page_search_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="20dp"
android:text="0/0"
tools:ignore="HardcodedText" />
</LinearLayout>
<ImageView
android:id="@+id/iv_left_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:src="@mipmap/left_page_search"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/iv_right_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:src="@mipmap/right_page_search"
tools:ignore="ContentDescription" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment