mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 12:53:55 +01:00
Remove unused classes, do not forget centerMapToPlace doesn't work on this branch
This commit is contained in:
neslihanturan
parent
e6f36336f8
commit
ea2d0cfa60
5 changed files with 4 additions and 1825 deletions
|
|
@ -83,6 +83,8 @@ dependencies {
|
||||||
implementation "androidx.cardview:cardview:1.0.0"
|
implementation "androidx.cardview:cardview:1.0.0"
|
||||||
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
|
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
|
||||||
implementation "androidx.exifinterface:exifinterface:1.0.0"
|
implementation "androidx.exifinterface:exifinterface:1.0.0"
|
||||||
|
//swipe_layout
|
||||||
|
implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
|
||||||
//metadata extractor
|
//metadata extractor
|
||||||
implementation 'com.drewnoakes:metadata-extractor:2.11.0'
|
implementation 'com.drewnoakes:metadata-extractor:2.11.0'
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,723 +0,0 @@
|
||||||
package fr.free.nrw.commons.nearby;
|
|
||||||
|
|
||||||
import android.Manifest;
|
|
||||||
import android.content.BroadcastReceiver;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.content.IntentFilter;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.FrameLayout;
|
|
||||||
import android.widget.LinearLayout;
|
|
||||||
import android.widget.ProgressBar;
|
|
||||||
|
|
||||||
import com.google.android.material.bottomsheet.BottomSheetBehavior;
|
|
||||||
import com.google.android.material.snackbar.Snackbar;
|
|
||||||
import com.google.gson.Gson;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.annotation.Nullable;
|
|
||||||
import androidx.constraintlayout.widget.ConstraintLayout;
|
|
||||||
import androidx.fragment.app.FragmentManager;
|
|
||||||
import androidx.fragment.app.FragmentTransaction;
|
|
||||||
import butterknife.BindView;
|
|
||||||
import butterknife.ButterKnife;
|
|
||||||
import fr.free.nrw.commons.R;
|
|
||||||
import fr.free.nrw.commons.contributions.MainActivity;
|
|
||||||
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
|
|
||||||
import fr.free.nrw.commons.location.LatLng;
|
|
||||||
import fr.free.nrw.commons.location.LocationServiceManager;
|
|
||||||
import fr.free.nrw.commons.location.LocationUpdateListener;
|
|
||||||
import fr.free.nrw.commons.utils.FragmentUtils;
|
|
||||||
import fr.free.nrw.commons.utils.NetworkUtils;
|
|
||||||
import fr.free.nrw.commons.utils.PermissionUtils;
|
|
||||||
import fr.free.nrw.commons.utils.ViewUtil;
|
|
||||||
import fr.free.nrw.commons.wikidata.WikidataEditListener;
|
|
||||||
import io.reactivex.Observable;
|
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
|
||||||
import io.reactivex.schedulers.Schedulers;
|
|
||||||
import timber.log.Timber;
|
|
||||||
|
|
||||||
import static fr.free.nrw.commons.contributions.MainActivity.CONTRIBUTIONS_TAB_POSITION;
|
|
||||||
import static fr.free.nrw.commons.contributions.MainActivity.NEARBY_TAB_POSITION;
|
|
||||||
import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED;
|
|
||||||
import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.LOCATION_SLIGHTLY_CHANGED;
|
|
||||||
import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.MAP_UPDATED;
|
|
||||||
import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.PERMISSION_JUST_GRANTED;
|
|
||||||
|
|
||||||
public class NearbyFragment extends CommonsDaggerSupportFragment
|
|
||||||
implements LocationUpdateListener,
|
|
||||||
WikidataEditListener.WikidataP18EditListener {
|
|
||||||
|
|
||||||
@BindView(R.id.progressBar)
|
|
||||||
ProgressBar progressBar;
|
|
||||||
@BindView(R.id.bottom_sheet)
|
|
||||||
LinearLayout bottomSheet;
|
|
||||||
@BindView(R.id.bottom_sheet_details)
|
|
||||||
LinearLayout bottomSheetDetails;
|
|
||||||
@BindView(R.id.transparentView)
|
|
||||||
View transparentView;
|
|
||||||
@BindView(R.id.container_sheet)
|
|
||||||
FrameLayout frameLayout;
|
|
||||||
@BindView(R.id.loading_nearby_list)
|
|
||||||
ConstraintLayout loading_nearby_layout;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
LocationServiceManager locationManager;
|
|
||||||
@Inject
|
|
||||||
NearbyController nearbyController;
|
|
||||||
@Inject
|
|
||||||
WikidataEditListener wikidataEditListener;
|
|
||||||
@Inject Gson gson;
|
|
||||||
|
|
||||||
public NearbyMapFragment nearbyMapFragment;
|
|
||||||
private NearbyListFragment nearbyListFragment;
|
|
||||||
private static final String TAG_RETAINED_MAP_FRAGMENT = NearbyMapFragment.class.getSimpleName();
|
|
||||||
private static final String TAG_RETAINED_LIST_FRAGMENT = NearbyListFragment.class.getSimpleName();
|
|
||||||
private Bundle bundle;
|
|
||||||
private BottomSheetBehavior bottomSheetBehavior; // Behavior for list bottom sheet
|
|
||||||
private BottomSheetBehavior bottomSheetBehaviorForDetails; // Behavior for details bottom sheet
|
|
||||||
|
|
||||||
private LatLng curLatLng;
|
|
||||||
private boolean lockNearbyView; //Determines if the nearby places needs to be refreshed
|
|
||||||
public View view;
|
|
||||||
private Snackbar snackbar;
|
|
||||||
|
|
||||||
private LatLng lastKnownLocation;
|
|
||||||
private LatLng customLatLng;
|
|
||||||
|
|
||||||
private final String NETWORK_INTENT_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";
|
|
||||||
private BroadcastReceiver broadcastReceiver;
|
|
||||||
|
|
||||||
private boolean onOrientationChanged = false;
|
|
||||||
private boolean populateForCurrentLocation = false;
|
|
||||||
private boolean isNetworkErrorOccured = false;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(@Nullable Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
setRetainInstance(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
|
||||||
@Override
|
|
||||||
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
|
|
||||||
View view = inflater.inflate(R.layout.fragment_nearby, container, false);
|
|
||||||
ButterKnife.bind(this, view);
|
|
||||||
|
|
||||||
/*// Resume the fragment if exist
|
|
||||||
resumeFragment();*/
|
|
||||||
bundle = new Bundle();
|
|
||||||
initBottomSheetBehaviour();
|
|
||||||
this.view = view;
|
|
||||||
return view;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
|
|
||||||
super.onViewCreated(view, savedInstanceState);
|
|
||||||
if (savedInstanceState != null) {
|
|
||||||
onOrientationChanged = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Hide or expand bottom sheet according to states of all sheets
|
|
||||||
*/
|
|
||||||
public void listOptionMenuItemClicked() {
|
|
||||||
if(bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_COLLAPSED || bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_HIDDEN){
|
|
||||||
bottomSheetBehaviorForDetails.setState(BottomSheetBehavior.STATE_HIDDEN);
|
|
||||||
bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
|
|
||||||
}else if(bottomSheetBehavior.getState()==BottomSheetBehavior.STATE_EXPANDED){
|
|
||||||
bottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Resume fragments if they exists
|
|
||||||
*/
|
|
||||||
private void resumeFragment() {
|
|
||||||
// Find the retained fragment on activity restarts
|
|
||||||
nearbyMapFragment = getMapFragment();
|
|
||||||
nearbyListFragment = getListFragment();
|
|
||||||
addNetworkBroadcastReceiver();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the map fragment added to child fragment manager previously, if exists.
|
|
||||||
*/
|
|
||||||
private NearbyMapFragment getMapFragment() {
|
|
||||||
return (NearbyMapFragment) getChildFragmentManager().findFragmentByTag(TAG_RETAINED_MAP_FRAGMENT);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void removeMapFragment() {
|
|
||||||
if (nearbyMapFragment != null) {
|
|
||||||
FragmentManager fm = getFragmentManager();
|
|
||||||
fm.beginTransaction().remove(nearbyMapFragment).commit();
|
|
||||||
nearbyMapFragment = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the list fragment added to child fragment manager previously, if exists.
|
|
||||||
*/
|
|
||||||
private NearbyListFragment getListFragment() {
|
|
||||||
return (NearbyListFragment) getChildFragmentManager().findFragmentByTag(TAG_RETAINED_LIST_FRAGMENT);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void removeListFragment() {
|
|
||||||
if (nearbyListFragment != null) {
|
|
||||||
FragmentManager fm = getFragmentManager();
|
|
||||||
fm.beginTransaction().remove(nearbyListFragment).commit();
|
|
||||||
nearbyListFragment = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialize bottom sheet behaviour (sheet for map list.) Set height 9/16 of all window.
|
|
||||||
* Add callback for bottom sheet changes, so that we can sync it with bottom sheet for details
|
|
||||||
* (sheet for nearby details)
|
|
||||||
*/
|
|
||||||
private void initBottomSheetBehaviour() {
|
|
||||||
|
|
||||||
transparentView.setAlpha(0);
|
|
||||||
bottomSheet.getLayoutParams().height = getActivity().getWindowManager()
|
|
||||||
.getDefaultDisplay().getHeight() / 16 * 9;
|
|
||||||
bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet);
|
|
||||||
bottomSheetBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onStateChanged(View bottomSheet, int unusedNewState) {
|
|
||||||
prepareViewsForSheetPosition();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onSlide(View bottomSheet, float slideOffset) {
|
|
||||||
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
bottomSheetBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
|
|
||||||
bottomSheetBehaviorForDetails = BottomSheetBehavior.from(bottomSheetDetails);
|
|
||||||
bottomSheetBehaviorForDetails.setState(BottomSheetBehavior.STATE_HIDDEN);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets camera position, zoom level according to sheet positions
|
|
||||||
*/
|
|
||||||
private void prepareViewsForSheetPosition() {
|
|
||||||
// TODO
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onLocationChangedSignificantly(LatLng latLng) {
|
|
||||||
refreshView(LOCATION_SIGNIFICANTLY_CHANGED);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onLocationChangedSlightly(LatLng latLng) {
|
|
||||||
refreshView(LOCATION_SLIGHTLY_CHANGED);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onLocationChangedMedium(LatLng latLng) {
|
|
||||||
// For nearby map actions, there are no differences between 500 meter location change (aka medium change) and slight change
|
|
||||||
refreshView(LOCATION_SLIGHTLY_CHANGED);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onWikidataEditSuccessful() {
|
|
||||||
// Do not refresh nearby map if we are checking other areas with search this area button
|
|
||||||
if (nearbyMapFragment != null && !nearbyMapFragment.searchThisAreaModeOn) {
|
|
||||||
refreshView(MAP_UPDATED);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This method should be the single point to load/refresh nearby places
|
|
||||||
*
|
|
||||||
* @param locationChangeType defines if location changed significantly or slightly
|
|
||||||
*/
|
|
||||||
private void refreshView(LocationServiceManager.LocationChangeType locationChangeType) {
|
|
||||||
Timber.d("Refreshing nearby places");
|
|
||||||
if (lockNearbyView) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!NetworkUtils.isInternetConnectionEstablished(getActivity())) {
|
|
||||||
hideProgressBar();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
registerLocationUpdates();
|
|
||||||
LatLng lastLocation = locationManager.getLastLocation();
|
|
||||||
|
|
||||||
if (curLatLng != null && curLatLng.equals(lastLocation)
|
|
||||||
&& !locationChangeType.equals(MAP_UPDATED)) { //refresh view only if location has changed
|
|
||||||
// Two exceptional cases to refresh nearby map manually.
|
|
||||||
if (!onOrientationChanged) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
curLatLng = lastLocation;
|
|
||||||
|
|
||||||
if (locationChangeType.equals(PERMISSION_JUST_GRANTED)) {
|
|
||||||
curLatLng = lastKnownLocation;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (curLatLng == null) {
|
|
||||||
Timber.d("Skipping update of nearby places as location is unavailable");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
onOrientation changed is true whenever activities orientation changes. After orientation
|
|
||||||
change we want to refresh map significantly, doesn't matter if location changed significantly
|
|
||||||
or not. Thus, we included onOrientationChanged boolean to if clause
|
|
||||||
*/
|
|
||||||
if (locationChangeType.equals(LOCATION_SIGNIFICANTLY_CHANGED)
|
|
||||||
|| locationChangeType.equals(PERMISSION_JUST_GRANTED)
|
|
||||||
|| locationChangeType.equals(MAP_UPDATED)
|
|
||||||
|| onOrientationChanged) {
|
|
||||||
progressBar.setVisibility(View.VISIBLE);
|
|
||||||
|
|
||||||
//TODO: This hack inserts curLatLng before populatePlaces is called (see #1440). Ideally a proper fix should be found
|
|
||||||
String gsonCurLatLng = gson.toJson(curLatLng);
|
|
||||||
bundle.clear();
|
|
||||||
bundle.putString("CurLatLng", gsonCurLatLng);
|
|
||||||
|
|
||||||
compositeDisposable.add(Observable.fromCallable(() -> nearbyController
|
|
||||||
.loadAttractionsFromLocation(curLatLng, curLatLng, false, true))
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(this::populatePlaces,
|
|
||||||
throwable -> {
|
|
||||||
Timber.d(throwable);
|
|
||||||
showErrorMessage(getString(R.string.error_fetching_nearby_places));
|
|
||||||
progressBar.setVisibility(View.GONE);
|
|
||||||
}));
|
|
||||||
|
|
||||||
} else if (locationChangeType
|
|
||||||
.equals(LOCATION_SLIGHTLY_CHANGED) && nearbyMapFragment != null) {
|
|
||||||
String gsonCurLatLng = gson.toJson(curLatLng);
|
|
||||||
bundle.putString("CurLatLng", gsonCurLatLng);
|
|
||||||
updateMapFragment(false,true, null, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nearbyMapFragment != null && nearbyMapFragment.searchThisAreaButton != null) {
|
|
||||||
nearbyMapFragment.searchThisAreaButton.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This method should be used with "Search this are button". This method will search nearby
|
|
||||||
* points around any custom location (target location when user clicked on search this area)
|
|
||||||
* button. It populates places for custom location.
|
|
||||||
* @param customLatLng Custom area which we will search around
|
|
||||||
*/
|
|
||||||
void refreshViewForCustomLocation(LatLng customLatLng, boolean refreshForCurrentLocation) {
|
|
||||||
if (customLatLng == null) {
|
|
||||||
// If null, return
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
populateForCurrentLocation = refreshForCurrentLocation;
|
|
||||||
this.customLatLng = customLatLng;
|
|
||||||
compositeDisposable.add(Observable.fromCallable(() -> nearbyController
|
|
||||||
.loadAttractionsFromLocation(curLatLng, customLatLng, false, populateForCurrentLocation))
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(this::populatePlacesFromCustomLocation,
|
|
||||||
throwable -> {
|
|
||||||
Timber.d(throwable);
|
|
||||||
showErrorMessage(getString(R.string.error_fetching_nearby_places));
|
|
||||||
}));
|
|
||||||
|
|
||||||
if (nearbyMapFragment != null) {
|
|
||||||
nearbyMapFragment.searchThisAreaButton.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Populates places for custom location, should be used for finding nearby places around a
|
|
||||||
* location where you are not at.
|
|
||||||
* @param nearbyPlacesInfo This variable has place list information and distances.
|
|
||||||
*/
|
|
||||||
private void populatePlacesFromCustomLocation(NearbyController.NearbyPlacesInfo nearbyPlacesInfo) {
|
|
||||||
if (nearbyMapFragment != null) {
|
|
||||||
nearbyMapFragment.searchThisAreaButtonProgressBar.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nearbyMapFragment != null && curLatLng != null) {
|
|
||||||
if (!populateForCurrentLocation) {
|
|
||||||
nearbyMapFragment.updateMapSignificantlyForCustomLocation(customLatLng, nearbyPlacesInfo.placeList);
|
|
||||||
} else {
|
|
||||||
updateMapFragment(true,true, customLatLng, nearbyPlacesInfo);
|
|
||||||
}
|
|
||||||
updateListFragmentForCustomLocation(nearbyPlacesInfo.placeList);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Turns nearby place lists and boundary coordinates into gson and update map and list fragments
|
|
||||||
* accordingly
|
|
||||||
* @param nearbyPlacesInfo a variable holds both nearby place list and boundary coordinates
|
|
||||||
*/
|
|
||||||
private void populatePlaces(NearbyController.NearbyPlacesInfo nearbyPlacesInfo) {
|
|
||||||
Timber.d("Populating nearby places");
|
|
||||||
List<Place> placeList = nearbyPlacesInfo.placeList;
|
|
||||||
LatLng[] boundaryCoordinates = nearbyPlacesInfo.boundaryCoordinates;
|
|
||||||
String gsonPlaceList = gson.toJson(placeList);
|
|
||||||
String gsonCurLatLng = gson.toJson(curLatLng);
|
|
||||||
String gsonBoundaryCoordinates = gson.toJson(boundaryCoordinates);
|
|
||||||
|
|
||||||
if (placeList.size() == 0) {
|
|
||||||
ViewUtil.showShortSnackbar(view.findViewById(R.id.container), R.string.no_nearby);
|
|
||||||
}
|
|
||||||
|
|
||||||
bundle.putString("PlaceList", gsonPlaceList);
|
|
||||||
bundle.putString("BoundaryCoord", gsonBoundaryCoordinates);
|
|
||||||
|
|
||||||
// First time to init fragments
|
|
||||||
if (nearbyMapFragment == null) {
|
|
||||||
Timber.d("Init map fragment for the first time");
|
|
||||||
lockNearbyView(true);
|
|
||||||
setMapFragment();
|
|
||||||
setListFragment();
|
|
||||||
hideProgressBar();
|
|
||||||
lockNearbyView(false);
|
|
||||||
} else {
|
|
||||||
// There are fragments, just update the map and list
|
|
||||||
Timber.d("Map fragment already exists, just update the map and list");
|
|
||||||
updateMapFragment(false,false, null, null);
|
|
||||||
updateListFragment();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lock nearby view updates while updating map or list. Because we don't want new update calls
|
|
||||||
* when we already updating for old location update.
|
|
||||||
* @param lock true if we should lock nearby map
|
|
||||||
*/
|
|
||||||
private void lockNearbyView(boolean lock) {
|
|
||||||
if (lock) {
|
|
||||||
lockNearbyView = true;
|
|
||||||
locationManager.unregisterLocationManager();
|
|
||||||
locationManager.removeLocationListener(this);
|
|
||||||
} else {
|
|
||||||
lockNearbyView = false;
|
|
||||||
registerLocationUpdates();
|
|
||||||
locationManager.addLocationListener(this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates map fragment,
|
|
||||||
* For slight update: camera follows users location
|
|
||||||
* For significant update: nearby markers are removed and new markers added again
|
|
||||||
* Slight updates stop if user is checking another area of map
|
|
||||||
*
|
|
||||||
* @param updateViaButton search this area button is clicked
|
|
||||||
* @param isSlightUpdate Means no need to update markers, just follow user location with camera
|
|
||||||
* @param customLatLng Will be used for updates for other locations than users current location.
|
|
||||||
* Ie. when we use search this area feature
|
|
||||||
* @param nearbyPlacesInfo Includes nearby places list and boundary coordinates
|
|
||||||
*/
|
|
||||||
private void updateMapFragment(boolean updateViaButton, boolean isSlightUpdate, @Nullable LatLng customLatLng, @Nullable NearbyController.NearbyPlacesInfo nearbyPlacesInfo) {
|
|
||||||
/*
|
|
||||||
Significant update means updating nearby place markers. Slightly update means only
|
|
||||||
updating current location marker and camera target.
|
|
||||||
We update our map Significantly on each 1000 meter change, but we can't never know
|
|
||||||
the frequency of nearby places. Thus we check if we are close to the boundaries of
|
|
||||||
our nearby markers, we update our map Significantly.
|
|
||||||
*/
|
|
||||||
NearbyMapFragment nearbyMapFragment = getMapFragment();
|
|
||||||
|
|
||||||
if (nearbyMapFragment != null && !nearbyMapFragment.isCurrentLocationMarkerVisible() && !onOrientationChanged) {
|
|
||||||
Timber.d("Do not update the map, user is not seeing current location marker" +
|
|
||||||
" means they are checking around and moving on map");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (nearbyMapFragment != null && curLatLng != null) {
|
|
||||||
hideProgressBar(); // In case it is visible (this happens, not an impossible case)
|
|
||||||
/*
|
|
||||||
* If we are close to nearby places boundaries, we need a significant update to
|
|
||||||
* get new nearby places. Check order is south, north, west, east
|
|
||||||
* */
|
|
||||||
if (nearbyMapFragment.boundaryCoordinates != null
|
|
||||||
&& !nearbyMapFragment.checkingAround
|
|
||||||
&& !nearbyMapFragment.searchThisAreaModeOn
|
|
||||||
&& !onOrientationChanged
|
|
||||||
&& (curLatLng.getLatitude() < nearbyMapFragment.boundaryCoordinates[0].getLatitude()
|
|
||||||
|| curLatLng.getLatitude() > nearbyMapFragment.boundaryCoordinates[1].getLatitude()
|
|
||||||
|| curLatLng.getLongitude() < nearbyMapFragment.boundaryCoordinates[2].getLongitude()
|
|
||||||
|| curLatLng.getLongitude() > nearbyMapFragment.boundaryCoordinates[3].getLongitude())) {
|
|
||||||
// populate places
|
|
||||||
compositeDisposable.add(Observable.fromCallable(() -> nearbyController
|
|
||||||
.loadAttractionsFromLocation(curLatLng, curLatLng, false, updateViaButton))
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(this::populatePlaces,
|
|
||||||
throwable -> {
|
|
||||||
Timber.d(throwable);
|
|
||||||
showErrorMessage(getString(R.string.error_fetching_nearby_places));
|
|
||||||
progressBar.setVisibility(View.GONE);
|
|
||||||
}));
|
|
||||||
nearbyMapFragment.setBundleForUpdates(bundle);
|
|
||||||
nearbyMapFragment.updateMapSignificantlyForCurrentLocation();
|
|
||||||
updateListFragment();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (updateViaButton) {
|
|
||||||
nearbyMapFragment.updateMapSignificantlyForCustomLocation(customLatLng, nearbyPlacesInfo.placeList);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
If this is the map update just after orientation change, then it is not a slight update
|
|
||||||
anymore. We want to significantly update map after each orientation change
|
|
||||||
*/
|
|
||||||
if (onOrientationChanged) {
|
|
||||||
isSlightUpdate = false;
|
|
||||||
onOrientationChanged = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isSlightUpdate) {
|
|
||||||
nearbyMapFragment.setBundleForUpdates(bundle);
|
|
||||||
nearbyMapFragment.updateMapSlightly();
|
|
||||||
} else {
|
|
||||||
nearbyMapFragment.setBundleForUpdates(bundle);
|
|
||||||
nearbyMapFragment.updateMapSignificantlyForCurrentLocation();
|
|
||||||
updateListFragment();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
lockNearbyView(true);
|
|
||||||
setMapFragment();
|
|
||||||
setListFragment();
|
|
||||||
hideProgressBar();
|
|
||||||
lockNearbyView(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates already existing list fragment with bundle includes nearby places and boundary
|
|
||||||
* coordinates
|
|
||||||
*/
|
|
||||||
private void updateListFragment() {
|
|
||||||
nearbyListFragment.setBundleForUpdates(bundle);
|
|
||||||
nearbyListFragment.updateNearbyListSignificantly();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates nearby list for custom location, will be used with search this area method. When you
|
|
||||||
* want to search for a place where you are not at.
|
|
||||||
* @param placeList List of places around your manually chosen target location from map.
|
|
||||||
*/
|
|
||||||
private void updateListFragmentForCustomLocation(List<Place> placeList) {
|
|
||||||
nearbyListFragment.updateNearbyListSignificantlyForCustomLocation(placeList);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Calls fragment for map view.
|
|
||||||
*/
|
|
||||||
private void setMapFragment() {
|
|
||||||
FragmentTransaction fragmentTransaction = getChildFragmentManager().beginTransaction();
|
|
||||||
nearbyMapFragment = new NearbyMapFragment();
|
|
||||||
nearbyMapFragment.setArguments(bundle);
|
|
||||||
fragmentTransaction.replace(R.id.container, nearbyMapFragment, TAG_RETAINED_MAP_FRAGMENT);
|
|
||||||
fragmentTransaction.commitAllowingStateLoss();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Calls fragment for list view.
|
|
||||||
*/
|
|
||||||
private void setListFragment() {
|
|
||||||
loading_nearby_layout.setVisibility(View.GONE);
|
|
||||||
frameLayout.setVisibility(View.VISIBLE);
|
|
||||||
FragmentTransaction fragmentTransaction = getChildFragmentManager().beginTransaction();
|
|
||||||
nearbyListFragment = new NearbyListFragment();
|
|
||||||
nearbyListFragment.setArguments(bundle);
|
|
||||||
fragmentTransaction.replace(R.id.container_sheet, nearbyListFragment, TAG_RETAINED_LIST_FRAGMENT);
|
|
||||||
initBottomSheetBehaviour();
|
|
||||||
bottomSheetBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
|
|
||||||
fragmentTransaction.commitAllowingStateLoss();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Hides progress bar
|
|
||||||
*/
|
|
||||||
private void hideProgressBar() {
|
|
||||||
if (progressBar != null) {
|
|
||||||
progressBar.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This method first checks if the location permissions has been granted and then register the location manager for updates.
|
|
||||||
*/
|
|
||||||
private void registerLocationUpdates() {
|
|
||||||
locationManager.registerLocationManager();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void showErrorMessage(String message) {
|
|
||||||
ViewUtil.showLongToast(getActivity(), message);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds network broadcast receiver to recognize connection established
|
|
||||||
*/
|
|
||||||
private void addNetworkBroadcastReceiver() {
|
|
||||||
if (!FragmentUtils.isFragmentUIActive(this)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (broadcastReceiver != null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
IntentFilter intentFilter = new IntentFilter(NETWORK_INTENT_ACTION);
|
|
||||||
|
|
||||||
broadcastReceiver = new BroadcastReceiver() {
|
|
||||||
@Override
|
|
||||||
public void onReceive(Context context, Intent intent) {
|
|
||||||
if (getActivity() != null) {
|
|
||||||
if (NetworkUtils.isInternetConnectionEstablished(getActivity())) {
|
|
||||||
if (isNetworkErrorOccured) {
|
|
||||||
refreshView(LOCATION_SIGNIFICANTLY_CHANGED);
|
|
||||||
isNetworkErrorOccured = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (snackbar != null) {
|
|
||||||
snackbar.dismiss();
|
|
||||||
snackbar = null;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (snackbar == null) {
|
|
||||||
snackbar = Snackbar.make(view, R.string.no_internet, Snackbar.LENGTH_INDEFINITE);
|
|
||||||
if (nearbyMapFragment != null && nearbyMapFragment.searchThisAreaButton != null) {
|
|
||||||
nearbyMapFragment.searchThisAreaButton.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
isNetworkErrorOccured = true;
|
|
||||||
snackbar.show();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
getActivity().registerReceiver(broadcastReceiver, intentFilter);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
// Resume the fragment if exist
|
|
||||||
if (((MainActivity) getActivity()).viewPager.getCurrentItem() == NEARBY_TAB_POSITION) {
|
|
||||||
checkPermissionsAndPerformAction(this::resumeFragment);
|
|
||||||
} else {
|
|
||||||
resumeFragment();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Perform nearby operations on nearby tab selected
|
|
||||||
* @param onOrientationChanged pass orientation changed info to fragment
|
|
||||||
*/
|
|
||||||
public void onTabSelected(boolean onOrientationChanged) {
|
|
||||||
Timber.d("On nearby tab selected");
|
|
||||||
this.onOrientationChanged = onOrientationChanged;
|
|
||||||
checkPermissionsAndPerformAction(this::performNearbyOperations);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void checkPermissionsAndPerformAction(Runnable runnable) {
|
|
||||||
PermissionUtils.checkPermissionsAndPerformAction(getActivity(),
|
|
||||||
Manifest.permission.ACCESS_FINE_LOCATION,
|
|
||||||
runnable,
|
|
||||||
() -> ((MainActivity) getActivity()).viewPager.setCurrentItem(CONTRIBUTIONS_TAB_POSITION),
|
|
||||||
R.string.location_permission_title,
|
|
||||||
R.string.location_permission_rationale_nearby);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Calls nearby operations in required order.
|
|
||||||
*/
|
|
||||||
private void performNearbyOperations() {
|
|
||||||
locationManager.addLocationListener(this);
|
|
||||||
registerLocationUpdates();
|
|
||||||
lockNearbyView = false;
|
|
||||||
addNetworkBroadcastReceiver();
|
|
||||||
refreshView(LOCATION_SIGNIFICANTLY_CHANGED);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onAttach(Context context) {
|
|
||||||
super.onAttach(context);
|
|
||||||
wikidataEditListener.setAuthenticationStateListener(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroy() {
|
|
||||||
super.onDestroy();
|
|
||||||
wikidataEditListener.setAuthenticationStateListener(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDetach() {
|
|
||||||
super.onDetach();
|
|
||||||
snackbar = null;
|
|
||||||
broadcastReceiver = null;
|
|
||||||
wikidataEditListener.setAuthenticationStateListener(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPause() {
|
|
||||||
super.onPause();
|
|
||||||
// this means that this activity will not be recreated now, user is leaving it
|
|
||||||
// or the activity is otherwise finishing
|
|
||||||
if(getActivity().isFinishing()) {
|
|
||||||
// we will not need this fragment anymore, this may also be a good place to signal
|
|
||||||
// to the retained fragment object to perform its own cleanup.
|
|
||||||
//removeMapFragment();
|
|
||||||
removeListFragment();
|
|
||||||
|
|
||||||
}
|
|
||||||
if (broadcastReceiver != null) {
|
|
||||||
getActivity().unregisterReceiver(broadcastReceiver);
|
|
||||||
broadcastReceiver = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (locationManager != null) {
|
|
||||||
locationManager.removeLocationListener(this);
|
|
||||||
locationManager.unregisterLocationManager();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Centers the map in nearby fragment to a given place
|
|
||||||
* @param place is new center of the map
|
|
||||||
*/
|
|
||||||
public void centerMapToPlace(Place place) {
|
|
||||||
if (nearbyMapFragment != null) {
|
|
||||||
nearbyMapFragment.centerMapToPlace(place);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isBottomSheetExpanded() { return bottomSheetBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -90,7 +90,7 @@ public class NearbyNotificationCardView extends SwipableCardView {
|
||||||
m.viewPager.setCurrentItem(NEARBY_TAB_POSITION);
|
m.viewPager.setCurrentItem(NEARBY_TAB_POSITION);
|
||||||
|
|
||||||
// Center the map to the place
|
// Center the map to the place
|
||||||
((NearbyFragment) m.contributionsActivityPagerAdapter.getItem(NEARBY_TAB_POSITION)).centerMapToPlace(place);
|
//((NearbyFragment) m.contributionsActivityPagerAdapter.getItem(NEARBY_TAB_POSITION)).centerMapToPlace(place);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -117,7 +117,7 @@ public class PlaceRenderer extends Renderer<Place> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (onBookmarkClick == null) {
|
if (onBookmarkClick == null) {
|
||||||
((NearbyFragment) fragment.getParentFragment()).centerMapToPlace(place);
|
//((NearbyFragment) fragment.getParentFragment()).centerMapToPlace(place);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
view.setOnClickListener(listener);
|
view.setOnClickListener(listener);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue