Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
P
PDF Viewer Scanner White ago
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
kuxulei
PDF Viewer Scanner White ago
Commits
b627119e
Commit
b627119e
authored
Dec 17, 2024
by
周文华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【修复】修复首页删除与搜索模式下的侧滑返回问题。
parent
a6dedc73
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
15 deletions
+13
-15
DocumentFragment.kt
...om/base/pdfviewerscannerwhite/ui/main/DocumentFragment.kt
+4
-4
MainActivity.kt
...va/com/base/pdfviewerscannerwhite/ui/main/MainActivity.kt
+9
-11
No files found.
app/src/main/java/com/base/pdfviewerscannerwhite/ui/main/DocumentFragment.kt
View file @
b627119e
...
...
@@ -244,7 +244,7 @@ class DocumentFragment(
fun
changeSelectUI
(
show
:
Boolean
)
{
if
(
show
)
{
binding
.
viewPager2
.
isUserInputEnabled
=
false
(
requireActivity
()
as
MainActivity
).
callback
.
isEnabled
=
true
//
(requireActivity() as MainActivity).callback.isEnabled = true
uiMode
=
UI_MODE_SELECT
binding
.
ivPaixu
.
visibility
=
View
.
INVISIBLE
...
...
@@ -260,7 +260,7 @@ class DocumentFragment(
currentPage
.
changeSelectUi
(
true
)
}
else
{
binding
.
viewPager2
.
isUserInputEnabled
=
true
(
requireActivity
()
as
MainActivity
).
callback
.
isEnabled
=
false
//
(requireActivity() as MainActivity).callback.isEnabled = false
uiMode
=
UI_MODE_NORMAL
binding
.
flFanhui
.
visibility
=
View
.
INVISIBLE
binding
.
ivAllSelector
.
visibility
=
View
.
INVISIBLE
...
...
@@ -288,7 +288,7 @@ class DocumentFragment(
fun
changeSearchUI
(
show
:
Boolean
)
{
if
(
show
)
{
uiMode
=
UI_MODE_SEARCH
(
requireActivity
()
as
MainActivity
).
callback
.
isEnabled
=
true
//
(requireActivity() as MainActivity).callback.isEnabled = true
binding
.
card
.
elevation
=
0f
binding
.
tvTittle
.
visibility
=
View
.
INVISIBLE
...
...
@@ -308,7 +308,7 @@ class DocumentFragment(
}
else
{
uiMode
=
UI_MODE_NORMAL
(
requireActivity
()
as
MainActivity
).
callback
.
isEnabled
=
false
//
(requireActivity() as MainActivity).callback.isEnabled = false
binding
.
card
.
elevation
=
resources
.
getDimension
(
R
.
dimen
.
dp_5
)
binding
.
editSearch
.
visibility
=
View
.
INVISIBLE
...
...
app/src/main/java/com/base/pdfviewerscannerwhite/ui/main/MainActivity.kt
View file @
b627119e
...
...
@@ -326,18 +326,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView {
var
isBookmarkAdd
:
Boolean
=
false
var
isToolAdd
:
Boolean
=
false
@SuppressLint
(
"MissingSuperCall"
)
override
fun
onBackPressed
()
{
LogEx
.
logDebug
(
TAG
,
"onBackPressed"
)
showAppExitDialog
()
}
//OnBackPressedCallback 并将 isEnabled 设置为 false 时,默认的返回键行为将被禁用。
lateinit
var
callback
:
OnBackPressedCallback
override
fun
initListener
()
{
super
.
initListener
()
callback
=
object
:
OnBackPressedCallback
(
false
)
{
val
callback
:
OnBackPressedCallback
by
lazy
(
LazyThreadSafetyMode
.
NONE
)
{
object
:
OnBackPressedCallback
(
true
)
{
override
fun
handleOnBackPressed
()
{
LogEx
.
logDebug
(
TAG
,
"handleOnBackPressed"
)
if
(
currentFragment
is
DocumentFragment
)
{
...
...
@@ -345,13 +336,20 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView {
LogEx
.
logDebug
(
TAG
,
"handleOnBackPressed uiMode=${documentFragment.uiMode}"
)
if
(
documentFragment
.
uiMode
==
ConstObject
.
UI_MODE_SELECT
)
{
documentFragment
.
changeSelectUI
(
false
)
return
}
if
(
documentFragment
.
uiMode
==
ConstObject
.
UI_MODE_SEARCH
)
{
documentFragment
.
changeSearchUI
(
false
)
return
}
}
showAppExitDialog
()
}
}
}
override
fun
initListener
()
{
super
.
initListener
()
onBackPressedDispatcher
.
addCallback
(
callback
)
binding
.
llDocument
.
setOnClickListener
{
...
...
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