From 9686ad6f00268c7732e6347f8dbe30bdfffa0ee4 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Mon, 7 Mar 2022 12:42:22 +0200
Subject: [PATCH] Show page progress on ProgressIndicator

---
 .../kotatsu/reader/ui/pager/standard/PageHolder.kt     | 10 ++++++----
 .../kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt   | 10 ++++++----
 .../java/org/koitharu/kotatsu/utils/ext/ViewExt.kt     |  1 +
 app/src/main/res/layout/item_page.xml                  |  9 ---------
 app/src/main/res/layout/item_page_webtoon.xml          |  9 ---------
 5 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt
index 4ac9c7e7a..ff1828c00 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt
@@ -44,12 +44,16 @@ open class PageHolder(
 	override fun onLoadingStarted() {
 		binding.layoutError.isVisible = false
 		binding.progressBar.isVisible = true
-		binding.textViewProgress.isVisible = true
 		binding.ssiv.recycle()
 	}
 
 	override fun onProgressChanged(progress: Int) {
-		binding.textViewProgress.text = if (progress in 0..100) "%d%%".format(progress) else null
+		if (progress in 0..100) {
+			binding.progressBar.isIndeterminate = false
+			binding.progressBar.setProgressCompat(progress, true)
+		} else {
+			binding.progressBar.isIndeterminate = true
+		}
 	}
 
 	override fun onImageReady(uri: Uri) {
@@ -94,7 +98,6 @@ open class PageHolder(
 
 	override fun onImageShown() {
 		binding.progressBar.isVisible = false
-		binding.textViewProgress.isVisible = false
 	}
 
 	override fun onClick(v: View) {
@@ -110,6 +113,5 @@ open class PageHolder(
 		)
 		binding.layoutError.isVisible = true
 		binding.progressBar.isVisible = false
-		binding.textViewProgress.isVisible = false
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt
index 642f24212..33c29bd4b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt
@@ -44,12 +44,16 @@ class WebtoonHolder(
 	override fun onLoadingStarted() {
 		binding.layoutError.isVisible = false
 		binding.progressBar.isVisible = true
-		binding.textViewProgress.isVisible = true
 		binding.ssiv.recycle()
 	}
 
 	override fun onProgressChanged(progress: Int) {
-		binding.textViewProgress.text = if (progress in 0..100) "%d%%".format(progress) else null
+		if (progress in 0..100) {
+			binding.progressBar.isIndeterminate = false
+			binding.progressBar.setProgressCompat(progress, true)
+		} else {
+			binding.progressBar.isIndeterminate = true
+		}
 	}
 
 	override fun onImageReady(uri: Uri) {
@@ -73,7 +77,6 @@ class WebtoonHolder(
 
 	override fun onImageShown() {
 		binding.progressBar.isVisible = false
-		binding.textViewProgress.isVisible = false
 	}
 
 	override fun onClick(v: View) {
@@ -89,7 +92,6 @@ class WebtoonHolder(
 		)
 		binding.layoutError.isVisible = true
 		binding.progressBar.isVisible = false
-		binding.textViewProgress.isVisible = false
 	}
 
 	fun getScrollY() = binding.ssiv.getScroll()
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt
index 95546d3c2..243356b1d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt
@@ -166,6 +166,7 @@ inline fun <reified T> RecyclerView.ViewHolder.getItem(): T? {
 	return ((this as? AdapterDelegateViewBindingViewHolder<*, *>)?.item as? T)
 }
 
+@Deprecated("Useless")
 fun BaseProgressIndicator<*>.setIndeterminateCompat(indeterminate: Boolean) {
 	if (isIndeterminate != indeterminate) {
 		if (indeterminate && visibility == View.VISIBLE) {
diff --git a/app/src/main/res/layout/item_page.xml b/app/src/main/res/layout/item_page.xml
index d8cb38ef0..6154ce8fe 100644
--- a/app/src/main/res/layout/item_page.xml
+++ b/app/src/main/res/layout/item_page.xml
@@ -19,15 +19,6 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="center" />
 
-	<TextView
-		android:id="@+id/textView_progress"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center"
-		android:singleLine="true"
-		android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
-		tools:text="146%" />
-
 	<TextView
 		android:id="@+id/textView_number"
 		android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/item_page_webtoon.xml b/app/src/main/res/layout/item_page_webtoon.xml
index ae114dd73..c66df5034 100644
--- a/app/src/main/res/layout/item_page_webtoon.xml
+++ b/app/src/main/res/layout/item_page_webtoon.xml
@@ -21,15 +21,6 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="center" />
 
-	<TextView
-		android:id="@+id/textView_progress"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center"
-		android:singleLine="true"
-		android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
-		tools:text="146%" />
-
 	<LinearLayout
 		android:id="@+id/layout_error"
 		android:layout_width="wrap_content"