From 30d3619d057b10f0be37e118232389eb804b1e19 Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Sun, 12 Apr 2020 14:30:02 +0430
Subject: Use Android's own file size formatter

---
 .../de/danoeh/antennapod/adapter/DataFolderAdapter.java  | 16 +++++++++-------
 .../adapter/DownloadStatisticsListAdapter.java           | 10 +++++-----
 .../danoeh/antennapod/adapter/DownloadlistAdapter.java   |  6 +++---
 .../view/viewholder/EpisodeItemViewHolder.java           |  8 ++++++--
 4 files changed, 23 insertions(+), 17 deletions(-)

(limited to 'app/src/main/java')

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DataFolderAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DataFolderAdapter.java
index e3ca5b5a5..64560df56 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DataFolderAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DataFolderAdapter.java
@@ -2,23 +2,24 @@ package de.danoeh.antennapod.adapter;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.widget.ProgressBar;
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
+import android.text.format.Formatter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ProgressBar;
 import android.widget.RadioButton;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
-import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.StorageUtils;
 import de.danoeh.antennapod.dialog.ChooseDataFolderDialog;
 
@@ -48,8 +49,9 @@ public class DataFolderAdapter extends RecyclerView.Adapter<DataFolderAdapter.Vi
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         StoragePath storagePath = entries.get(position);
-        String freeSpace = Converter.byteToString(storagePath.getAvailableSpace());
-        String totalSpace = Converter.byteToString(storagePath.getTotalSpace());
+        Context context = holder.root.getContext();
+        String freeSpace = Formatter.formatShortFileSize(context, storagePath.getAvailableSpace());
+        String totalSpace = Formatter.formatShortFileSize(context, storagePath.getTotalSpace());
 
         holder.path.setText(storagePath.getShortPath());
         holder.size.setText(String.format(freeSpaceString, freeSpace, totalSpace));
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadStatisticsListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadStatisticsListAdapter.java
index c49d2f39d..721b720d1 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadStatisticsListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadStatisticsListAdapter.java
@@ -1,14 +1,14 @@
 package de.danoeh.antennapod.adapter;
 
 import android.content.Context;
+import android.text.format.Formatter;
+
+import java.util.List;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.storage.StatisticsItem;
-import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.view.PieChartView;
 
-import java.util.List;
-
 /**
  * Adapter for the download statistics list.
  */
@@ -25,7 +25,7 @@ public class DownloadStatisticsListAdapter extends StatisticsListAdapter {
 
     @Override
     String getHeaderValue() {
-        return Converter.byteToString((long) pieChartData.getSum());
+        return Formatter.formatShortFileSize(context, (long) pieChartData.getSum());
     }
 
     @Override
@@ -40,7 +40,7 @@ public class DownloadStatisticsListAdapter extends StatisticsListAdapter {
 
     @Override
     void onBindFeedViewHolder(StatisticsHolder holder, StatisticsItem item) {
-        holder.value.setText(Converter.byteToString(item.totalDownloadSize));
+        holder.value.setText(Formatter.formatShortFileSize(context, item.totalDownloadSize));
     }
 
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
index 3aaeec902..540cd054c 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
@@ -1,6 +1,7 @@
 package de.danoeh.antennapod.adapter;
 
 import android.content.Context;
+import android.text.format.Formatter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,7 +15,6 @@ import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.service.download.DownloadRequest;
 import de.danoeh.antennapod.core.service.download.DownloadStatus;
 import de.danoeh.antennapod.core.service.download.Downloader;
-import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.ThemeUtils;
 import de.danoeh.antennapod.view.CircularProgressBar;
 
@@ -79,9 +79,9 @@ public class DownloadlistAdapter extends BaseAdapter {
         if (request.getSoFar() <= 0) {
             status += context.getString(R.string.download_pending);
         } else {
-            status += Converter.byteToString(request.getSoFar());
+            status += Formatter.formatShortFileSize(context, request.getSoFar());
             if (request.getSize() != DownloadStatus.SIZE_UNKNOWN) {
-                status += " / " + Converter.byteToString(request.getSize());
+                status += " / " + Formatter.formatShortFileSize(context, request.getSize());
                 holder.secondaryActionProgress.setPercentage(
                         0.01f * Math.max(1, request.getProgressPercent()), request);
             }
diff --git a/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java b/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java
index 506f0f695..7b80c3850 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java
@@ -2,6 +2,7 @@ package de.danoeh.antennapod.view.viewholder;
 
 import android.os.Build;
 import android.text.Layout;
+import android.text.format.Formatter;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -9,9 +10,12 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+
 import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
+
 import com.joanzapata.iconify.Iconify;
+
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.CoverLoader;
@@ -153,14 +157,14 @@ public class EpisodeItemViewHolder extends RecyclerView.ViewHolder {
         }
 
         if (media.getSize() > 0) {
-            size.setText(Converter.byteToString(media.getSize()));
+            size.setText(Formatter.formatShortFileSize(activity, media.getSize()));
         } else if (NetworkUtils.isEpisodeHeadDownloadAllowed() && !media.checkedOnSizeButUnknown()) {
             size.setText("{fa-spinner}");
             Iconify.addIcons(size);
             NetworkUtils.getFeedMediaSizeObservable(media).subscribe(
                     sizeValue -> {
                         if (sizeValue > 0) {
-                            size.setText(Converter.byteToString(sizeValue));
+                            size.setText(Formatter.formatShortFileSize(activity, sizeValue));
                         } else {
                             size.setText("");
                         }
-- 
cgit v1.2.3