mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 21:03:54 +01:00
Fixed upload count to show correct number of pictures upload by user in beta version of app.
Fixes #1262
This commit is contained in:
parent
30f04d0565
commit
7c32f57c31
2 changed files with 6 additions and 12 deletions
|
|
@ -139,7 +139,6 @@ public class ContributionsActivity
|
||||||
requestAuthToken();
|
requestAuthToken();
|
||||||
initDrawer();
|
initDrawer();
|
||||||
setTitle(getString(R.string.title_activity_contributions));
|
setTitle(getString(R.string.title_activity_contributions));
|
||||||
setUploadCount();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -266,17 +265,9 @@ public class ContributionsActivity
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("ConstantConditions")
|
@SuppressWarnings("ConstantConditions")
|
||||||
private void setUploadCount() {
|
public void setUploadCount(int uploadCount) {
|
||||||
compositeDisposable.add(mediaWikiApi
|
getSupportActionBar().setSubtitle(getResources()
|
||||||
.getUploadCount(sessionManager.getCurrentAccount().name)
|
.getQuantityString(R.plurals.contributions_subtitle, uploadCount, uploadCount));
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(
|
|
||||||
uploadCount -> getSupportActionBar().setSubtitle(getResources()
|
|
||||||
.getQuantityString(R.plurals.contributions_subtitle,
|
|
||||||
uploadCount, uploadCount)),
|
|
||||||
t -> Timber.e(t, "Fetching upload count failed")
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -56,6 +56,7 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
|
||||||
|
|
||||||
private ContributionController controller;
|
private ContributionController controller;
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
View v = inflater.inflate(R.layout.fragment_contributions, container, false);
|
View v = inflater.inflate(R.layout.fragment_contributions, container, false);
|
||||||
|
|
@ -87,6 +88,8 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
|
||||||
|
|
||||||
public void setAdapter(ListAdapter adapter) {
|
public void setAdapter(ListAdapter adapter) {
|
||||||
this.contributionsList.setAdapter(adapter);
|
this.contributionsList.setAdapter(adapter);
|
||||||
|
Timber.d("ContributionsListFragment -> " + adapter.getCount());
|
||||||
|
((ContributionsActivity) getActivity()).setUploadCount(adapter.getCount());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void changeProgressBarVisibility(boolean isVisible) {
|
public void changeProgressBarVisibility(boolean isVisible) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue