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
acaacd1f
Commit
acaacd1f
authored
Sep 03, 2024
by
wanglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
...
parent
83fbf64c
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
2 deletions
+23
-2
Constants.java
app/src/main/java/com/base/browserwhite/help/Constants.java
+2
-1
SearchActivity.kt
...om/base/browserwhite/ui/activity/search/SearchActivity.kt
+1
-0
WebBrowserActivity.kt
...browserwhite/ui/activity/webbrowser/WebBrowserActivity.kt
+20
-0
DialogViews.kt
...c/main/java/com/base/browserwhite/ui/views/DialogViews.kt
+0
-1
No files found.
app/src/main/java/com/base/browserwhite/help/Constants.java
View file @
acaacd1f
...
@@ -3,5 +3,6 @@ package com.base.browserwhite.help;
...
@@ -3,5 +3,6 @@ package com.base.browserwhite.help;
public
class
Constants
{
public
class
Constants
{
public
static
final
String
CHANGE_SEARCH_TYPE
=
"change_search_type"
;
public
static
final
String
CHANGE_SEARCH_TYPE
=
"change_search_type"
;
public
static
final
String
CHANGE_SEARCH_URL
=
"change_search_url"
;
}
}
app/src/main/java/com/base/browserwhite/ui/activity/search/SearchActivity.kt
View file @
acaacd1f
...
@@ -128,6 +128,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
...
@@ -128,6 +128,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
binding
.
tvCancel
.
visibility
=
View
.
GONE
binding
.
tvCancel
.
visibility
=
View
.
GONE
binding
.
tvSearch
.
visibility
=
View
.
VISIBLE
binding
.
tvSearch
.
visibility
=
View
.
VISIBLE
binding
.
ivClear
.
visibility
=
View
.
VISIBLE
binding
.
ivClear
.
visibility
=
View
.
VISIBLE
searchContent
=
""
}
}
...
...
app/src/main/java/com/base/browserwhite/ui/activity/webbrowser/WebBrowserActivity.kt
View file @
acaacd1f
package
com.base.browserwhite.ui.activity.webbrowser
package
com.base.browserwhite.ui.activity.webbrowser
import
android.annotation.SuppressLint
import
android.content.Intent
import
android.content.Intent
import
android.graphics.Color
import
android.graphics.Color
import
android.view.KeyEvent
import
android.view.KeyEvent
...
@@ -19,6 +20,8 @@ import com.base.browserwhite.bean.ConstObject
...
@@ -19,6 +20,8 @@ import com.base.browserwhite.bean.ConstObject
import
com.base.browserwhite.bean.ConstObject.GOOGLE
import
com.base.browserwhite.bean.ConstObject.GOOGLE
import
com.base.browserwhite.bean.ConstObject.searchEngineSp
import
com.base.browserwhite.bean.ConstObject.searchEngineSp
import
com.base.browserwhite.databinding.ActivityWebBrowserBinding
import
com.base.browserwhite.databinding.ActivityWebBrowserBinding
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.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
...
@@ -38,6 +41,8 @@ import com.base.browserwhite.utils.LinkSearchUtils.getYandexSearch
...
@@ -38,6 +41,8 @@ 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
import
com.base.browserwhite.utils.SpBeanUtils.BOOKMARK_SP_KEY
import
com.base.browserwhite.utils.SpBeanUtils.BOOKMARK_SP_KEY
import
io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import
io.reactivex.rxjava3.core.Observable
import
kotlinx.coroutines.delay
import
kotlinx.coroutines.delay
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
...
@@ -50,9 +55,11 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
...
@@ -50,9 +55,11 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
private
val
fragmentList
=
arrayListOf
<
Fragment
>()
private
val
fragmentList
=
arrayListOf
<
Fragment
>()
private
var
currentFragment
:
WebViewFragment
?
=
null
private
var
currentFragment
:
WebViewFragment
?
=
null
private
var
searchAction
:
(
context
:
String
)
->
String
=
::
getSpSearchAction
private
var
searchAction
:
(
context
:
String
)
->
String
=
::
getSpSearchAction
private
var
mChangeSearchUrl
:
Observable
<
String
>?
=
null
var
from
:
String
=
""
var
from
:
String
=
""
@SuppressLint
(
"CheckResult"
)
override
fun
initView
()
{
override
fun
initView
()
{
BarUtils
.
setStatusBarLightMode
(
this
,
true
)
BarUtils
.
setStatusBarLightMode
(
this
,
true
)
BarUtils
.
setStatusBarColor
(
this
,
Color
.
TRANSPARENT
)
BarUtils
.
setStatusBarColor
(
this
,
Color
.
TRANSPARENT
)
...
@@ -96,6 +103,11 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
...
@@ -96,6 +103,11 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
}
}
mChangeSearchUrl
=
RxBus
.
get
().
register
(
Constants
.
CHANGE_SEARCH_URL
,
String
::
class
.
java
)
mChangeSearchUrl
?.
observeOn
(
AndroidSchedulers
.
mainThread
())
?.
subscribe
{
t
->
}
addNewWebSite
(
url
)
addNewWebSite
(
url
)
}
}
...
@@ -263,4 +275,12 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
...
@@ -263,4 +275,12 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
}
}
}
}
override
fun
onDestroy
()
{
super
.
onDestroy
()
mChangeSearchUrl
?.
let
{
RxBus
.
get
().
unregister
(
Constants
.
CHANGE_SEARCH_URL
,
it
)
}
}
}
}
\ No newline at end of file
app/src/main/java/com/base/browserwhite/ui/views/DialogViews.kt
View file @
acaacd1f
...
@@ -32,7 +32,6 @@ import com.base.browserwhite.help.Constants
...
@@ -32,7 +32,6 @@ 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
...
...
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