From b0bc8d053249dc564aae35d47a42481e617873de Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Mon, 17 Jun 2013 15:13:57 +0000
Subject: [PATCH] Add a progress bar to display upload progress, instead of
 just text

Change-Id: Id858ce3e508031435f7ceda3b2ffe2372b0c5510
GitHub: https://github.com/wikimedia/apps-android-commons/pull/11
---
 commons/res/layout/layout_contribution.xml       |  9 +++++++++
 commons/res/values-v14/styles.xml                |  2 +-
 commons/res/values-v9/styles.xml                 |  4 +---
 .../contributions/ContributionsListFragment.java | 16 ++++++++++++----
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/commons/res/layout/layout_contribution.xml b/commons/res/layout/layout_contribution.xml
index 1c7dcf052..7ca86a542 100644
--- a/commons/res/layout/layout_contribution.xml
+++ b/commons/res/layout/layout_contribution.xml
@@ -30,6 +30,15 @@
             android:orientation="vertical"
             android:padding="8dp"
             >
+        <ProgressBar
+            android:id="@+id/contributionProgress"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            style="@style/ProgressBar"
+            android:indeterminateOnly="false"
+            android:max="100"
+            android:visibility="gone"
+            />
 
         <TextView
                 android:id="@+id/contributionState"
diff --git a/commons/res/values-v14/styles.xml b/commons/res/values-v14/styles.xml
index b2d5c7f03..d5e8aa40f 100644
--- a/commons/res/values-v14/styles.xml
+++ b/commons/res/values-v14/styles.xml
@@ -1,5 +1,5 @@
 <resources>
 
-    <style name="NotificationProgress" parent="android:Widget.Holo.ProgressBar.Horizontal" />
+    <style name="ProgressBar" parent="android:Widget.Holo.ProgressBar.Horizontal" />
 
 </resources>
\ No newline at end of file
diff --git a/commons/res/values-v9/styles.xml b/commons/res/values-v9/styles.xml
index a4c9d25b9..615082e9b 100644
--- a/commons/res/values-v9/styles.xml
+++ b/commons/res/values-v9/styles.xml
@@ -1,7 +1,5 @@
 <resources>
 
-    <style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent" />
-
-    <style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title" />
+    <style name="ProgressBar" parent="android:Widget.ProgressBar.Horizontal" />
 
 </resources>
\ No newline at end of file
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
index e8b076d98..8ffbaa4d5 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
@@ -52,6 +52,7 @@ public class ContributionsListFragment extends SherlockFragment {
         final TextView titleView;
         final TextView stateView;
         final TextView seqNumView;
+        final ProgressBar progressView;
 
         String url;
 
@@ -60,6 +61,7 @@ public class ContributionsListFragment extends SherlockFragment {
             titleView = (TextView)parent.findViewById(R.id.contributionTitle);
             stateView = (TextView)parent.findViewById(R.id.contributionState);
             seqNumView = (TextView)parent.findViewById(R.id.contributionSequenceNumber);
+            progressView = (ProgressBar)parent.findViewById(R.id.contributionProgress);
         }
     }
 
@@ -122,23 +124,29 @@ public class ContributionsListFragment extends SherlockFragment {
             switch(contribution.getState()) {
                 case Contribution.STATE_COMPLETED:
                     views.stateView.setVisibility(View.GONE);
+                    views.progressView.setVisibility(View.GONE);
                     views.stateView.setText("");
                     break;
                 case Contribution.STATE_QUEUED:
                     views.stateView.setVisibility(View.VISIBLE);
+                    views.progressView.setVisibility(View.GONE);
                     views.stateView.setText(R.string.contribution_state_queued);
                     break;
                 case Contribution.STATE_IN_PROGRESS:
-                    views.stateView.setVisibility(View.VISIBLE);
-                    views.stateView.setText(R.string.contribution_state_starting);
+                    views.stateView.setVisibility(View.GONE);
+                    views.progressView.setVisibility(View.VISIBLE);
                     long total = contribution.getDataLength();
                     long transferred = contribution.getTransferred();
-                    String stateString = String.format(getString(R.string.contribution_state_in_progress), (int)(((double)transferred / (double)total) * 100));
-                    views.stateView.setText(stateString);
+                    if(transferred == 0 || transferred >= total) {
+                        views.progressView.setIndeterminate(true);
+                    } else {
+                        views.progressView.setProgress((int)(((double)transferred / (double)total) * 100));
+                    }
                     break;
                 case Contribution.STATE_FAILED:
                     views.stateView.setVisibility(View.VISIBLE);
                     views.stateView.setText(R.string.contribution_state_failed);
+                    views.progressView.setVisibility(View.GONE);
                     break;
             }