From f9c812864e82a9a2a8f56deef12ee223a6447ef4 Mon Sep 17 00:00:00 2001
From: Dude so hot <djohn@fbi.gov>
Date: Sat, 19 Oct 2024 21:50:35 +0800
Subject: [PATCH] Apply RollingNumber to gp & c

---
 .../kotlin/com/hippo/ehviewer/client/parser/ArchiveParser.kt  | 2 +-
 .../kotlin/com/hippo/ehviewer/client/parser/HomeParser.kt     | 4 ++--
 app/src/main/kotlin/com/hippo/ehviewer/ui/main/FundsItem.kt   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/client/parser/ArchiveParser.kt b/app/src/main/kotlin/com/hippo/ehviewer/client/parser/ArchiveParser.kt
index f9043c35e..c68b0210c 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/client/parser/ArchiveParser.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/client/parser/ArchiveParser.kt
@@ -62,7 +62,7 @@ object ArchiveParser {
         val funds = maybeFunds ?: PATTERN_CURRENT_FUNDS.find(body)!!.groupValues.run {
             val fundsGP = ParserUtils.parseInt(get(1), 0)
             val fundsC = ParserUtils.parseInt(get(2), 0)
-            Funds("%,d".format(fundsGP), "%,d".format(fundsC))
+            Funds(fundsGP, fundsC)
         }
         return Result(paramOr, archiveList, funds)
     }
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/client/parser/HomeParser.kt b/app/src/main/kotlin/com/hippo/ehviewer/client/parser/HomeParser.kt
index 202f17409..b7205b48a 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/client/parser/HomeParser.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/client/parser/HomeParser.kt
@@ -30,7 +30,7 @@ object HomeParser {
         FundsRegex.find(body)?.groupValues?.run {
             val fundsC = ParserUtils.parseInt(get(1), 0)
             val fundsGP = ParserUtils.parseInt(get(2), 0) * 1000
-            return Funds("%,d+".format(fundsGP), "%,d".format(fundsC))
+            return Funds(fundsGP, fundsC)
         }
         throw ParseException("Parse funds error")
     }
@@ -40,7 +40,7 @@ object HomeParser {
 }
 
 @Parcelize
-data class Funds(val gp: String, val credit: String) : Parcelable
+data class Funds(val gp: Int, val credit: Int) : Parcelable
 
 @Parcelize
 @Serializable
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/main/FundsItem.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/main/FundsItem.kt
index 02f23a279..8a2419950 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/main/FundsItem.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/main/FundsItem.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.unit.dp
 @Composable
 fun FundsItem(
     type: String,
-    amount: String,
+    amount: Int,
     modifier: Modifier = Modifier,
     textStyle: TextStyle = LocalTextStyle.current,
 ) {
@@ -27,6 +27,6 @@ fun FundsItem(
         Badge(containerColor = MaterialTheme.colorScheme.primaryContainer) {
             Text(text = type)
         }
-        Text(text = amount, style = textStyle)
+        RollingNumber(number = amount, style = textStyle)
     }
 }