From f23cf3e7fa9678444ad37fd7793c00c78e2811e6 Mon Sep 17 00:00:00 2001
From: Vanshika Arora <34261945+vanshikaarora@users.noreply.github.com>
Date: Sun, 27 Jan 2019 21:22:33 +0530
Subject: [PATCH] Caption can acquire the entire horizontal space (#2360)

* Fixed Issue #2357

* final commit

* final changes
---
 .../contributions/ContributionViewHolder.java        |  3 +++
 .../contributions/ContributionsListAdapter.java      | 12 ++++--------
 app/src/main/res/layout/layout_contribution.xml      |  9 ++++-----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
index df50b9cb8..23d3e03db 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
@@ -3,6 +3,7 @@ package fr.free.nrw.commons.contributions;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageButton;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -17,6 +18,7 @@ class ContributionViewHolder {
     final ProgressBar progressView;
     final ImageButton retryButton;
     final ImageButton cancelButton;
+    final LinearLayout failedImageOptions;
     int position;
 
     ContributionViewHolder(View parent) {
@@ -27,6 +29,7 @@ class ContributionViewHolder {
         progressView = parent.findViewById(R.id.contributionProgress);
         retryButton = parent.findViewById(R.id.retryButton);
         cancelButton = parent.findViewById(R.id.cancelButton);
+        failedImageOptions=parent.findViewById(R.id.failed_image_options);
         position = 0;
     }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java
index e26599cbc..cb190a11d 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java
@@ -55,22 +55,19 @@ class ContributionsListAdapter extends CursorAdapter {
             case Contribution.STATE_COMPLETED:
                 views.stateView.setVisibility(View.GONE);
                 views.progressView.setVisibility(View.GONE);
-                views.retryButton.setVisibility(View.GONE);
-                views.cancelButton.setVisibility(View.GONE);
+                views.failedImageOptions.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);
-                views.retryButton.setVisibility(View.GONE);
-                views.cancelButton.setVisibility(View.GONE);
+                views.failedImageOptions.setVisibility(View.GONE);
                 break;
             case Contribution.STATE_IN_PROGRESS:
                 views.stateView.setVisibility(View.GONE);
                 views.progressView.setVisibility(View.VISIBLE);
-                views.retryButton.setVisibility(View.GONE);
-                views.cancelButton.setVisibility(View.GONE);
+                views.failedImageOptions.setVisibility(View.GONE);
                 long total = contribution.getDataLength();
                 long transferred = contribution.getTransferred();
                 if (transferred == 0 || transferred >= total) {
@@ -83,8 +80,7 @@ class ContributionsListAdapter extends CursorAdapter {
                 views.stateView.setVisibility(View.VISIBLE);
                 views.stateView.setText(R.string.contribution_state_failed);
                 views.progressView.setVisibility(View.GONE);
-                views.retryButton.setVisibility(View.VISIBLE);
-                views.cancelButton.setVisibility(View.VISIBLE);
+                views.failedImageOptions.setVisibility(View.VISIBLE);
 
                 views.retryButton.setOnClickListener(new View.OnClickListener() {
                     @Override
diff --git a/app/src/main/res/layout/layout_contribution.xml b/app/src/main/res/layout/layout_contribution.xml
index 5b99c65d5..d93b6b985 100644
--- a/app/src/main/res/layout/layout_contribution.xml
+++ b/app/src/main/res/layout/layout_contribution.xml
@@ -31,15 +31,14 @@
         android:orientation="horizontal"
         android:layout_gravity="center|bottom"
         android:background="#AA000000"
-        android:weightSum="4"
         >
 
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="3"
             android:layout_gravity="center|bottom"
             android:orientation="vertical"
+            android:layout_weight="3"
             android:padding="@dimen/small_gap"
             >
             <ProgressBar
@@ -74,10 +73,12 @@
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/failed_image_options"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:orientation="horizontal"
+            android:layout_weight="1"
+            android:visibility="gone"
             android:padding="@dimen/small_gap"
             >
 
@@ -89,7 +90,6 @@
                 android:text="@string/menu_cancel_upload"
                 android:background="@android:color/transparent"
                 android:padding="8dp"
-                android:visibility="gone"
                 />
 
             <ImageButton
@@ -100,7 +100,6 @@
                 android:text="@string/menu_retry_upload"
                 android:background="@android:color/transparent"
                 android:padding="8dp"
-                android:visibility="gone"
                 />
 
         </LinearLayout>