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

Modified the code to only function in beta build variant.

Browse source
This commit is contained in:
knightshade 2018-03-07 16:06:36 +05:30
parent 7c32f57c31
commit 2ae46a4c33
2 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
View file

@ -26,6 +26,7 @@ import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import fr.free.nrw.commons.BuildConfig;
import fr.free.nrw.commons.HandlerService; import fr.free.nrw.commons.HandlerService;
import fr.free.nrw.commons.Media; import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
@ -139,6 +140,12 @@ public class ContributionsActivity
requestAuthToken(); requestAuthToken();
initDrawer(); initDrawer();
setTitle(getString(R.string.title_activity_contributions)); setTitle(getString(R.string.title_activity_contributions));
if(!BuildConfig.FLAVOR.equalsIgnoreCase("beta")){
Timber.d("setUploadCount()");
setUploadCount();
}
} }
@Override @Override
@ -265,11 +272,26 @@ public class ContributionsActivity
} }
@SuppressWarnings("ConstantConditions") @SuppressWarnings("ConstantConditions")
public void setUploadCount(int uploadCount) { private void setUploadCount() {
getSupportActionBar().setSubtitle(getResources() compositeDisposable.add(mediaWikiApi
.getQuantityString(R.plurals.contributions_subtitle, uploadCount, uploadCount)); .getUploadCount(sessionManager.getCurrentAccount().name)
.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")
));
} }
public void betaSetUploadCount(int betaUploadCount){
Timber.d("" + betaUploadCount);
getSupportActionBar().setSubtitle(getResources()
.getQuantityString(R.plurals.contributions_subtitle, betaUploadCount, betaUploadCount));
}
@Override @Override
public void notifyDatasetChanged() { public void notifyDatasetChanged() {
// Do nothing for now // Do nothing for now

9
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
View file

@ -27,6 +27,7 @@ import javax.inject.Named;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import fr.free.nrw.commons.BuildConfig;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.nearby.NearbyActivity; import fr.free.nrw.commons.nearby.NearbyActivity;
@ -88,8 +89,12 @@ 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()); Timber.d("" + adapter.getCount());
((ContributionsActivity) getActivity()).setUploadCount(adapter.getCount());
if(BuildConfig.FLAVOR.equalsIgnoreCase("beta")){
Timber.d("betaBuild : adapter count -> " + adapter.getCount());
((ContributionsActivity) getActivity()).betaSetUploadCount(adapter.getCount());
}
} }
public void changeProgressBarVisibility(boolean isVisible) { public void changeProgressBarVisibility(boolean isVisible) {