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

Implement onBack Pressed settings

Browse source
This commit is contained in:
neslihanturan 2018-09-07 18:50:21 +03:00
parent 5252f6d66b
commit 01052a83b3
2 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -152,6 +152,32 @@ public class ContributionsActivity extends AuthenticatedActivity {
}
@Override
public void onBackPressed() {
String contributionsFragmentTag = ((ContributionsActivityPagerAdapter) viewPager.getAdapter()).makeFragmentName(R.id.pager, 0);
if (getSupportFragmentManager().findFragmentByTag(contributionsFragmentTag) != null && isContributionsFragmentVisible) {
// Meas that contribution fragment is visible (not nearby fragment)
ContributionsFragment contributionsFragment = (ContributionsFragment) getSupportFragmentManager().findFragmentByTag(contributionsFragmentTag);
if (contributionsFragment.getChildFragmentManager().findFragmentByTag(ContributionsFragment.MEDIA_DETAIL_PAGER_FRAGMENT_TAG) != null) {
// Means that media details fragment is visible to uer instead of contributions list fragment (As chils fragment)
// Then we want to go back to contributions list fragment on backbutton pressed from media detail fragment
contributionsFragment.getChildFragmentManager().popBackStack();
// Tabs were invisible when Media Details Fragment is active, make them visible again on Contrib List Fragment active
showTabs();
// Make number of uploads visible when Contributions List is visible
// TODO Neslihan: ContributionListViewUtils.setIndicatorVisibility(contributionsFragment.numberOfUploads, contributionsFragment.numberOfUploadsProgressBar, true, false);
// TODO Neslihan: ContributionListViewUtils.setIndicatorVisibility(contributionsFragment.notificationsCardView, contributionsFragment.notificationsCardViewProgressBar, true, false);
} else {
//super.onBackPressed();
finish();
}
} else {
// TODO handle nearby fragment is active posibility here.
super.onBackPressed();
}
}
public class ContributionsActivityPagerAdapter extends FragmentPagerAdapter {
FragmentManager fragmentManager;
private boolean isContributionsListFragment = true; // to know what to put in first tab, Contributions of Media Details
@ -252,5 +278,4 @@ public class ContributionsActivity extends AuthenticatedActivity {
this.isContributionsListFragment = isContributionsListFragment;
}
}
}

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

@ -197,7 +197,7 @@ public class ContributionsFragment
@Override
public void onBackStackChanged() {
((ContributionsActivity)getActivity()).initBackButton();
}
@Override
@ -206,7 +206,6 @@ public class ContributionsFragment
return new CursorLoader(getActivity(), BASE_URI, //TODO find out the reason we pass activity here
ALL_FIELDS, "", null,
ContributionDao.CONTRIBUTION_SORT + "LIMIT " + uploads);
}
@Override