From cd579a2230d89b370b72408e1a37f8f51cc05d0c Mon Sep 17 00:00:00 2001
From: C10udburst <18114966+C10udburst@users.noreply.github.com>
Date: Sun, 21 Aug 2022 09:47:58 +0200
Subject: [PATCH] use formatShortFileSize wherever its possible

---
 .../cloudstream3/ui/download/DownloadFragment.kt    | 11 ++++-------
 .../ui/download/DownloadHeaderAdapter.kt            |  3 ++-
 .../cloudstream3/ui/download/EasyDownloadButton.kt  |  5 +++--
 .../cloudstream3/ui/settings/SettingsPlayer.kt      |  4 ++--
 app/src/main/res/values-bp/strings.xml              | 13 -------------
 app/src/main/res/values-cs/strings.xml              | 11 -----------
 app/src/main/res/values-es/strings-es.xml           | 11 -----------
 app/src/main/res/values-in/strings.xml              | 11 -----------
 app/src/main/res/values-it/strings.xml              | 10 ----------
 app/src/main/res/values-nl/strings.xml              | 11 -----------
 app/src/main/res/values-ro/strings.xml              | 11 -----------
 app/src/main/res/values-tr/strings.xml              | 11 -----------
 app/src/main/res/values-vi/strings.xml              | 11 -----------
 app/src/main/res/values/strings.xml                 |  7 +++----
 14 files changed, 14 insertions(+), 116 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
index e8bda305..7ea360a8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
@@ -37,6 +37,7 @@ import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
 import kotlinx.android.synthetic.main.fragment_downloads.*
 import kotlinx.android.synthetic.main.stream_input.*
+import android.text.format.Formatter.formatShortFileSize
 
 
 const val DOWNLOAD_NAVIGATE_TO = "downloadpage"
@@ -44,10 +45,6 @@ const val DOWNLOAD_NAVIGATE_TO = "downloadpage"
 class DownloadFragment : Fragment() {
     private lateinit var downloadsViewModel: DownloadViewModel
 
-    private fun getBytesAsText(bytes: Long): String {
-        return "%.1f".format(bytes / 1000000000f)
-    }
-
     private fun View.setLayoutWidth(weight: Long) {
         val param = LinearLayout.LayoutParams(
             0,
@@ -101,7 +98,7 @@ class DownloadFragment : Fragment() {
             download_free_txt?.text =
                 getString(R.string.storage_size_format).format(
                     getString(R.string.free_storage),
-                    getBytesAsText(it)
+                    formatShortFileSize(view.context, it)
                 )
             download_free?.setLayoutWidth(it)
         }
@@ -109,7 +106,7 @@ class DownloadFragment : Fragment() {
             download_used_txt?.text =
                 getString(R.string.storage_size_format).format(
                     getString(R.string.used_storage),
-                    getBytesAsText(it)
+                    formatShortFileSize(view.context, it)
                 )
             download_used?.setLayoutWidth(it)
             download_storage_appbar?.isVisible = it > 0
@@ -118,7 +115,7 @@ class DownloadFragment : Fragment() {
             download_app_txt?.text =
                 getString(R.string.storage_size_format).format(
                     getString(R.string.app_storage),
-                    getBytesAsText(it)
+                    formatShortFileSize(view.context, it)
                 )
             download_app?.setLayoutWidth(it)
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadHeaderAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadHeaderAdapter.kt
index 5168409e..fde490e2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadHeaderAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadHeaderAdapter.kt
@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.ui.download
 
 import android.annotation.SuppressLint
+import android.text.format.Formatter.formatShortFileSize
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -113,7 +114,7 @@ class DownloadHeaderAdapter(
             }
 
             title.text = d.name
-            val mbString = "%.1f".format(card.totalBytes / 1000000f)
+            val mbString = formatShortFileSize(itemView.context, card.totalBytes)
 
             //val isMovie = d.type.isMovieType()
             if (card.child != null) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/EasyDownloadButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/EasyDownloadButton.kt
index 04a20e73..77878432 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/EasyDownloadButton.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/EasyDownloadButton.kt
@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.ui.download
 
 import android.animation.ObjectAnimator
+import android.text.format.Formatter.formatShortFileSize
 import android.view.View
 import android.view.animation.DecelerateInterpolator
 import android.widget.ImageView
@@ -171,8 +172,8 @@ class EasyDownloadButton : IDisposable {
                 }
                 textView?.visibility = View.VISIBLE
                 progressBar.visibility = View.VISIBLE
-                val currentMbString = "%.1f".format(setCurrentBytes / 1000000f)
-                val totalMbString = "%.1f".format(setTotalBytes / 1000000f)
+                val currentMbString = formatShortFileSize(textView?.context, setCurrentBytes)
+                val totalMbString = formatShortFileSize(textView?.context, setTotalBytes)
 
                 textView?.text =
                     if (isTextPercentage) "%d%%".format(setCurrentBytes * 100L / setTotalBytes) else
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt
index 72ed9ad9..478457c4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt
@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.ui.settings
 
 import android.os.Bundle
+import android.text.format.Formatter.formatShortFileSize
 import android.view.View
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
@@ -164,8 +165,7 @@ class SettingsPlayer : PreferenceFragmentCompat() {
 
             fun updateSummery() {
                 try {
-                    pref.summary =
-                        getString(R.string.mb_format).format(getFolderSize(cacheDir) / (1024L * 1024L))
+                    pref.summary = formatShortFileSize(view?.context, getFolderSize(cacheDir))
                 } catch (e: Exception) {
                     logError(e)
                 }
diff --git a/app/src/main/res/values-bp/strings.xml b/app/src/main/res/values-bp/strings.xml
index a908bcb2..beacb1e3 100644
--- a/app/src/main/res/values-bp/strings.xml
+++ b/app/src/main/res/values-bp/strings.xml
@@ -1,21 +1,8 @@
 <!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
 <resources>
     <!-- KEYS DON'T TRANSLATE -->
-    <string name="bottom_title_key" translatable="false">bottom_title_key</string>
-    <string name="override_site_key" translatable="false">override_site_key</string>
 
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="extra_info_format" translatable="false" formatted="true">%d %s | %sMB</string>
-    <string name="storage_size_format" translatable="false" formatted="true">%s • %sGB</string>
-    <string name="download_size_format" translatable="false" formatted="true">%sMB / %sMB</string>
-    <string name="mb_format" translatable="false" formatted="true">%dMB</string>
-    <string name="episode_name_format" translatable="false" formatted="true">%s %s</string>
-    <string name="ffw_text_format" translatable="false" formatted="true">+%d</string>
-    <string name="rew_text_format" translatable="false" formatted="true">-%d</string>
-    <string name="ffw_text_regular_format" translatable="false" formatted="true">%d</string>
-    <string name="rew_text_regular_format" translatable="false" formatted="true">%d</string>
-    <string name="rating_format" translatable="false" formatted="true">%.1f/10.0</string>
-    <string name="year_format" translatable="false" formatted="true">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Elenco: %s</string>
     <string name="next_episode_format" formatted="true">O episódio %d vai ser lançado em</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 645337c3..c09f5170 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -3,17 +3,6 @@
     <!-- KEYS DON'T TRANSLATE -->
 
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="extra_info_format" translatable="false" formatted="true">%d %s | %sMB</string>
-    <string name="storage_size_format" translatable="false" formatted="true">%s • %sGB</string>
-    <string name="download_size_format" translatable="false" formatted="true">%sMB / %sMB</string>
-    <string name="mb_format" translatable="false" formatted="true">%dMB</string>
-    <string name="episode_name_format" translatable="false" formatted="true">%s %s</string>
-    <string name="ffw_text_format" translatable="false" formatted="true">+%d</string>
-    <string name="rew_text_format" translatable="false" formatted="true">-%d</string>
-    <string name="ffw_text_regular_format" translatable="false" formatted="true">%d</string>
-    <string name="rew_text_regular_format" translatable="false" formatted="true">%d</string>
-    <string name="rating_format" translatable="false" formatted="true">%.1f/10.0</string>
-    <string name="year_format" translatable="false" formatted="true">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Hrají: %s</string>
 
diff --git a/app/src/main/res/values-es/strings-es.xml b/app/src/main/res/values-es/strings-es.xml
index fbd73ce8..a16edc6a 100644
--- a/app/src/main/res/values-es/strings-es.xml
+++ b/app/src/main/res/values-es/strings-es.xml
@@ -1,17 +1,6 @@
 <!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
 <resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="extra_info_format" translatable="false" formatted="true">%d %s | %sMB</string>
-    <string name="storage_size_format" translatable="false" formatted="true">%s • %sGB</string>
-    <string name="download_size_format" translatable="false" formatted="true">%sMB / %sMB</string>
-    <string name="mb_format" translatable="false" formatted="true">%dMB</string>
-    <string name="episode_name_format" translatable="false" formatted="true">%s %s</string>
-    <string name="ffw_text_format" translatable="false" formatted="true">+%d</string>
-    <string name="rew_text_format" translatable="false" formatted="true">-%d</string>
-    <string name="ffw_text_regular_format" translatable="false" formatted="true">%d</string>
-    <string name="rew_text_regular_format" translatable="false" formatted="true">%d</string>
-    <string name="rating_format" translatable="false" formatted="true">%.1f/10.0</string>
-    <string name="year_format" translatable="false" formatted="true">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Reparto: %s</string>
     <string name="next_episode_format" formatted="true">El episodio %d se publicará en</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 171f5e1f..107d4395 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -2,17 +2,6 @@
 <resources>
 
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="extra_info_format" translatable="false" formatted="true">%d %s | %sMB</string>
-    <string name="storage_size_format" translatable="false" formatted="true">%s • %sGB</string>
-    <string name="download_size_format" translatable="false" formatted="true">%sMB / %sMB</string>
-    <string name="mb_format" translatable="false" formatted="true">%dMB</string>
-    <string name="episode_name_format" translatable="false" formatted="true">%s %s</string>
-    <string name="ffw_text_format" translatable="false" formatted="true">+%d</string>
-    <string name="rew_text_format" translatable="false" formatted="true">-%d</string>
-    <string name="ffw_text_regular_format" translatable="false" formatted="true">%d</string>
-    <string name="rew_text_regular_format" translatable="false" formatted="true">%d</string>
-    <string name="rating_format" translatable="false" formatted="true">%.1f/10.0</string>
-    <string name="year_format" translatable="false" formatted="true">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Pemeran: %s</string>
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 61a81af1..1bf3f023 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,16 +1,6 @@
 <!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
 <resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="extra_info_format" translatable="false" formatted="true">%d %s | %sMB</string>
-    <string name="storage_size_format" translatable="false" formatted="true">%s • %sGB</string>
-    <string name="download_size_format" translatable="false" formatted="true">%sMB / %sMB</string>
-    <string name="episode_name_format" translatable="false" formatted="true">%s %s</string>
-    <string name="ffw_text_format" translatable="false" formatted="true">+%d</string>
-    <string name="rew_text_format" translatable="false" formatted="true">-%d</string>
-    <string name="ffw_text_regular_format" translatable="false" formatted="true">%d</string>
-    <string name="rew_text_regular_format" translatable="false" formatted="true">%d</string>
-    <string name="rating_format" translatable="false" formatted="true">%.1f/10.0</string>
-    <string name="year_format" translatable="false" formatted="true">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
     <string name="next_episode_format" formatted="true">L\'episodio %d uscirà in</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 3a083170..1bf34b5a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,17 +1,6 @@
 <!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
 <resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="extra_info_format" formatted="true" translatable="false">%d %s | %sMB</string>
-    <string name="storage_size_format" formatted="true" translatable="false">%s • %sGB</string>
-    <string name="download_size_format" formatted="true" translatable="false">%sMB / %sMB</string>
-    <string name="mb_format" formatted="true" translatable="false">%dMB</string>
-    <string name="episode_name_format" formatted="true" translatable="false">%s %s</string>
-    <string name="ffw_text_format" formatted="true" translatable="false">+%d</string>
-    <string name="rew_text_format" formatted="true" translatable="false">-%d</string>
-    <string name="ffw_text_regular_format" formatted="true" translatable="false">%d</string>
-    <string name="rew_text_regular_format" formatted="true" translatable="false">%d</string>
-    <string name="rating_format" formatted="true" translatable="false">%.1f/10.0</string>
-    <string name="year_format" formatted="true" translatable="false">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
     <string name="next_episode_format" formatted="true">Aflevering %d zal worden uitgebracht in</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 12e81004..6386e44e 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1,17 +1,6 @@
 <!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
 <resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="extra_info_format" translatable="false" formatted="true">%d %s | %sMB</string>
-    <string name="storage_size_format" translatable="false" formatted="true">%s • %sGB</string>
-    <string name="download_size_format" translatable="false" formatted="true">%sMB / %sMB</string>
-    <string name="mb_format" translatable="false" formatted="true">%dMB</string>
-    <string name="episode_name_format" translatable="false" formatted="true">%s %s</string>
-    <string name="ffw_text_format" translatable="false" formatted="true">+%d</string>
-    <string name="rew_text_format" translatable="false" formatted="true">-%d</string>
-    <string name="ffw_text_regular_format" translatable="false" formatted="true">%d</string>
-    <string name="rew_text_regular_format" translatable="false" formatted="true">%d</string>
-    <string name="rating_format" translatable="false" formatted="true">%.1f/10.0</string>
-    <string name="year_format" translatable="false" formatted="true">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Distribuție: %s</string>
     <string name="next_episode_format" formatted="true">Episodul %d va fi lansat în</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 0513d122..29e1c5c8 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,17 +1,6 @@
 <!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
 <resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="extra_info_format" formatted="true" translatable="false">%d %s | %sMB</string>
-    <string name="storage_size_format" formatted="true" translatable="false">%s • %sGB</string>
-    <string name="download_size_format" formatted="true" translatable="false">%sMB / %sMB</string>
-    <string name="mb_format" formatted="true" translatable="false">%dMB</string>
-    <string name="episode_name_format" formatted="true" translatable="false">%s %s</string>
-    <string name="ffw_text_format" formatted="true" translatable="false">+%d</string>
-    <string name="rew_text_format" formatted="true" translatable="false">-%d</string>
-    <string name="ffw_text_regular_format" formatted="true" translatable="false">%d</string>
-    <string name="rew_text_regular_format" formatted="true" translatable="false">%d</string>
-    <string name="rating_format" formatted="true" translatable="false">%.1f/10.0</string>
-    <string name="year_format" formatted="true" translatable="false">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Ep %d</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
     <string name="next_episode_format" formatted="true">Bölüm %d şu tarihte yayınlanacak: </string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 49631d1f..f0c47e0e 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -3,17 +3,6 @@
     <!-- KEYS DON'T TRANSLATE -->
 
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="extra_info_format" translatable="false" formatted="true">%d %s | %sMB</string>
-    <string name="storage_size_format" translatable="false" formatted="true">%s • %sGB</string>
-    <string name="download_size_format" translatable="false" formatted="true">%sMB / %sMB</string>
-    <string name="mb_format" translatable="false" formatted="true">%dMB</string>
-    <string name="episode_name_format" translatable="false" formatted="true">%s %s</string>
-    <string name="ffw_text_format" translatable="false" formatted="true">+%d</string>
-    <string name="rew_text_format" translatable="false" formatted="true">-%d</string>
-    <string name="ffw_text_regular_format" translatable="false" formatted="true">%d</string>
-    <string name="rew_text_regular_format" translatable="false" formatted="true">%d</string>
-    <string name="rating_format" translatable="false" formatted="true">%.1f/10.0</string>
-    <string name="year_format" translatable="false" formatted="true">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%s Tập %d</string>
     <string name="cast_format" formatted="true">Diễn viên: %s</string>
     <string name="next_episode_format" formatted="true">Tập %d sẽ ra mắt sau</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 873de287..f0fd0102 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -56,10 +56,9 @@
     <string name="pref_filter_search_quality_key" translatable="false">pref_filter_search_quality_key</string>
 
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="extra_info_format" formatted="true" translatable="false">%d %s | %sMB</string>
-    <string name="storage_size_format" formatted="true" translatable="false">%s • %sGB</string>
-    <string name="download_size_format" formatted="true" translatable="false">%sMB / %sMB</string>
-    <string name="mb_format" formatted="true" translatable="false">%dMB</string>
+    <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
+    <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
+    <string name="download_size_format" formatted="true" translatable="false">%s / %s</string>
     <string name="episode_name_format" formatted="true" translatable="false">%s %s</string>
     <string name="ffw_text_format" formatted="true" translatable="false">+%d</string>
     <string name="rew_text_format" formatted="true" translatable="false">-%d</string>