[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Offline compilations : show size in MB when its less than 1 gb

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/396573 )

Change subject: Offline compilations : show size in MB when its less than 1 gb
..


Offline compilations : show size in MB when its less than 1 gb

Bug: T177879

Change-Id: Idb5c86373eea57224e2b44f30ab2c0832c522899
---
M app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
M app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java
M app/src/main/java/org/wikipedia/offline/DiskUsageView.java
M app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
M app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
M app/src/main/java/org/wikipedia/util/FileUtil.java
M app/src/main/res/layout/fragment_compilation_detail.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
9 files changed, 47 insertions(+), 20 deletions(-)

Approvals:
  Dbrant: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java 
b/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
index 2b4f95b..2fef47e 100644
--- a/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
@@ -36,7 +36,7 @@
 
 import static 
org.wikipedia.offline.CompilationDetailActivity.EXTRA_COMPILATION;
 import static org.wikipedia.util.DateUtil.getShortDateString;
-import static org.wikipedia.util.FileUtil.bytesToGB;
+import static org.wikipedia.util.FileUtil.bytesToUserVisibleUnit;
 
 public class CompilationDetailFragment extends DownloadObserverFragment {
 @BindView(R.id.compilation_detail_toolbar) Toolbar toolbar;
@@ -81,12 +81,12 @@
 
gradientView.setBackground(GradientUtil.getPowerGradient(R.color.black54, 
Gravity.TOP));
 imageView.loadImage(compilation.featureImageUri());
 nameView.setText(compilation.name());
-
dateSizeView.setText(String.format(getString(R.string.offline_compilation_detail_date_size),
-getShortDateString(compilation.date()), 
bytesToGB(compilation.size(;
+
dateSizeView.setText(getString(R.string.offline_compilation_detail_date_size_v2,
+getShortDateString(compilation.date()), 
bytesToUserVisibleUnit(getContext(), compilation.size(;
 summaryView.setText(compilation.summary());
 descriptionView.setText(compilation.description());
-
downloadButton.setText(String.format(getString(R.string.offline_compilation_detail_button_download),
-bytesToGB(compilation.size(;
+
downloadButton.setText(getString(R.string.offline_compilation_detail_button_download_v2,
+bytesToUserVisibleUnit(getContext(), compilation.size(;
 
 controls.setCallback(new CompilationDownloadControlView.Callback() {
 @Override
diff --git 
a/app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java 
b/app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java
index 50f0ba6..7687141 100644
--- 
a/app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java
+++ 
b/app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java
@@ -23,7 +23,7 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-import static org.wikipedia.util.FileUtil.bytesToGB;
+import static org.wikipedia.util.FileUtil.bytesToUserVisibleUnit;
 
 public class CompilationDownloadControlView extends LinearLayout {
 @BindView(R.id.compilation_download_widget_progress_text) TextView 
progressText;
@@ -81,8 +81,8 @@
 progressBar.setIndeterminate(true);
 timeRemainingText.setVisibility(GONE);
 }
-
progressText.setText(getString(R.string.offline_compilation_download_progress_text,
-bytesToGB(item.bytesDownloaded()), 
bytesToGB(item.bytesTotal(;
+
progressText.setText(getString(R.string.offline_compilation_download_progress_text_v2,
+bytesToUserVisibleUnit(getContext(), item.bytesDownloaded()), 
bytesToUserVisibleUnit(getContext(), item.bytesTotal(;
 long bytesPerMin = item.bytesPerSec() * TimeUnit.MINUTES.toSeconds(1);
 if (bytesPerMin >= 0) {
 long minsRemaining = (item.bytesTotal() - item.bytesDownloaded()) 
/ bytesPerMin;
diff --git a/app/src/main/java/org/wikipedia/offline/DiskUsageView.java 
b/app/src/main/java/org/wikipedia/offline/DiskUsageView.java
index d8afb7c..57c45c6 100644
--- a/app/src/main/java/org/wikipedia/offline/DiskUsageView.java
+++ b/app/src/main/java/org/wikipedia/offline/DiskUsageView.java
@@ -18,6 +18,7 @@
 import butterknife.ButterKnife;
 
 import static org.wikipedia.util.FileUtil.bytesToGB;
+import static org.wikipedia.util.FileUtil.bytesToUserVisibleUnit;
 
 public class DiskUsageView 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Offline compilations : show size in MB when its less than 1 gb

[Yashasvi (Code Review)]

Yashasvi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/396573 )

Change subject: Offline compilations : show size in MB when its less than 1 gb
..

Offline compilations : show size in MB when its less than 1 gb

Bug: T177879
Change-Id: Idb5c86373eea57224e2b44f30ab2c0832c522899
---
M app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
M app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java
M app/src/main/java/org/wikipedia/offline/DiskUsageView.java
M app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
M app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java
M app/src/main/java/org/wikipedia/util/FileUtil.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
8 files changed, 45 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/73/396573/1

diff --git 
a/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java 
b/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
index 2b4f95b..f766117 100644
--- a/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
@@ -36,7 +36,7 @@
 
 import static 
org.wikipedia.offline.CompilationDetailActivity.EXTRA_COMPILATION;
 import static org.wikipedia.util.DateUtil.getShortDateString;
-import static org.wikipedia.util.FileUtil.bytesToGB;
+import static org.wikipedia.util.FileUtil.bytesToUserVisibleUnit;
 
 public class CompilationDetailFragment extends DownloadObserverFragment {
 @BindView(R.id.compilation_detail_toolbar) Toolbar toolbar;
@@ -81,12 +81,12 @@
 
gradientView.setBackground(GradientUtil.getPowerGradient(R.color.black54, 
Gravity.TOP));
 imageView.loadImage(compilation.featureImageUri());
 nameView.setText(compilation.name());
-
dateSizeView.setText(String.format(getString(R.string.offline_compilation_detail_date_size),
-getShortDateString(compilation.date()), 
bytesToGB(compilation.size(;
+
dateSizeView.setText(getString(R.string.offline_compilation_detail_date_size,
+getShortDateString(compilation.date()), 
bytesToUserVisibleUnit(getContext(), compilation.size(;
 summaryView.setText(compilation.summary());
 descriptionView.setText(compilation.description());
-
downloadButton.setText(String.format(getString(R.string.offline_compilation_detail_button_download),
-bytesToGB(compilation.size(;
+
downloadButton.setText(getString(R.string.offline_compilation_detail_button_download,
+bytesToUserVisibleUnit(getContext(), compilation.size(;
 
 controls.setCallback(new CompilationDownloadControlView.Callback() {
 @Override
diff --git 
a/app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java 
b/app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java
index 50f0ba6..37cf82f 100644
--- 
a/app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java
+++ 
b/app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java
@@ -23,7 +23,7 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-import static org.wikipedia.util.FileUtil.bytesToGB;
+import static org.wikipedia.util.FileUtil.bytesToUserVisibleUnit;
 
 public class CompilationDownloadControlView extends LinearLayout {
 @BindView(R.id.compilation_download_widget_progress_text) TextView 
progressText;
@@ -82,7 +82,7 @@
 timeRemainingText.setVisibility(GONE);
 }
 
progressText.setText(getString(R.string.offline_compilation_download_progress_text,
-bytesToGB(item.bytesDownloaded()), 
bytesToGB(item.bytesTotal(;
+bytesToUserVisibleUnit(getContext(), item.bytesDownloaded()), 
bytesToUserVisibleUnit(getContext(), item.bytesTotal(;
 long bytesPerMin = item.bytesPerSec() * TimeUnit.MINUTES.toSeconds(1);
 if (bytesPerMin >= 0) {
 long minsRemaining = (item.bytesTotal() - item.bytesDownloaded()) 
/ bytesPerMin;
diff --git a/app/src/main/java/org/wikipedia/offline/DiskUsageView.java 
b/app/src/main/java/org/wikipedia/offline/DiskUsageView.java
index d8afb7c..f673bfb 100644
--- a/app/src/main/java/org/wikipedia/offline/DiskUsageView.java
+++ b/app/src/main/java/org/wikipedia/offline/DiskUsageView.java
@@ -18,6 +18,7 @@
 import butterknife.ButterKnife;
 
 import static org.wikipedia.util.FileUtil.bytesToGB;
+import static org.wikipedia.util.FileUtil.bytesToUserVisibleUnit;
 
 public class DiskUsageView extends LinearLayout {
 @BindView(R.id.view_disk_usage_size_text) TextView sizeText;
@@ -51,13 +52,14 @@
 
 public void update(long usedBytes) {
 File path =