diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt
index eccb43432..ec1042653 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt
@@ -20,14 +20,10 @@
package com.aurora.store.view.epoxy.views.app
import android.content.Context
-import android.graphics.Color
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
import android.util.AttributeSet
import android.view.View
import android.widget.RelativeLayout
import androidx.core.content.ContextCompat
-import androidx.core.graphics.ColorUtils
import androidx.core.text.HtmlCompat
import androidx.core.view.isVisible
import coil.load
@@ -73,11 +69,6 @@ class AppUpdateView : RelativeLayout {
private fun init(context: Context?) {
val view = inflate(context, R.layout.view_app_update, this)
B = ViewAppUpdateBinding.bind(view)
-
- B.progressDownload.progressDrawable?.apply {
- val alphaColor = ColorUtils.setAlphaComponent(Color.GRAY, 100)
- colorFilter = PorterDuffColorFilter(alphaColor, PorterDuff.Mode.SRC_IN)
- }
}
@ModelProp
@@ -118,6 +109,7 @@ class AppUpdateView : RelativeLayout {
if (download != null) {
/*Inflate Download details*/
B.btnAction.updateState(download.status)
+ B.progressDownload.isIndeterminate = download.progress < 1
when (download.status) {
DownloadStatus.QUEUED -> {
B.progressDownload.progress = 0
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt
index 033a01353..3a1a9c7c4 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt
@@ -249,7 +249,9 @@ class AppDetailsFragment : BaseFragment(R.layout.fragment_details) {
if (it.isFinished) flip(0) else flip(1)
when (it.status) {
- DownloadStatus.QUEUED,
+ DownloadStatus.QUEUED -> {
+ updateProgress(it.progress)
+ }
DownloadStatus.DOWNLOADING -> {
updateProgress(it.progress, it.speed, it.timeRemaining)
}
@@ -580,13 +582,10 @@ class AppDetailsFragment : BaseFragment(R.layout.fragment_details) {
binding.layoutDetailsInstall.apply {
txtProgressPercent.text = ("${progress}%")
-
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
- progressDownload.setProgress(progress, true)
- } else {
- progressDownload.progress = progress
+ progressDownload.apply {
+ this.progress = progress
+ isIndeterminate = progress < 1
}
-
txtEta.text = CommonUtil.getETAString(requireContext(), timeRemaining)
txtSpeed.text = CommonUtil.getDownloadSpeedString(requireContext(), speed)
}
diff --git a/app/src/main/res/drawable/progressbar_bg.xml b/app/src/main/res/drawable/progressbar_bg.xml
deleted file mode 100644
index ef4508896..000000000
--- a/app/src/main/res/drawable/progressbar_bg.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_details_install.xml b/app/src/main/res/layout/layout_details_install.xml
index 20f42d760..250a22397 100644
--- a/app/src/main/res/layout/layout_details_install.xml
+++ b/app/src/main/res/layout/layout_details_install.xml
@@ -60,15 +60,22 @@
android:gravity="center_vertical"
android:weightSum="4">
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/view_app_update.xml b/app/src/main/res/layout/view_app_update.xml
index 1ee810dc5..c7807e9ad 100644
--- a/app/src/main/res/layout/view_app_update.xml
+++ b/app/src/main/res/layout/view_app_update.xml
@@ -52,14 +52,15 @@
diff --git a/app/src/main/res/layout/view_download.xml b/app/src/main/res/layout/view_download.xml
index 5853c0bf8..500b8633f 100644
--- a/app/src/main/res/layout/view_download.xml
+++ b/app/src/main/res/layout/view_download.xml
@@ -21,6 +21,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="?android:attr/selectableItemBackground"
android:paddingStart="@dimen/padding_small"
android:paddingEnd="@dimen/padding_small">
@@ -61,12 +62,19 @@
android:textAlignment="viewStart"
tools:text="Status" />
-
-
+ android:indeterminate="false"
+ app:indicatorColor="@color/colorAccent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:trackColor="@android:color/darker_gray"
+ app:trackCornerRadius="10dp"
+ app:trackThickness="8dp"
+ tools:progress="40" />
+