Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
5c562591
Commit
5c562591
authored
Sep 28, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix back button behavior
parent
6a10cc9c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
30 deletions
+27
-30
MainActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+27
-30
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
View file @
5c562591
...
...
@@ -43,12 +43,11 @@ open class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Na
override
val
navHostId
:
Int
=
R
.
id
.
main_nav_host
override
val
defaultPosition
:
Int
=
0
private
val
navigationController
get
()
=
if
(
navHostId
==
0
)
null
else
_navigationController
private
val
_navigationController
by
lazy
{
private
val
navigationController
by
lazy
{
FragNavController
(
supportFragmentManager
,
navHostId
)
}
private
val
isRootFragment
get
()
=
navigationController
?.
let
{
it
.
currentStackIndex
!=
defaultPosition
}
?:
false
navigationController
.
currentStackIndex
!=
defaultPosition
override
val
baseFragments
:
List
<
KClass
<
out
Fragment
>>
=
listOf
(
HomeFragment
::
class
,
...
...
@@ -68,7 +67,7 @@ open class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Na
super
.
onCreate
(
savedInstanceState
)
navigationController
?
.
apply
{
navigationController
.
apply
{
rootFragmentListener
=
this
@MainActivity
transactionListener
=
this
@MainActivity
initialize
(
defaultPosition
,
savedInstanceState
)
...
...
@@ -90,7 +89,7 @@ open class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Na
override
fun
onSaveInstanceState
(
outState
:
Bundle
)
{
super
.
onSaveInstanceState
(
outState
)
navigationController
?
.
onSaveInstanceState
(
outState
)
navigationController
.
onSaveInstanceState
(
outState
)
}
override
fun
setTitle
(
title
:
CharSequence
?)
{
...
...
@@ -102,31 +101,29 @@ open class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Na
}
override
fun
onBackPressed
()
{
val
fragment
=
navigationController
?.
currentFrag
as
?
BaseFragment
<*,
*>
if
(
binding
.
drawerLayout
.
isDrawerOpen
(
binding
.
navView
))
{
binding
.
drawerLayout
.
closeDrawer
(
binding
.
navView
)
}
else
{
val
fragment
=
navigationController
.
currentFrag
as
?
BaseFragment
<*,
*>
if
(
fragment
?.
onBackPressed
()
==
true
)
{
return
}
if
(
fragment
?.
onBackPressed
()
==
true
)
{
return
}
try
{
navigationController
?.
popFragment
()
?:
throw
UnsupportedOperationException
()
}
catch
(
e
:
UnsupportedOperationException
)
{
when
{
isRootFragment
->
{
val
options
=
FragNavTransactionOptions
.
newBuilder
()
.
transition
(
FragmentTransaction
.
TRANSIT_FRAGMENT_CLOSE
)
.
build
()
navigationController
?.
switchTab
(
defaultPosition
,
options
)
try
{
navigationController
.
popFragment
()
}
catch
(
e
:
UnsupportedOperationException
)
{
when
{
isRootFragment
->
{
val
options
=
FragNavTransactionOptions
.
newBuilder
()
.
transition
(
FragmentTransaction
.
TRANSIT_FRAGMENT_CLOSE
)
.
build
()
navigationController
.
switchTab
(
defaultPosition
,
options
)
}
else
->
super
.
onBackPressed
()
}
else
->
super
.
onBackPressed
()
}
}
if
(
binding
.
drawerLayout
.
isDrawerOpen
(
binding
.
navView
))
{
binding
.
drawerLayout
.
closeDrawer
(
binding
.
navView
)
}
else
{
super
.
onBackPressed
()
}
}
override
fun
onEventDispatched
(
event
:
ViewEvent
)
{
...
...
@@ -197,15 +194,15 @@ open class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Na
override
fun
navigateTo
(
event
:
MagiskNavigationEvent
)
{
val
directions
=
event
.
navDirections
navigationController
?
.
defaultTransactionOptions
=
FragNavTransactionOptions
.
newBuilder
()
navigationController
.
defaultTransactionOptions
=
FragNavTransactionOptions
.
newBuilder
()
.
customAnimations
(
event
.
animOptions
)
.
build
()
navigationController
?
.
currentStack
navigationController
.
currentStack
?.
indexOfFirst
{
it
.
javaClass
==
event
.
navOptions
.
popUpTo
}
?.
let
{
if
(
it
==
-
1
)
null
else
it
}
// invalidate if class is not found
?.
let
{
if
(
event
.
navOptions
.
inclusive
)
it
+
1
else
it
}
?.
let
{
navigationController
?
.
popFragments
(
it
)
}
?.
let
{
navigationController
.
popFragments
(
it
)
}
when
(
directions
.
isActivity
)
{
true
->
navigateToActivity
(
event
)
...
...
@@ -238,9 +235,9 @@ open class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Na
when
(
val
index
=
baseFragments
.
indexOfFirst
{
it
.
java
.
name
==
destination
.
name
})
{
-
1
->
destination
.
newInstance
()
.
apply
{
arguments
=
event
.
navDirections
.
args
}
.
let
{
navigationController
?
.
pushFragment
(
it
)
}
.
let
{
navigationController
.
pushFragment
(
it
)
}
// When it's desired that fragments of same class are put on top of one another edit this
else
->
navigationController
?
.
switchTab
(
index
)
else
->
navigationController
.
switchTab
(
index
)
}
}
...
...
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