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

Changes for better wiki integration.

master
Tomasz Półgrabia 2016-09-02 16:19:10 +02:00
parent f3ff01fb2f
commit c2eca0b662
2 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/WikiLocationsFragment.java
View File

@ -1,19 +1,28 @@
package pl.tpolgrabia.urbanexplorer.fragments;
import android.content.Intent;
import android.location.Location;
import android.location.LocationManager;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.text.Editable;
import android.util.Log;
import android.view.LayoutInflater;
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.R;
import pl.tpolgrabia.urbanexplorer.adapters.WikiLocationsAdapter;
import pl.tpolgrabia.urbanexplorer.callbacks.WikiResponseCallback;
import pl.tpolgrabia.urbanexplorer.callbacks.WikiStatus;
import pl.tpolgrabia.urbanexplorer.dto.WikiPage;
import pl.tpolgrabia.urbanexplorer.dto.WikiResponse;
import pl.tpolgrabia.urbanexplorer.utils.LocationUtils;
import pl.tpolgrabia.urbanexplorer.utils.NumberUtils;
@ -27,6 +36,7 @@ import static android.content.Context.LOCATION_SERVICE;
public class WikiLocationsFragment extends Fragment {
private static final String CLASS_TAG = WikiLocationsFragment.class.getSimpleName();
private LocationManager locationService;
private TextView currentLocation;
private Button fetchPlaces;
@ -71,7 +81,7 @@ public class WikiLocationsFragment extends Fragment {
radius_limit != null ? radius_limit.toString() : null),
new WikiResponseCallback() {
@Override
public void callback(WikiStatus status, WikiResponse response) {
public void callback(WikiStatus status, final WikiResponse response) {
// handling here wiki locations
if (status != WikiStatus.SUCCESS) {
Toast.makeText(getActivity(), "Sorry, currently we have problem with interfacing wiki" +
@ -82,6 +92,47 @@ public class WikiLocationsFragment extends Fragment {
// TODO on success
ListView locations = (ListView) inflatedView.findViewById(R.id.wiki_places);
locations.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
@Override
public boolean onItemLongClick(AdapterView<?> parent, View view, final int position, long id) {
// WikiPage item = response.getPages().get(position);
// Intent intent = new Intent(android.content.Intent.ACTION_VIEW,
// Uri.parse(item.get);
// startActivity(intent);
final WikiPage item = response.getPages().get(position);
new AQuery(getActivity()).ajax(
"https://en.wikipedia.org/w/api.php?action=query&prop=info&pageids="
+ item.getPageId() + "&inprop=url&format=json",
JSONObject.class,
new AjaxCallback<JSONObject>() {
@Override
public void callback(String url, JSONObject object, AjaxStatus status) {
if (status.getCode() != 200) {
Toast.makeText(getActivity(),
"Sorry, network error code: " + status.getCode(),
Toast.LENGTH_LONG)
.show();
return;
}
try {
String wikiUrl = object.getJSONObject("query")
.getJSONObject("pages")
.getJSONObject(item.getPageId().toString())
.getString("fullurl");
Intent intent = new Intent(android.content.Intent.ACTION_VIEW,
Uri.parse(wikiUrl));
startActivity(intent);
} catch (JSONException e) {
Log.e(CLASS_TAG, "Error", e);
}
}
}
);
return false;
}
});
locations.setAdapter(new WikiLocationsAdapter(getActivity(), response.getPages()));
}
});

4
app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/WikiUtils.java
View File

@ -42,7 +42,7 @@ public class WikiUtils {
@Override
public void callback(String url, JSONObject object, AjaxStatus status) {
// TODO handle response
String qurl = "https://en.wikipedia.org/w/api.php?" +
final String qurl = "https://en.wikipedia.org/w/api.php?" +
"action=query" +
"&prop=coordinates%7Cpageimages%7Cpageterms" +
"&colimit=50" +
@ -63,7 +63,7 @@ public class WikiUtils {
try {
callback.callback(WikiStatus.SUCCESS, fetchWikiResponse(object));
} catch (JSONException e) {
Log.e(CLASS_TAG, "JSon error", e);
Log.e(CLASS_TAG, "JSon error: " + object.toString(), e);
}
} else {
callback.callback(WikiStatus.NETWORK_ERROR, null);