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

Merge pull request #582 from misaochan/display_toast

Browse source 
Display toast if no nearby places found
This commit is contained in:
Josephine Lim 2017-05-15 12:05:03 +02:00 • committed by GitHub
commit 5f4c86c698
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,12 @@
package fr.free.nrw.commons.nearby;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.location.LocationManager;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
@ -14,6 +18,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.ProgressBar;
import android.widget.Toast;
import butterknife.BindView;
import butterknife.ButterKnife;
@ -57,7 +62,7 @@ public class NearbyActivity extends BaseActivity {
locationManager = new LocationServiceManager(this);
locationManager.registerLocationManager();
curLatLang = locationManager.getLatestLocation();
nearbyAsyncTask = new NearbyAsyncTask();
nearbyAsyncTask = new NearbyAsyncTask(this);
nearbyAsyncTask.execute();
}
@ -148,7 +153,7 @@ public class NearbyActivity extends BaseActivity {
}
protected void refreshView() {
nearbyAsyncTask = new NearbyAsyncTask();
nearbyAsyncTask = new NearbyAsyncTask(this);
nearbyAsyncTask.execute();
}
@ -164,6 +169,12 @@ public class NearbyActivity extends BaseActivity {
private class NearbyAsyncTask extends AsyncTask<Void, Integer, List<Place>> {
private Context mContext;
private NearbyAsyncTask (Context context) {
mContext = context;
}
@Override
protected void onPreExecute() {
super.onPreExecute();
@ -195,6 +206,12 @@ public class NearbyActivity extends BaseActivity {
gsonPlaceList = gson.toJson(placeList);
gsonCurLatLng = gson.toJson(curLatLang);
if (placeList.size() == 0) {
int duration = Toast.LENGTH_SHORT;
Toast toast = Toast.makeText(mContext, R.string.no_nearby, duration);
toast.show();
}
bundle.clear();
bundle.putString("PlaceList", gsonPlaceList);
bundle.putString("CurLatLng", gsonCurLatLng);

1
app/src/main/res/values/strings.xml
View file

@ -159,6 +159,7 @@ Tap this message (or hit back) to skip this step.</string>
<string name="location_permission_rationale">Optional permission: Get current location for category suggestions</string>
<string name="ok">OK</string>
<string name="title_activity_nearby">Nearby Places</string>
<string name="no_nearby">No nearby places found</string>
<string name="warning">Warning</string>
<string name="file_exists">This file already exists on Commons. Are you sure you want to proceed?</string>
<string name="yes">Yes</string>