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
580c993c
Unverified
Commit
580c993c
authored
May 29, 2022
by
南宫雪珊
Committed by
GitHub
May 29, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Display module status
parent
0cc29350
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
3 deletions
+15
-3
LocalModule.kt
...ava/com/topjohnwu/magisk/core/model/module/LocalModule.kt
+2
-0
MainActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+2
-1
ModuleViewModel.kt
...in/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
+1
-1
fragment_module_md2.xml
app/src/main/res/layout/fragment_module_md2.xml
+9
-1
strings.xml
app/src/main/res/values/strings.xml
+1
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/core/model/module/LocalModule.kt
View file @
580c993c
...
@@ -138,6 +138,8 @@ data class LocalModule(
...
@@ -138,6 +138,8 @@ data class LocalModule(
private
val
PERSIST
get
()
=
"${Const.MAGISKTMP}/mirror/persist/magisk"
private
val
PERSIST
get
()
=
"${Const.MAGISKTMP}/mirror/persist/magisk"
fun
loaded
()
=
RootUtils
.
fs
.
getFile
(
Const
.
MAGISK_PATH
).
exists
()
suspend
fun
installed
()
=
withContext
(
Dispatchers
.
IO
)
{
suspend
fun
installed
()
=
withContext
(
Dispatchers
.
IO
)
{
RootUtils
.
fs
.
getFile
(
Const
.
MAGISK_PATH
)
RootUtils
.
fs
.
getFile
(
Const
.
MAGISK_PATH
)
.
listFiles
()
.
listFiles
()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
View file @
580c993c
...
@@ -20,6 +20,7 @@ import com.topjohnwu.magisk.core.Config
...
@@ -20,6 +20,7 @@ import com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.isRunningAsStub
import
com.topjohnwu.magisk.core.isRunningAsStub
import
com.topjohnwu.magisk.core.model.module.LocalModule
import
com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
import
com.topjohnwu.magisk.databinding.ActivityMainMd2Binding
import
com.topjohnwu.magisk.ktx.startAnimations
import
com.topjohnwu.magisk.ktx.startAnimations
import
com.topjohnwu.magisk.ui.home.HomeFragmentDirections
import
com.topjohnwu.magisk.ui.home.HomeFragmentDirections
...
@@ -84,7 +85,7 @@ class MainActivity : BaseMainActivity<ActivityMainMd2Binding>() {
...
@@ -84,7 +85,7 @@ class MainActivity : BaseMainActivity<ActivityMainMd2Binding>() {
}
}
binding
.
mainNavigation
.
menu
.
apply
{
binding
.
mainNavigation
.
menu
.
apply
{
findItem
(
R
.
id
.
superuserFragment
)
?.
isEnabled
=
Utils
.
showSuperUser
()
findItem
(
R
.
id
.
superuserFragment
)
?.
isEnabled
=
Utils
.
showSuperUser
()
findItem
(
R
.
id
.
modulesFragment
)
?.
isEnabled
=
Info
.
env
.
isActive
findItem
(
R
.
id
.
modulesFragment
)
?.
isEnabled
=
Info
.
env
.
isActive
&&
LocalModule
.
loaded
()
}
}
val
section
=
val
section
=
...
...
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
View file @
580c993c
...
@@ -37,7 +37,7 @@ class ModuleViewModel : BaseViewModel() {
...
@@ -37,7 +37,7 @@ class ModuleViewModel : BaseViewModel() {
val
data
get
()
=
uri
val
data
get
()
=
uri
init
{
init
{
if
(
Info
.
env
.
isActive
)
{
if
(
Info
.
env
.
isActive
&&
LocalModule
.
loaded
()
)
{
items
.
insertItem
(
InstallModule
)
items
.
insertItem
(
InstallModule
)
.
insertList
(
itemsInstalled
)
.
insertList
(
itemsInstalled
)
}
}
...
...
app/src/main/res/layout/fragment_module_md2.xml
View file @
580c993c
...
@@ -33,7 +33,6 @@
...
@@ -33,7 +33,6 @@
tools:listitem=
"@layout/item_module_md2"
/>
tools:listitem=
"@layout/item_module_md2"
/>
<LinearLayout
<LinearLayout
goneUnless=
"@{viewModel.loading}"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_gravity=
"center"
...
@@ -41,6 +40,7 @@
...
@@ -41,6 +40,7 @@
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
<TextView
<TextView
goneUnless=
"@{viewModel.loading}"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/loading"
android:text=
"@string/loading"
...
@@ -49,8 +49,16 @@
...
@@ -49,8 +49,16 @@
<ProgressBar
<ProgressBar
style=
"@style/WidgetFoundation.ProgressBar.Indeterminate"
style=
"@style/WidgetFoundation.ProgressBar.Indeterminate"
goneUnless=
"@{viewModel.loading}"
android:layout_marginTop=
"@dimen/l1"
/>
android:layout_marginTop=
"@dimen/l1"
/>
<TextView
gone=
"@{viewModel.loading || viewModel.items.size() != 1 }"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/module_empty"
android:textAppearance=
"@style/AppearanceFoundation.Title"
android:textStyle=
"bold"
/>
</LinearLayout>
</LinearLayout>
</FrameLayout>
</FrameLayout>
...
...
app/src/main/res/values/strings.xml
View file @
580c993c
...
@@ -111,6 +111,7 @@
...
@@ -111,6 +111,7 @@
<string
name=
"suspend_text_riru"
>
Module suspended because %1$s is enabled
</string>
<string
name=
"suspend_text_riru"
>
Module suspended because %1$s is enabled
</string>
<string
name=
"suspend_text_zygisk"
>
Module suspended because %1$s is not enabled
</string>
<string
name=
"suspend_text_zygisk"
>
Module suspended because %1$s is not enabled
</string>
<string
name=
"zygisk_module_unloaded"
>
Zygisk module not loaded due to incompatibility
</string>
<string
name=
"zygisk_module_unloaded"
>
Zygisk module not loaded due to incompatibility
</string>
<string
name=
"module_empty"
>
No module installed
</string>
<!--Settings-->
<!--Settings-->
<string
name=
"settings_dark_mode_title"
>
Theme Mode
</string>
<string
name=
"settings_dark_mode_title"
>
Theme Mode
</string>
...
...
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