From d0819dc7dd9ac5594edf3739c6a63a72db0132ab Mon Sep 17 00:00:00 2001
From: Gabriele M <moto.falcon.git@gmail.com>
Date: Fri, 6 Apr 2018 21:39:54 +0200
Subject: [PATCH] Always show the size of the updates

This is now possible since the size is included in the JSON.

Change-Id: Ie38ccfbdc7abb0e4b86e8e625ed8d131376402e7
---
 res/layout/update_item_view.xml               | 49 +++++++++++++------
 .../lineageos/updater/UpdatesListAdapter.java | 11 ++++-
 2 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/res/layout/update_item_view.xml b/res/layout/update_item_view.xml
index 4abfebf6..ddcf3268 100644
--- a/res/layout/update_item_view.xml
+++ b/res/layout/update_item_view.xml
@@ -43,23 +43,40 @@
                 android:textSize="14sp"
                 tools:text="29 February 2018" />
 
-            <ProgressBar
-                android:id="@+id/progress_bar"
-                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="8dp"
-                android:visibility="gone"
-                tools:progress="65"
-                tools:visibility="visible" />
-
-            <TextView
-                android:id="@+id/progress_text"
+            <RelativeLayout
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="marquee"
-                android:singleLine="true"
-                tools:text="162 of 300 MB (3 minutes left) • 65%" />
+                android:layout_height="wrap_content">
+
+                <ProgressBar
+                    android:id="@+id/progress_bar"
+                    style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="4sp"
+                    android:visibility="invisible"
+                    tools:progress="65"
+                    tools:visibility="visible" />
+
+                <TextView
+                    android:id="@+id/progress_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/progress_bar"
+                    android:ellipsize="marquee"
+                    android:singleLine="true"
+                    android:visibility="invisible"
+                    tools:text="162 of 300 MB (3 minutes left) • 65%"
+                    tools:visibility="visible" />
+
+                <TextView
+                    android:id="@+id/build_size"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="8sp"
+                    android:singleLine="true"
+                    tools:text="300 MB"
+                    tools:visibility="invisible" />
+            </RelativeLayout>
         </LinearLayout>
 
         <Button
diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index 6ed4f7a3..8ef231df 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -82,6 +82,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
 
         private TextView mBuildDate;
         private TextView mBuildVersion;
+        private TextView mBuildSize;
 
         private ProgressBar mProgressBar;
         private TextView mProgressText;
@@ -92,6 +93,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
 
             mBuildDate = (TextView) view.findViewById(R.id.build_date);
             mBuildVersion = (TextView) view.findViewById(R.id.build_version);
+            mBuildSize = (TextView) view.findViewById(R.id.build_size);
 
             mProgressBar = (ProgressBar) view.findViewById(R.id.progress_bar);
             mProgressText = (TextView) view.findViewById(R.id.progress_text);
@@ -172,6 +174,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
                 viewHolder.mBuildDate));
         viewHolder.mProgressBar.setVisibility(View.VISIBLE);
         viewHolder.mProgressText.setVisibility(View.VISIBLE);
+        viewHolder.mBuildSize.setVisibility(View.INVISIBLE);
     }
 
     private void handleNotActiveStatus(ViewHolder viewHolder, UpdateInfo update) {
@@ -190,8 +193,12 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
                     getLongClickListener(update, false, viewHolder.mBuildDate));
             setButtonAction(viewHolder.mAction, Action.DOWNLOAD, update.getDownloadId(), !isBusy());
         }
-        viewHolder.mProgressBar.setVisibility(View.GONE);
-        viewHolder.mProgressText.setVisibility(View.GONE);
+        String fileSize = Formatter.formatShortFileSize(mActivity, update.getFileSize());
+        viewHolder.mBuildSize.setText(fileSize);
+
+        viewHolder.mProgressBar.setVisibility(View.INVISIBLE);
+        viewHolder.mProgressText.setVisibility(View.INVISIBLE);
+        viewHolder.mBuildSize.setVisibility(View.VISIBLE);
     }
 
     @Override