From 236ad576082af0a28a8f9c1f8ee9578feb0d2666 Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Sun, 20 Oct 2019 12:40:50 +0200
Subject: [PATCH] Added showing download progress in the home ui

---
 .../magisk/redesign/home/HomeFragment.kt      | 16 ++++++++++--
 .../magisk/redesign/home/HomeViewModel.kt     |  3 +++
 .../res/drawable/progress_determinate.xml     | 26 +++++++++++++++++++
 app/src/main/res/layout/fragment_home_md2.xml | 17 +++++++++++-
 app/src/main/res/values/attrs.xml             |  4 +++
 app/src/main/res/values/styles_md2.xml        |  4 +++
 app/src/main/res/values/styles_md2_impl.xml   | 12 +++++++++
 7 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/progress_determinate.xml

diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt
index 3bf76be98..674ee0fdf 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt
@@ -1,10 +1,15 @@
 package com.topjohnwu.magisk.redesign.home
 
 import android.graphics.Insets
+import androidx.lifecycle.Observer
 import com.topjohnwu.magisk.R
 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 org.koin.androidx.viewmodel.ext.android.viewModel
+import timber.log.Timber
+import kotlin.math.roundToInt
 
 class HomeFragment : CompatFragment<HomeViewModel, FragmentHomeMd2Binding>() {
 
@@ -15,8 +20,15 @@ class HomeFragment : CompatFragment<HomeViewModel, FragmentHomeMd2Binding>() {
 
     override fun 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)
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt
index 20ca3e50b..e37b0dbed 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt
@@ -50,6 +50,9 @@ class HomeViewModel(
     val stateVersionUpdateMagisk = KObservableField("")
     val stateVersionUpdateManager = KObservableField("")
 
+    val stateMagiskProgress = KObservableField(0)
+    val stateManagerProgress = KObservableField(0)
+
     val stateHideManagerName = R.string.manager.res().let {
         if (!statePackageOriginal) {
             it.replaceRandomWithSpecial(3)
diff --git a/app/src/main/res/drawable/progress_determinate.xml b/app/src/main/res/drawable/progress_determinate.xml
new file mode 100644
index 000000000..95b275b5d
--- /dev/null
+++ b/app/src/main/res/drawable/progress_determinate.xml
@@ -0,0 +1,26 @@
+<?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
diff --git a/app/src/main/res/layout/fragment_home_md2.xml b/app/src/main/res/layout/fragment_home_md2.xml
index 73a80790b..c9db30fb8 100644
--- a/app/src/main/res/layout/fragment_home_md2.xml
+++ b/app/src/main/res/layout/fragment_home_md2.xml
@@ -148,6 +148,14 @@
 
                     </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
@@ -252,8 +260,15 @@
 
                     </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>
 
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 4d9d21dce..637df5635 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -44,6 +44,10 @@
     <!--Checkbox-->
     <attr name="styleCheckboxNormal" format="reference" />
 
+    <!--Progress-->
+    <attr name="styleProgressDeterminate" format="reference" />
+    <attr name="styleProgressIndeterminate" format="reference" />
+
     <!--endregion-->
 
     <!--region Texts-->
diff --git a/app/src/main/res/values/styles_md2.xml b/app/src/main/res/values/styles_md2.xml
index e3a69cd08..0a26fa01b 100644
--- a/app/src/main/res/values/styles_md2.xml
+++ b/app/src/main/res/values/styles_md2.xml
@@ -53,6 +53,10 @@
 
         <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>
diff --git a/app/src/main/res/values/styles_md2_impl.xml b/app/src/main/res/values/styles_md2_impl.xml
index 106ea8370..1ecc8dca5 100644
--- a/app/src/main/res/values/styles_md2_impl.xml
+++ b/app/src/main/res/values/styles_md2_impl.xml
@@ -131,4 +131,16 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
         <item name="tint">?colorPrimary</item>
     </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>
\ No newline at end of file