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

use SupportMapFragment instead

Browse source
This commit is contained in:
neslihanturan 2019-07-10 12:42:36 +03:00
parent f3694e3647
commit 3890ea578b
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
View file

@ -188,7 +188,7 @@ public class MainActivity extends AuthenticatedActivity implements FragmentManag
isContributionsFragmentVisible = false;
updateMenuItem();
// Do all permission and GPS related tasks on tab selected, not on create
((NearbyParentFragment)contributionsActivityPagerAdapter.getItem(1)).nearbyParentFragmentPresenter.onTabSelected();
//((NearbyParentFragment)contributionsActivityPagerAdapter.getItem(1)).nearbyParentFragmentPresenter.onTabSelected();
break;
default:
tabLayout.getTabAt(CONTRIBUTIONS_TAB_POSITION).select();

34
app/src/main/java/fr/free/nrw/commons/nearby/mvp/fragments/NearbyParentFragment.java
View file

@ -68,7 +68,7 @@ import static fr.free.nrw.commons.location.LocationServiceManager.LocationChange
*/
public class NearbyParentFragment extends CommonsDaggerSupportFragment
implements WikidataEditListener.WikidataP18EditListener,
NearbyParentFragmentContract.View {
NearbyParentFragmentContract.View, OnMapReadyCallback {
@BindView(R.id.progressBar)
ProgressBar progressBar;
@ -98,9 +98,9 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
private NearbyParentFragmentContract.UserActions userActions;
private NearbyMapFragment2 nearbyMapFragment;
private SupportMapFragment nearbyMapFragment;
private NearbyListFragment nearbyListFragment;
private static final String TAG_RETAINED_MAP_FRAGMENT = NearbyMapFragment2.class.getSimpleName();
private static final String TAG_RETAINED_MAP_FRAGMENT = SupportMapFragment.class.getSimpleName();
private static final String TAG_RETAINED_LIST_FRAGMENT = NearbyListFragment.class.getSimpleName();
public NearbyParentFragmentPresenter nearbyParentFragmentPresenter;
@ -168,7 +168,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
*/
public void childMapFragmentAttached() {
nearbyParentFragmentPresenter = new NearbyParentFragmentPresenter
(this, nearbyMapFragment, locationManager);
(this, null, locationManager);
Timber.d("Child fragment attached");
}
@ -240,8 +240,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
/**
* Returns the map fragment added to child fragment manager previously, if exists.
*/
private NearbyMapFragment2 getMapFragment() {
NearbyMapFragment2 existingFragment = (NearbyMapFragment2) getChildFragmentManager()
private SupportMapFragment getMapFragment() {
SupportMapFragment existingFragment = (SupportMapFragment) getChildFragmentManager()
.findFragmentByTag(TAG_RETAINED_MAP_FRAGMENT);
if (existingFragment == null) {
existingFragment = setMapFragment();
@ -249,7 +249,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
return existingFragment;
}
private NearbyMapFragment2 setMapFragment() {
private SupportMapFragment setMapFragment() {
Log.d("deneme2","setMapFragment is called");
FragmentTransaction fragmentTransaction = getChildFragmentManager().beginTransaction();
// Build mapboxMap
MapboxMapOptions options = new MapboxMapOptions();
@ -259,22 +260,16 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
.build());
// Create map fragment
NearbyMapFragment2 nearbyMapFragment = NearbyMapFragment2.newInstance(options);
SupportMapFragment nearbyMapFragment = SupportMapFragment.newInstance(options);
//NearbyMapFragment2 nearbyMapFragment = new NearbyMapFragment2();
fragmentTransaction.replace(R.id.container, nearbyMapFragment, TAG_RETAINED_MAP_FRAGMENT);
fragmentTransaction.commitAllowingStateLoss();
nearbyMapFragment.getMapAsync(new OnMapReadyCallback() {
@Override
public void onMapReady(@NonNull MapboxMap mapboxMap) {
Log.d("deneme2","onMapReady");
nearbyMapFragment.viewsAreReadyCallback.nearbyMapViewReady();
}
});
if (nearbyMapFragment.getMapboxMap()!=null){
nearbyMapFragment.getMapAsync(this);
/*if (nearbyMapFragment.getMapboxMap()!=null){
}
}*/
return nearbyMapFragment;
}
@ -421,4 +416,9 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
public boolean isBottomSheetExpanded() {
return bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED;
}
@Override
public void onMapReady(MapboxMap mapboxMap) {
Log.d("deneme2","on map ready");
}
}