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

Add cancel and retry buttons on layout contribution

Browse source
This commit is contained in:
neslihanturan 2018-12-12 17:15:15 +03:00
parent f3a90c004c
commit c7f6849cef
14 changed files with 101 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,8 @@
package fr.free.nrw.commons.contributions;
import android.view.View;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.ProgressBar;
import android.widget.TextView;
@ -13,6 +15,8 @@ class ContributionViewHolder {
final TextView stateView;
final TextView seqNumView;
final ProgressBar progressView;
final ImageButton retryButton;
final ImageButton cancelButton;
ContributionViewHolder(View parent) {
imageView = parent.findViewById(R.id.contributionImage);
@ -20,5 +24,7 @@ class ContributionViewHolder {
stateView = parent.findViewById(R.id.contributionState);
seqNumView = parent.findViewById(R.id.contributionSequenceNumber);
progressView = parent.findViewById(R.id.contributionProgress);
retryButton = parent.findViewById(R.id.retryButton);
cancelButton = parent.findViewById(R.id.cancelButton);
}
}

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

@ -3,6 +3,7 @@ package fr.free.nrw.commons.contributions;
import android.content.Context;
import android.database.Cursor;
import android.support.v4.widget.CursorAdapter;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -37,20 +38,40 @@ class ContributionsListAdapter extends CursorAdapter {
views.seqNumView.setText(String.valueOf(cursor.getPosition() + 1));
views.seqNumView.setVisibility(View.VISIBLE);
views.retryButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Log.d("deneme","Retry button is clicked");
}
});
views.cancelButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Log.d("deneme","Cancel button is clicked");
}
});
switch (contribution.getState()) {
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.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);
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);
long total = contribution.getDataLength();
long transferred = contribution.getTransferred();
if (transferred == 0 || transferred >= total) {
@ -63,6 +84,8 @@ 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);
break;
}
}

2
app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java
View file

@ -8,6 +8,7 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import android.text.TextUtils;
import android.util.Log;
import com.google.gson.Gson;
@ -897,6 +898,7 @@ public class ApacheHttpClientMediaWikiApi implements MediaWikiApi {
if (!resultStatus.equals("Success")) {
String errorCode = result.getString("/api/error/@code");
Log.d("deneme","error code: "+errorCode);
Timber.e(errorCode);
return new UploadResult(resultStatus, errorCode);
} else {