tomasz
/
urban-explorer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some panoramio loading photos improvments - but not enough good.

master
Tomasz Półgrabia 2016-09-21 21:19:25 +02:00
parent f484a6474a
commit dfdf1abd05
7 changed files with 267 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java
View File

@ -29,6 +29,7 @@ import pl.tpolgrabia.urbanexplorer.views.CustomInterceptor;
import pl.tpolgrabia.urbanexplorer.views.SwipeFrameLayout;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class MainActivity extends ActionBarActivity {
@ -54,6 +55,8 @@ public class MainActivity extends ActionBarActivity {
fragTags.put(AppConstants.WIKI_FRAGMENT_ID, WikiLocationsFragment.TAG);
}
private List<PanoramioImageInfo> photos;
public StandardLocationListener getLocationCallback() {
return locationCallback;
}
@ -362,4 +365,8 @@ public class MainActivity extends ActionBarActivity {
super.onStart();
lg.trace("onStart {}", System.identityHashCode(this));
}
public void setPhotos(List<PanoramioImageInfo> photos) {
this.photos = photos;
}
}

75
app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/FetchAdditionalPanoramioPhotosCallback.java Normal file
View File

@ -0,0 +1,75 @@
package pl.tpolgrabia.urbanexplorer.callbacks;
import android.support.v4.app.FragmentActivity;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.Toast;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pl.tpolgrabia.urbanexplorer.R;
import pl.tpolgrabia.urbanexplorer.dto.panoramio.PanoramioImageInfo;
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
import pl.tpolgrabia.urbanexplorer.fragments.PanoramioAdapter;
import java.util.List;
/**
* Created by tpolgrabia on 21.09.16.
*/
public class FetchAdditionalPanoramioPhotosCallback implements PanoramioResponseCallback {
private static final Logger lg = LoggerFactory.getLogger(FetchAdditionalPanoramioPhotosCallback.class);
private HomeFragment homeFragment;
private final FragmentActivity activity;
public FetchAdditionalPanoramioPhotosCallback(HomeFragment homeFragment, FragmentActivity activity) {
this.homeFragment = homeFragment;
this.activity = activity;
}
@Override
public void callback(PanoramioResponseStatus status, List<PanoramioImageInfo> images, Long imagesCount) {
try {
lg.debug("Fetched with status: {}, images: {}, count: {}", status, images, imagesCount);
if (status != PanoramioResponseStatus.SUCCESS) {
return;
}
final View view = homeFragment.getView();
if (view == null) {
lg.debug("View still not initialized");
return;
}
ListView locations = (ListView) view.findViewById(R.id.locations);
if (locations == null) {
lg.trace("Empty locations");
return;
}
ArrayAdapter<PanoramioImageInfo> adapter = (ArrayAdapter<PanoramioImageInfo>) locations.getAdapter();
homeFragment.addPhotos(images);
lg.debug("Additional Photos size {} loaded. There are {} photos", images.size(), homeFragment.getPhotosCount());
if (homeFragment.getPhotosCount() <= 0) {
Toast.makeText(homeFragment.getActivity(), "No results", Toast.LENGTH_SHORT).show();
}
homeFragment.setNoMorePhotos(images.isEmpty());
if (adapter == null) {
locations.setAdapter(new PanoramioAdapter(activity, R.id.list_item, images));
} else {
adapter.addAll(images);
}
// TODO we can think about removing first items also and last if the number
// TODO of items exceeds the limit (to save the memory)
lg.debug("Finished Fetching additional photos count: {}", homeFragment.getPhotosCount());
} finally {
lg.trace("Releasing fetching lock");
homeFragment.getLoading().release();
}
}
}

66
app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/FetchPanoramioPhotosCallback.java Normal file
View File

@ -0,0 +1,66 @@
package pl.tpolgrabia.urbanexplorer.callbacks;
import android.support.v4.app.FragmentActivity;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.Toast;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pl.tpolgrabia.urbanexplorer.MainActivity;
import pl.tpolgrabia.urbanexplorer.R;
import pl.tpolgrabia.urbanexplorer.dto.panoramio.PanoramioImageInfo;
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
import pl.tpolgrabia.urbanexplorer.fragments.PanoramioAdapter;
import java.util.List;
/**
* Created by tpolgrabia on 21.09.16.
*/
public class FetchPanoramioPhotosCallback implements PanoramioResponseCallback {
private static final Logger lg = LoggerFactory.getLogger(FetchPanoramioPhotosCallback.class);
private HomeFragment homeFragment;
private final FragmentActivity activity;
public FetchPanoramioPhotosCallback(HomeFragment homeFragment, FragmentActivity activity) {
this.homeFragment = homeFragment;
this.activity = activity;
}
@Override
public void callback(PanoramioResponseStatus status, List<PanoramioImageInfo> images, Long imagesCount) {
lg.trace("Panoramio response status {}, images: {}, imagesCount: {}",
status,
images,
imagesCount);
ArrayAdapter<PanoramioImageInfo> adapter = new PanoramioAdapter(activity,
R.layout.location_item,
images);
if (images.isEmpty()) {
Toast.makeText(homeFragment.getActivity(), "No results", Toast.LENGTH_SHORT).show();
}
final View view = homeFragment.getView();
if (view == null) {
lg.trace("Fragment's view is not initialized");
return;
}
ListView locations = (ListView) view.findViewById(R.id.locations);
locations.setAdapter(adapter);
MainActivity mainActivity = (MainActivity) homeFragment.getActivity();
if (mainActivity == null) {
return;
}
mainActivity.setPhotos(images);
lg.trace("Photos size: {}", homeFragment.getPhotosCount());
mainActivity.hideProgress();
}
}

18
app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/panoramio/PanoramioImageInfo.java
View File

@ -115,4 +115,22 @@ public class PanoramioImageInfo implements Serializable{
public String getPhotoUrl() {
return photoUrl;
}
@Override
public String toString() {
return "PanoramioImageInfo{" +
"height=" + height +
", ownerName='" + ownerName + '\'' +
", ownerId=" + ownerId +
", photoFileUrl='" + photoFileUrl + '\'' +
", photoTitle='" + photoTitle + '\'' +
", uploadDate='" + uploadDate + '\'' +
", width=" + width +
", latitude=" + latitude +
", longitude=" + longitude +
", ownerUrl='" + ownerUrl + '\'' +
", photoId=" + photoId +
", photoUrl='" + photoUrl + '\'' +
'}';
}
}

152
app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/HomeFragment.java
View File

@ -10,7 +10,10 @@ import android.support.v4.app.FragmentActivity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.*;
import android.widget.AdapterView;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import com.google.gson.Gson;
import com.google.gson.stream.JsonReader;
import org.slf4j.Logger;
@ -21,6 +24,7 @@ import pl.tpolgrabia.urbanexplorer.R;
import pl.tpolgrabia.urbanexplorer.callbacks.*;
import pl.tpolgrabia.urbanexplorer.dto.panoramio.PanoramioCacheDto;
import pl.tpolgrabia.urbanexplorer.dto.panoramio.PanoramioImageInfo;
import pl.tpolgrabia.urbanexplorer.handlers.PanoramioLocationsScrollListener;
import pl.tpolgrabia.urbanexplorer.utils.LocationUtils;
import pl.tpolgrabia.urbanexplorer.utils.PanoramioUtils;
@ -208,49 +212,12 @@ public class HomeFragment extends Fragment implements Refreshable {
locations.setAdapter(new PanoramioAdapter(getActivity(), R.layout.location_item, photos));
lg.trace("Photos initialized {}", photos);
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) {
try {
if (firstVisibleItem <= 0) {
// scrolled to the top
lg.trace("Scrolled to the top");
}
if (firstVisibleItem + visibleItemCount >= totalItemCount) {
lg.trace("Scrolled to the bottom");
// scrolled to the bottom
final View fragView = getView();
if (fragView == null) {
lg.trace("Frag still not initialized");
return;
}
fetchAdditionalPhotos();
}
} catch (InterruptedException e) {
lg.error("Aquiring lock interrupted exception", e);
}
}
});
lg.trace("Photos size: {}", photos.size());
locations.setOnScrollListener(new PanoramioLocationsScrollListener(this));
return inflatedView;
}
private void fetchAdditionalPhotos() throws InterruptedException {
public void fetchAdditionalPhotos() throws InterruptedException {
final FragmentActivity activity = getActivity();
if (activity == null) {
@ -307,50 +274,7 @@ public class HomeFragment extends Fragment implements Refreshable {
fetchRadiusY(),
(long)(offset),
fetchLocationPageSize(),
new PanoramioResponseCallback() {
@Override
public void callback(PanoramioResponseStatus status, List<PanoramioImageInfo> images, Long imagesCount) {
try {
lg.debug("Fetched with status: {}, images: {}, count: {}", status, images, imagesCount);
if (status != PanoramioResponseStatus.SUCCESS) {
return;
}
final View view = getView();
if (view == null) {
lg.debug("View still not initialized");
return;
}
ListView locations = (ListView) view.findViewById(R.id.locations);
if (locations == null) {
lg.trace("Empty locations");
return;
}
ArrayAdapter<PanoramioImageInfo> adapter = (ArrayAdapter<PanoramioImageInfo>) locations.getAdapter();
photos.addAll(images);
if (photos.isEmpty()) {
Toast.makeText(getActivity(), "No results", Toast.LENGTH_SHORT).show();
}
noMorePhotos = images.isEmpty();
if (adapter == null) {
locations.setAdapter(new PanoramioAdapter(activity, R.id.list_item, images));
} else {
adapter.addAll(images);
}
// TODO we can think about removing first items also and last if the number
// TODO of items exceeds the limit (to save the memory)
lg.debug("Finished Fetching additional photos count: {}", photos.size());
} finally {
lg.trace("Releasing fetching lock");
loading.release();
}
}
}
new FetchAdditionalPanoramioPhotosCallback(this, activity)
);
}
@ -382,32 +306,7 @@ public class HomeFragment extends Fragment implements Refreshable {
radiusY,
(pageId - 1) * fetchLocationPageSize(),
fetchLocationPageSize(),
new PanoramioResponseCallback() {
@Override
public void callback(PanoramioResponseStatus status, List<PanoramioImageInfo> images, Long imagesCount) {
ArrayAdapter<PanoramioImageInfo> adapter = new PanoramioAdapter(activity,
R.layout.location_item,
images);
if (images.isEmpty()) {
Toast.makeText(getActivity(), "No results", Toast.LENGTH_SHORT).show();
}
final View view = getView();
if (view == null) {
lg.trace("Fragment's view is not initialized");
return;
}
ListView locations = (ListView) view.findViewById(R.id.locations);
locations.setAdapter(adapter);
MainActivity mainActivity = (MainActivity) getActivity();
if (mainActivity == null) {
return;
}
mainActivity.hideProgress();
}
}
new FetchPanoramioPhotosCallback(this, activity)
);
}
@ -479,10 +378,12 @@ public class HomeFragment extends Fragment implements Refreshable {
lg.trace("onDestroy");
File cacheDir = getActivity().getCacheDir();
try (BufferedWriter br = new BufferedWriter(
BufferedWriter br = null;
try {
br = new BufferedWriter(
new OutputStreamWriter(
new FileOutputStream(
new File(cacheDir, AppConstants.PANORAMIO_CACHE_FILENAME))))) {
new File(cacheDir, AppConstants.PANORAMIO_CACHE_FILENAME))));
PanoramioCacheDto dto = new PanoramioCacheDto();
dto.setPanoramioImages(photos);
@ -503,6 +404,14 @@ public class HomeFragment extends Fragment implements Refreshable {
lg.error("File not found", e);
} catch (IOException e) {
lg.error("I/O Exception", e);
} finally {
if (br != null) {
try {
br.close();
} catch (IOException e) {
lg.error("I/O error during photos cache saving", e);
}
}
}
}
@ -533,4 +442,21 @@ public class HomeFragment extends Fragment implements Refreshable {
public void refresh() {
fetchPanoramioPhotos();
}
public Semaphore getLoading() {
return loading;
}
public void setNoMorePhotos(boolean noMorePhotos) {
this.noMorePhotos = noMorePhotos;
}
public int getPhotosCount() {
return photos.size();
}
public void addPhotos(List<PanoramioImageInfo> images) {
photos.addAll(images);
}
}

58
app/src/main/java/pl/tpolgrabia/urbanexplorer/handlers/PanoramioLocationsScrollListener.java Normal file
View File

@ -0,0 +1,58 @@
package pl.tpolgrabia.urbanexplorer.handlers;
import android.view.View;
import android.widget.AbsListView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
/**
* Created by tpolgrabia on 21.09.16.
*/
public class PanoramioLocationsScrollListener implements AbsListView.OnScrollListener {
private static final Logger lg = LoggerFactory.getLogger(PanoramioLocationsScrollListener.class);
private HomeFragment homeFragment;
public PanoramioLocationsScrollListener(HomeFragment homeFragment) {
this.homeFragment = homeFragment;
}
@Override
public void onScrollStateChanged(AbsListView view, int scrollState) {
}
@Override
public void onScroll(AbsListView view,
int firstVisibleItem,
int visibleItemCount,
int totalItemCount) {
try {
if (firstVisibleItem <= 0) {
// scrolled to the top
lg.trace("Scrolled to the top");
}
if (firstVisibleItem + visibleItemCount >= totalItemCount) {
lg.trace("Scrolled to the bottom");
// scrolled to the bottom
final View fragView = homeFragment.getView();
if (fragView == null) {
lg.trace("Frag still not initialized");
return;
}
homeFragment.fetchAdditionalPhotos();
}
} catch (InterruptedException e) {
lg.error("Aquiring lock interrupted exception", e);
}
}
}

4
app/src/main/res/layout/wiki_locations_item.xml
View File

@ -14,8 +14,8 @@
android:layout_marginBottom="8dp">
<ImageView android:id="@+id/wiki_locs_item_img_preview"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_marginRight="10dp"/>
<LinearLayout android:id="@+id/wiki_locs_item_desc_container"