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
bb7eda9a
Commit
bb7eda9a
authored
Sep 05, 2024
by
wanglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
...
parent
c6d8a2b4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
SearchActivity.kt
...om/base/browserwhite/ui/activity/search/SearchActivity.kt
+8
-2
FileFragment.kt
...in/java/com/base/browserwhite/ui/fragment/FileFragment.kt
+1
-1
No files found.
app/src/main/java/com/base/browserwhite/ui/activity/search/SearchActivity.kt
View file @
bb7eda9a
...
@@ -38,6 +38,7 @@ import com.base.browserwhite.utils.BarUtils.setStatusBarLightMode
...
@@ -38,6 +38,7 @@ import com.base.browserwhite.utils.BarUtils.setStatusBarLightMode
import
com.base.browserwhite.utils.LinkSearchUtils
import
com.base.browserwhite.utils.LinkSearchUtils
import
com.base.browserwhite.utils.LogEx
import
com.base.browserwhite.utils.LogEx
import
com.base.browserwhite.utils.SpBeanUtils
import
com.base.browserwhite.utils.SpBeanUtils
import
com.base.browserwhite.utils.SpBeanUtils.HISTORY_SP_KEY
import
com.base.browserwhite.utils.SpBeanUtils.SEARCH_RECORD_SP_KEY
import
com.base.browserwhite.utils.SpBeanUtils.SEARCH_RECORD_SP_KEY
import
com.base.browserwhite.utils.Utils
import
com.base.browserwhite.utils.Utils
import
com.base.browserwhite.utils.Utils.dpToPx
import
com.base.browserwhite.utils.Utils.dpToPx
...
@@ -66,6 +67,11 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
...
@@ -66,6 +67,11 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
},
performSearch
=
{
},
performSearch
=
{
link
=
LinkSearchUtils
.
getSpSearchAction
(
content
)
link
=
LinkSearchUtils
.
getSpSearchAction
(
content
)
})
})
val
list
=
SpBeanUtils
.
getSpBeanList
(
SEARCH_RECORD_SP_KEY
).
map
{
Gson
().
fromJson
(
it
,
SearchRecordBean
::
class
.
java
)
}
val
old
=
list
.
find
{
it
.
content
==
content
}
if
(
old
!=
null
)
{
SpBeanUtils
.
deleteSpBeanCondition
(
SEARCH_RECORD_SP_KEY
,
old
.
id
)
}
SpBeanUtils
.
addSpBean
(
SEARCH_RECORD_SP_KEY
,
SearchRecordBean
(
content
))
SpBeanUtils
.
addSpBean
(
SEARCH_RECORD_SP_KEY
,
SearchRecordBean
(
content
))
LogEx
.
logDebug
(
TAG
,
"isHomeSearch=$isHomeSearch"
)
LogEx
.
logDebug
(
TAG
,
"isHomeSearch=$isHomeSearch"
)
...
@@ -238,7 +244,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
...
@@ -238,7 +244,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
var
searchContent
:
String
=
""
var
searchContent
:
String
=
""
fun
startActivityWithButtonAnimation
(
currentActivity
:
Activity
,
button
:
View
,
verticalOffset
:
Int
)
{
fun
startActivityWithButtonAnimation
(
currentActivity
:
Activity
,
button
:
View
,
verticalOffset
:
Int
)
{
val
finalPosition
=
MyApplication
.
context
.
dpToPx
(
16f
)
val
finalPosition
=
MyApplication
.
context
.
dpToPx
(
16f
)
val
buttonTop
=
button
.
top
-
finalPosition
val
buttonTop
=
button
.
top
-
finalPosition
val
distanceToTop
=
-
buttonTop
-
verticalOffset
val
distanceToTop
=
-
buttonTop
-
verticalOffset
val
animator
=
ObjectAnimator
.
ofFloat
(
button
,
"translationY"
,
button
.
translationY
,
distanceToTop
.
toFloat
())
val
animator
=
ObjectAnimator
.
ofFloat
(
button
,
"translationY"
,
button
.
translationY
,
distanceToTop
.
toFloat
())
...
@@ -267,7 +273,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
...
@@ -267,7 +273,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
verticalOffset
:
Int
verticalOffset
:
Int
)
{
)
{
val
marginEnd
=
MyApplication
.
context
.
dpToPx
(
30f
)
val
marginEnd
=
MyApplication
.
context
.
dpToPx
(
30f
)
val
screenWidth
=
Utils
.
getScreenWidth
(
MyApplication
.
context
)
-
marginEnd
val
screenWidth
=
Utils
.
getScreenWidth
(
MyApplication
.
context
)
-
marginEnd
val
x
=
screenWidth
.
toFloat
()
/
button
.
width
.
toFloat
()
val
x
=
screenWidth
.
toFloat
()
/
button
.
width
.
toFloat
()
val
scaleXAnimator
=
ObjectAnimator
.
ofFloat
(
button
,
"scaleX"
,
1f
,
x
)
val
scaleXAnimator
=
ObjectAnimator
.
ofFloat
(
button
,
"scaleX"
,
1f
,
x
)
val
scaleYAnimator
=
ObjectAnimator
.
ofFloat
(
button
,
"scaleY"
,
1f
,
50f
/
44f
)
val
scaleYAnimator
=
ObjectAnimator
.
ofFloat
(
button
,
"scaleY"
,
1f
,
50f
/
44f
)
...
...
app/src/main/java/com/base/browserwhite/ui/fragment/FileFragment.kt
View file @
bb7eda9a
...
@@ -159,7 +159,7 @@ class FileFragment : BaseFragment<FragmentFileBinding>() {
...
@@ -159,7 +159,7 @@ class FileFragment : BaseFragment<FragmentFileBinding>() {
}
}
fun
mediaPermission
(
jump
:
()
->
Unit
)
{
private
fun
mediaPermission
(
jump
:
()
->
Unit
)
{
if
(
requireContext
().
checkStorePermission
())
{
if
(
requireContext
().
checkStorePermission
())
{
jump
.
invoke
()
jump
.
invoke
()
return
return
...
...
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