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

Use retained nearby fragment

Browse source
This commit is contained in:
neslihanturan 2018-09-28 14:29:02 +03:00
parent 55a391a2a9
commit 86b3633b23
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,7 @@ import fr.free.nrw.commons.R;
import fr.free.nrw.commons.auth.AuthenticatedActivity;
import fr.free.nrw.commons.auth.SessionManager;
import fr.free.nrw.commons.location.LocationServiceManager;
import fr.free.nrw.commons.nearby.NearbyController;
import fr.free.nrw.commons.nearby.NearbyFragment;
import fr.free.nrw.commons.notification.NotificationActivity;
import fr.free.nrw.commons.theme.NavigationBaseActivity;
@ -56,8 +57,6 @@ public class ContributionsActivity extends AuthenticatedActivity implements Frag
private final int CONTRIBUTIONS_TAB_POSITION = 0;
private final int NEARBY_TAB_POSITION = 1;
//public ContributionsFragment contributionsFragment;
private NearbyFragment nearbyFragment;
public boolean isContributionsFragmentVisible = true; // False means nearby fragment is visible
private Menu menu;
private boolean isThereUnreadNotifications = false;
@ -326,7 +325,7 @@ public class ContributionsActivity extends AuthenticatedActivity implements Frag
retainedContributionsFragment.setMediaDetailPagerFragment();
}
contributionsFragment = retainedContributionsFragment;
return retainedContributionsFragment;
return contributionsFragment;
}
// If we reach here, retainedContributionsFragment is null
@ -339,10 +338,22 @@ public class ContributionsActivity extends AuthenticatedActivity implements Frag
return contributionsFragment;
case 1:
if (getNearbyFragment(1) != null) {
return getNearbyFragment(1);
NearbyFragment retainedNearbyFragment = getNearbyFragment(1);
if (retainedNearbyFragment != null) {
nearbyFragment = retainedNearbyFragment;
return nearbyFragment;
}
return new NearbyFragment();// nearby places needs photo
// If we reach here, retainedNearbyFragment is null
nearbyFragment = new NearbyFragment();
String nearbyFragmentTag = makeFragmentName(R.id.pager, 1);
fragmentManager.beginTransaction()
.replace(R.id.pager, nearbyFragment, nearbyFragmentTag)
.addToBackStack(nearbyFragmentTag)
.commit();
return nearbyFragment;
default:
return null;
}