mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Caption can acquire the entire horizontal space (#2360)

Browse source 
* Fixed Issue #2357

* final commit

* final changes
This commit is contained in:
Vanshika Arora 2019-01-27 21:22:33 +05:30 • committed by Vivek Maskara
parent 075ff6d148
commit f23cf3e7fa
3 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java
View file

@ -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;
}
}

12
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java
View file

@ -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

9
app/src/main/res/layout/layout_contribution.xml
View file

@ -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>