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
796c1623
Commit
796c1623
authored
Apr 14, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed same events not being able to propagate consecutively
parent
861ad988
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
ViewEvents.kt
...main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
+5
-5
HomeViewModel.kt
...c/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+5
-5
MagiskFragment.kt
.../main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.kt
+1
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
View file @
796c1623
...
...
@@ -5,10 +5,10 @@ import com.skoumal.teanity.viewevents.ViewEvent
data class
OpenLinkEvent
(
val
url
:
String
)
:
ViewEvent
()
object
ManagerInstallEvent
:
ViewEvent
()
object
MagiskInstallEvent
:
ViewEvent
()
class
ManagerInstallEvent
:
ViewEvent
()
class
MagiskInstallEvent
:
ViewEvent
()
object
ManagerChangelogEvent
:
ViewEvent
()
object
MagiskChangelogEvent
:
ViewEvent
()
class
ManagerChangelogEvent
:
ViewEvent
()
class
MagiskChangelogEvent
:
ViewEvent
()
object
UninstallEvent
:
ViewEvent
()
class
UninstallEvent
:
ViewEvent
()
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
View file @
796c1623
...
...
@@ -80,18 +80,18 @@ class HomeViewModel(
fun
twitterPressed
()
=
OpenLinkEvent
(
Const
.
Url
.
TWITTER_URL
).
publish
()
fun
githubPressed
()
=
OpenLinkEvent
(
Const
.
Url
.
REPO_URL
).
publish
()
fun
xdaPressed
()
=
OpenLinkEvent
(
Const
.
Url
.
XDA_THREAD
).
publish
()
fun
uninstallPressed
()
=
UninstallEvent
.
publish
()
fun
uninstallPressed
()
=
UninstallEvent
()
.
publish
()
fun
advancedPressed
()
=
isAdvancedExpanded
.
toggle
()
fun
installPressed
(
item
:
MagiskItem
)
=
when
(
item
)
{
MagiskItem
.
MANAGER
->
ManagerInstallEvent
.
publish
()
MagiskItem
.
MAGISK
->
MagiskInstallEvent
.
publish
()
MagiskItem
.
MANAGER
->
ManagerInstallEvent
()
.
publish
()
MagiskItem
.
MAGISK
->
MagiskInstallEvent
()
.
publish
()
}
fun
cardPressed
(
item
:
MagiskItem
)
=
when
(
item
)
{
MagiskItem
.
MANAGER
->
ManagerChangelogEvent
.
publish
()
MagiskItem
.
MAGISK
->
MagiskChangelogEvent
.
publish
()
MagiskItem
.
MANAGER
->
ManagerChangelogEvent
()
.
publish
()
MagiskItem
.
MAGISK
->
MagiskChangelogEvent
()
.
publish
()
}
fun
refresh
()
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.kt
View file @
796c1623
...
...
@@ -67,7 +67,7 @@ class MagiskFragment : NewMagiskFragment<HomeViewModel, com.topjohnwu.magisk.dat
private
fun
installMagisk
()
{
// Show Manager update first
if
(
Config
.
remoteManagerVersionCode
>
BuildConfig
.
VERSION_CODE
)
{
ManagerInstallDialog
(
requireActivity
()).
show
()
installManager
()
return
}
//FIXME dialog requires old base
...
...
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