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
3b4cb231
Commit
3b4cb231
authored
Oct 16, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed error in navigation implementation
parent
974cb116
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
MainActivity.kt
...c/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt
+1
-1
CompatNavigationDelegate.kt
...johnwu/magisk/redesign/compat/CompatNavigationDelegate.kt
+4
-4
No files found.
app/src/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt
View file @
3b4cb231
...
...
@@ -100,7 +100,7 @@ open class MainActivity : CompatActivity<MainViewModel, ActivityMainMd2Binding>(
fragment
:
Fragment
?,
transactionType
:
FragNavController
.
TransactionType
)
=
when
(
transactionType
)
{
FragNavController
.
TransactionType
.
PUSH
->
setDisplayHomeAsUpEnabled
(
true
)
FragNavController
.
TransactionType
.
PUSH
->
setDisplayHomeAsUpEnabled
(
!
navigation
.
isRoot
)
else
->
Unit
//dunno might be useful
}
...
...
app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatNavigationDelegate.kt
View file @
3b4cb231
...
...
@@ -89,15 +89,15 @@ class CompatNavigationDelegate<out Source>(
}
private
fun
navigateToFragment
(
event
:
MagiskNavigationEvent
)
{
val
destination
=
event
.
navDirections
.
destination
?.
java
?:
let
{
val
destination
=
event
.
navDirections
.
destination
?:
let
{
Timber
.
e
(
"Cannot navigate to null destination"
)
return
}
source
.
baseFragments
.
indexOfFirst
{
it
.
java
.
name
==
destination
.
name
}
.
takeIf
{
it
>
0
}
?.
let
{
controller
.
switchTab
(
it
)
}
?:
destination
.
newInstance
()
.
indexOfFirst
{
it
==
destination
}
.
takeIf
{
it
>
=
0
}
?.
let
{
controller
.
switchTab
(
it
)
}
?:
destination
.
java
.
newInstance
()
.
also
{
it
.
arguments
=
event
.
navDirections
.
args
}
.
let
{
controller
.
pushFragment
(
it
)
}
}
...
...
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