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

Make reuse existing fragments if there is any

Browse source
This commit is contained in:
neslihanturan 2019-09-14 20:46:40 +03:00
parent 0725af2b96
commit 62eba391da
1 changed files with 46 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

59
app/src/main/java/fr/free/nrw/commons/nearby/NearbyTestLayersFragment.java
View file

@ -192,7 +192,6 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
private final double CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT = 0.06; private final double CAMERA_TARGET_SHIFT_FACTOR_PORTRAIT = 0.06;
private final double CAMERA_TARGET_SHIFT_FACTOR_LANDSCAPE = 0.04; private final double CAMERA_TARGET_SHIFT_FACTOR_LANDSCAPE = 0.04;
private com.mapbox.mapboxsdk.maps.SupportMapFragment nearbyMapFragment;
private fr.free.nrw.commons.nearby.NearbyListFragment nearbyListFragment; private fr.free.nrw.commons.nearby.NearbyListFragment nearbyListFragment;
private static final String TAG_RETAINED_MAP_FRAGMENT = com.mapbox.mapboxsdk.maps.SupportMapFragment.class.getSimpleName(); private static final String TAG_RETAINED_MAP_FRAGMENT = com.mapbox.mapboxsdk.maps.SupportMapFragment.class.getSimpleName();
private static final String TAG_RETAINED_LIST_FRAGMENT = NearbyListFragment.class.getSimpleName(); private static final String TAG_RETAINED_LIST_FRAGMENT = NearbyListFragment.class.getSimpleName();
@ -211,10 +210,17 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
//initViews(); //initViews();
setMapFragment(savedInstanceState);
setListFragment(savedInstanceState);
} }
@Override
public void onResume() {
super.onResume();
mapFragment = getMapFragment();
nearbyListFragment = getListFragment();
}
public void initViews() { public void initViews() {
Timber.d("init views called"); Timber.d("init views called");
//ButterKnife.bind(this, view); //ButterKnife.bind(this, view);
@ -302,13 +308,37 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
} }
public void setMapFragment(Bundle savedInstanceState) { /**
* Returns the map fragment added to child fragment manager previously, if exists.
*/
private NearbyListFragment getListFragment() {
NearbyListFragment existingFragment = (NearbyListFragment) getChildFragmentManager()
.findFragmentByTag(TAG_RETAINED_LIST_FRAGMENT);
if (existingFragment == null) {
existingFragment = setListFragment();
}
return existingFragment;
}
/**
* Returns the map fragment added to child fragment manager previously, if exists.
*/
private SupportMapFragment getMapFragment() {
SupportMapFragment existingFragment = (SupportMapFragment) getChildFragmentManager()
.findFragmentByTag(TAG_RETAINED_MAP_FRAGMENT);
if (existingFragment == null) {
existingFragment = setMapFragment();
}
return existingFragment;
}
public SupportMapFragment setMapFragment() {
// Mapbox access token is configured here. This needs to be called either in your application // Mapbox access token is configured here. This needs to be called either in your application
// object or in the same activity which contains the mapview. // object or in the same activity which contains the mapview.
Mapbox.getInstance(getActivity(), getString(R.string.mapbox_commons_app_token)); Mapbox.getInstance(getActivity(), getString(R.string.mapbox_commons_app_token));
SupportMapFragment mapFragment;
// Create supportMapFragment // Create supportMapFragment
if (savedInstanceState == null) { //if (savedInstanceState == null) {
// Create fragment // Create fragment
transaction = getChildFragmentManager().beginTransaction(); transaction = getChildFragmentManager().beginTransaction();
@ -333,9 +363,9 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
getChildFragmentManager().executePendingTransactions(); getChildFragmentManager().executePendingTransactions();
transaction.add(R.id.container, mapFragment, TAG_RETAINED_MAP_FRAGMENT); transaction.add(R.id.container, mapFragment, TAG_RETAINED_MAP_FRAGMENT);
transaction.commit(); transaction.commit();
} else { /*} else {
mapFragment = (SupportMapFragment) getChildFragmentManager().findFragmentByTag(TAG_RETAINED_MAP_FRAGMENT); mapFragment = (SupportMapFragment) getChildFragmentManager().findFragmentByTag(TAG_RETAINED_MAP_FRAGMENT);
} }*/
mapFragment.getMapAsync(new OnMapReadyCallback() { mapFragment.getMapAsync(new OnMapReadyCallback() {
@Override @Override
@ -353,22 +383,25 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
}); });
} }
}); });
return mapFragment;
} }
void setListFragment(Bundle savedInstanceState) { NearbyListFragment setListFragment() {
if (savedInstanceState == null) { ///if (savedInstanceState == null) {
NearbyListFragment nearbyListFragment;
loadingNearbyLayout.setVisibility(View.GONE); loadingNearbyLayout.setVisibility(View.GONE);
frameLayout.setVisibility(View.VISIBLE); frameLayout.setVisibility(View.VISIBLE);
FragmentTransaction fragmentTransaction = getChildFragmentManager().beginTransaction(); FragmentTransaction fragmentTransaction = getChildFragmentManager().beginTransaction();
nearbyListFragment = new NearbyListFragment(); nearbyListFragment = new NearbyListFragment();
nearbyListFragment.setArguments(savedInstanceState); nearbyListFragment.setArguments(null);
fragmentTransaction.replace(R.id.container_sheet, nearbyListFragment, TAG_RETAINED_LIST_FRAGMENT); fragmentTransaction.replace(R.id.container_sheet, nearbyListFragment, TAG_RETAINED_LIST_FRAGMENT);
// initBottomSheetBehaviour(); // initBottomSheetBehaviour();
//bottomSheetListBehavior.setState(BottomSheetBehavior.STATE_HIDDEN); //bottomSheetListBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
fragmentTransaction.commitAllowingStateLoss(); fragmentTransaction.commitAllowingStateLoss();
} else { /*} else {
nearbyListFragment = (NearbyListFragment) getChildFragmentManager().findFragmentByTag(TAG_RETAINED_LIST_FRAGMENT); nearbyListFragment = (NearbyListFragment) getChildFragmentManager().findFragmentByTag(TAG_RETAINED_LIST_FRAGMENT);
} }*/
return nearbyListFragment;
} }
/** /**