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
d2e171ea
Commit
d2e171ea
authored
Oct 22, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added a way to listen to download service from homepage and behave accordingly
parent
e50094af
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
17 deletions
+40
-17
HomeFragment.kt
...n/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt
+0
-14
HomeViewModel.kt
.../java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt
+39
-2
fragment_home_md2.xml
app/src/main/res/layout/fragment_home_md2.xml
+1
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt
View file @
d2e171ea
package
com.topjohnwu.magisk.redesign.home
package
com.topjohnwu.magisk.redesign.home
import
android.graphics.Insets
import
android.graphics.Insets
import
androidx.lifecycle.Observer
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.FragmentHomeMd2Binding
import
com.topjohnwu.magisk.databinding.FragmentHomeMd2Binding
import
com.topjohnwu.magisk.model.download.RemoteFileService
import
com.topjohnwu.magisk.model.entity.internal.DownloadSubject
import
com.topjohnwu.magisk.redesign.compat.CompatFragment
import
com.topjohnwu.magisk.redesign.compat.CompatFragment
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
timber.log.Timber
import
kotlin.math.roundToInt
class
HomeFragment
:
CompatFragment
<
HomeViewModel
,
FragmentHomeMd2Binding
>()
{
class
HomeFragment
:
CompatFragment
<
HomeViewModel
,
FragmentHomeMd2Binding
>()
{
...
@@ -20,15 +15,6 @@ class HomeFragment : CompatFragment<HomeViewModel, FragmentHomeMd2Binding>() {
...
@@ -20,15 +15,6 @@ class HomeFragment : CompatFragment<HomeViewModel, FragmentHomeMd2Binding>() {
override
fun
onStart
()
{
override
fun
onStart
()
{
super
.
onStart
()
super
.
onStart
()
RemoteFileService
.
progressBroadcast
.
observe
(
this
,
Observer
{
when
(
it
.
second
)
{
is
DownloadSubject
.
Magisk
.
Download
,
is
DownloadSubject
.
Magisk
.
Flash
->
viewModel
.
stateMagiskProgress
.
value
=
it
.
first
.
times
(
100f
).
roundToInt
().
also
{
Timber
.
i
(
"Progress: $it"
)
}
is
DownloadSubject
.
Manager
->
viewModel
.
stateManagerProgress
.
value
=
it
.
first
.
times
(
100f
).
roundToInt
().
also
{
Timber
.
i
(
"Progress: $it"
)
}
}
})
activity
.
title
=
resources
.
getString
(
R
.
string
.
section_home
)
activity
.
title
=
resources
.
getString
(
R
.
string
.
section_home
)
}
}
}
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt
View file @
d2e171ea
package
com.topjohnwu.magisk.redesign.home
package
com.topjohnwu.magisk.redesign.home
import
android.Manifest
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.Info
import
com.topjohnwu.magisk.Info
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.data.repository.MagiskRepository
import
com.topjohnwu.magisk.data.repository.MagiskRepository
import
com.topjohnwu.magisk.databinding.ComparableRvItem
import
com.topjohnwu.magisk.databinding.ComparableRvItem
import
com.topjohnwu.magisk.extensions.*
import
com.topjohnwu.magisk.extensions.*
import
com.topjohnwu.magisk.model.download.DownloadService
import
com.topjohnwu.magisk.model.download.RemoteFileService
import
com.topjohnwu.magisk.model.entity.MagiskJson
import
com.topjohnwu.magisk.model.entity.MagiskJson
import
com.topjohnwu.magisk.model.entity.ManagerJson
import
com.topjohnwu.magisk.model.entity.ManagerJson
import
com.topjohnwu.magisk.model.entity.UpdateInfo
import
com.topjohnwu.magisk.model.entity.UpdateInfo
import
com.topjohnwu.magisk.model.entity.internal.Configuration
import
com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Magisk
import
com.topjohnwu.magisk.model.entity.internal.DownloadSubject.Manager
import
com.topjohnwu.magisk.model.entity.recycler.HomeItem
import
com.topjohnwu.magisk.model.entity.recycler.HomeItem
import
com.topjohnwu.magisk.model.events.OpenInappLinkEvent
import
com.topjohnwu.magisk.model.events.OpenInappLinkEvent
import
com.topjohnwu.magisk.model.events.dialog.EnvFixDialog
import
com.topjohnwu.magisk.model.events.dialog.EnvFixDialog
import
com.topjohnwu.magisk.model.events.dialog.MagiskInstallDialog
import
com.topjohnwu.magisk.model.events.dialog.ManagerInstallDialog
import
com.topjohnwu.magisk.model.events.dialog.ManagerInstallDialog
import
com.topjohnwu.magisk.model.events.dialog.UninstallDialog
import
com.topjohnwu.magisk.model.events.dialog.UninstallDialog
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.model.observer.Observer
import
com.topjohnwu.magisk.model.observer.Observer
import
com.topjohnwu.magisk.redesign.compat.CompatViewModel
import
com.topjohnwu.magisk.redesign.compat.CompatViewModel
import
com.topjohnwu.magisk.ui.home.MagiskState
import
com.topjohnwu.magisk.ui.home.MagiskState
...
@@ -23,6 +29,7 @@ import com.topjohnwu.superuser.Shell
...
@@ -23,6 +29,7 @@ import com.topjohnwu.superuser.Shell
import
me.tatarka.bindingcollectionadapter2.BR
import
me.tatarka.bindingcollectionadapter2.BR
import
me.tatarka.bindingcollectionadapter2.ItemBinding
import
me.tatarka.bindingcollectionadapter2.ItemBinding
import
me.tatarka.bindingcollectionadapter2.OnItemBind
import
me.tatarka.bindingcollectionadapter2.OnItemBind
import
kotlin.math.roundToInt
class
HomeViewModel
(
class
HomeViewModel
(
private
val
repoMagisk
:
MagiskRepository
private
val
repoMagisk
:
MagiskRepository
...
@@ -74,6 +81,22 @@ class HomeViewModel(
...
@@ -74,6 +81,22 @@ class HomeViewModel(
private
var
shownDialog
=
false
private
var
shownDialog
=
false
init
{
RemoteFileService
.
progressBroadcast
.
observeForever
{
when
(
it
.
second
)
{
is
Magisk
.
Download
,
is
Magisk
.
Flash
->
stateMagiskProgress
.
value
=
it
.
first
.
times
(
100f
).
roundToInt
()
is
Manager
->
stateManagerProgress
.
value
=
it
.
first
.
times
(
100f
).
roundToInt
()
}
}
stateMagiskProgress
.
addOnPropertyChangedCallback
{
if
(
it
==
100
)
{
Navigation
.
install
().
publish
()
}
}
}
override
fun
refresh
()
=
repoMagisk
.
fetchUpdate
()
override
fun
refresh
()
=
repoMagisk
.
fetchUpdate
()
.
onErrorReturn
{
Info
.
remote
}
.
onErrorReturn
{
Info
.
remote
}
.
subscribeK
{
updateBy
(
it
)
}
.
subscribeK
{
updateBy
(
it
)
}
...
@@ -116,7 +139,21 @@ class HomeViewModel(
...
@@ -116,7 +139,21 @@ class HomeViewModel(
fun
onManagerPressed
()
=
ManagerInstallDialog
().
publish
()
fun
onManagerPressed
()
=
ManagerInstallDialog
().
publish
()
fun
onMagiskPressed
()
=
MagiskInstallDialog
().
publish
()
fun
onMagiskPressed
()
{
//pre-fix so user doesn't click twice accidentally
stateMagiskProgress
.
value
=
1
withPermissions
(
Manifest
.
permission
.
READ_EXTERNAL_STORAGE
,
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
).
map
{
check
(
it
);
it
}.
subscribeK
(
onError
=
{
stateManagerProgress
.
value
=
0
})
{
DownloadService
(
get
())
{
subject
=
Magisk
(
Configuration
.
Download
)
}
}.
add
()
}
private
fun
ensureEnv
()
{
private
fun
ensureEnv
()
{
val
invalidStates
=
listOf
(
val
invalidStates
=
listOf
(
...
...
app/src/main/res/layout/fragment_home_md2.xml
View file @
d2e171ea
...
@@ -133,7 +133,7 @@
...
@@ -133,7 +133,7 @@
<com.google.android.material.button.MaterialButton
<com.google.android.material.button.MaterialButton
style=
"?styleButtonText"
style=
"?styleButtonText"
gone=
"@{viewModel.stateMagisk == MagiskState.OBSOLETE}"
gone=
"@{viewModel.stateMagisk == MagiskState.OBSOLETE}"
isEnabled=
"@{viewModel.stateManager == MagiskState.UP_TO_DATE}"
isEnabled=
"@{viewModel.stateManager == MagiskState.UP_TO_DATE
&& (viewModel.stateMagiskProgress == 0 || viewModel.stateMagiskProgress == 100)
}"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_gravity=
"center"
...
...
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