From 892287430984c891580d86a289ca57127035da5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20P=C3=B3=C5=82grabia?= Date: Thu, 1 Sep 2016 22:50:14 +0200 Subject: [PATCH] Refactored (not tested) panoramio image info loading. --- .../callbacks/PanoramioResponseCallback.java | 6 +- .../urbanexplorer/fragments/HomeFragment.java | 127 +++++++++--------- .../urbanexplorer/utils/PanoramioUtils.java | 70 +++++++++- 3 files changed, 133 insertions(+), 70 deletions(-) diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/PanoramioResponseCallback.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/PanoramioResponseCallback.java index 0153e8e..787e343 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/PanoramioResponseCallback.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/PanoramioResponseCallback.java @@ -1,10 +1,12 @@ package pl.tpolgrabia.urbanexplorer.callbacks; -import org.json.JSONObject; +import pl.tpolgrabia.urbanexplorer.dto.PanoramioImageInfo; + +import java.util.List; /** * Created by tpolgrabia on 28.08.16. */ public interface PanoramioResponseCallback { - void callback(PanoramioResponseStatus status, JSONObject response); + void callback(PanoramioResponseStatus status, List images, Long imagesCount); } diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/HomeFragment.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/HomeFragment.java index f7bcbf9..a4f83c4 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/HomeFragment.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/HomeFragment.java @@ -16,18 +16,14 @@ import android.view.View; import android.view.ViewGroup; import android.widget.*; import com.androidquery.AQuery; -import com.androidquery.callback.AjaxCallback; -import com.androidquery.callback.AjaxStatus; -import org.json.JSONException; -import org.json.JSONObject; import pl.tpolgrabia.urbanexplorer.MainActivity; import pl.tpolgrabia.urbanexplorer.R; +import pl.tpolgrabia.urbanexplorer.callbacks.PanoramioResponseCallback; +import pl.tpolgrabia.urbanexplorer.callbacks.PanoramioResponseStatus; import pl.tpolgrabia.urbanexplorer.dto.PanoramioImageInfo; import pl.tpolgrabia.urbanexplorer.utils.NumberUtils; import pl.tpolgrabia.urbanexplorer.utils.PanoramioUtils; -import java.text.ParseException; -import java.util.ArrayList; import java.util.List; import static android.content.Context.LOCATION_SERVICE; @@ -100,6 +96,44 @@ public class HomeFragment extends Fragment implements LocationListener { Bundle savedInstanceState) { // Inflate the layout for this fragment inflatedView = inflater.inflate(R.layout.fragment_home, container, false); + locations = (ListView)inflatedView.findViewById(R.id.locations); + locations.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() { + @Override + public boolean onItemLongClick(AdapterView adapterView, View view, int pos, long rowId) { + PanoramioAdapter panAdapter = (PanoramioAdapter) locations.getAdapter(); + PanoramioImageInfo photoInfo = panAdapter.getItem(pos); + MainActivity activity = (MainActivity) getActivity(); + activity.switchToPhoto(photoInfo); + return false; + } + }); + + locations.setOnScrollListener(new AbsListView.OnScrollListener() { + @Override + public void onScrollStateChanged(AbsListView view, int scrollState) { + + } + + + @Override + public void onScroll(AbsListView view, + int firstVisibleItem, + int visibleItemCount, + int totalItemCount) { + + if (firstVisibleItem <= 0) { + // scrolled to the top + } + + if (firstVisibleItem + visibleItemCount >= totalItemCount) { + // scrolled to the bottom + + + } + + } + }); + // getActivity().findViewById(R.id.update_places).setOnClickListener( // new View.OnClickListener() { // @Override @@ -198,73 +232,32 @@ public class HomeFragment extends Fragment implements LocationListener { private void fetchPanoramioLocations() { - fetchPanoramioPhotos(); - } - - private void fetchPanoramioPhotos() { final Location location = locationService.getLastKnownLocation(locationProvider); Double radiusX = fetchRadiusX(); Double radiusY = fetchRadiusY(); - final String aqQuery = "http://www.panoramio.com/map/get_panoramas.php?" + - "set=public" + - "&from=" + (pageId - 1) * fetchLocationPageSize() + - "&to=" + pageId * fetchLocationPageSize() + - "&minx=" + (location.getLongitude() - radiusX) + - "&miny=" + (location.getLatitude() - radiusY) + - "&maxx=" + (location.getLongitude() + radiusX) + - "&maxy=" + (location.getLatitude() + radiusX) + - "&size=" + LOCATIONS_LIST_IMAGE_SIZE + - "&order=" + LOCATIONS_ORDER + - "&mapfilter=true"; - Log.d(CLASS_TAG, "Query: " + aqQuery); - aq.ajax(aqQuery, - JSONObject.class, - new AjaxCallback() { + PanoramioUtils.fetchPanoramioImages( + getActivity(), + location.getLatitude(), + location.getLongitude(), + radiusX, + radiusY, + (pageId - 1) * fetchLocationPageSize(), + fetchLocationPageSize(), + new PanoramioResponseCallback() { @Override - public void callback(String url, JSONObject object, AjaxStatus status) { - try { - Log.d(CLASS_TAG, "Query code: " + status.getCode() - + ", error: " + status.getError() + ", message: " + status.getMessage()); - if (object == null) { - return; - } + public void callback(PanoramioResponseStatus status, List images, Long imagesCount) { + Long pageSize = fetchLocationPageSize(); + Long start = (pageId - 1) * pageSize + 1; + Long end = pageId * pageSize; + locationsResultInfo.setText("" + start + "-" + end + " from " + imagesCount); - List photosInfos; - try { - photosInfos = PanoramioUtils.fetchPanoramioImagesFromResponse(object.getJSONArray("photos")); - } catch (ParseException e) { - Log.w(CLASS_TAG, "Parse exception", e); - photosInfos = new ArrayList<>(); - } - - photosCount = PanoramioUtils.fetchPanoramioImagesCountFromResponse(object); - locationsResultInfo = (TextView)inflatedView.findViewById(R.id.locations_result_info); - Long pageSize = fetchLocationPageSize(); - Long start = (pageId - 1) * pageSize + 1; - Long end = pageId * pageSize; - locationsResultInfo.setText("" + start + "-" + end + " from " + photosCount); - - ArrayAdapter adapter = new PanoramioAdapter(getActivity(), - R.layout.location_item, - photosInfos); - locations.setAdapter(adapter); - - locations.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() { - @Override - public boolean onItemLongClick(AdapterView adapterView, View view, int pos, long rowId) { - PanoramioAdapter panAdapter = (PanoramioAdapter) locations.getAdapter(); - PanoramioImageInfo photoInfo = panAdapter.getItem(pos); - MainActivity activity = (MainActivity) getActivity(); - activity.switchToPhoto(photoInfo); - return false; - } - }); - - } catch (JSONException e) { - Log.w(CLASS_TAG, "Json not supported format", e); - } + ArrayAdapter adapter = new PanoramioAdapter(getActivity(), + R.layout.location_item, + images); + locations.setAdapter(adapter); } - }); + } + ); } private Long fetchLocationPageSize() { diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/PanoramioUtils.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/PanoramioUtils.java index cae65f0..8aae3c7 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/PanoramioUtils.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/PanoramioUtils.java @@ -1,12 +1,23 @@ package pl.tpolgrabia.urbanexplorer.utils; +import android.content.Context; +import android.util.Log; +import android.widget.ArrayAdapter; +import android.widget.TextView; +import com.androidquery.AQuery; +import com.androidquery.callback.AjaxCallback; +import com.androidquery.callback.AjaxStatus; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import pl.tpolgrabia.urbanexplorer.R; +import pl.tpolgrabia.urbanexplorer.callbacks.PanoramioResponseCallback; +import pl.tpolgrabia.urbanexplorer.callbacks.PanoramioResponseStatus; import pl.tpolgrabia.urbanexplorer.dto.PanoramioImageInfo; import pl.tpolgrabia.urbanexplorer.dto.PanoramioMapLocation; import pl.tpolgrabia.urbanexplorer.dto.PanoramioResponse; import pl.tpolgrabia.urbanexplorer.exceptions.PanoramioResponseNotExpected; +import pl.tpolgrabia.urbanexplorer.fragments.PanoramioAdapter; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -18,7 +29,64 @@ import java.util.List; */ public class PanoramioUtils { - private static SimpleDateFormat panoramioDateFormatter = new SimpleDateFormat("dd MMMMMMMMMMMMMM yyyy"); + private static final String CLASS_TAG = PanoramioUtils.class.getSimpleName(); + + private static final String LOCATIONS_LIST_IMAGE_SIZE = "medium"; + private static final String LOCATIONS_ORDER = "popularity"; + + public static void fetchPanoramioImages( + Context ctx, + Double lat, + Double lon, + Double radiusX, + Double radiusY, + Long offset, + Long count, + final PanoramioResponseCallback callback) { + AQuery aq = new AQuery(ctx); + final String aqQuery = "http://www.panoramio.com/map/get_panoramas.php?" + + "set=public" + + "&from=" + offset + + "&to=" + (offset + count) + + "&minx=" + (lon - radiusX) + + "&miny=" + (lat - radiusY) + + "&maxx=" + (lon + radiusX) + + "&maxy=" + (lat + radiusX) + + "&size=" + LOCATIONS_LIST_IMAGE_SIZE + + "&order=" + LOCATIONS_ORDER + + "&mapfilter=true"; + Log.d(CLASS_TAG, "Query: " + aqQuery); + aq.ajax(aqQuery, + JSONObject.class, + new AjaxCallback() { + @Override + public void callback(String url, JSONObject object, AjaxStatus status) { + try { + Log.d(CLASS_TAG, "Query code: " + status.getCode() + + ", error: " + status.getError() + ", message: " + status.getMessage()); + if (object == null) { + return; + } + + List photosInfos; + try { + photosInfos = PanoramioUtils.fetchPanoramioImagesFromResponse(object.getJSONArray("photos")); + } catch (ParseException e) { + Log.w(CLASS_TAG, "Parse exception", e); + photosInfos = new ArrayList<>(); + } + + Long photosCount = PanoramioUtils.fetchPanoramioImagesCountFromResponse(object); + callback.callback(PanoramioResponseStatus.SUCCESS, + photosInfos, + photosCount); + + } catch (JSONException e) { + Log.w(CLASS_TAG, "Json not supported format", e); + } + } + }); + } public static PanoramioImageInfo fetchPanoramioDto(JSONObject photo) throws JSONException, ParseException { PanoramioImageInfo info = new PanoramioImageInfo();