ReVanced-Mirror/VancedMicroG
1
0
Fork 0
mirror of https://github.com/TeamVanced/VancedMicroG synced 2024-10-15 01:09:38 +02:00
Code Issues Projects Releases Wiki Activity

PlacePicker: Correctly handle named locations

Browse Source
This commit is contained in:
Marvin W 2017-01-18 10:49:01 +01:00
parent c57d99d64e
commit 6422f2a2d7
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java
View File

@ -29,6 +29,7 @@ import android.support.v4.view.MenuItemCompat;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.SearchView; import android.support.v7.widget.SearchView;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.text.Html;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.Menu; import android.view.Menu;
@ -190,7 +191,7 @@ public class PlacePickerActivity extends AppCompatActivity implements Map.Update
place.viewport = GmsMapsTypeHelper.toLatLngBounds(mapView.map().viewport().getBBox(null, 0)); place.viewport = GmsMapsTypeHelper.toLatLngBounds(mapView.map().viewport().getBBox(null, 0));
resultIntent.putExtra(LocationConstants.EXTRA_FINAL_BOUNDS, place.viewport); resultIntent.putExtra(LocationConstants.EXTRA_FINAL_BOUNDS, place.viewport);
place.latLng = GmsMapsTypeHelper.toLatLng(position.getGeoPoint()); place.latLng = GmsMapsTypeHelper.toLatLng(position.getGeoPoint());
place.name = getString(R.string.place_picker_location_lat_lng, place.latLng.latitude, place.latLng.longitude); place.name = "";
place.address = ""; place.address = "";
updateInfoText(); updateInfoText();
if (geocoderInProgress.compareAndSet(false, true)) { if (geocoderInProgress.compareAndSet(false, true)) {
@ -209,12 +210,15 @@ public class PlacePickerActivity extends AppCompatActivity implements Map.Update
Address address = addresses.get(0); Address address = addresses.get(0);
StringBuilder sb = new StringBuilder(address.getAddressLine(0)); StringBuilder sb = new StringBuilder(address.getAddressLine(0));
for (int i = 1; i < address.getMaxAddressLineIndex(); ++i) { for (int i = 1; i < address.getMaxAddressLineIndex(); ++i) {
if (i == 1 && sb.toString().equals(address.getFeatureName())) {
sb = new StringBuilder(address.getAddressLine(i));
continue;
}
sb.append(", ").append(address.getAddressLine(i)); sb.append(", ").append(address.getAddressLine(i));
} }
if (place.latLng == ll) { if (place.latLng == ll) {
place.address = sb.toString(); place.address = sb.toString();
place.name = address.getFeatureName(); place.name = address.getFeatureName();
if (TextUtils.isEmpty(place.name)) place.name = place.address;
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -234,6 +238,12 @@ public class PlacePickerActivity extends AppCompatActivity implements Map.Update
} }
private void updateInfoText() { private void updateInfoText() {
((TextView) findViewById(R.id.place_picker_info)).setText(place.name); if (TextUtils.isEmpty(place.address)) {
((TextView) findViewById(R.id.place_picker_info)).setText(getString(R.string.place_picker_location_lat_lng, place.latLng.latitude, place.latLng.longitude));
} else if (TextUtils.isEmpty(place.name)) {
((TextView) findViewById(R.id.place_picker_info)).setText(place.address);
} else {
((TextView) findViewById(R.id.place_picker_info)).setText(Html.fromHtml("<b>" + place.name + "</b>, " + place.address));
}
} }
} }