Browse Source

Library update notification changes (#10175)

Don't round up notification percentage. Why show 100% when stuff is still updating.

Show same notification when hide notification content is enabled. Just exclude manga titles.
AntsyLich 1 year ago
parent
commit
ba10093ddc

+ 12 - 13
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt

@@ -33,12 +33,14 @@ import tachiyomi.domain.chapter.model.Chapter
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.i18n.MR
 import uy.kohesive.injekt.injectLazy
+import java.math.RoundingMode
 import java.text.NumberFormat
 
 class LibraryUpdateNotifier(private val context: Context) {
 
     private val preferences: SecurityPreferences by injectLazy()
     private val percentFormatter = NumberFormat.getPercentInstance().apply {
+        roundingMode = RoundingMode.DOWN
         maximumFractionDigits = 0
     }
 
@@ -78,20 +80,17 @@ class LibraryUpdateNotifier(private val context: Context) {
      * @param total the total progress.
      */
     fun showProgressNotification(manga: List<Manga>, current: Int, total: Int) {
-        if (preferences.hideNotificationContent().get()) {
-            progressNotificationBuilder
-                .setContentTitle(context.stringResource(MR.strings.notification_check_updates))
-                .setContentText("($current/$total)")
-        } else {
+        progressNotificationBuilder
+            .setContentTitle(
+                context.stringResource(
+                    MR.strings.notification_updating_progress,
+                    percentFormatter.format(current.toFloat() / total),
+                ),
+            )
+
+        if (!preferences.hideNotificationContent().get()) {
             val updatingText = manga.joinToString("\n") { it.title.chop(40) }
-            progressNotificationBuilder
-                .setContentTitle(
-                    context.stringResource(
-                        MR.strings.notification_updating_progress,
-                        percentFormatter.format(current.toFloat() / total),
-                    ),
-                )
-                .setStyle(NotificationCompat.BigTextStyle().bigText(updatingText))
+            progressNotificationBuilder.setStyle(NotificationCompat.BigTextStyle().bigText(updatingText))
         }
 
         context.notify(

+ 0 - 1
i18n/src/commonMain/resources/MR/base/strings.xml

@@ -800,7 +800,6 @@
     <string name="download_queue_size_warning">Warning: large bulk downloads may lead to sources becoming slower and/or blocking Tachiyomi. Tap to learn more.</string>
 
     <!-- Library update service notifications -->
-    <string name="notification_check_updates">Checking for new chapters</string>
     <string name="notification_updating_progress">Updating library… (%s)</string>
     <string name="notification_size_warning">Large updates harm sources and may lead to slower updates and also increased battery usage. Tap to learn more.</string>
     <string name="notification_new_chapters">New chapters found</string>