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

Merge branch 'master' into directNearbyUploadsNew

Browse source
This commit is contained in:
Vivek Maskara 2018-03-21 17:54:03 +05:30 • committed by GitHub
commit 50d9cff8c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
152 changed files with 2687 additions and 945 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
View file

@ -300,7 +300,6 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
LatLng lastLocation = locationManager.getLastLocation();
if (curLatLang != null && curLatLang.equals(lastLocation)) { //refresh view only if location has changed
return;
}
curLatLang = lastLocation;
@ -340,9 +339,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
String gsonBoundaryCoordinates = gson.toJson(boundaryCoordinates);
if (placeList.size() == 0) {
int duration = Toast.LENGTH_SHORT;
Toast toast = Toast.makeText(this, R.string.no_nearby, duration);
toast.show();
ViewUtil.showSnackbar(findViewById(R.id.container), R.string.no_nearby);
}
bundle.clear();

2
app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
View file

@ -144,9 +144,9 @@ public class PlaceRenderer extends Renderer<Place> {
place = getContent();
tvName.setText(place.name);
String descriptionText = place.getLongDescription();
if (descriptionText.equals("?")) {
descriptionText = getContext().getString(R.string.no_description_found);
tvDesc.setVisibility(View.INVISIBLE);
}
tvDesc.setText(descriptionText);
distance.setText(place.distance);