From f721b163d1c1a99f500848183b7673db951f0975 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Wed, 24 Apr 2013 01:24:14 +0530
Subject: [PATCH] Prevent upload status from overlapping with the title of
 upload

Bug: 47458
---
 commons/res/layout/layout_contribution.xml    | 24 ++++++++++---------
 .../ContributionsListFragment.java            |  4 ++++
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/commons/res/layout/layout_contribution.xml b/commons/res/layout/layout_contribution.xml
index 9efc493e8..f436e96ad 100644
--- a/commons/res/layout/layout_contribution.xml
+++ b/commons/res/layout/layout_contribution.xml
@@ -22,14 +22,24 @@
                android:scaleType="centerCrop"
                />
 
-    <RelativeLayout
+    <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center|bottom"
             android:background="#AA000000"
+            android:orientation="vertical"
             android:padding="8dp"
             >
 
+        <TextView
+                android:id="@+id/contributionState"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="?android:textAppearanceSmall"
+                android:textColor="#FFFFFFFF"
+                android:visibility="gone"
+                />
+
         <TextView
                 android:id="@+id/contributionTitle"
                 android:layout_width="wrap_content"
@@ -39,15 +49,7 @@
                 android:maxLines="2"
                 android:ellipsize="end"
                 />
-        <TextView
-            android:id="@+id/contributionState"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignBaseline="@id/contributionTitle"
-            style="?android:textAppearanceSmall"
-            android:textColor="#FFFFFFFF"
-            />
-    </RelativeLayout>
+
+    </LinearLayout>
 
 </FrameLayout>
\ 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 a111fccff..45c8699a7 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
@@ -108,12 +108,15 @@ public class ContributionsListFragment extends SherlockFragment {
 
             switch(contribution.getState()) {
                 case Contribution.STATE_COMPLETED:
+                    views.stateView.setVisibility(View.GONE);
                     views.stateView.setText("");
                     break;
                 case Contribution.STATE_QUEUED:
+                    views.stateView.setVisibility(View.VISIBLE);
                     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);
                     long total = contribution.getDataLength();
                     long transferred = contribution.getTransferred();
@@ -121,6 +124,7 @@ public class ContributionsListFragment extends SherlockFragment {
                     views.stateView.setText(stateString);
                     break;
                 case Contribution.STATE_FAILED:
+                    views.stateView.setVisibility(View.VISIBLE);
                     views.stateView.setText(R.string.contribution_state_failed);
                     break;
             }