Commit 343fd8a9 authored by wanglei's avatar wanglei

...

parent e7adf50f
......@@ -37,8 +37,7 @@ class BookmarkFragment : BaseFragment<FragmentBookmarkBinding>() {
}
bookmarkAdapter.moreAction = { view, bean ->
requireContext().showBookmarkMoreDialog(
view,
bean.isFolder,
view, 0,
//新开
openNewTab = {
startActivity(Intent(requireContext(), WebBrowserActivity::class.java).apply {
......
......@@ -15,7 +15,7 @@ import com.chad.library.adapter4.BaseQuickAdapter
class HistoryAdapter : BaseQuickAdapter<HistoryBean, HistoryAdapter.HistoryViewHolder>() {
inner class HistoryViewHolder(view: View) : ViewHolder(view)
var moreAction: ((item: HistoryBean) -> Unit)? = null
var moreAction: ((view: View,item: HistoryBean) -> Unit)? = null
override fun onBindViewHolder(holder: HistoryViewHolder, position: Int, item: HistoryBean?) {
if (item == null) return
......@@ -28,7 +28,7 @@ class HistoryAdapter : BaseQuickAdapter<HistoryBean, HistoryAdapter.HistoryViewH
binding.tvName.text = item.name
}
binding.flOpeartion.setOnClickListener {
moreAction?.invoke(item)
moreAction?.invoke(it,item)
}
}
......
......@@ -4,6 +4,7 @@ import androidx.core.view.isVisible
import com.base.browserwhite.bean.HistoryBean
import com.base.browserwhite.databinding.FragmentHistoryBinding
import com.base.browserwhite.ui.fragment.BaseFragment
import com.base.browserwhite.ui.views.BookmarkDialog.showBookmarkMoreDialog
import com.base.browserwhite.utils.KotlinExt.toFormatTime
import com.base.browserwhite.utils.SpBeanUtils
import com.google.gson.Gson
......@@ -24,8 +25,14 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>() {
override fun setView() {
historyAdapter = HistoryAdapter()
historyAdapter.moreAction={
historyAdapter.moreAction = { view, item ->
requireContext().showBookmarkMoreDialog(
view, 1,
deleteAction = {
},
editAction = {},
selectAction = {})
}
binding.rv.adapter = historyAdapter
......
......@@ -13,7 +13,7 @@ object BookmarkDialog {
fun Context.showBookmarkMoreDialog(
anchorView: View,
isDir: Boolean,
uiType: Int = -1,//-1所有展示
openNewTab: (() -> Unit)? = null,
deleteAction: (() -> Unit)? = null,
editAction: (() -> Unit)? = null,
......@@ -40,15 +40,35 @@ object BookmarkDialog {
params?.y = location[1] - resources.getDimensionPixelOffset(R.dimen.dp_150)
dialog.window?.attributes = params
if (isDir) {
binding.llOpenNewTab.visibility = View.GONE
binding.vOpenNewTab.visibility = View.GONE
when (uiType) {
-1 -> {
binding.llAddBookmark.visibility = View.GONE
}
binding.llAddNavigation.visibility = View.GONE
binding.vAddNavigation.visibility = View.GONE
0 -> {
binding.llOpenNewTab.visibility = View.GONE
binding.vOpenNewTab.visibility = View.GONE
binding.llAddBookmark.visibility = View.GONE
binding.vAddBookmark.visibility = View.GONE
binding.llAddNavigation.visibility = View.GONE
binding.vAddNavigation.visibility = View.GONE
binding.llAddDesktop.visibility = View.GONE
binding.vAddDesktop.visibility = View.GONE
}
1 -> {
binding.llOpenNewTab.visibility = View.GONE
binding.vOpenNewTab.visibility = View.GONE
binding.llEdit.visibility = View.GONE
binding.vEdit.visibility = View.GONE
binding.llSelect.visibility = View.GONE
}
binding.llAddDesktop.visibility = View.GONE
binding.vAddDesktop.visibility = View.GONE
}
binding.llOpenNewTab.setOnClickListener {
......
......@@ -136,7 +136,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_flow"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="260dp"
android:padding="15dp"
android:visibility="gone" />
......
......@@ -44,6 +44,7 @@
android:textColor="#010101"
android:textSize="16sp"
tools:ignore="HardcodedText" />
</LinearLayout>
<View
......@@ -116,6 +117,42 @@
</LinearLayout>
<View
android:id="@+id/v_edit"
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginHorizontal="20dp"
android:background="#E5E6EB" />
<LinearLayout
android:id="@+id/ll_add_bookmark"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="8dp"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
tools:ignore="UseCompoundDrawables">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="12dp"
android:src="@mipmap/b_join"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="10dp"
android:text="Add to Bookmark"
android:textColor="#010101"
android:textSize="16sp"
tools:ignore="HardcodedText" />
</LinearLayout>
<View
android:id="@+id/v_add_bookmark"
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginHorizontal="20dp"
......
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