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
63055818
Commit
63055818
authored
May 05, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed items in navView not being checked
parent
0beb08b6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
2 deletions
+24
-2
MainActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+15
-1
MagiskActivity.kt
.../main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt
+9
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
View file @
63055818
...
@@ -71,6 +71,20 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
...
@@ -71,6 +71,20 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
supportActionBar
?.
setTitle
(
titleId
)
supportActionBar
?.
setTitle
(
titleId
)
}
}
override
fun
onTabTransaction
(
fragment
:
Fragment
?,
index
:
Int
)
{
val
fragmentId
=
when
(
fragment
)
{
is
HomeFragment
->
R
.
id
.
magiskFragment
is
SuperuserFragment
->
R
.
id
.
superuserFragment
is
MagiskHideFragment
->
R
.
id
.
magiskHideFragment
is
ModulesFragment
->
R
.
id
.
modulesFragment
is
ReposFragment
->
R
.
id
.
reposFragment
is
LogFragment
->
R
.
id
.
logFragment
is
SettingsFragment
->
R
.
id
.
settings
else
->
return
}
binding
.
navView
.
setCheckedItem
(
fragmentId
)
}
override
fun
onBackPressed
()
{
override
fun
onBackPressed
()
{
if
(
binding
.
drawerLayout
.
isDrawerOpen
(
binding
.
navView
))
{
if
(
binding
.
drawerLayout
.
isDrawerOpen
(
binding
.
navView
))
{
binding
.
drawerLayout
.
closeDrawer
(
binding
.
navView
)
binding
.
drawerLayout
.
closeDrawer
(
binding
.
navView
)
...
@@ -88,7 +102,7 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
...
@@ -88,7 +102,7 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
private
fun
openNav
()
=
binding
.
drawerLayout
.
openDrawer
(
GravityCompat
.
START
)
private
fun
openNav
()
=
binding
.
drawerLayout
.
openDrawer
(
GravityCompat
.
START
)
fun
checkHideSection
()
{
private
fun
checkHideSection
()
{
val
menu
=
binding
.
navView
.
menu
val
menu
=
binding
.
navView
.
menu
menu
.
findItem
(
R
.
id
.
magiskHideFragment
).
isVisible
=
menu
.
findItem
(
R
.
id
.
magiskHideFragment
).
isVisible
=
Shell
.
rootAccess
()
&&
Config
.
get
<
Any
>(
Config
.
Key
.
MAGISKHIDE
)
as
Boolean
Shell
.
rootAccess
()
&&
Config
.
get
<
Any
>(
Config
.
Key
.
MAGISKHIDE
)
as
Boolean
...
...
app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt
View file @
63055818
...
@@ -31,7 +31,7 @@ import kotlin.reflect.KClass
...
@@ -31,7 +31,7 @@ import kotlin.reflect.KClass
abstract
class
MagiskActivity
<
ViewModel
:
MagiskViewModel
,
Binding
:
ViewDataBinding
>
:
abstract
class
MagiskActivity
<
ViewModel
:
MagiskViewModel
,
Binding
:
ViewDataBinding
>
:
MagiskLeanbackActivity
<
ViewModel
,
Binding
>(),
FragNavController
.
RootFragmentListener
,
MagiskLeanbackActivity
<
ViewModel
,
Binding
>(),
FragNavController
.
RootFragmentListener
,
Navigator
{
Navigator
,
FragNavController
.
TransactionListener
{
override
val
numberOfRootFragments
:
Int
get
()
=
baseFragments
.
size
override
val
numberOfRootFragments
:
Int
get
()
=
baseFragments
.
size
override
val
baseFragments
:
List
<
KClass
<
out
Fragment
>>
=
listOf
()
override
val
baseFragments
:
List
<
KClass
<
out
Fragment
>>
=
listOf
()
...
@@ -62,6 +62,7 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
...
@@ -62,6 +62,7 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
super
.
onCreate
(
savedInstanceState
)
super
.
onCreate
(
savedInstanceState
)
navigationController
?.
apply
{
navigationController
?.
apply
{
rootFragmentListener
=
this
@MagiskActivity
rootFragmentListener
=
this
@MagiskActivity
transactionListener
=
this
@MagiskActivity
initialize
(
defaultPosition
,
savedInstanceState
)
initialize
(
defaultPosition
,
savedInstanceState
)
}
}
}
}
...
@@ -162,6 +163,13 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
...
@@ -162,6 +163,13 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
}
}
}
}
override
fun
onFragmentTransaction
(
fragment
:
Fragment
?,
transactionType
:
FragNavController
.
TransactionType
)
=
Unit
override
fun
onTabTransaction
(
fragment
:
Fragment
?,
index
:
Int
)
=
Unit
fun
openUrl
(
url
:
String
)
=
Utils
.
openLink
(
this
,
url
.
toUri
())
fun
openUrl
(
url
:
String
)
=
Utils
.
openLink
(
this
,
url
.
toUri
())
fun
withPermissions
(
vararg
permissions
:
String
,
builder
:
PermissionRequestBuilder
.()
->
Unit
)
{
fun
withPermissions
(
vararg
permissions
:
String
,
builder
:
PermissionRequestBuilder
.()
->
Unit
)
{
...
...
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