Refactored (not tested) panoramio image info loading.

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<PanoramioImageInfo> images, Long imagesCount);
 }

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?" +
+        PanoramioUtils.fetchPanoramioImages(
-            "set=public" +
+            getActivity(),
-            "&from=" + (pageId - 1) * fetchLocationPageSize() +
+            location.getLatitude(),
-            "&to="   + pageId * fetchLocationPageSize() +
+            location.getLongitude(),
-            "&minx=" + (location.getLongitude() - radiusX) +
+            radiusX,
-            "&miny=" + (location.getLatitude() - radiusY) +
+            radiusY,
-            "&maxx=" + (location.getLongitude() + radiusX) +
+            (pageId - 1) * fetchLocationPageSize(),
-            "&maxy=" + (location.getLatitude() + radiusX) +
+            fetchLocationPageSize(),
-            "&size=" + LOCATIONS_LIST_IMAGE_SIZE +
+            new PanoramioResponseCallback() {
-            "&order=" + LOCATIONS_ORDER +
-            "&mapfilter=true";
-        Log.d(CLASS_TAG, "Query: " + aqQuery);
-        aq.ajax(aqQuery,
-            JSONObject.class,
-            new AjaxCallback<JSONObject>() {
                 @Override
-                public void callback(String url, JSONObject object, AjaxStatus status) {
+                public void callback(PanoramioResponseStatus status, List<PanoramioImageInfo> images, Long imagesCount) {
-                    try {
-                        Log.d(CLASS_TAG, "Query code: " + status.getCode()
-                            + ", error: " + status.getError() + ", message: " + status.getMessage());
-                        if (object == null) {
-                            return;
-                        }
-
-                        List<PanoramioImageInfo> 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);
+                    locationsResultInfo.setText("" + start + "-" + end + " from " + imagesCount);
 
                     ArrayAdapter<PanoramioImageInfo> adapter = new PanoramioAdapter(getActivity(),
                         R.layout.location_item,
-                            photosInfos);
+                        images);
                     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);
                 }
             }
-            });
+        );
     }
 
     private Long fetchLocationPageSize() {

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<JSONObject>() {
+                @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<PanoramioImageInfo> 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();