diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/adapters/PlacesAdapter.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/adapters/PlacesAdapter.java index d20b44f..c42f5ab 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/adapters/PlacesAdapter.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/adapters/PlacesAdapter.java @@ -9,9 +9,13 @@ import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.TextView; import com.nostra13.universalimageloader.core.ImageLoader; +import pl.tpolgrabia.googleutils.dto.GooglePlacePhoto; +import pl.tpolgrabia.googleutils.dto.GooglePlacePhotoRefResult; import pl.tpolgrabia.googleutils.dto.GooglePlaceResult; +import pl.tpolgrabia.urbanexplorer.AppConstants; import pl.tpolgrabia.urbanexplorer.MainActivity; import pl.tpolgrabia.urbanexplorer.R; +import pl.tpolgrabia.urbanexplorer.dto.GooglePlacesResponse; import java.util.List; @@ -20,8 +24,11 @@ import java.util.List; */ public class PlacesAdapter extends ArrayAdapter { - public PlacesAdapter(Context context, @NonNull List objects) { - super(context, R.layout.google_place_item, objects); + private final GooglePlacesResponse objects; + + public PlacesAdapter(Context context, GooglePlacesResponse objects) { + super(context, R.layout.google_place_item, objects.getPlaces()); + this.objects = objects; } @Override @@ -35,6 +42,11 @@ public class PlacesAdapter extends ArrayAdapter { } GooglePlaceResult item = getItem(position); + final List photos = item.getPhotos(); + String photoRef = photos != null && !photos.isEmpty() ? photos.get(0).getPhotoReference() : null; + String photoUrl = photoRef == null ? null : "https://maps.googleapis.com/maps/api/place/photo?photoreference=" + + photoRef + "&maxwidth=64&key=" + AppConstants.GOOGLE_API_KEY; + TextView placeDescriptionWidget = (TextView) resultView.findViewById(R.id.place_description); placeDescriptionWidget.setText(item.getName()); @@ -47,7 +59,7 @@ public class PlacesAdapter extends ArrayAdapter { ImageView placePreviewWidget = (ImageView)resultView.findViewById(R.id.place_img_preview); ImageLoader.getInstance().displayImage( - item.getIcon(), + photoUrl != null ? photoUrl : item.getIcon(), placePreviewWidget, MainActivity.options); diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/GooglePlacesRequest.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/GooglePlacesRequest.java new file mode 100644 index 0000000..3212cc8 --- /dev/null +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/GooglePlacesRequest.java @@ -0,0 +1,86 @@ +package pl.tpolgrabia.urbanexplorer.dto; + +import android.location.Location; +import pl.tpolgrabia.googleutils.callback.PlacesCallback; + +/** + * Created by tpolgrabia on 03.10.16. + */ +public class GooglePlacesRequest { + private Location location; + private Long offset; + private Long count; + private Double searchRadius; + private String searchItemType; + private String pageToken; + private PlacesCallback callback; + + public Location getLocation() { + return location; + } + + public void setLocation(Location location) { + this.location = location; + } + + public Long getOffset() { + return offset; + } + + public void setOffset(Long offset) { + this.offset = offset; + } + + public Long getCount() { + return count; + } + + public void setCount(Long count) { + this.count = count; + } + + public Double getSearchRadius() { + return searchRadius; + } + + public void setSearchRadius(Double searchRadius) { + this.searchRadius = searchRadius; + } + + public String getSearchItemType() { + return searchItemType; + } + + public void setSearchItemType(String searchItemType) { + this.searchItemType = searchItemType; + } + + public String getPageToken() { + return pageToken; + } + + public void setPageToken(String pageToken) { + this.pageToken = pageToken; + } + + public PlacesCallback getCallback() { + return callback; + } + + public void setCallback(PlacesCallback callback) { + this.callback = callback; + } + + @Override + public String toString() { + return "GooglePlacesRequest{" + + "location=" + location + + ", offset=" + offset + + ", count=" + count + + ", searchRadius=" + searchRadius + + ", searchItemType='" + searchItemType + '\'' + + ", pageToken='" + pageToken + '\'' + + ", callback=" + callback + + '}'; + } +} diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/GooglePlacesResponse.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/GooglePlacesResponse.java new file mode 100644 index 0000000..5fb3aee --- /dev/null +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/GooglePlacesResponse.java @@ -0,0 +1,39 @@ +package pl.tpolgrabia.urbanexplorer.dto; + +import pl.tpolgrabia.googleutils.dto.GooglePlacePhotoRefResult; +import pl.tpolgrabia.googleutils.dto.GooglePlaceResult; + +import java.util.List; +import java.util.Map; + +/** + * Created by tpolgrabia on 03.10.16. + */ +public class GooglePlacesResponse { + private List places; + private Map> photos; + + public List getPlaces() { + return places; + } + + public void setPlaces(List places) { + this.places = places; + } + + public Map> getPhotos() { + return photos; + } + + public void setPhotos(Map> photos) { + this.photos = photos; + } + + @Override + public String toString() { + return "GooglePlacesResponse{" + + "places=" + places + + ", photos=" + photos + + '}'; + } +} diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java index 893d29b..9e03855 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java @@ -23,6 +23,8 @@ import pl.tpolgrabia.urbanexplorer.AppConstants; import pl.tpolgrabia.urbanexplorer.MainActivity; import pl.tpolgrabia.urbanexplorer.R; import pl.tpolgrabia.urbanexplorer.adapters.PlacesAdapter; +import pl.tpolgrabia.urbanexplorer.dto.GooglePlacesRequest; +import pl.tpolgrabia.urbanexplorer.worker.GooglePlacesWorker; import pl.tpolgrabia.urbanexplorerutils.callbacks.StandardLocationListenerCallback; import pl.tpolgrabia.urbanexplorerutils.utils.LocationUtils; @@ -38,6 +40,7 @@ public class PlacesFragment extends Fragment { public static final String TAG = PlacesFragment.class.getSimpleName(); private PlacesUtils placesUtils; private GeocoderUtils geocoderUtils; + private GooglePlacesWorker worker; public PlacesFragment() { // Required empty public constructor @@ -100,6 +103,7 @@ public class PlacesFragment extends Fragment { }); geocoderUtils = new GeocoderUtils(getActivity(), AppConstants.GOOGLE_API_KEY); + worker = new GooglePlacesWorker(getActivity(), this); } @@ -129,29 +133,36 @@ public class PlacesFragment extends Fragment { locationWidget.setText(geocodedLocation); } }); + lg.debug("Fetching nearby places {}", location); fetchNearbyPlacesAndPresemt(location); } private void fetchNearbyPlacesAndPresemt(Location location) { - placesUtils.fetchNearbyPlaces( - location.getLatitude(), - location.getLongitude(), - AppConstants.DEF_PLACES_RADIUS, - "museum", - null, - new PlacesCallback() { - @Override - public void callback(Long statusCode, String statusMsg, List googlePlaceResult) { - lg.debug("Fetch nearby statusCode: {}, status message: {}, google result: {}", - statusCode, - statusMsg, - googlePlaceResult); + GooglePlacesRequest request = new GooglePlacesRequest(); + request.setLocation(location); + request.setSearchRadius(AppConstants.DEF_PLACES_RADIUS); + request.setSearchItemType("museum"); + worker.execute(request); - ListView googlePlacesWidget = (ListView) getView().findViewById(R.id.google_places); - PlacesAdapter adapter = new PlacesAdapter(getActivity(), googlePlaceResult); - googlePlacesWidget.setAdapter(adapter); - } - }); +// placesUtils.fetchNearbyPlaces( +// location.getLatitude(), +// location.getLongitude(), +// AppConstants.DEF_PLACES_RADIUS, +// "museum", +// null, +// new PlacesCallback() { +// @Override +// public void callback(Long statusCode, String statusMsg, List googlePlaceResult) { +// lg.debug("Fetch nearby statusCode: {}, status message: {}, google result: {}", +// statusCode, +// statusMsg, +// googlePlaceResult); +// +// ListView googlePlacesWidget = (ListView) getView().findViewById(R.id.google_places); +// PlacesAdapter adapter = new PlacesAdapter(getActivity(), googlePlaceResult); +// googlePlacesWidget.setAdapter(adapter); +// } +// }); } } diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/worker/GooglePlacesWorker.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/worker/GooglePlacesWorker.java new file mode 100644 index 0000000..31e0157 --- /dev/null +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/worker/GooglePlacesWorker.java @@ -0,0 +1,97 @@ +package pl.tpolgrabia.urbanexplorer.worker; + +import android.content.Context; +import android.location.Location; +import android.os.AsyncTask; +import android.view.View; +import android.widget.ListView; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import pl.tpolgrabia.googleutils.callback.PlacesCallback; +import pl.tpolgrabia.googleutils.dto.GooglePlacePhoto; +import pl.tpolgrabia.googleutils.dto.GooglePlaceResult; +import pl.tpolgrabia.googleutils.utils.PlacesUtils; +import pl.tpolgrabia.urbanexplorer.AppConstants; +import pl.tpolgrabia.urbanexplorer.R; +import pl.tpolgrabia.urbanexplorer.adapters.PlacesAdapter; +import pl.tpolgrabia.urbanexplorer.dto.GooglePlacesRequest; +import pl.tpolgrabia.urbanexplorer.dto.GooglePlacesResponse; +import pl.tpolgrabia.urbanexplorer.fragments.PlacesFragment; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.concurrent.Semaphore; + +/** + * Created by tpolgrabia on 03.10.16. + */ +public class GooglePlacesWorker extends AsyncTask> { + + private static final Logger lg = LoggerFactory.getLogger(GooglePlacesWorker.class); + + private final Context ctx; + private final PlacesUtils placesUtils; + private final PlacesFragment placesFragment; + + public GooglePlacesWorker(Context ctx, PlacesFragment placesFragment) { + this.ctx = ctx; + this.placesFragment = placesFragment; + this.placesUtils = new PlacesUtils(ctx, AppConstants.GOOGLE_API_KEY); + } + + @Override + protected List doInBackground(GooglePlacesRequest... params) { + lg.trace("Doing processing in background"); + + final List result = new ArrayList<>(); + + for (final GooglePlacesRequest param : params) { + lg.debug("Excuting param {}", param); + Location location = param.getLocation(); + final Semaphore sem = new Semaphore(0); + + placesUtils.fetchNearbyPlaces( + location.getLatitude(), + location.getLongitude(), + param.getSearchRadius(), + param.getSearchItemType(), + param.getPageToken(), + new PlacesCallback() { + @Override + public void callback(Long statusCode, String statusMsg, List googlePlaceResults) { + GooglePlacesResponse response = new GooglePlacesResponse(); + response.setPlaces(googlePlaceResults); + result.add(response); + sem.release(); + } + }); + try { + sem.acquire(); + } catch (InterruptedException e) { + lg.error("Interrupted"); + } + } + + lg.debug("Returning result: {}", result); + + return result; + } + + @Override + protected void onPostExecute(List googlePlacesResponses) { + lg.debug("Post execute {}", googlePlacesResponses); + final View view = placesFragment.getView(); + if (view == null) { + lg.error("Fragment not attached to the view"); + return; + } + + for (GooglePlacesResponse response : googlePlacesResponses) { + ListView places = (ListView) view.findViewById(R.id.google_places); + places.setAdapter(new PlacesAdapter(ctx, response)); + } + } +} diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/GooglePlacesService.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/GooglePlacesService.java index 09c9021..824b505 100644 --- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/GooglePlacesService.java +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/GooglePlacesService.java @@ -5,6 +5,7 @@ import pl.tpolgrabia.googleutils.dto.GooglePlaceResult; import retrofit2.Call; import retrofit2.http.GET; import retrofit2.http.Path; +import retrofit2.http.Query; import java.util.List; @@ -12,11 +13,9 @@ import java.util.List; * Created by tpolgrabia on 02.10.16. */ public interface GooglePlacesService { - @GET("photo?maxwidth={maxWidth}" + - "&photoreference={photoRef}" + - "&key={apiKey}") + @GET("photo") Call> fetchPhotosByRef( - @Path("maxWidth") Long maxWidth, - @Path("photoRef") String photoRef, - @Path("apiKey") String apiKey); + @Query("max_width") Long maxWidth, + @Query("photoreference") String photoRef, + @Query("key") String apiKey); } diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/constants/GooglePlacesConstants.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/constants/GooglePlacesConstants.java index 0cc768d..81c9251 100644 --- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/constants/GooglePlacesConstants.java +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/constants/GooglePlacesConstants.java @@ -4,6 +4,6 @@ package pl.tpolgrabia.googleutils.constants; * Created by tpolgrabia on 02.10.16. */ public class GooglePlacesConstants { - public static final String GOOGLE_PLACES_BASEURL = "https://maps.googleapis.com/maps/api/place"; + public static final String GOOGLE_PLACES_BASEURL = "https://maps.googleapis.com/maps/api/place/"; public static final Long PHOTO_MAX_WIDTH = 512L; }