Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
B
Browser White
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wanglei
Browser White
Commits
c5fea847
Commit
c5fea847
authored
Sep 03, 2024
by
wanglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
...
parent
5e27bdb6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
87 additions
and
10 deletions
+87
-10
BookmarkBean.kt
app/src/main/java/com/base/browserwhite/bean/BookmarkBean.kt
+3
-1
BookmarkEditActivity.kt
...browserwhite/ui/activity/bookmark/BookmarkEditActivity.kt
+1
-2
WebBrowserActivity.kt
...browserwhite/ui/activity/webbrowser/WebBrowserActivity.kt
+15
-5
DialogViews.kt
...c/main/java/com/base/browserwhite/ui/views/DialogViews.kt
+28
-2
bg_111c32_10.xml
app/src/main/res/drawable/bg_111c32_10.xml
+6
-0
dialog_bookmark_added_root.xml
app/src/main/res/layout/dialog_bookmark_added_root.xml
+34
-0
No files found.
app/src/main/java/com/base/browserwhite/bean/BookmarkBean.kt
View file @
c5fea847
package
com.base.browserwhite.bean
package
com.base.browserwhite.bean
import
com.base.browserwhite.utils.ColorUtils
class
BookmarkBean
(
class
BookmarkBean
(
var
folderId
:
Long
=
folderRootId
,
var
folderId
:
Long
=
folderRootId
,
...
@@ -7,7 +9,7 @@ class BookmarkBean(
...
@@ -7,7 +9,7 @@ class BookmarkBean(
var
name
:
String
=
""
,
var
name
:
String
=
""
,
var
url
:
String
=
""
,
var
url
:
String
=
""
,
var
isFolder
:
Boolean
=
false
,
var
isFolder
:
Boolean
=
false
,
var
color
:
Int
=
0
var
color
:
Int
=
ColorUtils
.
getRandomColor
()
)
:
SpBean
()
{
)
:
SpBean
()
{
val
viewType
:
Int
=
0
val
viewType
:
Int
=
0
var
isSelect
:
Boolean
=
false
var
isSelect
:
Boolean
=
false
...
...
app/src/main/java/com/base/browserwhite/ui/activity/bookmark/BookmarkEditActivity.kt
View file @
c5fea847
...
@@ -68,8 +68,7 @@ class BookmarkEditActivity : BaseActivity<ActivityBookmarkEditBinding>() {
...
@@ -68,8 +68,7 @@ class BookmarkEditActivity : BaseActivity<ActivityBookmarkEditBinding>() {
if
(
editBookmark
==
null
)
{
if
(
editBookmark
==
null
)
{
throw
Exception
(
"bug no BookmarkBean"
)
throw
Exception
(
"bug no BookmarkBean"
)
}
}
editBookmark
?.
color
=
ColorUtils
.
getRandomColor
()
editBookmark
?.
let
{
SpBeanUtils
.
editSpBean
(
BOOKMARK_SP_KEY
,
it
)
}
editBookmark
?.
let
{
SpBeanUtils
.
addSpBean
(
BOOKMARK_SP_KEY
,
it
)
}
finish
()
finish
()
}
}
}
}
...
...
app/src/main/java/com/base/browserwhite/ui/activity/webbrowser/WebBrowserActivity.kt
View file @
c5fea847
...
@@ -11,6 +11,7 @@ import androidx.activity.addCallback
...
@@ -11,6 +11,7 @@ import androidx.activity.addCallback
import
androidx.core.view.updatePadding
import
androidx.core.view.updatePadding
import
androidx.fragment.app.Fragment
import
androidx.fragment.app.Fragment
import
androidx.fragment.app.FragmentTransaction
import
androidx.fragment.app.FragmentTransaction
import
androidx.lifecycle.lifecycleScope
import
com.base.browserwhite.R
import
com.base.browserwhite.R
import
com.base.browserwhite.ads.AdmobMaxHelper
import
com.base.browserwhite.ads.AdmobMaxHelper
import
com.base.browserwhite.ads.AdmobMaxHelper.lastShowInter
import
com.base.browserwhite.ads.AdmobMaxHelper.lastShowInter
...
@@ -22,6 +23,7 @@ import com.base.browserwhite.ui.activity.BaseActivity
...
@@ -22,6 +23,7 @@ import com.base.browserwhite.ui.activity.BaseActivity
import
com.base.browserwhite.ui.activity.bookmark.BookmarkActivity
import
com.base.browserwhite.ui.activity.bookmark.BookmarkActivity
import
com.base.browserwhite.ui.activity.bookmark.BookmarkEditActivity
import
com.base.browserwhite.ui.activity.bookmark.BookmarkEditActivity
import
com.base.browserwhite.ui.activity.search.SearchActivity
import
com.base.browserwhite.ui.activity.search.SearchActivity
import
com.base.browserwhite.ui.views.DialogViews.showAddRootBookmarkDialog
import
com.base.browserwhite.ui.views.DialogViews.showSearchEngineDialog
import
com.base.browserwhite.ui.views.DialogViews.showSearchEngineDialog
import
com.base.browserwhite.ui.views.DialogViews.showWebBrowserMoreDialog
import
com.base.browserwhite.ui.views.DialogViews.showWebBrowserMoreDialog
import
com.base.browserwhite.utils.BarUtils
import
com.base.browserwhite.utils.BarUtils
...
@@ -34,6 +36,10 @@ import com.base.browserwhite.utils.LinkSearchUtils.getSpSearchAction
...
@@ -34,6 +36,10 @@ import com.base.browserwhite.utils.LinkSearchUtils.getSpSearchAction
import
com.base.browserwhite.utils.LinkSearchUtils.getYahooSearch
import
com.base.browserwhite.utils.LinkSearchUtils.getYahooSearch
import
com.base.browserwhite.utils.LinkSearchUtils.getYandexSearch
import
com.base.browserwhite.utils.LinkSearchUtils.getYandexSearch
import
com.base.browserwhite.utils.LinkSearchUtils.handleInput
import
com.base.browserwhite.utils.LinkSearchUtils.handleInput
import
com.base.browserwhite.utils.SpBeanUtils
import
com.base.browserwhite.utils.SpBeanUtils.BOOKMARK_SP_KEY
import
kotlinx.coroutines.delay
import
kotlinx.coroutines.launch
class
WebBrowserActivity
:
BaseActivity
<
ActivityWebBrowserBinding
>()
{
class
WebBrowserActivity
:
BaseActivity
<
ActivityWebBrowserBinding
>()
{
...
@@ -214,11 +220,15 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
...
@@ -214,11 +220,15 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
startActivity
(
Intent
(
this
,
BookmarkActivity
::
class
.
java
))
startActivity
(
Intent
(
this
,
BookmarkActivity
::
class
.
java
))
},
},
joinAction
=
{
joinAction
=
{
// val url = currentFragment?.url ?: ""
currentFragment
?.
bookmarkBean
?.
let
{
SpBeanUtils
.
addSpBean
(
BOOKMARK_SP_KEY
,
it
)
}
// val value = Gson().toJson(BookmarkBean(url = url, time = System.currentTimeMillis()))
val
dialog
=
showAddRootBookmarkDialog
{
// SpBeanUtils.addSpBean(BOOKMARK, value)
BookmarkEditActivity
.
editBookmark
=
currentFragment
?.
bookmarkBean
BookmarkEditActivity
.
editBookmark
=
currentFragment
?.
bookmarkBean
startActivity
(
Intent
(
this
,
BookmarkEditActivity
::
class
.
java
))
startActivity
(
Intent
(
this
,
BookmarkEditActivity
::
class
.
java
))
}
lifecycleScope
.
launch
{
delay
(
2500
)
dialog
.
dismiss
()
}
})
})
}
}
...
...
app/src/main/java/com/base/browserwhite/ui/views/DialogViews.kt
View file @
c5fea847
...
@@ -20,6 +20,7 @@ import com.base.browserwhite.bean.ConstObject.GOOGLE
...
@@ -20,6 +20,7 @@ import com.base.browserwhite.bean.ConstObject.GOOGLE
import
com.base.browserwhite.bean.ConstObject.YAHOO
import
com.base.browserwhite.bean.ConstObject.YAHOO
import
com.base.browserwhite.bean.ConstObject.YANDEX
import
com.base.browserwhite.bean.ConstObject.YANDEX
import
com.base.browserwhite.bean.ConstObject.searchEngineSp
import
com.base.browserwhite.bean.ConstObject.searchEngineSp
import
com.base.browserwhite.databinding.DialogBookmarkAddedRootBinding
import
com.base.browserwhite.databinding.DialogCleanerReocordBinding
import
com.base.browserwhite.databinding.DialogCleanerReocordBinding
import
com.base.browserwhite.databinding.DialogDefaultBrowserBinding
import
com.base.browserwhite.databinding.DialogDefaultBrowserBinding
import
com.base.browserwhite.databinding.DialogDeleteTipBinding
import
com.base.browserwhite.databinding.DialogDeleteTipBinding
...
@@ -31,6 +32,7 @@ import com.base.browserwhite.help.Constants
...
@@ -31,6 +32,7 @@ import com.base.browserwhite.help.Constants
import
com.base.browserwhite.help.RxBus
import
com.base.browserwhite.help.RxBus
import
com.base.browserwhite.ui.activity.about.AboutActivity
import
com.base.browserwhite.ui.activity.about.AboutActivity
import
com.base.browserwhite.ui.activity.feedback.FeedbackActivity
import
com.base.browserwhite.ui.activity.feedback.FeedbackActivity
import
com.base.browserwhite.ui.views.DialogViews.showWebBrowserMoreDialog
import
com.base.browserwhite.utils.ActivityLauncher
import
com.base.browserwhite.utils.ActivityLauncher
import
com.base.browserwhite.utils.AppPreferences
import
com.base.browserwhite.utils.AppPreferences
import
com.base.browserwhite.utils.RoleManagerUtils.isDefaultBrowser
import
com.base.browserwhite.utils.RoleManagerUtils.isDefaultBrowser
...
@@ -301,7 +303,7 @@ object DialogViews {
...
@@ -301,7 +303,7 @@ object DialogViews {
fun
Context
.
showDefaultBrowserDialog
(
launcher
:
ActivityLauncher
)
{
fun
Context
.
showDefaultBrowserDialog
(
launcher
:
ActivityLauncher
)
{
val
dialog
=
BottomSheetDialog
(
this
,
R
.
style
.
BottomSheetDialog
)
val
dialog
=
BottomSheetDialog
(
this
,
R
.
style
.
BottomSheetDialog
)
val
binding
=
DialogDefaultBrowserBinding
.
inflate
(
LayoutInflater
.
from
(
this
))
val
binding
=
DialogDefaultBrowserBinding
.
inflate
(
LayoutInflater
.
from
(
this
))
dialog
.
setContentView
(
binding
.
root
)
dialog
.
setContentView
(
binding
.
root
)
dialog
.
setCanceledOnTouchOutside
(
false
)
dialog
.
setCanceledOnTouchOutside
(
false
)
...
@@ -333,7 +335,7 @@ object DialogViews {
...
@@ -333,7 +335,7 @@ object DialogViews {
)
{
)
{
val
dialog
=
BottomSheetDialog
(
this
,
R
.
style
.
BottomSheetDialog
)
val
dialog
=
BottomSheetDialog
(
this
,
R
.
style
.
BottomSheetDialog
)
val
binding
=
DialogMoreWebbrowserBinding
.
inflate
(
LayoutInflater
.
from
(
this
))
val
binding
=
DialogMoreWebbrowserBinding
.
inflate
(
LayoutInflater
.
from
(
this
))
dialog
.
setContentView
(
binding
.
root
)
dialog
.
setContentView
(
binding
.
root
)
dialog
.
setCanceledOnTouchOutside
(
false
)
dialog
.
setCanceledOnTouchOutside
(
false
)
...
@@ -356,11 +358,35 @@ object DialogViews {
...
@@ -356,11 +358,35 @@ object DialogViews {
arrayOf
(
binding
.
ivJoinBookmark
,
binding
.
tvJoinBookmark
).
forEach
{
arrayOf
(
binding
.
ivJoinBookmark
,
binding
.
tvJoinBookmark
).
forEach
{
it
.
setOnClickListener
{
it
.
setOnClickListener
{
dialog
.
dismiss
()
joinAction
?.
invoke
()
joinAction
?.
invoke
()
}
}
}
}
}
}
fun
Context
.
showAddRootBookmarkDialog
(
editAction
:
()
->
Unit
):
BottomSheetDialog
{
val
dialog
=
BottomSheetDialog
(
this
,
R
.
style
.
BottomSheetDialog
)
val
binding
=
DialogBookmarkAddedRootBinding
.
inflate
(
LayoutInflater
.
from
(
this
))
dialog
.
setContentView
(
binding
.
root
)
dialog
.
setCanceledOnTouchOutside
(
false
)
dialog
.
show
()
dialog
.
window
?.
setDimAmount
(
0f
)
val
parentView
=
binding
.
root
.
parent
as
View
val
behavior
=
BottomSheetBehavior
.
from
(
parentView
)
//展开
behavior
.
state
=
BottomSheetBehavior
.
STATE_EXPANDED
binding
.
tvEdit
.
setOnClickListener
{
dialog
.
dismiss
()
editAction
.
invoke
()
}
return
dialog
}
}
}
\ No newline at end of file
app/src/main/res/drawable/bg_111c32_10.xml
0 → 100644
View file @
c5fea847
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<solid
android:color=
"#111C32"
/>
<corners
android:radius=
"10dp"
/>
</shape>
\ No newline at end of file
app/src/main/res/layout/dialog_bookmark_added_root.xml
0 → 100644
View file @
c5fea847
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@drawable/bg_111c32_10"
android:orientation=
"horizontal"
>
<TextView
android:layout_marginVertical=
"25dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical"
android:layout_marginStart=
"26dp"
android:layout_weight=
"1"
android:text=
"Added to the root directory"
android:textColor=
"@color/white"
android:textSize=
"14sp"
tools:ignore=
"HardcodedText"
/>
<TextView
android:id=
"@+id/tv_edit"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical"
android:layout_marginEnd=
"26dp"
android:paddingHorizontal=
"10dp"
android:paddingVertical=
"5dp"
android:text=
"Edit"
android:textColor=
"#0571ED"
android:textSize=
"16sp"
tools:ignore=
"HardcodedText"
/>
</LinearLayout>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment