From b874f775515ad6923d18ccf60e3fdf269eb18ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20P=C3=B3=C5=82grabia?= Date: Sun, 2 Oct 2016 11:17:03 +0200 Subject: [PATCH] Added retrofit and fetching photos by ref using retrofit (without tests). --- googleutils/build.gradle | 2 + googleutils/proguard-rules.pro | 13 ++++ .../googleutils/GooglePlacesService.java | 22 +++++++ .../callback/GooglePlacesPhotosCallback.java | 14 +++++ .../constants/GooglePlacesConstants.java | 9 +++ .../dto/GooglePlacePhotoRefResult.java | 59 +++++++++++++++++++ .../googleutils/utils/PlacesUtils.java | 55 ++++++++++++++++- 7 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 googleutils/src/main/java/pl/tpolgrabia/googleutils/GooglePlacesService.java create mode 100644 googleutils/src/main/java/pl/tpolgrabia/googleutils/callback/GooglePlacesPhotosCallback.java create mode 100644 googleutils/src/main/java/pl/tpolgrabia/googleutils/constants/GooglePlacesConstants.java create mode 100644 googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhotoRefResult.java diff --git a/googleutils/build.gradle b/googleutils/build.gradle index 404c7d3..dd9f1b8 100644 --- a/googleutils/build.gradle +++ b/googleutils/build.gradle @@ -32,4 +32,6 @@ dependencies { compile 'com.googlecode.android-query:android-query:0.25.9' compile project(path: ':urbanexplorerutils') + compile 'com.squareup.retrofit2:retrofit:2.1.0' + compile 'com.squareup.retrofit2:converter-gson:2.1.0' } diff --git a/googleutils/proguard-rules.pro b/googleutils/proguard-rules.pro index f253a1f..06736b0 100644 --- a/googleutils/proguard-rules.pro +++ b/googleutils/proguard-rules.pro @@ -15,3 +15,16 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} + +# Proguard rules for retrofit + +# Platform calls Class.forName on types which do not exist on Android to determine platform. +-dontnote retrofit2.Platform +# Platform used when running on RoboVM on iOS. Will not be used at runtime. +-dontnote retrofit2.Platform$IOS$MainThreadExecutor +# Platform used when running on Java 8 VMs. Will not be used at runtime. +-dontwarn retrofit2.Platform$Java8 +# Retain generic type information for use by reflection by converters and adapters. +-keepattributes Signature +# Retain declared checked exceptions for use by a Proxy instance. +-keepattributes Exceptions diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/GooglePlacesService.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/GooglePlacesService.java new file mode 100644 index 0000000..09c9021 --- /dev/null +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/GooglePlacesService.java @@ -0,0 +1,22 @@ +package pl.tpolgrabia.googleutils; + +import pl.tpolgrabia.googleutils.dto.GooglePlacePhotoRefResult; +import pl.tpolgrabia.googleutils.dto.GooglePlaceResult; +import retrofit2.Call; +import retrofit2.http.GET; +import retrofit2.http.Path; + +import java.util.List; + +/** + * Created by tpolgrabia on 02.10.16. + */ +public interface GooglePlacesService { + @GET("photo?maxwidth={maxWidth}" + + "&photoreference={photoRef}" + + "&key={apiKey}") + Call> fetchPhotosByRef( + @Path("maxWidth") Long maxWidth, + @Path("photoRef") String photoRef, + @Path("apiKey") String apiKey); +} diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/callback/GooglePlacesPhotosCallback.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/callback/GooglePlacesPhotosCallback.java new file mode 100644 index 0000000..2e9b008 --- /dev/null +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/callback/GooglePlacesPhotosCallback.java @@ -0,0 +1,14 @@ +package pl.tpolgrabia.googleutils.callback; + +import pl.tpolgrabia.googleutils.dto.GooglePlacePhotoRefResult; +import pl.tpolgrabia.googleutils.dto.GooglePlaceResult; + +import java.util.List; + +/** + * Created by tpolgrabia on 02.10.16. + */ +public interface GooglePlacesPhotosCallback { + void onResponse(int code, String message, List body); + void onFailure(Throwable t); +} diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/constants/GooglePlacesConstants.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/constants/GooglePlacesConstants.java new file mode 100644 index 0000000..0cc768d --- /dev/null +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/constants/GooglePlacesConstants.java @@ -0,0 +1,9 @@ +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 Long PHOTO_MAX_WIDTH = 512L; +} diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhotoRefResult.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhotoRefResult.java new file mode 100644 index 0000000..a07aef8 --- /dev/null +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhotoRefResult.java @@ -0,0 +1,59 @@ +package pl.tpolgrabia.googleutils.dto; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +/** + * Created by tpolgrabia on 02.10.16. + */ +public class GooglePlacePhotoRefResult { + @SerializedName("htmlAttributions") + private List htmlAttributions; + private Long width; + private Long height; + @SerializedName("photoReference") + private String photoReference; + + public List getHtmlAttributions() { + return htmlAttributions; + } + + public void setHtmlAttributions(List htmlAttributions) { + this.htmlAttributions = htmlAttributions; + } + + public Long getWidth() { + return width; + } + + public void setWidth(Long width) { + this.width = width; + } + + public Long getHeight() { + return height; + } + + public void setHeight(Long height) { + this.height = height; + } + + public String getPhotoReference() { + return photoReference; + } + + public void setPhotoReference(String photoReference) { + this.photoReference = photoReference; + } + + @Override + public String toString() { + return "GooglePlacePhotoRefResult{" + + "htmlAttributions=" + htmlAttributions + + ", width=" + width + + ", height=" + height + + ", photoReference='" + photoReference + '\'' + + '}'; + } +} diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java index a22f14e..c786230 100644 --- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java @@ -4,15 +4,26 @@ import android.content.Context; import com.androidquery.AQuery; import com.androidquery.callback.AjaxCallback; import com.androidquery.callback.AjaxStatus; -import com.google.gson.JsonObject; +import org.apache.http.HttpStatus; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pl.tpolgrabia.googleutils.GooglePlacesService; +import pl.tpolgrabia.googleutils.callback.GooglePlacesPhotosCallback; import pl.tpolgrabia.googleutils.callback.PlacesCallback; +import pl.tpolgrabia.googleutils.constants.GooglePlacesConstants; import pl.tpolgrabia.googleutils.converter.GooglePlaceConverter; +import pl.tpolgrabia.googleutils.dto.GooglePlacePhoto; +import pl.tpolgrabia.googleutils.dto.GooglePlacePhotoRefResult; import pl.tpolgrabia.googleutils.dto.GooglePlaceResult; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; -import java.util.List; +import java.io.IOException; +import java.util.*; /** * Created by tpolgrabia on 27.09.16. @@ -97,4 +108,44 @@ public class PlacesUtils { } }); } + + public List fetchPhotosByRefSync(String photosRef) throws IOException { + Response> results = fetchPhotosByRefInvocation(photosRef).execute(); + return results.code() == HttpStatus.SC_OK ? results.body() : null; + } + + public void fetchPhotosByRefAsync(String photosRef, final GooglePlacesPhotosCallback clbk) { + fetchPhotosByRefInvocation(photosRef).enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + clbk.onResponse(response.code(), response.message(), response.body()); + } + + @Override + public void onFailure(Call> call, Throwable t) { + clbk.onFailure(t); + } + }); + } + + private Call> fetchPhotosByRefInvocation(String photosRef) { + Retrofit retrofit = new Retrofit.Builder() + .baseUrl(GooglePlacesConstants.GOOGLE_PLACES_BASEURL) + .addConverterFactory(GsonConverterFactory.create()) + .build(); + GooglePlacesService service = retrofit.create(GooglePlacesService.class); + return service.fetchPhotosByRef( + GooglePlacesConstants.PHOTO_MAX_WIDTH, + photosRef, + apiKey); + } + + public Map> fetchPhotosSync(Set photoRefs) throws IOException { + HashMap> result = new HashMap>(); + for (String photoRef : photoRefs) { + result.put(photoRef, fetchPhotosByRefSync(photoRef)); + } + + return result; + } }