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
482a5b99
Commit
482a5b99
authored
Jun 10, 2022
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't always refresh on network state change
parent
20124fe4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
17 deletions
+19
-17
BaseViewModel.kt
app/src/main/java/com/topjohnwu/magisk/arch/BaseViewModel.kt
+4
-4
ViewModelHolder.kt
...rc/main/java/com/topjohnwu/magisk/arch/ViewModelHolder.kt
+2
-6
HomeViewModel.kt
...c/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+9
-7
ModuleViewModel.kt
...in/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
+4
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/arch/BaseViewModel.kt
View file @
482a5b99
...
...
@@ -21,9 +21,7 @@ import com.topjohnwu.magisk.events.PermissionEvent
import
com.topjohnwu.magisk.events.SnackbarEvent
import
kotlinx.coroutines.Job
abstract
class
BaseViewModel
(
initialState
:
State
=
State
.
LOADING
)
:
ViewModel
(),
ObservableHost
{
abstract
class
BaseViewModel
:
ViewModel
(),
ObservableHost
{
override
var
callbacks
:
PropertyChangeRegistry
?
=
null
...
...
@@ -40,7 +38,7 @@ abstract class BaseViewModel(
val
viewEvents
:
LiveData
<
ViewEvent
>
get
()
=
_viewEvents
var
state
=
initialState
var
state
=
State
.
LOADING
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
loading
,
BR
.
loaded
,
BR
.
loadFailed
)
private
val
_viewEvents
=
MutableLiveData
<
ViewEvent
>()
...
...
@@ -60,6 +58,8 @@ abstract class BaseViewModel(
protected
open
fun
refresh
():
Job
?
=
null
open
fun
onNetworkChanged
(
network
:
Boolean
)
{}
fun
withPermission
(
permission
:
String
,
callback
:
(
Boolean
)
->
Unit
)
{
PermissionEvent
(
permission
,
callback
).
publish
()
}
...
...
app/src/main/java/com/topjohnwu/magisk/arch/ViewModelHolder.kt
View file @
482a5b99
...
...
@@ -17,12 +17,8 @@ interface ViewModelHolder : LifecycleOwner, ViewModelStoreOwner {
val
viewModel
:
BaseViewModel
fun
startObserveLiveData
()
{
viewModel
.
viewEvents
.
observe
(
this
)
{
onEventDispatched
(
it
)
}
Info
.
isConnected
.
observe
(
this
)
{
viewModel
.
requestRefresh
()
}
viewModel
.
viewEvents
.
observe
(
this
,
this
::
onEventDispatched
)
Info
.
isConnected
.
observe
(
this
,
viewModel
::
onNetworkChanged
)
}
/**
...
...
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
View file @
482a5b99
...
...
@@ -104,13 +104,9 @@ class HomeViewModel(
ensureEnv
()
}
val
showTest
=
false
fun
onTestPressed
()
=
object
:
ViewEvent
(),
ActivityExecutor
{
override
fun
invoke
(
activity
:
UIActivity
<
*
>)
{
/* Entry point to trigger test events within the app */
}
}.
publish
()
override
fun
onNetworkChanged
(
network
:
Boolean
)
{
requestRefresh
()
}
fun
onProgressUpdate
(
progress
:
Float
,
subject
:
Subject
)
{
if
(
subject
is
App
)
...
...
@@ -151,4 +147,10 @@ class HomeViewModel(
checkedEnv
=
true
}
val
showTest
=
false
fun
onTestPressed
()
=
object
:
ViewEvent
(),
ActivityExecutor
{
override
fun
invoke
(
activity
:
UIActivity
<
*
>)
{
/* Entry point to trigger test events within the app */
}
}.
publish
()
}
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
View file @
482a5b99
...
...
@@ -52,6 +52,10 @@ class ModuleViewModel : BaseViewModel() {
}
}
override
fun
onNetworkChanged
(
network
:
Boolean
)
{
requestRefresh
()
}
private
suspend
fun
loadInstalled
()
{
val
installed
=
LocalModule
.
installed
().
map
{
LocalModuleRvItem
(
it
)
}
val
diff
=
withContext
(
Dispatchers
.
Default
)
{
...
...
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