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
236ad576
Commit
236ad576
authored
Oct 20, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added showing download progress in the home ui
parent
6d037983
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
79 additions
and
3 deletions
+79
-3
HomeFragment.kt
...n/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt
+14
-2
HomeViewModel.kt
.../java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt
+3
-0
progress_determinate.xml
app/src/main/res/drawable/progress_determinate.xml
+26
-0
fragment_home_md2.xml
app/src/main/res/layout/fragment_home_md2.xml
+16
-1
attrs.xml
app/src/main/res/values/attrs.xml
+4
-0
styles_md2.xml
app/src/main/res/values/styles_md2.xml
+4
-0
styles_md2_impl.xml
app/src/main/res/values/styles_md2_impl.xml
+12
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt
View file @
236ad576
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
>()
{
...
@@ -15,8 +20,15 @@ class HomeFragment : CompatFragment<HomeViewModel, FragmentHomeMd2Binding>() {
...
@@ -15,8 +20,15 @@ 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 @
236ad576
...
@@ -50,6 +50,9 @@ class HomeViewModel(
...
@@ -50,6 +50,9 @@ class HomeViewModel(
val
stateVersionUpdateMagisk
=
KObservableField
(
""
)
val
stateVersionUpdateMagisk
=
KObservableField
(
""
)
val
stateVersionUpdateManager
=
KObservableField
(
""
)
val
stateVersionUpdateManager
=
KObservableField
(
""
)
val
stateMagiskProgress
=
KObservableField
(
0
)
val
stateManagerProgress
=
KObservableField
(
0
)
val
stateHideManagerName
=
R
.
string
.
manager
.
res
().
let
{
val
stateHideManagerName
=
R
.
string
.
manager
.
res
().
let
{
if
(!
statePackageOriginal
)
{
if
(!
statePackageOriginal
)
{
it
.
replaceRandomWithSpecial
(
3
)
it
.
replaceRandomWithSpecial
(
3
)
...
...
app/src/main/res/drawable/progress_determinate.xml
0 → 100644
View file @
236ad576
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item
android:id=
"@android:id/background"
>
<shape>
<solid
android:color=
"@android:color/transparent"
/>
</shape>
</item>
<item
android:id=
"@android:id/secondaryProgress"
>
<clip>
<shape>
<solid
android:color=
"?colorSecondary"
/>
</shape>
</clip>
</item>
<item
android:id=
"@android:id/progress"
>
<clip>
<shape>
<solid
android:color=
"?colorPrimary"
/>
</shape>
</clip>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/layout/fragment_home_md2.xml
View file @
236ad576
...
@@ -148,6 +148,14 @@
...
@@ -148,6 +148,14 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<ProgressBar
style=
"?styleProgressDeterminate"
gone=
"@{viewModel.stateMagiskProgress == 0 || viewModel.stateMagiskProgress == 100}"
android:layout_width=
"match_parent"
android:layout_gravity=
"bottom"
android:max=
"100"
android:progress=
"@{viewModel.stateMagiskProgress}"
/>
</com.google.android.material.card.MaterialCardView>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
<com.google.android.material.card.MaterialCardView
...
@@ -252,8 +260,15 @@
...
@@ -252,8 +260,15 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
<ProgressBar
style=
"?styleProgressDeterminate"
gone=
"@{viewModel.stateManagerProgress == 0 || viewModel.stateManagerProgress == 100}"
android:layout_width=
"match_parent"
android:layout_gravity=
"bottom"
android:max=
"100"
android:progress=
"@{viewModel.stateManagerProgress}"
/>
</com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
...
...
app/src/main/res/values/attrs.xml
View file @
236ad576
...
@@ -44,6 +44,10 @@
...
@@ -44,6 +44,10 @@
<!--Checkbox-->
<!--Checkbox-->
<attr
name=
"styleCheckboxNormal"
format=
"reference"
/>
<attr
name=
"styleCheckboxNormal"
format=
"reference"
/>
<!--Progress-->
<attr
name=
"styleProgressDeterminate"
format=
"reference"
/>
<attr
name=
"styleProgressIndeterminate"
format=
"reference"
/>
<!--endregion-->
<!--endregion-->
<!--region Texts-->
<!--region Texts-->
...
...
app/src/main/res/values/styles_md2.xml
View file @
236ad576
...
@@ -53,6 +53,10 @@
...
@@ -53,6 +53,10 @@
<item
name=
"styleCheckboxNormal"
>
@style/WidgetFoundation.Checkbox
</item>
<item
name=
"styleCheckboxNormal"
>
@style/WidgetFoundation.Checkbox
</item>
<item
name=
"styleProgressDeterminate"
>
@style/WidgetFoundation.ProgressBar
</item>
<item
name=
"styleProgressIndeterminate"
>
@style/WidgetFoundation.ProgressBar.Indeterminate
</item>
<!--///-->
<!--///-->
<item
name=
"appearanceTextDisplayNormal"
>
@style/AppearanceFoundation.Display
</item>
<item
name=
"appearanceTextDisplayNormal"
>
@style/AppearanceFoundation.Display
</item>
...
...
app/src/main/res/values/styles_md2_impl.xml
View file @
236ad576
...
@@ -131,4 +131,16 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
...
@@ -131,4 +131,16 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
<item
name=
"tint"
>
?colorPrimary
</item>
<item
name=
"tint"
>
?colorPrimary
</item>
</style>
</style>
<style
name=
"WidgetFoundation.ProgressBar"
parent=
"Widget.AppCompat.ProgressBar.Horizontal"
>
<item
name=
"android:indeterminate"
>
false
</item>
<item
name=
"android:layout_height"
>
4dp
</item>
<item
name=
"android:progressDrawable"
>
@drawable/progress_determinate
</item>
</style>
<style
name=
"WidgetFoundation.ProgressBar.Indeterminate"
parent=
"Widget.AppCompat.ProgressBar.Horizontal"
>
<item
name=
"android:indeterminate"
>
true
</item>
<item
name=
"android:layout_height"
>
wrap_content
</item>
<item
name=
"android:layout_width"
>
100dp
</item>
</style>
</resources>
</resources>
\ No newline at end of file
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