From 0f43f02fadb5ef6b9a0589829bda8c9a077e7811 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 14 May 2024 14:47:00 +0300
Subject: [PATCH] Update parsers

---
 app/build.gradle                               |  6 +++---
 .../org/koitharu/kotatsu/core/model/Manga.kt   | 18 +++++-------------
 .../ui/list/chapters/DownloadChapterAD.kt      |  2 +-
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8c2d5e7bd..c61969a30 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 34
-		versionCode = 641
-		versionName = '7.0'
+		versionCode = 642
+		versionName = '7.0.1'
 		generatedDensities = []
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
@@ -82,7 +82,7 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:3e32a6280a') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:915d4093b9') {
 		exclude group: 'org.json', module: 'json'
 	}
 
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/Manga.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/Manga.kt
index b3b591f7f..8ca03088a 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/Manga.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/Manga.kt
@@ -13,9 +13,8 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaState
+import org.koitharu.kotatsu.parsers.util.formatSimple
 import org.koitharu.kotatsu.parsers.util.mapToSet
-import java.text.DecimalFormat
-import java.text.DecimalFormatSymbols
 import com.google.android.material.R as materialR
 
 @JvmName("mangaIds")
@@ -119,17 +118,10 @@ val Manga.appUrl: Uri
 		.appendQueryParameter("url", url)
 		.build()
 
-private val chaptersNumberFormat = DecimalFormat("#.#").also { f ->
-	f.decimalFormatSymbols = DecimalFormatSymbols.getInstance().also {
-		it.decimalSeparator = '.'
-	}
-}
-
-fun MangaChapter.formatNumber(): String? {
-	if (number <= 0f) {
-		return null
-	}
-	return chaptersNumberFormat.format(number.toDouble())
+fun MangaChapter.formatNumber(): String? = if (number > 0f) {
+	number.formatSimple()
+} else {
+	null
 }
 
 fun Manga.chaptersCount(): Int {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/chapters/DownloadChapterAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/chapters/DownloadChapterAD.kt
index 30ebff4ef..b144a6386 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/chapters/DownloadChapterAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/chapters/DownloadChapterAD.kt
@@ -13,7 +13,7 @@ fun downloadChapterAD() = adapterDelegateViewBinding<DownloadChapter, DownloadCh
 	val iconDone = ContextCompat.getDrawable(context, R.drawable.ic_check)
 
 	bind {
-		binding.textViewNumber.text = item.number.toString()
+		binding.textViewNumber.text = item.number
 		binding.textViewTitle.text = item.name
 		binding.textViewTitle.drawableEnd = if (item.isDownloaded) iconDone else null
 	}