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
5e27bdb6
Commit
5e27bdb6
authored
Sep 03, 2024
by
wanglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
...
parent
7357d28f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
65 additions
and
9 deletions
+65
-9
MainActivity.kt
...in/java/com/base/browserwhite/ui/activity/MainActivity.kt
+0
-1
SearchActivity.kt
...om/base/browserwhite/ui/activity/search/SearchActivity.kt
+23
-2
WebBrowserActivity.kt
...browserwhite/ui/activity/webbrowser/WebBrowserActivity.kt
+23
-0
activity_web_browser.xml
app/src/main/res/layout/activity_web_browser.xml
+19
-6
fenxiang.png
app/src/main/res/mipmap-xxhdpi/fenxiang.png
+0
-0
shuaxin.png
app/src/main/res/mipmap-xxhdpi/shuaxin.png
+0
-0
No files found.
app/src/main/java/com/base/browserwhite/ui/activity/MainActivity.kt
View file @
5e27bdb6
...
...
@@ -101,7 +101,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
override
fun
onActivityResult
(
requestCode
:
Int
,
resultCode
:
Int
,
data
:
Intent
?)
{
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
)
homeFragment
?.
onActivityResult
(
resultCode
,
resultCode
,
data
)
}
override
fun
initListener
()
{
...
...
app/src/main/java/com/base/browserwhite/ui/activity/search/SearchActivity.kt
View file @
5e27bdb6
...
...
@@ -9,10 +9,8 @@ import android.graphics.Color
import
android.os.Handler
import
android.util.TypedValue
import
android.view.View
import
android.view.inputmethod.InputMethodManager
import
android.widget.LinearLayout
import
android.widget.TextView
import
androidx.core.view.isVisible
import
androidx.core.widget.addTextChangedListener
import
com.base.browserwhite.R
import
com.base.browserwhite.bean.ConstObject
...
...
@@ -159,6 +157,29 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
})
animator
.
start
()
}
fun
startActivityWithButtonExpandAnimation
(
currentActivity
:
Activity
,
button
:
View
,
verticalOffset
:
Int
)
{
// val finalPosition =
// TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16f, currentActivity.resources.displayMetrics).toInt()
// val buttonTop = button.top - finalPosition
// val distanceToTop = -buttonTop - verticalOffset
// val animator = ObjectAnimator.ofFloat(button, "scaleX", 1f, 1.05f)
// animator.setDuration(500)
// animator.addListener(object : Animator.AnimatorListener {
// override fun onAnimationStart(animation: Animator) {}
// override fun onAnimationEnd(animation: Animator) {
// button.visibility = View.VISIBLE
val
intent
=
Intent
(
currentActivity
,
SearchActivity
::
class
.
java
)
currentActivity
.
startActivityForResult
(
intent
,
10086
)
currentActivity
.
overridePendingTransition
(
R
.
anim
.
fade_in
,
R
.
anim
.
fade_out
)
// }
//
// override fun onAnimationCancel(animation: Animator) {}
// override fun onAnimationRepeat(animation: Animator) {}
// })
// animator.start()
}
}
private
fun
switchSearch
(
website
:
String
)
{
...
...
app/src/main/java/com/base/browserwhite/ui/activity/webbrowser/WebBrowserActivity.kt
View file @
5e27bdb6
...
...
@@ -4,6 +4,7 @@ package com.base.browserwhite.ui.activity.webbrowser
import
android.content.Intent
import
android.graphics.Color
import
android.view.KeyEvent
import
android.view.View
import
android.view.inputmethod.EditorInfo
import
android.widget.TextView
import
androidx.activity.addCallback
...
...
@@ -20,6 +21,7 @@ import com.base.browserwhite.databinding.ActivityWebBrowserBinding
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.search.SearchActivity
import
com.base.browserwhite.ui.views.DialogViews.showSearchEngineDialog
import
com.base.browserwhite.ui.views.DialogViews.showWebBrowserMoreDialog
import
com.base.browserwhite.utils.BarUtils
...
...
@@ -92,6 +94,11 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
}
override
fun
onActivityResult
(
requestCode
:
Int
,
resultCode
:
Int
,
data
:
Intent
?)
{
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
)
binding
.
ivShare
.
visibility
=
View
.
VISIBLE
}
private
fun
checkLeftRight
()
{
if
(
currentFragment
?.
canGoBack
()
==
true
)
{
...
...
@@ -214,6 +221,22 @@ class WebBrowserActivity : BaseActivity<ActivityWebBrowserBinding>() {
startActivity
(
Intent
(
this
,
BookmarkEditActivity
::
class
.
java
))
})
}
binding
.
ivShare
.
setOnClickListener
{
val
shareIntent
=
Intent
()
shareIntent
.
setAction
(
Intent
.
ACTION_SEND
)
shareIntent
.
putExtra
(
Intent
.
EXTRA_TEXT
,
currentFragment
?.
url
)
shareIntent
.
setType
(
"text/plain"
)
}
binding
.
editWeb
.
setOnFocusChangeListener
{
v
,
hasFocus
->
if
(
hasFocus
)
{
binding
.
editWeb
.
selectAll
()
binding
.
ivShare
.
visibility
=
View
.
GONE
SearchActivity
.
startActivityWithButtonExpandAnimation
(
this
,
binding
.
clSearch
,
0
)
v
.
clearFocus
()
}
}
}
private
fun
addNewWebSite
(
uri
:
String
)
{
...
...
app/src/main/res/layout/activity_web_browser.xml
View file @
5e27bdb6
...
...
@@ -9,8 +9,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id=
"@+id/cl_
top
"
android:layout_width=
"
match_parent
"
android:id=
"@+id/cl_
search
"
android:layout_width=
"
0dp
"
android:layout_height=
"50dp"
android:layout_marginHorizontal=
"15dp"
android:layout_marginVertical=
"10dp"
...
...
@@ -18,7 +18,7 @@
android:gravity=
"center"
android:orientation=
"horizontal"
app:layout_constraintBottom_toTopOf=
"@id/container"
app:layout_constraintEnd_to
EndOf=
"parent
"
app:layout_constraintEnd_to
StartOf=
"@id/iv_share
"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
...
...
@@ -88,21 +88,34 @@
tools:ignore=
"ContentDescription"
>
<ImageView
android:id=
"@+id/iv_refresh"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:src=
"@mipmap/saoyisao"
android:visibility=
"gone"
/>
android:src=
"@mipmap/shuaxin"
/>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id=
"@+id/iv_share"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginHorizontal=
"20dp"
android:src=
"@mipmap/fenxiang"
app:layout_constraintBottom_toBottomOf=
"@id/cl_search"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toEndOf=
"@id/cl_search"
app:layout_constraintTop_toTopOf=
"@id/cl_search"
tools:ignore=
"ContentDescription"
/>
<FrameLayout
android:id=
"@+id/container"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
app:layout_constraintBottom_toTopOf=
"@id/cl_bottom"
app:layout_constraintTop_toBottomOf=
"@id/cl_
top
"
app:layout_constraintTop_toBottomOf=
"@id/cl_
search
"
tools:ignore=
"UselessLeaf"
/>
<androidx.constraintlayout.widget.ConstraintLayout
...
...
app/src/main/res/mipmap-xxhdpi/fenxiang.png
0 → 100644
View file @
5e27bdb6
2.25 KB
app/src/main/res/mipmap-xxhdpi/shuaxin.png
0 → 100644
View file @
5e27bdb6
3.01 KB
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