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

Issue 5835 nearby (#5843)

Browse source 
* NearbyParentFragment.java:
OnScroll - removed distance threshold, delay search by 800ms, discard multiple OnScroll within 800ms.
OnDestroy - destroy any queued OnScroll events

* NearbyParentFragment.java:
loadPlacesDataAsync - set batchSize from 50 back to original 3

* comment

---------

Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com>
This commit is contained in:
tristan 2024-10-02 14:03:25 +10:00 • committed by GitHub
parent 3d49b1f79a
commit d0e64d7886
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,6 +27,7 @@ import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES; import android.os.Build.VERSION_CODES;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.os.Handler;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.provider.Settings; import android.provider.Settings;
import android.text.Html; import android.text.Html;
@ -149,7 +150,6 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
WikidataEditListener.WikidataP18EditListener, LocationUpdateListener, WikidataEditListener.WikidataP18EditListener, LocationUpdateListener,
LocationPermissionCallback, BottomSheetAdapter.ItemClickListener { LocationPermissionCallback, BottomSheetAdapter.ItemClickListener {
FragmentNearbyParentBinding binding; FragmentNearbyParentBinding binding;
@Inject @Inject
@ -171,6 +171,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
SystemThemeUtils systemThemeUtils; SystemThemeUtils systemThemeUtils;
@Inject @Inject
CommonPlaceClickActions commonPlaceClickActions; CommonPlaceClickActions commonPlaceClickActions;
private LocationPermissionsHelper locationPermissionsHelper; private LocationPermissionsHelper locationPermissionsHelper;
private NearbyFilterSearchRecyclerViewAdapter nearbyFilterSearchRecyclerViewAdapter; private NearbyFilterSearchRecyclerViewAdapter nearbyFilterSearchRecyclerViewAdapter;
private BottomSheetBehavior bottomSheetListBehavior; private BottomSheetBehavior bottomSheetListBehavior;
@ -208,6 +209,11 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
private Place nearestPlace; private Place nearestPlace;
private volatile boolean stopQuery; private volatile boolean stopQuery;
private boolean isSearchInProgress = false;
private final Handler searchHandler = new Handler();
private Runnable searchRunnable;
private static final long SCROLL_DELAY = 800; // Delay for debounce of onscroll, in milliseconds.
private List<Place> updatedPlacesList; private List<Place> updatedPlacesList;
private LatLng updatedLatLng; private LatLng updatedLatLng;
private boolean searchable; private boolean searchable;
@ -419,28 +425,27 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
binding.map.addMapListener(new MapListener() { binding.map.addMapListener(new MapListener() {
@Override @Override
public boolean onScroll(ScrollEvent event) { public boolean onScroll(ScrollEvent event) {
if (lastMapFocus != null) {
Location mylocation = new Location(""); // Remove any pending search runnables
Location dest_location = new Location(""); searchHandler.removeCallbacks(searchRunnable);
dest_location.setLatitude(binding.map.getMapCenter().getLatitude());
dest_location.setLongitude(binding.map.getMapCenter().getLongitude()); // Set a runnable to call the Search after a delay
mylocation.setLatitude(lastMapFocus.getLatitude()); searchRunnable = new Runnable() {
mylocation.setLongitude(lastMapFocus.getLongitude()); @Override
Float distance = mylocation.distanceTo(dest_location);//in meters public void run() {
if (lastMapFocus != null) { if (!isSearchInProgress) {
if (isNetworkConnectionEstablished() && (event.getX() > 0 isSearchInProgress = true; // search executing flag
|| event.getY() > 0)) { // Start Search
if (distance > 2000.0) { try {
searchable = true;
presenter.searchInTheArea(); presenter.searchInTheArea();
} else { } finally {
searchable = false; isSearchInProgress = false;
} }
} }
} else {
searchable = false;
} }
} };
// post runnable with configured SCROLL_DELAY
searchHandler.postDelayed(searchRunnable, SCROLL_DELAY);
return true; return true;
} }
@ -680,6 +685,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
@Override @Override
public void onDestroyView() { public void onDestroyView() {
super.onDestroyView(); super.onDestroyView();
searchHandler.removeCallbacks(searchRunnable);
presenter.removeNearbyPreferences(applicationKvStore); presenter.removeNearbyPreferences(applicationKvStore);
} }
@ -1027,7 +1033,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
@Override @Override
public void populatePlaces(final LatLng currentLatLng) { public void populatePlaces(final LatLng currentLatLng) {
IGeoPoint screenTopRight = binding.map.getProjection() IGeoPoint screenTopRight = binding.map.getProjection()
.fromPixels(binding.map.getWidth(), 0); .fromPixels(binding.map.getWidth(), 0);
IGeoPoint screenBottomLeft = binding.map.getProjection() IGeoPoint screenBottomLeft = binding.map.getProjection()
.fromPixels(0, binding.map.getHeight()); .fromPixels(0, binding.map.getHeight());
@ -1931,8 +1937,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
return (R.drawable.ic_clear_black_24dp); return (R.drawable.ic_clear_black_24dp);
}else if (place.name == "") { }else if (place.name == "") {
return (isBookmarked ? return (isBookmarked ?
R.drawable.ic_custom_map_marker_grey_bookmarked : R.drawable.ic_custom_map_marker_grey_bookmarked :
R.drawable.ic_custom_map_marker_grey); R.drawable.ic_custom_map_marker_grey);
} else { } else {
return (isBookmarked ? return (isBookmarked ?
R.drawable.ic_custom_map_marker_red_bookmarked : R.drawable.ic_custom_map_marker_red_bookmarked :
@ -2499,5 +2505,4 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
intent.setData(Uri.parse(WLM_URL)); intent.setData(Uri.parse(WLM_URL));
startActivity(intent); startActivity(intent);
} }
} }