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

Fixes #3355 : Do not display pins at all when "Needs Photo" is selected (#3407)

Browse source 
* ic_custom_greyed_out_marker: removing grey marker

* NearbyParentFragment: changing function name and description

* change method name to hideAllMarkers
This commit is contained in:
Kshitij Bhardwaj 2020-02-19 13:43:19 -05:00 • committed by GitHub
parent af97e40c13
commit 96f4a5c08f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1050,7 +1050,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
@Override
public void filterOutAllMarkers() {
greyOutAllMarkers();
hideAllMArkers();
}
/**
@ -1077,7 +1077,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
boolean filterForPlaceState,
boolean filterForAllNoneType) {
if (selectedLabels.size() == 0 && filterForPlaceState) { // If nothing is selected, display all
greyOutAllMarkers();
// remove the previous markers before updating them
hideAllMArkers();
for (MarkerPlaceGroup markerPlaceGroup : NearbyController.markerLabelList) {
if (displayExists && displayNeedsPhoto) {
// Exists and needs photo
@ -1101,8 +1102,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
}
} else {
// First greyed out all markers
greyOutAllMarkers();
// First remove all the markers
hideAllMArkers();
for (MarkerPlaceGroup markerPlaceGroup : NearbyController.markerLabelList) {
for (Label label : selectedLabels) {
if (markerPlaceGroup.getPlace().getLabel().toString().equals(label.toString())) {
@ -1186,9 +1187,11 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
}
/**
* Greys out all markers except current location marker
* Removes all markers except current location marker, an icon has been used
* but it is transparent more than grey(as the name of the icon might suggest)
* since grey icon may lead the users to believe that it is disabled or prohibited contribution
*/
private void greyOutAllMarkers() {
private void hideAllMArkers() {
if(currentLocationMarker==null){
return;
}