Commit 1db8f65d authored by wanglei's avatar wanglei

...

parent 6945a95b
...@@ -14,9 +14,11 @@ import com.base.browserwhite.bean.BookmarkBean ...@@ -14,9 +14,11 @@ import com.base.browserwhite.bean.BookmarkBean
import com.base.browserwhite.databinding.ActivityBookmarkBinding import com.base.browserwhite.databinding.ActivityBookmarkBinding
import com.base.browserwhite.ui.activity.BaseActivity import com.base.browserwhite.ui.activity.BaseActivity
import com.base.browserwhite.ui.activity.bookmark.BookmarkFolderActivity.Companion.selectFolder import com.base.browserwhite.ui.activity.bookmark.BookmarkFolderActivity.Companion.selectFolder
import com.base.browserwhite.ui.views.DialogViews.showDeleteTipDialog
import com.base.browserwhite.utils.BarUtils import com.base.browserwhite.utils.BarUtils
import com.base.browserwhite.utils.SpBeanUtils import com.base.browserwhite.utils.SpBeanUtils
import com.base.browserwhite.utils.SpBeanUtils.BOOKMARK_SP_KEY import com.base.browserwhite.utils.SpBeanUtils.BOOKMARK_SP_KEY
import com.base.browserwhite.utils.SpBeanUtils.HISTORY_SP_KEY
import com.base.browserwhite.utils.ToastUtils.toast import com.base.browserwhite.utils.ToastUtils.toast
import com.google.gson.Gson import com.google.gson.Gson
...@@ -133,6 +135,15 @@ class BookmarkActivity : BaseActivity<ActivityBookmarkBinding>() { ...@@ -133,6 +135,15 @@ class BookmarkActivity : BaseActivity<ActivityBookmarkBinding>() {
} }
binding.ivDelete.setOnClickListener {
if (currentTab == HISTORY_TAB) {
showDeleteTipDialog(desc = "Clear all browsing history?") {
SpBeanUtils.clearSpBean(HISTORY_SP_KEY)
historyFragment.initData()
}
}
}
} }
......
...@@ -23,8 +23,10 @@ class HistoryAdapter : BaseQuickAdapter<HistoryBean, HistoryAdapter.HistoryViewH ...@@ -23,8 +23,10 @@ class HistoryAdapter : BaseQuickAdapter<HistoryBean, HistoryAdapter.HistoryViewH
val binding = ItemBookmarkHistoryBinding.bind(holder.itemView) val binding = ItemBookmarkHistoryBinding.bind(holder.itemView)
binding.flTime.isVisible = item.showTime binding.flTime.isVisible = item.showTime
binding.tvLetters.background = ColorDrawable(item.color) binding.tvLetters.background = ColorDrawable(item.color)
binding.tvLetters.text = item.name.first().toString() if (item.name.isNotEmpty()) {
binding.tvName.text = item.name binding.tvLetters.text = item.name.first().toString()
binding.tvName.text = item.name
}
binding.flOpeartion.setOnClickListener { binding.flOpeartion.setOnClickListener {
moreAction?.invoke(item) moreAction?.invoke(item)
} }
......
...@@ -36,10 +36,11 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>() { ...@@ -36,10 +36,11 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>() {
val gson = Gson() val gson = Gson()
val item = list.map { gson.fromJson(it, HistoryBean::class.java) } val item = list.map { gson.fromJson(it, HistoryBean::class.java) }
val time = "" var time = ""
item.sortedBy { it.time }.forEach { item.sortedBy { it.time }.forEach {
if (time != it.time.toFormatTime()) { if (time != it.time.toFormatTime()) {
it.showTime = true it.showTime = true
time = it.time.toFormatTime()
} }
historyList.add(it) historyList.add(it)
} }
......
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