Skip to content

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

...

parent 515d226d
Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 103 deletions
app/src/main/java/com/base/browserwhite/ui/activity/bookmark/HistoryAdapter.kt
View file @ f1dbcbd0
...@@ -25,11 +25,16 @@ class HistoryAdapter : BaseQuickAdapter<HistoryBean, HistoryAdapter.HistoryViewH ...@@ -25,11 +25,16 @@ class HistoryAdapter : BaseQuickAdapter<HistoryBean, HistoryAdapter.HistoryViewH
if (item == null) return if (item == null) return
val binding = ItemBookmarkHistoryBinding.bind(holder.itemView) val binding = ItemBookmarkHistoryBinding.bind(holder.itemView)
binding.flTime.isVisible = item.showTime binding.llTime.isVisible = item.showTime
runCatching {
if (binding.llTime.isVisible) {
binding.vFenge.isVisible = item != items.first()
}
}
if (System.currentTimeMillis().toFormatTime() == item.time.toFormatTime()) { if (System.currentTimeMillis().toFormatTime() == item.time.toFormatTime()) {
binding.tvTime.text = "Today" binding.tvTime.text = "Today"
} else { } else {
binding.tvTime.text = item.time.toFormatTime() binding.tvTime.text = item.time.toFormatTime()
} }
......
app/src/main/java/com/base/browserwhite/ui/activity/bookmark/HistoryFragment.kt
View file @ f1dbcbd0
...@@ -86,6 +86,7 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>() { ...@@ -86,6 +86,7 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>() {
binding.llEmpty.isVisible = list.isEmpty() binding.llEmpty.isVisible = list.isEmpty()
historyAdapter.submitList(list) historyAdapter.submitList(list)
} }
private fun filterList(content: String) { private fun filterList(content: String) {
val filterList = historyList.filter { it.name.contains(content) } val filterList = historyList.filter { it.name.contains(content) }
binding.llEmpty.isVisible = filterList.isEmpty() binding.llEmpty.isVisible = filterList.isEmpty()
...@@ -100,7 +101,7 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>() { ...@@ -100,7 +101,7 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>() {
val item = list.map { gson.fromJson(it, HistoryBean::class.java) } val item = list.map { gson.fromJson(it, HistoryBean::class.java) }
var time = "" var time = ""
item.sortedBy { it.time }.forEach { item.reversed().forEach {
if (time != it.time.toFormatTime()) { if (time != it.time.toFormatTime()) {
it.showTime = true it.showTime = true
time = it.time.toFormatTime() time = it.time.toFormatTime()
......
app/src/main/java/com/base/browserwhite/ui/activity/search/SearchActivity.kt
View file @ f1dbcbd0
...@@ -147,12 +147,13 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() { ...@@ -147,12 +147,13 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
binding.ivClear.visibility = View.VISIBLE binding.ivClear.visibility = View.VISIBLE
searchContent = "" searchContent = ""
isHomeSearch = false isHomeSearch = false
binding.root.postDelayed({
val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
imm.showSoftInput(binding.editWeb, InputMethodManager.SHOW_IMPLICIT)
}, 800)
} }
binding.root.postDelayed({
val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
imm.showSoftInput(binding.editWeb, InputMethodManager.SHOW_IMPLICIT)
}, 800)
binding.editWeb.setOnClickListener { binding.editWeb.setOnClickListener {
binding.editWeb.selectAll() binding.editWeb.selectAll()
......
app/src/main/java/com/base/browserwhite/ui/activity/webbrowser/WebBrowserActivity.kt
View file @ f1dbcbd0
...@@ -249,6 +249,9 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() { ...@@ -249,6 +249,9 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
shareIntent.setAction(Intent.ACTION_SEND) shareIntent.setAction(Intent.ACTION_SEND)
shareIntent.putExtra(Intent.EXTRA_TEXT, currentFragment?.url) shareIntent.putExtra(Intent.EXTRA_TEXT, currentFragment?.url)
shareIntent.setType("text/plain") shareIntent.setType("text/plain")
runCatching {
startActivity(shareIntent)
}
} }
binding.editWeb.setOnFocusChangeListener { v, hasFocus -> binding.editWeb.setOnFocusChangeListener { v, hasFocus ->
if (hasFocus) { if (hasFocus) {
......
app/src/main/res/layout/activity_search.xml
View file @ f1dbcbd0
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="-2dp" android:layout_marginEnd="-3dp"
android:layout_marginBottom="-2dp" android:layout_marginBottom="-3dp"
android:src="@mipmap/xuanze" android:src="@mipmap/xuanze"
app:layout_constraintBottom_toBottomOf="@id/fl_search_engine" app:layout_constraintBottom_toBottomOf="@id/fl_search_engine"
app:layout_constraintEnd_toEndOf="@id/fl_search_engine" app:layout_constraintEnd_toEndOf="@id/fl_search_engine"
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
<EditText <EditText
android:selectAllOnFocus="true"
android:id="@+id/edit_web" android:id="@+id/edit_web"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
...@@ -66,6 +65,7 @@ ...@@ -66,6 +65,7 @@
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:inputType="textUri" android:inputType="textUri"
android:paddingHorizontal="5dp" android:paddingHorizontal="5dp"
android:selectAllOnFocus="true"
android:singleLine="true" android:singleLine="true"
android:textColorHint="#858587" android:textColorHint="#858587"
android:textSize="14sp" android:textSize="14sp"
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="Cancel" android:text="Cancel"
android:textColor="#0571ED" android:textColor="@color/black"
android:textSize="16sp" android:textSize="16sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/activity_web_browser.xml
View file @ f1dbcbd0
...@@ -5,15 +5,16 @@ ...@@ -5,15 +5,16 @@
android:id="@+id/main" android:id="@+id/main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white"
tools:context=".ui.activity.webbrowser.WebBrowserActivity"> tools:context=".ui.activity.webbrowser.WebBrowserActivity">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_search" android:id="@+id/cl_search"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="50dp" android:layout_height="44dp"
android:layout_marginHorizontal="15dp"
android:layout_marginVertical="10dp" android:layout_marginVertical="10dp"
android:layout_marginStart="15dp"
android:background="@drawable/bg_stroke_070709" android:background="@drawable/bg_stroke_070709"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
...@@ -48,8 +49,8 @@ ...@@ -48,8 +49,8 @@
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="-2dp" android:layout_marginEnd="-3dp"
android:layout_marginBottom="-2dp" android:layout_marginBottom="-3dp"
android:src="@mipmap/xuanze" android:src="@mipmap/xuanze"
app:layout_constraintBottom_toBottomOf="@id/fl_search_engine" app:layout_constraintBottom_toBottomOf="@id/fl_search_engine"
app:layout_constraintEnd_toEndOf="@id/fl_search_engine" app:layout_constraintEnd_toEndOf="@id/fl_search_engine"
...@@ -121,7 +122,7 @@ ...@@ -121,7 +122,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_bottom" android:id="@+id/cl_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="56dp"
app:layout_constraintBottom_toBottomOf="parent"> app:layout_constraintBottom_toBottomOf="parent">
<ImageView <ImageView
......
app/src/main/res/layout/dialog_more_webbrowser.xml
View file @ f1dbcbd0
...@@ -149,6 +149,7 @@ ...@@ -149,6 +149,7 @@
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<TextView <TextView
android:textColor="@color/black"
android:id="@+id/tv_traceless" android:id="@+id/tv_traceless"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -179,7 +180,7 @@ ...@@ -179,7 +180,7 @@
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
<View <View
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="1px" android:layout_height="1px"
android:layout_marginBottom="1dp" android:layout_marginBottom="1dp"
android:background="#E5E6EB" android:background="#E5E6EB"
...@@ -205,6 +206,7 @@ ...@@ -205,6 +206,7 @@
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<TextView <TextView
android:textColor="@color/black"
android:id="@+id/tv_download" android:id="@+id/tv_download"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -218,9 +220,9 @@ ...@@ -218,9 +220,9 @@
<View <View
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="1px" android:layout_height="1px"
android:layout_marginBottom="1dp" android:layout_marginBottom="1px"
android:background="#E5E6EB" android:background="#E5E6EB"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -245,6 +247,7 @@ ...@@ -245,6 +247,7 @@
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<TextView <TextView
android:textColor="@color/black"
android:id="@+id/tv_settings" android:id="@+id/tv_settings"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -258,9 +261,9 @@ ...@@ -258,9 +261,9 @@
<View <View
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="1px" android:layout_height="1px"
android:layout_marginBottom="1dp" android:layout_marginBottom="1px"
android:background="#E5E6EB" android:background="#E5E6EB"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -285,6 +288,7 @@ ...@@ -285,6 +288,7 @@
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<TextView <TextView
android:textColor="@color/black"
android:id="@+id/tv_inside_search" android:id="@+id/tv_inside_search"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -298,9 +302,9 @@ ...@@ -298,9 +302,9 @@
<View <View
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="1px" android:layout_height="1px"
android:layout_marginBottom="1dp" android:layout_marginBottom="1px"
android:background="#E5E6EB" android:background="#E5E6EB"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -325,6 +329,7 @@ ...@@ -325,6 +329,7 @@
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<TextView <TextView
android:textColor="@color/black"
android:id="@+id/tv_off" android:id="@+id/tv_off"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -338,9 +343,9 @@ ...@@ -338,9 +343,9 @@
<View <View
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="1px" android:layout_height="1px"
android:layout_marginBottom="1dp" android:layout_marginBottom="1px"
android:background="#E5E6EB" android:background="#E5E6EB"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
app/src/main/res/layout/fragment_home.xml
View file @ f1dbcbd0
...@@ -121,8 +121,8 @@ ...@@ -121,8 +121,8 @@
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="-2dp" android:layout_marginEnd="-3dp"
android:layout_marginBottom="-2dp" android:layout_marginBottom="-3dp"
android:src="@mipmap/xuanze" android:src="@mipmap/xuanze"
app:layout_constraintBottom_toBottomOf="@id/fl_search_engine" app:layout_constraintBottom_toBottomOf="@id/fl_search_engine"
app:layout_constraintEnd_toEndOf="@id/fl_search_engine" app:layout_constraintEnd_toEndOf="@id/fl_search_engine"
...@@ -169,10 +169,10 @@ ...@@ -169,10 +169,10 @@
</FrameLayout> </FrameLayout>
<TextView <TextView
android:layout_marginEnd="15dp"
android:id="@+id/tv_cancel" android:id="@+id/tv_cancel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="15dp"
android:text="Cancel" android:text="Cancel"
android:textColor="#0571ED" android:textColor="#0571ED"
android:textSize="16sp" android:textSize="16sp"
......
app/src/main/res/layout/item_bookmark_history.xml
View file @ f1dbcbd0
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white" android:background="@color/white"
android:orientation="horizontal"> android:orientation="vertical">
<LinearLayout
<FrameLayout android:id="@+id/ll_time"
android:id="@+id/fl_time"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@id/card" app:layout_constraintBottom_toTopOf="@id/card"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<View
android:id="@+id/v_fenge"
android:layout_width="match_parent"
android:layout_height="6dp"
android:background="#EDF1F4" />
<TextView <TextView
android:id="@+id/tv_time" android:id="@+id/tv_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -34,84 +40,90 @@ ...@@ -34,84 +40,90 @@
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="#E5E6EB" /> android:background="#E5E6EB" />
</FrameLayout> </LinearLayout>
<androidx.cardview.widget.CardView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/card" android:layout_width="match_parent"
android:layout_width="29dp" android:layout_height="wrap_content">
android:layout_height="29dp"
android:layout_marginVertical="4dp"
android:layout_marginStart="15dp"
app:cardElevation="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/fl_time">
<TextView <androidx.cardview.widget.CardView
android:id="@+id/tv_letters" android:id="@+id/card"
android:layout_width="match_parent" android:layout_width="29dp"
android:layout_height="match_parent" android:layout_height="29dp"
android:layout_gravity="center" android:layout_marginVertical="4dp"
android:gravity="center" android:layout_marginStart="15dp"
android:text="G" app:cardElevation="0dp"
android:textColor="@color/white" app:layout_constraintBottom_toBottomOf="parent"
android:textSize="16sp" app:layout_constraintStart_toStartOf="parent"
tools:background="#FA94ED" app:layout_constraintTop_toTopOf="parent">
tools:ignore="ContentDescription,HardcodedText" />
</androidx.cardview.widget.CardView> <TextView
android:id="@+id/tv_letters"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:text="G"
android:textColor="@color/white"
android:textSize="16sp"
tools:background="#FA94ED"
tools:ignore="ContentDescription,HardcodedText" />
<LinearLayout </androidx.cardview.widget.CardView>
android:id="@+id/ll"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="5dp"
android:layout_marginStart="16dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="@id/card"
app:layout_constraintEnd_toStartOf="@id/fl_opeartion"
app:layout_constraintStart_toEndOf="@id/card"
app:layout_constraintTop_toTopOf="@id/card">
<TextView <LinearLayout
android:id="@+id/tv_name" android:id="@+id/ll"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:layout_marginHorizontal="5dp"
android:singleLine="true" android:layout_marginStart="16dp"
android:text="My Favorite" android:orientation="vertical"
android:textColor="#010101" app:layout_constraintBottom_toBottomOf="@id/card"
android:textSize="18sp" app:layout_constraintEnd_toStartOf="@id/fl_opeartion"
tools:ignore="HardcodedText" /> app:layout_constraintStart_toEndOf="@id/card"
</LinearLayout> app:layout_constraintTop_toTopOf="@id/card">
<FrameLayout <TextView
android:id="@+id/fl_opeartion" android:id="@+id/tv_name"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:ellipsize="end"
android:layout_marginEnd="8dp" android:singleLine="true"
android:background="?android:attr/selectableItemBackground" android:text="My Favorite"
android:padding="8dp" android:textColor="#010101"
app:layout_constraintBottom_toBottomOf="@id/card" android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent" tools:ignore="HardcodedText" />
app:layout_constraintTop_toTopOf="@id/card"> </LinearLayout>
<ImageView <FrameLayout
android:id="@+id/fl_opeartion"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@mipmap/geduo" android:layout_gravity="center_vertical"
tools:ignore="ContentDescription" /> android:layout_marginEnd="8dp"
</FrameLayout> android:background="?android:attr/selectableItemBackground"
android:padding="8dp"
<View app:layout_constraintBottom_toBottomOf="@id/card"
android:layout_width="0dp" app:layout_constraintEnd_toEndOf="parent"
android:layout_height="1px" app:layout_constraintTop_toTopOf="@id/card">
android:layout_marginTop="15dp"
android:background="#E5E6EB" <ImageView
app:layout_constraintBottom_toBottomOf="parent" android:layout_width="wrap_content"
app:layout_constraintEnd_toEndOf="parent" android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="@id/ll" android:src="@mipmap/geduo"
app:layout_constraintTop_toBottomOf="@id/ll" /> tools:ignore="ContentDescription" />
</FrameLayout>
<View
android:layout_width="0dp"
android:layout_height="1px"
android:layout_marginTop="15dp"
android:background="#E5E6EB"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/ll"
app:layout_constraintTop_toBottomOf="@id/ll" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </LinearLayout>
\ No newline at end of file \ No newline at end of file
app/src/main/res/mipmap-xxhdpi/xuanze.png
View replaced file @ 515d226d View file @ f1dbcbd0
app/src/main/res/mipmap-xxhdpi/xuanze.png

302 Bytes | W: | H:

app/src/main/res/mipmap-xxhdpi/xuanze.png

223 Bytes | W: | H:

app/src/main/res/mipmap-xxhdpi/xuanze.png
app/src/main/res/mipmap-xxhdpi/xuanze.png
app/src/main/res/mipmap-xxhdpi/xuanze.png
app/src/main/res/mipmap-xxhdpi/xuanze.png
  • 2-up
  • Swipe
  • Onion skin
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