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
dc8d2ae6
Commit
dc8d2ae6
authored
Oct 03, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added basic navigation
parent
191c7c50
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
6 deletions
+38
-6
Navigation.kt
.../java/com/topjohnwu/magisk/model/navigation/Navigation.kt
+13
-2
MainActivity.kt
...c/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt
+22
-1
menu_bottom_nav.xml
app/src/main/res/menu/menu_bottom_nav.xml
+3
-3
No files found.
app/src/main/java/com/topjohnwu/magisk/model/navigation/Navigation.kt
View file @
dc8d2ae6
...
@@ -14,12 +14,23 @@ import com.topjohnwu.magisk.ui.module.ReposFragment
...
@@ -14,12 +14,23 @@ import com.topjohnwu.magisk.ui.module.ReposFragment
import
com.topjohnwu.magisk.ui.settings.SettingsFragment
import
com.topjohnwu.magisk.ui.settings.SettingsFragment
import
com.topjohnwu.magisk.ui.superuser.SuperuserFragment
import
com.topjohnwu.magisk.ui.superuser.SuperuserFragment
import
com.topjohnwu.magisk.redesign.MainActivity
as
RedesignActivity
import
com.topjohnwu.magisk.redesign.MainActivity
as
RedesignActivity
import
com.topjohnwu.magisk.redesign.home.HomeFragment
as
RedesignHomeFragment
object
Navigation
{
object
Navigation
{
fun
home
()
=
MagiskNavigationEvent
{
fun
home
()
=
MagiskNavigationEvent
{
navDirections
{
destination
=
HomeFragment
::
class
}
navDirections
{
navOptions
{
popUpTo
=
HomeFragment
::
class
}
destination
=
when
{
Config
.
redesign
->
RedesignHomeFragment
::
class
else
->
HomeFragment
::
class
}
}
navOptions
{
popUpTo
=
when
{
Config
.
redesign
->
RedesignHomeFragment
::
class
else
->
HomeFragment
::
class
}
}
}
}
fun
superuser
()
=
MagiskNavigationEvent
{
fun
superuser
()
=
MagiskNavigationEvent
{
...
...
app/src/main/java/com/topjohnwu/magisk/redesign/MainActivity.kt
View file @
dc8d2ae6
...
@@ -6,8 +6,13 @@ import androidx.fragment.app.Fragment
...
@@ -6,8 +6,13 @@ import androidx.fragment.app.Fragment
import
com.ncapdevi.fragnav.FragNavController
import
com.ncapdevi.fragnav.FragNavController
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
import
com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.redesign.compat.CompatActivity
import
com.topjohnwu.magisk.redesign.compat.CompatActivity
import
com.topjohnwu.magisk.redesign.home.HomeFragment
import
com.topjohnwu.magisk.redesign.home.HomeFragment
import
com.topjohnwu.magisk.ui.log.LogFragment
import
com.topjohnwu.magisk.ui.module.ModulesFragment
import
com.topjohnwu.magisk.ui.settings.SettingsFragment
import
com.topjohnwu.magisk.ui.superuser.SuperuserFragment
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
kotlin.reflect.KClass
import
kotlin.reflect.KClass
...
@@ -19,13 +24,29 @@ open class MainActivity : CompatActivity<MainViewModel, ActivityMainMd2Binding>(
...
@@ -19,13 +24,29 @@ open class MainActivity : CompatActivity<MainViewModel, ActivityMainMd2Binding>(
override
val
defaultPosition
:
Int
=
0
override
val
defaultPosition
:
Int
=
0
override
val
baseFragments
:
List
<
KClass
<
out
Fragment
>>
=
listOf
(
override
val
baseFragments
:
List
<
KClass
<
out
Fragment
>>
=
listOf
(
HomeFragment
::
class
HomeFragment
::
class
,
ModulesFragment
::
class
,
SuperuserFragment
::
class
,
LogFragment
::
class
,
SettingsFragment
::
class
)
)
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
super
.
onCreate
(
savedInstanceState
)
setSupportActionBar
(
binding
.
mainToolbar
)
setSupportActionBar
(
binding
.
mainToolbar
)
binding
.
mainNavigation
.
setOnNavigationItemSelectedListener
{
when
(
it
.
itemId
)
{
R
.
id
.
homeFragment
->
Navigation
.
home
()
R
.
id
.
modulesFragment
->
Navigation
.
modules
()
R
.
id
.
superuserFragment
->
Navigation
.
superuser
()
R
.
id
.
logFragment
->
Navigation
.
log
()
R
.
id
.
settingsFragment
->
Navigation
.
settings
()
else
->
throw
NotImplementedError
(
"Id ${it.itemId} is not defined as selectable"
)
}.
also
{
onEventDispatched
(
it
)
}
true
}
}
}
override
fun
onTabTransaction
(
fragment
:
Fragment
?,
index
:
Int
)
{
override
fun
onTabTransaction
(
fragment
:
Fragment
?,
index
:
Int
)
{
...
...
app/src/main/res/menu/menu_bottom_nav.xml
View file @
dc8d2ae6
...
@@ -3,13 +3,13 @@
...
@@ -3,13 +3,13 @@
xmlns:tools=
"http://schemas.android.com/tools"
>
xmlns:tools=
"http://schemas.android.com/tools"
>
<item
<item
android:id=
"@+id/
magisk
Fragment"
android:id=
"@+id/
home
Fragment"
android:icon=
"@drawable/ic_home"
android:icon=
"@drawable/ic_home"
android:title=
"Home"
android:title=
"Home"
tools:showAsAction=
"always"
/>
tools:showAsAction=
"always"
/>
<item
<item
android:id=
"@+id/m
agisk
Fragment"
android:id=
"@+id/m
odules
Fragment"
android:icon=
"@drawable/ic_cloud_download"
android:icon=
"@drawable/ic_cloud_download"
android:title=
"@string/modules"
android:title=
"@string/modules"
tools:showAsAction=
"always"
/>
tools:showAsAction=
"always"
/>
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
tools:showAsAction=
"always"
/>
tools:showAsAction=
"always"
/>
<item
<item
android:id=
"@+id/
magisk
Fragment"
android:id=
"@+id/
log
Fragment"
android:icon=
"@drawable/ic_bug_report"
android:icon=
"@drawable/ic_bug_report"
android:title=
"@string/log"
android:title=
"@string/log"
tools:showAsAction=
"always"
/>
tools:showAsAction=
"always"
/>
...
...
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