Deduplicator: Use "X files" instead of "copies", with similar files i…

…n the mix, it's not really a copy anymore...
lydretz1982 · Nov 8, 2023 · 2cc27bd · 2cc27bd
1 parent 1c49211
commit 2cc27bd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/app-common/src/main/res/values/strings.xml b/app-common/src/main/res/values/strings.xml
@@ -145,4 +145,9 @@
     <string name="general_timeunit_days">Days</string>
     <string name="general_progress_ready">Ready</string>
     <string name="general_progress_done">Done</string>
+
+    <plurals name="result_x_files">
+        <item quantity="one">%s file</item>
+        <item quantity="other">%s files</item>
+    </plurals>
 </resources>
diff --git a/...in/java/eu/darken/sdmse/deduplicator/ui/details/cluster/elements/ChecksumGroupHeaderVH.kt b/...in/java/eu/darken/sdmse/deduplicator/ui/details/cluster/elements/ChecksumGroupHeaderVH.kt
@@ -29,7 +29,7 @@ class ChecksumGroupHeaderVH(parent: ViewGroup) :
 
         previewImage.loadFilePreview(group.preview)
 
-        countValue.text = context.getQuantityString2(R.plurals.deduplicator_result_x_duplicates, group.count)
+        countValue.text = context.getQuantityString2(eu.darken.sdmse.common.R.plurals.result_x_files, group.count)
         sizeValue.text = Formatter.formatFileSize(context, group.averageSize.roundToLong())
 
         viewAction.setOnClickListener { item.onViewActionClick(item) }

diff --git a/...src/main/java/eu/darken/sdmse/deduplicator/ui/details/cluster/elements/ClusterHeaderVH.kt b/...src/main/java/eu/darken/sdmse/deduplicator/ui/details/cluster/elements/ClusterHeaderVH.kt
@@ -28,12 +28,12 @@ class ClusterHeaderVH(parent: ViewGroup) :
         val cluster = item.cluster
 
         methodChecksumCount.text = context.getQuantityString2(
-            R.plurals.deduplicator_result_x_duplicates,
+            eu.darken.sdmse.common.R.plurals.result_x_files,
             cluster.groups.filterIsInstance<ChecksumDuplicate.Group>().sumOf { it.count }
         )
 
         methodPhashValue.text = context.getQuantityString2(
-            R.plurals.deduplicator_result_x_duplicates,
+            eu.darken.sdmse.common.R.plurals.result_x_files,
             cluster.groups.filterIsInstance<PHashDuplicate.Group>().sumOf { it.count }
         )
 

diff --git a/.../main/java/eu/darken/sdmse/deduplicator/ui/details/cluster/elements/PHashGroupHeaderVH.kt b/.../main/java/eu/darken/sdmse/deduplicator/ui/details/cluster/elements/PHashGroupHeaderVH.kt
@@ -58,7 +58,7 @@ class PHashGroupHeaderVH(parent: ViewGroup) :
             }
         })
 
-        countValue.text = context.getQuantityString2(R.plurals.deduplicator_result_x_duplicates, group.count)
+        countValue.text = context.getQuantityString2(eu.darken.sdmse.common.R.plurals.result_x_files, group.count)
         sizeValue.text = Formatter.formatFileSize(context, group.averageSize.roundToLong())
 
         viewAction.setOnClickListener { item.onViewActionClick(item) }

diff --git a/app/src/main/java/eu/darken/sdmse/deduplicator/ui/list/DeduplicatorListGridVH.kt b/app/src/main/java/eu/darken/sdmse/deduplicator/ui/list/DeduplicatorListGridVH.kt
@@ -38,7 +38,7 @@ class DeduplicatorListGridVH(parent: ViewGroup) :
         previewImage.loadFilePreview(cluster.previewFile)
 
         primary.text = Formatter.formatShortFileSize(context, cluster.totalSize)
-        secondary.text = context.getQuantityString2(R.plurals.deduplicator_result_x_duplicates, cluster.count)
+        secondary.text = context.getQuantityString2(eu.darken.sdmse.common.R.plurals.result_x_items, cluster.count)
 
         matchTypeChecksum.isVisible = item.cluster.types.contains(Duplicate.Type.CHECKSUM)
         matchTypePhash.isVisible = item.cluster.types.contains(Duplicate.Type.PHASH)