Skip to content

B
Browser White
Commit 883eadab authored by wanglei's avatar wanglei
Browse files
Options

...

parent 321653a0
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 49 deletions
app/src/main/java/com/base/browserwhite/bean/ConstObject.kt
View file @ 883eadab
......@@ -82,5 +82,12 @@ object ConstObject {
AppPreferences.getInstance().put("mainShowCount", value, true)
}
var webPrivacy = false
get() {
return AppPreferences.getInstance().getBoolean("webPrivacy", field)
}
set(value) {
field = value
AppPreferences.getInstance().put("webPrivacy", value, true)
}
}
\ No newline at end of file
app/src/main/java/com/base/browserwhite/ui/activity/bookmark/BookmarkActivity.kt
View file @ 883eadab
......@@ -28,6 +28,7 @@ class BookmarkActivity : BaseActivity<ActivityBookmarkBinding>() {
private val TAG = "BookmarkActivity"
private var currentTab = BOOKMARK_TAB
private var from: String = ""
override val binding: ActivityBookmarkBinding by lazy {
......@@ -50,18 +51,6 @@ class BookmarkActivity : BaseActivity<ActivityBookmarkBinding>() {
BarUtils.setStatusBarColor(this, Color.WHITE)
binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
binding.viewPager2.run {
adapter = object : FragmentStateAdapter(this@BookmarkActivity) {
override fun getItemCount(): Int {
return fragments.size
}
override fun createFragment(position: Int): Fragment {
return fragments[position]
}
}
}
binding.viewPager2.registerOnPageChangeCallback(object :
ViewPager2.OnPageChangeCallback() {
override fun onPageSelected(position: Int) {
......@@ -74,8 +63,22 @@ class BookmarkActivity : BaseActivity<ActivityBookmarkBinding>() {
}
})
// val page = intent.extras?.getInt("page", 0) ?: 0
// binding.viewPager2.currentItem = page
val adapter = object : FragmentStateAdapter(this@BookmarkActivity) {
override fun getItemCount(): Int {
return fragments.size
}
override fun createFragment(position: Int): Fragment {
return fragments[position]
}
}
binding.viewPager2.adapter = adapter
val page = intent.extras?.getInt("page", 0) ?: 0
binding.viewPager2.currentItem = page
}
override fun initListener() {
......@@ -90,10 +93,10 @@ class BookmarkActivity : BaseActivity<ActivityBookmarkBinding>() {
if (it) {
lastShowInter = System.currentTimeMillis()
}
finishToMain()
finish()
}
} else {
finishToMain()
finish()
}
}
} else {
......@@ -102,24 +105,22 @@ class BookmarkActivity : BaseActivity<ActivityBookmarkBinding>() {
if (it) {
lastShowInter = System.currentTimeMillis()
}
finishToMain()
finish()
}
} else {
finishToMain()
finish()
}
}
}
binding.flFanhui.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
}
binding.tvTabBookmark.setOnClickListener {
if (binding.tvTabBookmark.isSelected) {
return@setOnClickListener
}
binding.viewPager2.currentItem = 0
}
binding.tvTabHistory.setOnClickListener {
if (binding.tvTabHistory.isSelected) {
return@setOnClickListener
......@@ -158,7 +159,6 @@ class BookmarkActivity : BaseActivity<ActivityBookmarkBinding>() {
}
binding.ivDelete.setOnClickListener {
if (currentTab == HISTORY_TAB) {
showDeleteTipDialog(desc = "Clear all browsing history?") {
......@@ -203,9 +203,11 @@ class BookmarkActivity : BaseActivity<ActivityBookmarkBinding>() {
binding.tvCancel.visibility = View.VISIBLE
binding.ivNewFolder.visibility = View.GONE
binding.flOperation.visibility = View.VISIBLE
bookmarkFragment.bookmarkAdapter.showSelector = true
bookmarkFragment.bookmarkAdapter.items.forEach { it.isSelect = false }
bookmarkFragment.bookmarkAdapter.notifyDataSetChanged()
if (bookmarkFragment.isVisible) {
bookmarkFragment.bookmarkAdapter.showSelector = true
bookmarkFragment.bookmarkAdapter.items.forEach { it.isSelect = false }
bookmarkFragment.bookmarkAdapter.notifyDataSetChanged()
}
}
@SuppressLint("NotifyDataSetChanged")
......@@ -215,8 +217,11 @@ class BookmarkActivity : BaseActivity<ActivityBookmarkBinding>() {
binding.flTab.visibility = View.VISIBLE
binding.ivNewFolder.visibility = View.VISIBLE
binding.flOperation.visibility = View.GONE
bookmarkFragment.bookmarkAdapter.showSelector = false
bookmarkFragment.bookmarkAdapter.notifyDataSetChanged()
if (bookmarkFragment.viewInit) {
bookmarkFragment.bookmarkAdapter.showSelector = false
bookmarkFragment.bookmarkAdapter.notifyDataSetChanged()
}
}
companion object {
......
app/src/main/java/com/base/browserwhite/ui/activity/bookmark/BookmarkFragment.kt
View file @ 883eadab
......@@ -28,7 +28,7 @@ class BookmarkFragment : BaseFragment<FragmentBookmarkBinding>() {
lateinit var bookmarkAdapter: BookmarkAdapter
private val bookmarkList = arrayListOf<BookmarkBean>()
private var viewInit: Boolean = false
var viewInit: Boolean = false
@SuppressLint("NotifyDataSetChanged")
override fun setView() {
......
app/src/main/java/com/base/browserwhite/ui/activity/download/DownloadDialog.kt
View file @ 883eadab
......@@ -11,11 +11,15 @@ import android.view.inputmethod.InputMethodManager
import android.widget.TextView
import android.widget.TextView.OnEditorActionListener
import android.widget.Toast
import androidx.core.content.ContentProviderCompat.requireContext
import com.base.browserwhite.R
import com.base.browserwhite.bean.DownloadBean
import com.base.browserwhite.databinding.DialogDownloadConfirmBinding
import com.base.browserwhite.databinding.DialogDownloadFinishBinding
import com.base.browserwhite.databinding.DialogDownloadVideoBinding
import com.base.browserwhite.ui.activity.download.DownloadDialog.showDownloadFinishDialog
import com.base.browserwhite.utils.DownloadUtils
import com.base.browserwhite.utils.DownloadUtils.getDownloadJson
import com.base.browserwhite.utils.KotlinExt.toFormatSize
import com.base.browserwhite.utils.LogEx
import com.bumptech.glide.Glide
......@@ -58,6 +62,17 @@ object DownloadDialog {
dialog.setOnDismissListener {
dismissAction.invoke()
}
adapter.downloadAction = {
dialog.dismiss()
}
adapter.downloadFinishAction = { id ->
dialog.dismiss()
val recordFile = getDownloadJson()
val bean = DownloadUtils.getDownloadJsonBean(recordFile).filter { it.downloadId == id }
showDownloadFinishDialog()
}
binding.tvDownloadDir.setOnClickListener {
dialog.dismiss()
startActivity(Intent(this, WebDownloadManagerActivity::class.java))
......
app/src/main/java/com/base/browserwhite/ui/activity/download/WebDownloadGuideActivity.kt
View file @ 883eadab
......@@ -10,6 +10,8 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
import androidx.viewpager2.widget.ViewPager2
import com.base.browserwhite.R
import com.base.browserwhite.databinding.ActivityWebDownloadGuideBinding
import com.base.browserwhite.help.Constants
import com.base.browserwhite.help.RxBus
import com.base.browserwhite.ui.activity.BaseActivity
import com.base.browserwhite.ui.activity.webbrowser.WebBrowserActivity
import com.base.browserwhite.utils.BarUtils
......@@ -115,10 +117,19 @@ class WebDownloadGuideActivity : BaseActivity<ActivityWebDownloadGuideBinding>()
if (index > 3) return@setOnClickListener
binding.viewPager2.currentItem = index
}
val upDate = intent.extras?.getBoolean("update", false) ?: false
binding.flTry.setOnClickListener {
startActivity(Intent(this, WebBrowserActivity::class.java).apply {
putExtra("url", "https://mixkit.co/free-stock-video/girl-dancing-happily-in-a-field-of-flowers-4702/")
})
if (upDate) {
RxBus.get().post(
Constants.CHANGE_SEARCH_URL,
"https://mixkit.co/free-stock-video/girl-dancing-happily-in-a-field-of-flowers-4702/"
)
} else {
startActivity(Intent(this, WebBrowserActivity::class.java).apply {
putExtra("url", "https://mixkit.co/free-stock-video/girl-dancing-happily-in-a-field-of-flowers-4702/")
})
}
finish()
}
}
......
app/src/main/java/com/base/browserwhite/ui/activity/download/WebDownloadManagerActivity.kt
View file @ 883eadab
......@@ -115,8 +115,11 @@ class WebDownloadManagerActivity : BaseActivity<ActivityWebDownloadManagerBindin
binding.flFanhui.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
}
val update = intent.extras?.getBoolean("update", false) ?: false
binding.tvHowUse.setOnClickListener {
startActivity(Intent(this, WebDownloadGuideActivity::class.java))
startActivity(Intent(this, WebDownloadGuideActivity::class.java).apply {
putExtra("update", update)
})
finish()
}
binding.ivDelete.setOnClickListener {
......
app/src/main/java/com/base/browserwhite/ui/activity/search/SearchActivity.kt
View file @ 883eadab
......@@ -73,7 +73,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
})
lifecycleScope.launch(Dispatchers.IO) {
val list = SpBeanUtils.getSpBeanList(SEARCH_RECORD_SP_KEY).map { Gson().fromJson(it, SearchRecordBean::class.java) }
val old = list.find { TextUtils.equals(it.content , content) }
val old = list.find { TextUtils.equals(it.content, content) }
if (old != null) {
SpBeanUtils.deleteSpBeanCondition(SEARCH_RECORD_SP_KEY, old.id)
}
......@@ -182,13 +182,13 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
}
binding.editWeb.requestFocus()
binding.root.postDelayed({
binding.editWeb.postDelayed({
binding.editWeb.requestFocus()
binding.editWeb.selectAll()
val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
imm.showSoftInput(binding.editWeb, InputMethodManager.SHOW_IMPLICIT)
}, 500)
}, 400)
binding.editWeb.setOnClickListener {
......
app/src/main/java/com/base/browserwhite/ui/activity/webbrowser/WebBrowserActivity.kt
View file @ 883eadab
......@@ -34,9 +34,11 @@ import com.base.browserwhite.help.RxBus
import com.base.browserwhite.ui.activity.BaseActivity
import com.base.browserwhite.ui.activity.bookmark.BookmarkActivity
import com.base.browserwhite.ui.activity.bookmark.BookmarkEditActivity
import com.base.browserwhite.ui.activity.download.WebDownloadManagerActivity
import com.base.browserwhite.ui.activity.search.SearchActivity
import com.base.browserwhite.ui.views.DialogViews.showAddRootBookmarkDialog
import com.base.browserwhite.ui.views.DialogViews.showDeleteTipDialog
import com.base.browserwhite.ui.views.DialogViews.showMyAccountDialog
import com.base.browserwhite.ui.views.DialogViews.showSearchEngineDialog
import com.base.browserwhite.ui.views.DialogViews.showWebBrowserMoreDialog
import com.base.browserwhite.utils.BarUtils
......@@ -279,7 +281,14 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
startActivity(Intent(this, BookmarkActivity::class.java).apply {
putExtra("page", 1)
})
finish()
},
downloadAction = {
startActivity(Intent(this, WebDownloadManagerActivity::class.java).apply {
putExtra("update", true)
})
},
settingAction = {
showMyAccountDialog(launcher)
}
)
......
app/src/main/java/com/base/browserwhite/ui/activity/webbrowser/WebViewFragment.kt
View file @ 883eadab
......@@ -113,15 +113,6 @@ class WebViewFragment : BaseFragment<FragmentWebViewBinding>() {
)
}
}
downloadAdapter?.downloadAction = {
downloadDialog?.dismiss()
}
downloadAdapter?.downloadFinishAction = { id ->
downloadDialog?.dismiss()
val recordFile = requireContext().getDownloadJson()
val bean = DownloadUtils.getDownloadJsonBean(recordFile).filter { it.downloadId == id }
requireContext().showDownloadFinishDialog()
}
}
......
app/src/main/java/com/base/browserwhite/ui/views/DialogViews.kt
View file @ 883eadab
......@@ -21,6 +21,7 @@ import com.base.browserwhite.bean.ConstObject.GOOGLE
import com.base.browserwhite.bean.ConstObject.YAHOO
import com.base.browserwhite.bean.ConstObject.YANDEX
import com.base.browserwhite.bean.ConstObject.searchEngineSp
import com.base.browserwhite.bean.ConstObject.webPrivacy
import com.base.browserwhite.databinding.DialogBookmarkAddedRootBinding
import com.base.browserwhite.databinding.DialogCleanerReocordBinding
import com.base.browserwhite.databinding.DialogDefaultBrowserBinding
......@@ -336,6 +337,8 @@ object DialogViews {
joinAction: (() -> Unit)? = null,//加入书签
refreshAction: (() -> Unit)? = null,//刷新
historyAction: (() -> Unit)? = null,//历史记录
downloadAction: (() -> Unit)? = null,//下载
settingAction: (() -> Unit)? = null,
) {
val dialog = BottomSheetDialog(this, R.style.BottomSheetDialog)
......@@ -382,7 +385,22 @@ object DialogViews {
historyAction?.invoke()
}
}
binding.clDownload.setOnClickListener {
dialog.dismiss()
downloadAction?.invoke()
}
binding.clSettings.setOnClickListener {
dialog.dismiss()
settingAction?.invoke()
}
binding.clOff.setOnClickListener {
dialog.dismiss()
}
binding.switchTraceless.isChecked = webPrivacy
binding.switchTraceless.setOnCheckedChangeListener { buttonView, isChecked ->
webPrivacy = isChecked
}
}
fun Context.showAddRootBookmarkDialog(editAction: () -> Unit): BottomSheetDialog {
......
app/src/main/res/layout/dialog_more_webbrowser.xml
View file @ 883eadab
......@@ -165,7 +165,7 @@
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/tv_switch_traceless"
android:id="@+id/switch_traceless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
......
app/src/main/res/layout/fragment_home.xml
View file @ 883eadab
......@@ -138,7 +138,7 @@
android:layout_marginHorizontal="5dp"
android:background="@null"
android:gravity="center_vertical"
android:hint="Search or enter website address"
android:hint="Search or type a URL"
android:imeOptions="actionDone"
android:inputType="textUri"
android:paddingHorizontal="5dp"
......
app/src/main/res/layout/item_searchrecord.xml
View file @ 883eadab
......@@ -8,16 +8,17 @@
android:background="@drawable/bg_eef1f6_100">
<TextView
android:visibility="gone"
android:gravity="center"
android:id="@+id/tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:ellipsize="end"
android:includeFontPadding="false"
android:paddingHorizontal="15dp"
android:singleLine="true"
android:textColor="@color/black"
android:visibility="gone"
tools:text="www.youtube.com" />
<ImageView
......
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