From 6374d983ba47400c8f0d695c5ba4aa5bedf38456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20P=C3=B3=C5=82grabia?= Date: Sat, 24 Sep 2016 11:28:41 +0200 Subject: [PATCH] Further cleaning wiki fragment. --- .../WikiLocationGeoCoderCallback.java | 26 ++++++++++++ .../fragments/WikiLocationsFragment.java | 40 ++----------------- .../urbanexplorer/utils/WikiUtils.java | 25 ++++++++++++ 3 files changed, 55 insertions(+), 36 deletions(-) create mode 100644 app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/WikiLocationGeoCoderCallback.java diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/WikiLocationGeoCoderCallback.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/WikiLocationGeoCoderCallback.java new file mode 100644 index 0000000..24adbaa --- /dev/null +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/WikiLocationGeoCoderCallback.java @@ -0,0 +1,26 @@ +package pl.tpolgrabia.urbanexplorer.callbacks; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import pl.tpolgrabia.urbanexplorer.fragments.WikiLocationsFragment; + +/** + * Created by tpolgrabia on 24.09.16. + */ +public class WikiLocationGeoCoderCallback implements LocationGeoCoderCallback { + private static final Logger lg = LoggerFactory.getLogger(WikiLocationGeoCoderCallback.class); + private WikiLocationsFragment wikiLocationsFragment; + + public WikiLocationGeoCoderCallback(WikiLocationsFragment wikiLocationsFragment) { + this.wikiLocationsFragment = wikiLocationsFragment; + } + + @Override + public void callback(int code, String message, String googleStatus, String geocodedLocation) { + lg.debug("Geocoded result code {}, message {}, status: {}, value {}", + code, message, googleStatus, geocodedLocation); + + wikiLocationsFragment.setCurrentGeocodedLocation(geocodedLocation); + wikiLocationsFragment.updateLocationInfo(); + } +} diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/WikiLocationsFragment.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/WikiLocationsFragment.java index a14820d..4c0ae9f 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/WikiLocationsFragment.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/WikiLocationsFragment.java @@ -108,8 +108,6 @@ public class WikiLocationsFragment extends Fragment { return; } - MainActivity mainActivity = (MainActivity) getActivity(); - if (lastFetchSize == 0) { lg.trace("There is no results"); EventBus.getDefault().post(new DataLoadingFinishEvent(this)); @@ -131,12 +129,6 @@ public class WikiLocationsFragment extends Fragment { return; } - if (getView() == null) { - lg.info("Wiki view is not yet initialized"); - EventBus.getDefault().post(new DataLoadingFinishEvent(this)); - return; - } - WikiUtils.fetchAppData(activity, location.getLatitude(), location.getLongitude(), @@ -160,37 +152,10 @@ public class WikiLocationsFragment extends Fragment { } private void updateGeocodedLocation() { - if (getActivity() == null) { - lg.debug("Activity is not attached"); - return; - } - - Location location = LocationUtils.getLastKnownLocation(getActivity()); - - if (location == null) { - lg.debug("Location is still not available"); - return; - } - - LocationUtils.getGeoCodedLocation(getActivity(), location.getLatitude(), location.getLongitude(), new LocationGeoCoderCallback() { - @Override - public void callback(int code, String message, String googleStatus, String geocodedLocation) { - lg.debug("Geocoded result code {}, message {}, status: {}, value {}", - code, message, googleStatus, geocodedLocation); - - currentGeocodedLocation = geocodedLocation; - updateLocationInfo(); - } - }); + WikiUtils.getGeoCodedLocation(getActivity(), new WikiLocationGeoCoderCallback(this)); } public void updateLocationInfo() { - final FragmentActivity activity = getActivity(); - if (activity == null) { - lg.warn("Activity shouldn't be null. No headless fragment"); - return; - } - currentLocation.setText(currentGeocodedLocation); } @@ -231,4 +196,7 @@ public class WikiLocationsFragment extends Fragment { this.appObjects = appObjects; } + public void setCurrentGeocodedLocation(String currentGeocodedLocation) { + this.currentGeocodedLocation = currentGeocodedLocation; + } } diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/WikiUtils.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/WikiUtils.java index 746146b..9326e02 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/WikiUtils.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/WikiUtils.java @@ -1,6 +1,8 @@ package pl.tpolgrabia.urbanexplorer.utils; import android.content.Context; +import android.location.Location; +import android.support.v4.app.FragmentActivity; import android.widget.Toast; import com.androidquery.AQuery; import com.androidquery.callback.AjaxCallback; @@ -11,6 +13,7 @@ import org.json.JSONException; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pl.tpolgrabia.urbanexplorer.callbacks.WikiLocationGeoCoderCallback; import pl.tpolgrabia.urbanexplorer.callbacks.WikiResponseCallback; import pl.tpolgrabia.urbanexplorer.callbacks.WikiStatus; import pl.tpolgrabia.urbanexplorer.dto.wiki.app.WikiAppObject; @@ -21,6 +24,7 @@ import pl.tpolgrabia.urbanexplorer.dto.wiki.generator.WikiThumbnail; import pl.tpolgrabia.urbanexplorer.dto.wiki.geosearch.WikiGeoObject; import pl.tpolgrabia.urbanexplorer.dto.wiki.geosearch.WikiGeoResponse; import pl.tpolgrabia.urbanexplorer.dto.wiki.geosearch.WikiGeoResponseCallback; +import pl.tpolgrabia.urbanexplorer.fragments.WikiLocationsFragment; import java.util.*; @@ -350,4 +354,25 @@ public class WikiUtils { callback ); } + + public static void getGeoCodedLocation(Context ctx, WikiLocationGeoCoderCallback clbk) { + + if (ctx == null) { + lg.warn("Context is null - not available"); + clbk.callback(-1, "ERROR", "ERROR", "Not available"); + return; + } + + Location location = LocationUtils.getLastKnownLocation(ctx); + + if (location == null) { + lg.debug("Location is still not available"); + return; + } + + LocationUtils.getGeoCodedLocation(ctx, + location.getLatitude(), + location.getLongitude(), + clbk); + } }