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

Merge pull request #633 from maskaravivek/mediaDetail

Browse source 
Fix issue where there was no way to back from MediaDetailFragment
This commit is contained in:
Josephine Lim 2017-05-19 17:02:05 +02:00 • committed by GitHub
commit 9d4c3cd2d9
2 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -126,18 +126,15 @@ public class ContributionsActivity
setContentView(R.layout.activity_contributions);
ButterKnife.bind(this);
// Activity can call methods in the fragment by acquiring a reference to the Fragment from FragmentManager, using findFragmentById()
contributionsList = (ContributionsListFragment)getSupportFragmentManager().findFragmentById(R.id.contributionsListFragment);
// Activity can call methods in the fragment by acquiring a
// reference to the Fragment from FragmentManager, using findFragmentById()
contributionsList = (ContributionsListFragment)getSupportFragmentManager()
.findFragmentById(R.id.contributionsListFragment);
getSupportFragmentManager().addOnBackStackChangedListener(this);
if (savedInstanceState != null) {
mediaDetails = (MediaDetailPagerFragment)getSupportFragmentManager().findFragmentById(R.id.contributionsFragmentContainer);
// onBackStackChanged uses mediaDetails.isVisible() but this returns false now.
// Use the saved value from before pause or orientation change.
if (mediaDetails != null && savedInstanceState.getBoolean("mediaDetailsVisible")) {
// Feels awful that we have to reset this manually!
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
mediaDetails = (MediaDetailPagerFragment)getSupportFragmentManager()
.findFragmentById(R.id.contributionsFragmentContainer);
}
requestAuthToken();
initDrawer();
@ -241,7 +238,10 @@ public class ContributionsActivity
getSupportActionBar().setSubtitle(getResources()
.getString(R.string.contributions_subtitle_zero));
} else {
getSupportActionBar().setSubtitle(getResources().getQuantityString(R.plurals.contributions_subtitle, cursor.getCount(), cursor.getCount()));
getSupportActionBar().setSubtitle(getResources()
.getQuantityString(R.plurals.contributions_subtitle,
cursor.getCount(),
cursor.getCount()));
}
contributionsList.clearSyncMessage();
@ -314,11 +314,7 @@ public class ContributionsActivity
@Override
public void onBackStackChanged() {
if(mediaDetails != null && mediaDetails.isVisible()) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
} else {
getSupportActionBar().setDisplayHomeAsUpEnabled(false);
}
initBackButton();
}
@Override