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

Merge branch 'master' into not-fully-working-interceptor-from-child-view

master
Tomasz Półgrabia 2016-09-13 20:27:53 +02:00
parent 356e6053f8 40cb00b28a
commit 7152d9aa70
40 changed files with 1720 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/build.gradle
View File

@ -1,4 +1,21 @@
buildscript {
repositories {
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
// The Fabric Gradle plugin uses an open ended version to react
// quickly to Android tooling updates
classpath 'io.fabric.tools:gradle:1.+'
}
}
apply plugin: 'com.android.application'
apply plugin: 'io.fabric'
repositories {
maven { url 'https://maven.fabric.io/public' }
}
android {
compileSdkVersion 21
@ -27,4 +44,8 @@ dependencies {
compile 'com.android.support:recyclerview-v7:21.0.3'
compile 'com.googlecode.android-query:android-query:0.25.9'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
compile('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') {
transitive = true;
}
compile 'org.apache.commons:commons-lang3:3.4'
}

7
app/src/androidTest/java/pl/tpolgrabia/urbanexplorer/utils/WikiUtilsTest.java Normal file
View File

@ -0,0 +1,7 @@
package pl.tpolgrabia.urbanexplorer.utils;
/**
* Created by tpolgrabia on 11.09.16.
*/
public class WikiUtilsTest {
}

4
app/src/main/AndroidManifest.xml
View File

@ -15,6 +15,10 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<meta-data
android:name="io.fabric.ApiKey"
android:value="f9f8274d1e204bbb3ef13a27a23fc58aa146d4b9"
/>
</application>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

2
app/src/main/java/pl/tpolgrabia/urbanexplorer/AppConstants.java
View File

@ -5,4 +5,6 @@ package pl.tpolgrabia.urbanexplorer;
*/
public class AppConstants {
public static final String GOOGLE_API_KEY = "AIzaSyDAnmEK6cgovRrefUuYojL1pxPEbIBLZUw";
public static final long MIN_TIME = 60000;
public static final float MIN_DISTANCE = 100;
}

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

@ -1,6 +1,11 @@
package pl.tpolgrabia.urbanexplorer;
import android.content.Context;
import android.content.Intent;
import android.location.Location;
import android.location.LocationManager;
import android.os.Bundle;
import android.provider.Settings;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
@ -10,11 +15,16 @@ import android.util.Log;
import android.view.GestureDetector;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.widget.Toast;
import com.crashlytics.android.Crashlytics;
import com.nostra13.universalimageloader.cache.memory.impl.WeakMemoryCache;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
import pl.tpolgrabia.urbanexplorer.dto.PanoramioImageInfo;
import io.fabric.sdk.android.Fabric;
import pl.tpolgrabia.urbanexplorer.callbacks.StandardLocationListener;
import pl.tpolgrabia.urbanexplorer.callbacks.StandardLocationListenerCallback;
import pl.tpolgrabia.urbanexplorer.dto.panoramio.PanoramioImageInfo;
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
import pl.tpolgrabia.urbanexplorer.fragments.PanoramioShowerFragment;
import pl.tpolgrabia.urbanexplorer.fragments.WikiLocationsFragment;
@ -24,6 +34,7 @@ import pl.tpolgrabia.urbanexplorer.views.SwipeFrameLayout;
public class MainActivity extends ActionBarActivity implements GestureDetector.OnGestureListener {
private static final int LOCATION_SETTINGS_REQUEST_ID = 1;
private static final String CLASS_TAG = MainActivity.class.getSimpleName();
private static final String PHOTO_BACKSTACK = "PHOTO_BACKSTACK";
private static final float SWIPE_VELOCITY_THRESHOLD = 20;
@ -31,15 +42,39 @@ public class MainActivity extends ActionBarActivity implements GestureDetector.O
private static final int WIKI_FRAGMENT_ID = 1;
private static final double MAX_FRAGMENT_ID = WIKI_FRAGMENT_ID;
private static final double MIN_FRAGMENT_ID = HOME_FRAGMENT_ID;
private static final String FRAG_ID = "FRAG_ID";
public static DisplayImageOptions options;
private GestureDetectorCompat gestureDetector;
private float SWIPE_THRESHOLD = 50;
private int currentFragmentId = 0;
private LocationManager locationService;
private StandardLocationListener locationCallback;
private boolean gpsLocationEnabled;
private boolean networkLocationEnabled;
private boolean locationEnabled;
private String locationProvider;
private boolean locationServicesActivated = false;
public StandardLocationListener getLocationCallback() {
return locationCallback;
}
@Override
public boolean onTouchEvent(MotionEvent event) {
gestureDetector.onTouchEvent(event);
return super.onTouchEvent(event);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Log.v(CLASS_TAG, "onCreate");
setContentView(R.layout.activity_main);
currentFragmentId = 0;
// Toolbar toolbar = (Toolbar) findViewById(R.id.navbar);
// setSupportActionBar(toolbar);
@ -56,15 +91,28 @@ public class MainActivity extends ActionBarActivity implements GestureDetector.O
ImageLoader.getInstance().init(config);
getSupportFragmentManager()
.beginTransaction()
.add(R.id.fragments, new HomeFragment())
.commit();
// getSupportFragmentManager()
// .beginTransaction()
// .replace(R.id.fragments, new HomeFragment())
// .commit();
// lLinearLayout locations = (LinearLayout) findViewById(R.id.locations);
// LinearLayout locations = (LinearLayout) findViewById(R.id.locations);
// locations.setOnTouchListener(new OnSwipeTouchListener);
gestureDetector = new GestureDetectorCompat(this, this);
locationCallback = new StandardLocationListener();
initLocalication();
Fabric fabric = new Fabric.Builder(this).debuggable(true).kits(new Crashlytics()).build();
Fabric.with(fabric);
Integer fragId = savedInstanceState != null ? savedInstanceState.getInt(FRAG_ID) : null;
Log.v(CLASS_TAG, "Restored orig frag id: " + fragId);
currentFragmentId = fragId == null ? 0 : fragId;
Log.v(CLASS_TAG, "Set final frag id: " + fragId);
switchFragment();
updateSwipeHandler();
}
@ -126,6 +174,14 @@ public class MainActivity extends ActionBarActivity implements GestureDetector.O
@Override
public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
if (e1 == null) {
return false;
}
if (e2 == null) {
return false;
}
float diffx = e2.getX() - e1.getX();
float diffy = e2.getY() - e1.getY();
Log.d(CLASS_TAG, "Flinging... diffx: " + diffx + " diffy" + diffy
@ -181,7 +237,7 @@ public class MainActivity extends ActionBarActivity implements GestureDetector.O
}
private void swipeLeft() {
currentFragmentId = (int)Math.min(MAX_FRAGMENT_ID, currentFragmentId+1);
currentFragmentId = (int)Math.max(MIN_FRAGMENT_ID, currentFragmentId-1);
switchFragment();
}
@ -223,7 +279,111 @@ public class MainActivity extends ActionBarActivity implements GestureDetector.O
}
private void swipeRight() {
currentFragmentId = (int)Math.max(MIN_FRAGMENT_ID, currentFragmentId-1);
currentFragmentId = (int)Math.min(MAX_FRAGMENT_ID, currentFragmentId+1);
switchFragment();
}
private void initLocalication() {
if (checkForLocalicatonEnabled()) return;
final Context ctx = this;
locationCallback.addCallback(new StandardLocationListenerCallback() {
@Override
public void callback(Location location) {
double lat = location.getLatitude();
double lng = location.getLongitude();
// getSupportFragmentManager().findFragmentById(R.id.wiki_)
// TextView locationInfo = (TextView) findViewById(R.id.locationInfo);
// locationInfo.setText("Location: (" + lat + "," + lng + ")");
Toast.makeText(ctx, "Location: (" + lat + "," + lng + ")", Toast.LENGTH_SHORT).show();
}
});
}
private boolean checkForLocalicatonEnabled() {
locationService = (LocationManager) getSystemService(LOCATION_SERVICE);
checkLocationSourceAvailability();
if (!locationEnabled) {
Intent locationSettingsIntent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
startActivityForResult(locationSettingsIntent, LOCATION_SETTINGS_REQUEST_ID);
return true;
}
return false;
}
private void checkLocationSourceAvailability() {
gpsLocationEnabled = locationService.isProviderEnabled(LocationManager.GPS_PROVIDER);
networkLocationEnabled = locationService.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
locationEnabled = gpsLocationEnabled || networkLocationEnabled;
if (gpsLocationEnabled) {
locationProvider = LocationManager.GPS_PROVIDER;
return;
}
if (networkLocationEnabled) {
locationProvider = LocationManager.NETWORK_PROVIDER;
return;
}
}
@Override
protected void onResume() {
super.onResume();
Log.v(CLASS_TAG, "onResume");
if (locationProvider != null) {
locationService.requestLocationUpdates(locationProvider,
AppConstants.MIN_TIME,
AppConstants.MIN_DISTANCE,
locationCallback);
locationServicesActivated = true;
Toast.makeText(this, "Location resumed", Toast.LENGTH_LONG).show();
}
}
@Override
protected void onPause() {
super.onPause();
Log.v(CLASS_TAG, "onPause");
if (locationServicesActivated) {
locationService.removeUpdates(locationCallback);
}
}
@Override
protected void onDestroy() {
super.onDestroy();
Log.v(CLASS_TAG, "onDestroy");
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) {
case LOCATION_SETTINGS_REQUEST_ID:
checkLocationSourceAvailability();
if (!locationEnabled) {
// sadly, nothing to do except from notifing user that program is not enable working
Toast.makeText(this, "Sorry location services are not working." +
" Program cannot work properly - check location settings to allow program working correctly",
Toast.LENGTH_LONG).show();
}
break;
default:
super.onActivityResult(requestCode, resultCode, data);
}
}
@Override
protected void onSaveInstanceState(Bundle outState) {
Log.v(CLASS_TAG, "1 Saving current fragment id: " + currentFragmentId);
super.onSaveInstanceState(outState);
outState.putSerializable(FRAG_ID, currentFragmentId);
Log.v(CLASS_TAG, "2 Saving current fragment id: " + currentFragmentId);
}
}

59
app/src/main/java/pl/tpolgrabia/urbanexplorer/adapters/WikiLocationsAdapter.java Normal file
View File

@ -0,0 +1,59 @@
package pl.tpolgrabia.urbanexplorer.adapters;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.TextView;
import com.nostra13.universalimageloader.core.ImageLoader;
import pl.tpolgrabia.urbanexplorer.MainActivity;
import pl.tpolgrabia.urbanexplorer.R;
import pl.tpolgrabia.urbanexplorer.dto.wiki.app.WikiAppObject;
import java.util.List;
/**
* Created by tpolgrabia on 01.09.16.
*/
public class WikiLocationsAdapter extends ArrayAdapter<WikiAppObject> {
public WikiLocationsAdapter(Context ctx, List<WikiAppObject> locations) {
super(ctx, R.layout.wiki_locations_item, locations);
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
final LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
View inflatedView;
if (convertView != null) {
// reusing old view
inflatedView = convertView;
} else {
inflatedView = inflater.inflate(R.layout.wiki_locations_item,parent,false);
}
WikiAppObject wikiPage = getItem(position);
// wiki page image preview
ImageView imgPreview = (ImageView) inflatedView.findViewById(R.id.wiki_locs_item_img_preview);
String url = wikiPage.getThumbnail() != null ? wikiPage.getThumbnail() : null;
TextView locDistanceInfo = (TextView) inflatedView.findViewById(R.id.wiki_locs_item_distance);
locDistanceInfo.setText("" + wikiPage.getDistance() / 1000.0 + " km");
if (url != null) {
ImageLoader.getInstance().displayImage(
url,
imgPreview,
MainActivity.options);
}
// wiki page title
TextView pageTitle = (TextView) inflatedView.findViewById(R.id.wiki_locs_item_title);
pageTitle.setText(wikiPage.getTitle());
return inflatedView;
}
}

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

@ -1,10 +1,13 @@
package pl.tpolgrabia.urbanexplorer.callbacks;
import org.json.JSONObject;
import pl.tpolgrabia.urbanexplorer.dto.panoramio.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);
}

48
app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/StandardLocationListener.java Normal file
View File

@ -0,0 +1,48 @@
package pl.tpolgrabia.urbanexplorer.callbacks;
import android.location.Location;
import android.location.LocationListener;
import android.os.Bundle;
import android.util.Log;
import java.util.ArrayList;
import java.util.List;
/**
* Created by tpolgrabia on 28.08.16.
*/
public class StandardLocationListener implements LocationListener {
private static final String CLASS_TAG = StandardLocationListener.class.getSimpleName();
private List<StandardLocationListenerCallback> locationChangedCallbacks = new ArrayList<>();
@Override
public void onLocationChanged(Location location) {
Log.i(CLASS_TAG, "Location provider changed: " + location);
for (StandardLocationListenerCallback callback : locationChangedCallbacks) {
callback.callback(location);
}
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
// Log.i(CLASS_TAG, "Location provider status changed")
}
@Override
public void onProviderEnabled(String provider) {
Log.i(CLASS_TAG, "Provider " + provider + " enabled");
}
@Override
public void onProviderDisabled(String provider) {
Log.i(CLASS_TAG, "Provider " + provider + " disabled");
}
public void addCallback(StandardLocationListenerCallback callback) {
locationChangedCallbacks.add(callback);
}
public boolean removeCallback(StandardLocationListenerCallback callback) {
return locationChangedCallbacks.remove(callback);
}
}

11
app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/StandardLocationListenerCallback.java Normal file
View File

@ -0,0 +1,11 @@
package pl.tpolgrabia.urbanexplorer.callbacks;
import android.location.Location;
/**
* Created by tpolgrabia on 28.08.16.
*/
public interface StandardLocationListenerCallback {
void callback(Location location);
}

10
app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/WikiResponseCallback.java Normal file
View File

@ -0,0 +1,10 @@
package pl.tpolgrabia.urbanexplorer.callbacks;
import pl.tpolgrabia.urbanexplorer.dto.wiki.generator.WikiResponse;
/**
* Created by tpolgrabia on 28.08.16.
*/
public interface WikiResponseCallback {
void callback(WikiStatus status, WikiResponse response);
}

10
app/src/main/java/pl/tpolgrabia/urbanexplorer/callbacks/WikiStatus.java Normal file
View File

@ -0,0 +1,10 @@
package pl.tpolgrabia.urbanexplorer.callbacks;
/**
* Created by tpolgrabia on 28.08.16.
*/
public enum WikiStatus {
SUCCESS,
NETWORK_ERROR,
GENERAL_ERROR
}

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

@ -1,4 +1,4 @@
package pl.tpolgrabia.urbanexplorer.dto;
package pl.tpolgrabia.urbanexplorer.dto.panoramio;
import java.io.Serializable;

2
app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/PanoramioMapLocation.java → app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/panoramio/PanoramioMapLocation.java
View File

@ -1,4 +1,4 @@
package pl.tpolgrabia.urbanexplorer.dto;
package pl.tpolgrabia.urbanexplorer.dto.panoramio;
import java.io.Serializable;

2
app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/PanoramioResponse.java → app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/panoramio/PanoramioResponse.java
View File

@ -1,4 +1,4 @@
package pl.tpolgrabia.urbanexplorer.dto;
package pl.tpolgrabia.urbanexplorer.dto.panoramio;
import java.io.Serializable;
import java.util.List;

84
app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/wiki/app/WikiAppObject.java Normal file
View File

@ -0,0 +1,84 @@
package pl.tpolgrabia.urbanexplorer.dto.wiki.app;
import java.io.Serializable;
/**
* Created by tpolgrabia on 05.09.16.
*/
public class WikiAppObject implements Serializable {
private String url;
private String thumbnail;
private String title;
private Double latitude;
private Double longitude;
private Double distance;
private Long pageId;
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public String getThumbnail() {
return thumbnail;
}
public void setThumbnail(String thumbnail) {
this.thumbnail = thumbnail;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public Double getLatitude() {
return latitude;
}
public void setLatitude(Double latitude) {
this.latitude = latitude;
}
public Double getLongitude() {
return longitude;
}
public void setLongitude(Double longitude) {
this.longitude = longitude;
}
public Double getDistance() {
return distance;
}
public void setDistance(Double distance) {
this.distance = distance;
}
@Override
public String toString() {
return "WikiAppObject{" +
"url='" + url + '\'' +
", thumbnail='" + thumbnail + '\'' +
", title='" + title + '\'' +
", latitude='" + latitude + '\'' +
", longitude='" + longitude + '\'' +
", distance='" + distance + '\'' +
'}';
}
public Long getPageId() {
return pageId;
}
public void setPageId(Long pageId) {
this.pageId = pageId;
}
}

60
app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/wiki/generator/WikiLocation.java Normal file
View File

@ -0,0 +1,60 @@
package pl.tpolgrabia.urbanexplorer.dto.wiki.generator;
import java.io.Serializable;
/**
* Created by tpolgrabia on 28.08.16.
*/
public class WikiLocation implements Serializable{
private static final long serialVersionUID = 2574692501816893919L;
private String globe;
private Double latitude;
private Double longitude;
private String primary;
public static long getSerialVersionUID() {
return serialVersionUID;
}
public String getGlobe() {
return globe;
}
public void setGlobe(String globe) {
this.globe = globe;
}
public Double getLatitude() {
return latitude;
}
public void setLatitude(Double latitude) {
this.latitude = latitude;
}
public Double getLongitude() {
return longitude;
}
public void setLongitude(Double longitude) {
this.longitude = longitude;
}
public String getPrimary() {
return primary;
}
public void setPrimary(String primary) {
this.primary = primary;
}
@Override
public String toString() {
return "WikiLocation{" +
"globe='" + globe + '\'' +
", latitude=" + latitude +
", longitude=" + longitude +
", primary='" + primary + '\'' +
'}';
}
}

75
app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/wiki/generator/WikiPage.java Normal file
View File

@ -0,0 +1,75 @@
package pl.tpolgrabia.urbanexplorer.dto.wiki.generator;
import java.util.List;
/**
* Created by tpolgrabia on 28.08.16.
*/
public class WikiPage {
private List<WikiLocation> coordinates;
private Long index;
private Long ns;
private Long pageId;
private WikiThumbnail thumbnail;
private String title;
public List<WikiLocation> getCoordinates() {
return coordinates;
}
public void setCoordinates(List<WikiLocation> coordinates) {
this.coordinates = coordinates;
}
public Long getIndex() {
return index;
}
public void setIndex(Long index) {
this.index = index;
}
public Long getNs() {
return ns;
}
public void setNs(Long ns) {
this.ns = ns;
}
public Long getPageId() {
return pageId;
}
public void setPageId(Long pageId) {
this.pageId = pageId;
}
public WikiThumbnail getThumbnail() {
return thumbnail;
}
public void setThumbnail(WikiThumbnail thumbnail) {
this.thumbnail = thumbnail;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
@Override
public String toString() {
return "WikiPage{" +
"coordinates=" + coordinates +
", index=" + index +
", ns=" + ns +
", pageId=" + pageId +
", thumbnail=" + thumbnail +
", title='" + title + '\'' +
'}';
}
}

37
app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/wiki/generator/WikiResponse.java Normal file
View File

@ -0,0 +1,37 @@
package pl.tpolgrabia.urbanexplorer.dto.wiki.generator;
import java.io.Serializable;
import java.util.List;
/**
* Created by tpolgrabia on 28.08.16.
*/
public class WikiResponse implements Serializable {
private static final long serialVersionUID = 2208673089408151268L;
private Boolean batchComplete;
private List<WikiPage> pages;
public Boolean getBatchComplete() {
return batchComplete;
}
public void setBatchComplete(Boolean batchComplete) {
this.batchComplete = batchComplete;
}
public List<WikiPage> getPages() {
return pages;
}
public void setPages(List<WikiPage> pages) {
this.pages = pages;
}
@Override
public String toString() {
return "WikiResponse{" +
"batchComplete=" + batchComplete +
", pages=" + pages +
'}';
}
}

43
app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/wiki/generator/WikiThumbnail.java Normal file
View File

@ -0,0 +1,43 @@
package pl.tpolgrabia.urbanexplorer.dto.wiki.generator;
/**
* Created by tpolgrabia on 28.08.16.
*/
public class WikiThumbnail {
private Long height;
private String source;
private Long width;
public Long getHeight() {
return height;
}
public void setHeight(Long height) {
this.height = height;
}
public String getSource() {
return source;
}
public void setSource(String source) {
this.source = source;
}
public Long getWidth() {
return width;
}
public void setWidth(Long width) {
this.width = width;
}
@Override
public String toString() {
return "WikiThumbnail{" +
"height=" + height +
", source='" + source + '\'' +
", width=" + width +
'}';
}
}

86
app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/wiki/geosearch/WikiGeoObject.java Normal file
View File

@ -0,0 +1,86 @@
package pl.tpolgrabia.urbanexplorer.dto.wiki.geosearch;
import java.io.Serializable;
/**
* Created by tpolgrabia on 05.09.16.
*/
public class WikiGeoObject implements Serializable {
private static final long serialVersionUID = 4527861009683008530L;
private Long pageId;
private Long ns;
private String title;
private Double latitude;
private Double longitude;
private Double distance;
private String primary;
public Long getPageId() {
return pageId;
}
public void setPageId(Long pageId) {
this.pageId = pageId;
}
public Long getNs() {
return ns;
}
public void setNs(Long ns) {
this.ns = ns;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public Double getLatitude() {
return latitude;
}
public void setLatitude(Double latitude) {
this.latitude = latitude;
}
public Double getLongitude() {
return longitude;
}
public void setLongitude(Double longitude) {
this.longitude = longitude;
}
public Double getDistance() {
return distance;
}
public void setDistance(Double distance) {
this.distance = distance;
}
public String getPrimary() {
return primary;
}
public void setPrimary(String primary) {
this.primary = primary;
}
@Override
public String toString() {
return "WikiGeoObject{" +
"pageId=" + pageId +
", ns=" + ns +
", title='" + title + '\'' +
", latitude=" + latitude +
", longitude=" + longitude +
", distance=" + distance +
", primary='" + primary + '\'' +
'}';
}
}

35
app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/wiki/geosearch/WikiGeoResponse.java Normal file
View File

@ -0,0 +1,35 @@
package pl.tpolgrabia.urbanexplorer.dto.wiki.geosearch;
import java.util.List;
/**
* Created by tpolgrabia on 05.09.16.
*/
public class WikiGeoResponse {
private Boolean batchComplete;
private List<WikiGeoObject> query;
public Boolean getBatchComplete() {
return batchComplete;
}
public void setBatchComplete(Boolean batchComplete) {
this.batchComplete = batchComplete;
}
public List<WikiGeoObject> getQuery() {
return query;
}
public void setQuery(List<WikiGeoObject> query) {
this.query = query;
}
@Override
public String toString() {
return "WikiGeoResponse{" +
"batchComplete=" + batchComplete +
", query=" + query +
'}';
}
}

10
app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/wiki/geosearch/WikiGeoResponseCallback.java Normal file
View File

@ -0,0 +1,10 @@
package pl.tpolgrabia.urbanexplorer.dto.wiki.geosearch;
import pl.tpolgrabia.urbanexplorer.callbacks.WikiStatus;
/**
* Created by tpolgrabia on 05.09.16.
*/
public interface WikiGeoResponseCallback {
void callback(WikiStatus status, WikiGeoResponse response);
}

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

@ -1,65 +1,46 @@
package pl.tpolgrabia.urbanexplorer.fragments;
import android.content.Intent;
import android.content.Context;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.os.Bundle;
import android.provider.Settings;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.text.Editable;
import android.text.TextWatcher;
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.MainActivity;
import pl.tpolgrabia.urbanexplorer.R;
import pl.tpolgrabia.urbanexplorer.dto.PanoramioImageInfo;
import pl.tpolgrabia.urbanexplorer.utils.NumberUtils;
import pl.tpolgrabia.urbanexplorer.callbacks.PanoramioResponseCallback;
import pl.tpolgrabia.urbanexplorer.callbacks.PanoramioResponseStatus;
import pl.tpolgrabia.urbanexplorer.callbacks.StandardLocationListenerCallback;
import pl.tpolgrabia.urbanexplorer.dto.panoramio.PanoramioImageInfo;
import pl.tpolgrabia.urbanexplorer.utils.LocationUtils;
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;
import java.util.concurrent.Semaphore;
/**
* A simple {@link Fragment} subclass.
*/
public class HomeFragment extends Fragment implements LocationListener {
public class HomeFragment extends Fragment {
private static final String CLASS_TAG = HomeFragment.class.getSimpleName();
private static final long MIN_TIME = 60000;
private static final float MIN_DISTANCE = 100;
private static final int LOCATION_SETTINGS_REQUEST_ID = 1;
private static final String LOCATIONS_LIST_IMAGE_SIZE = "medium";
private static final String LOCATIONS_ORDER = "popularity";
private boolean gpsLocationEnabled;
private boolean networkLocationEnabled;
private boolean locationEnabled;
private static final int PANORAMIA_BULK_DATA_SIZE = 10;
private LocationManager locationService;
private String locationProvider;
private boolean locationServicesActivated = false;
private AQuery aq;
private boolean initialized = false;
private View inflatedView;
private TextView pageSizeWidget;
private TextView pageIdWidget;
private Long pageId = 1L;
private ListView locations;
private ImageView prevWidget;
private ImageView nextWidget;
private Long photosCount;
private TextView locationsResultInfo;
private Long pageId;
private Semaphore loading;
private List<PanoramioImageInfo> photos;
private String locationProvider;
private boolean noMorePhotos;
public HomeFragment() {
// Required empty public constructor
@ -68,18 +49,36 @@ public class HomeFragment extends Fragment implements LocationListener {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
aq = new AQuery(getActivity());
Log.v(CLASS_TAG, "onCreate");
pageId = 1L;
loading = new Semaphore(1, true);
photos = new ArrayList<>();
noMorePhotos = false;
locationService = (LocationManager) getActivity().getSystemService(LOCATION_SERVICE);
}
checkLocationSourceAvailability();
if (!locationEnabled) {
Intent locationSettingsIntent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
startActivityForResult(locationSettingsIntent, LOCATION_SETTINGS_REQUEST_ID);
return;
}
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
initLocationCallback();
}
private void initLocationCallback() {
MainActivity mainActivity = ((MainActivity) getActivity());
mainActivity.getLocationCallback()
.addCallback(new StandardLocationListenerCallback() {
@Override
public void callback(Location location) {
noMorePhotos = false;
photos = new ArrayList<>();
updateLocationInfo();
try {
fetchAdditionalPhotos();
} catch (InterruptedException e) {
Log.e(CLASS_TAG, "Failed trying acquring lock to load photos", e);
}
}
});
}
private Double safeParseDouble(CharSequence text) {
@ -100,179 +99,177 @@ public class HomeFragment extends Fragment implements LocationListener {
Bundle savedInstanceState) {
// Inflate the layout for this fragment
inflatedView = inflater.inflate(R.layout.fragment_home, container, false);
// getActivity().findViewById(R.id.update_places).setOnClickListener(
// new View.OnClickListener() {
// @Override
// public void onClick(View view) {
// Location location = locationService.getLastKnownLocation(locationProvider);
// aq.ajax("https://maps.googleapis.com/maps/api/place/nearbysearch/output?" +
// "key=" + AppConstants.GOOGLE_API_KEY
// + "&location=" + location.getLatitude() + "," + location.getLongitude()
// + "&radius" + safeParseDouble(aq.id(R.id.location_range).getText())
// + "&rankby=distance",
// JSONObject.class,
// new AjaxCallback<JSONObject>() {
// @Override
// public void callback(String url, JSONObject object, AjaxStatus status) {
// object
// }
// });
// }
// }
// );
ListView locations = (ListView)inflatedView.findViewById(R.id.locations);
final ListView finalLocations = locations;
locations.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
@Override
public boolean onItemLongClick(AdapterView<?> adapterView, View view, int pos, long rowId) {
PanoramioAdapter panAdapter = (PanoramioAdapter) finalLocations.getAdapter();
PanoramioImageInfo photoInfo = panAdapter.getItem(pos);
MainActivity activity = (MainActivity) getActivity();
activity.switchToPhoto(photoInfo);
return false;
}
});
locations = (ListView)inflatedView.findViewById(R.id.locations);
inflatedView.findViewById(R.id.update_places).setOnClickListener(
new View.OnClickListener() {
@Override
public void onClick(View view) {
fetchPanoramioLocations();
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
Log.v(CLASS_TAG, "Scrolled to the top");
}
if (firstVisibleItem + visibleItemCount >= totalItemCount) {
Log.v(CLASS_TAG, "Scrolled to the bottom");
// scrolled to the bottom
final View fragView = getView();
if (fragView == null) {
Log.v(CLASS_TAG, "Frag still not initialized");
return;
}
fetchAdditionalPhotos();
}
} catch (InterruptedException e) {
Log.e(CLASS_TAG, "Aquiring lock interrupted exception", e);
}
}
);
pageSizeWidget = (TextView) inflatedView.findViewById(R.id.locations_page_size);
pageIdWidget = (TextView) inflatedView.findViewById(R.id.locations_page_id);
pageIdWidget.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
Log.d(CLASS_TAG, "Before text changed");
}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
pageId = Math.max(1, NumberUtils.safeParseLong(charSequence));
Log.d(CLASS_TAG, "text changed");
}
@Override
public void afterTextChanged(Editable editable) {
Log.d(CLASS_TAG, "After text changed");
}
});
pageSizeWidget.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
Log.d(CLASS_TAG, "Before text changed");
}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
fetchPanoramioLocations();
Log.d(CLASS_TAG, "text changed");
}
@Override
public void afterTextChanged(Editable editable) {
Log.d(CLASS_TAG, "After text changed");
}
});
prevWidget = (ImageView)inflatedView.findViewById(R.id.prev);
nextWidget = (ImageView)inflatedView.findViewById(R.id.next);
prevWidget.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (pageId > 1) {
pageId--;
pageIdWidget.setText(Long.toString(pageId));
fetchPanoramioLocations();
}
}
});
nextWidget.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
pageId++;
pageIdWidget.setText(Long.toString(pageId));
fetchPanoramioLocations();
}
});
initialized = true;
return inflatedView;
}
private void fetchPanoramioLocations() {
private void fetchAdditionalPhotos() throws InterruptedException {
fetchPanoramioPhotos();
if (noMorePhotos) {
Log.v(CLASS_TAG, "No more photos - last query was zero result");
return;
}
if (!initialized) {
Log.v(CLASS_TAG, "Fetching additional photos blocked till system is initialized");
return;
}
if (locationProvider == null) {
Log.i(CLASS_TAG, "Location providers not available");
Toast.makeText(getActivity(), "Location provicers not available", Toast.LENGTH_SHORT).show();
return;
}
if (getView() == null) {
Log.v(CLASS_TAG, "Application still not initialized");
return;
}
final Location location = locationService.getLastKnownLocation(locationProvider);
if (location == null) {
Log.i(CLASS_TAG, "Location still not available");
Toast.makeText(getActivity(), "Location still not available", Toast.LENGTH_SHORT).show();
return;
}
Log.v(CLASS_TAG, "Fetching additional photos. Trying loading acquirng lock");
if (!loading.tryAcquire()) {
Log.v(CLASS_TAG, "Fetching additional photos. Loading in progress");
return;
}
int offset = photos.size();
Log.v(CLASS_TAG, "Fetching additional photos offset: " + offset + ", count: " + PANORAMIA_BULK_DATA_SIZE);
Log.d(CLASS_TAG, "Fetching location using " + locationProvider + " provider");
PanoramioUtils.fetchPanoramioImages(
getActivity(),
location.getLatitude(),
location.getLongitude(),
fetchRadiusX(),
fetchRadiusY(),
(long)(offset + PANORAMIA_BULK_DATA_SIZE),
fetchLocationPageSize(),
new PanoramioResponseCallback() {
@Override
public void callback(PanoramioResponseStatus status, List<PanoramioImageInfo> images, Long imagesCount) {
Log.v(CLASS_TAG, "Fetched with status: " + status + ", images: " + images + ", count: " +
imagesCount);
if (status != PanoramioResponseStatus.SUCCESS) {
return;
}
ListView locations = (ListView) getView().findViewById(R.id.locations);
ArrayAdapter<PanoramioImageInfo> adapter = (ArrayAdapter<PanoramioImageInfo>) locations.getAdapter();
photos.addAll(images);
noMorePhotos = images.isEmpty();
if (adapter == null) {
locations.setAdapter(new PanoramioAdapter(getActivity(), 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)
Log.v(CLASS_TAG, "Finished Fetching additional photos count: " + photos.size());
loading.release();
}
}
);
}
private void fetchPanoramioPhotos() {
final Location location = locationService.getLastKnownLocation(locationProvider);
final Location location = locationService.getLastKnownLocation(LocationUtils.getDefaultLocation(getActivity()));
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<JSONObject>() {
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<PanoramioImageInfo> images, Long imagesCount) {
Long pageSize = fetchLocationPageSize();
Long start = (pageId - 1) * pageSize + 1;
Long end = pageId * pageSize;
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);
ArrayAdapter<PanoramioImageInfo> 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<PanoramioImageInfo> adapter = new PanoramioAdapter(getActivity(),
R.layout.location_item,
images);
ListView locations = (ListView)getView().findViewById(R.id.locations);
locations.setAdapter(adapter);
}
});
}
);
}
private Long fetchLocationPageSize() {
return NumberUtils.safeParseLong(pageSizeWidget.getText());
}
private Long fetchLocationPageId() {
return Math.max(0L, NumberUtils.safeParseLong(pageIdWidget.getText()));
return new Long(PANORAMIA_BULK_DATA_SIZE);
}
private Double fetchRadiusX() {
@ -285,82 +282,47 @@ public class HomeFragment extends Fragment implements LocationListener {
return safeParseDouble(radiusyTextView.getText());
}
@Override
public void onLocationChanged(Location location) {
Log.i(CLASS_TAG, "Location provider changed: " + location);
double lat = location.getLatitude();
double lng = location.getLongitude();
TextView locationInfo = (TextView) getActivity().findViewById(R.id.locationInfo);
locationInfo.setText("Location: (" + lat + "," + lng + ")");
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
// Log.i(CLASS_TAG, "Location provider status changed")
}
@Override
public void onProviderEnabled(String provider) {
Log.i(CLASS_TAG, "Provider " + provider + " enabled");
}
@Override
public void onProviderDisabled(String provider) {
Log.i(CLASS_TAG, "Provider " + provider + " disabled");
}
@Override
public void onResume() {
super.onResume();
Log.v(CLASS_TAG, "onResume");
locationProvider = LocationUtils.getDefaultLocation(getActivity());
updateLocationInfo();
}
if (locationProvider != null) {
locationService.requestLocationUpdates(locationProvider,
MIN_TIME,
MIN_DISTANCE,
this);
locationServicesActivated = true;
Toast.makeText(getActivity(), "Location resumed", Toast.LENGTH_LONG).show();
public void updateLocationInfo() {
final View view = getView();
if (view == null) {
Log.wtf(CLASS_TAG, "Fragment has no view");
return;
}
TextView locationInfo = (TextView) view.findViewById(R.id.locationInfo);
locationService = (LocationManager)getActivity().getSystemService(Context.LOCATION_SERVICE);
Location currLocation = locationService.getLastKnownLocation(LocationUtils.getDefaultLocation(getActivity()));
Log.v(CLASS_TAG, "Current location: " + currLocation + ", locationInfo: " + locationInfo);
if (currLocation != null && locationInfo != null) {
// update home fragment's location info
locationInfo.setText("Location: " + currLocation.getLatitude() + "," + currLocation.getLongitude());
}
}
@Override
public void onPause() {
super.onPause();
if (locationServicesActivated) {
locationService.removeUpdates(this);
}
}
private void checkLocationSourceAvailability() {
gpsLocationEnabled = locationService.isProviderEnabled(LocationManager.GPS_PROVIDER);
networkLocationEnabled = locationService.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
locationEnabled = gpsLocationEnabled || networkLocationEnabled;
if (gpsLocationEnabled) {
locationProvider = LocationManager.GPS_PROVIDER;
return;
}
if (networkLocationEnabled) {
locationProvider = LocationManager.NETWORK_PROVIDER;
return;
}
Log.v(CLASS_TAG, "onPause");
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) {
case LOCATION_SETTINGS_REQUEST_ID:
checkLocationSourceAvailability();
if (!locationEnabled) {
// sadly, nothing to do except from notifing user that program is not enable working
Toast.makeText(getActivity(), "Sorry location services are not working." +
" Program cannot work properly - check location settings to allow program working correctly",
Toast.LENGTH_LONG).show();
}
break;
default:
super.onActivityResult(requestCode, resultCode, data);
}
public void onDestroy() {
super.onDestroy();
Log.v(CLASS_TAG, "onDestroy");
}
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
Log.v(CLASS_TAG, "Saving state");
}
}

3
app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PanoramioAdapter.java
View File

@ -1,7 +1,6 @@
package pl.tpolgrabia.urbanexplorer.fragments;
import android.content.Context;
import android.graphics.Bitmap;
import android.support.v4.app.FragmentActivity;
import android.view.LayoutInflater;
import android.view.View;
@ -13,7 +12,7 @@ import com.androidquery.AQuery;
import com.nostra13.universalimageloader.core.ImageLoader;
import pl.tpolgrabia.urbanexplorer.MainActivity;
import pl.tpolgrabia.urbanexplorer.R;
import pl.tpolgrabia.urbanexplorer.dto.PanoramioImageInfo;
import pl.tpolgrabia.urbanexplorer.dto.panoramio.PanoramioImageInfo;
import java.util.List;

16
app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PanoramioShowerFragment.java
View File

@ -1,6 +1,8 @@
package pl.tpolgrabia.urbanexplorer.fragments;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
@ -12,7 +14,7 @@ import android.widget.TextView;
import com.nostra13.universalimageloader.core.ImageLoader;
import pl.tpolgrabia.urbanexplorer.MainActivity;
import pl.tpolgrabia.urbanexplorer.R;
import pl.tpolgrabia.urbanexplorer.dto.PanoramioImageInfo;
import pl.tpolgrabia.urbanexplorer.dto.panoramio.PanoramioImageInfo;
/**
* A simple {@link Fragment} subclass.
@ -43,7 +45,7 @@ public class PanoramioShowerFragment extends Fragment {
return inflatedView;
}
PanoramioImageInfo imageInfo = (PanoramioImageInfo) arguments.getSerializable(PANORAMIO_PHOTO_ARG_KEY);
final PanoramioImageInfo imageInfo = (PanoramioImageInfo) arguments.getSerializable(PANORAMIO_PHOTO_ARG_KEY);
if (imageInfo != null) {
ImageLoader.getInstance().displayImage(
@ -65,6 +67,16 @@ public class PanoramioShowerFragment extends Fragment {
photoLocation = (TextView)inflatedView.findViewById(R.id.photo_location);
photoLocation.setText(imageInfo.getLatitude() + "," + imageInfo.getLongitude());
photoLocation.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
Intent intent = new Intent(android.content.Intent.ACTION_VIEW,
Uri.parse("http://maps.google.com/maps?daddr=" + imageInfo.getLatitude() + "," +
imageInfo.getLongitude()));
startActivity(intent);
return true;
}
});
}

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

@ -1,13 +1,37 @@
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.MainActivity;
import pl.tpolgrabia.urbanexplorer.R;
import pl.tpolgrabia.urbanexplorer.adapters.WikiLocationsAdapter;
import pl.tpolgrabia.urbanexplorer.callbacks.StandardLocationListenerCallback;
import pl.tpolgrabia.urbanexplorer.callbacks.WikiStatus;
import pl.tpolgrabia.urbanexplorer.dto.wiki.app.WikiAppObject;
import pl.tpolgrabia.urbanexplorer.utils.LocationUtils;
import pl.tpolgrabia.urbanexplorer.utils.NumberUtils;
import pl.tpolgrabia.urbanexplorer.utils.WikiAppResponseCallback;
import pl.tpolgrabia.urbanexplorer.utils.WikiUtils;
import java.util.List;
import static android.content.Context.LOCATION_SERVICE;
/**
* A simple {@link Fragment} subclass.
@ -15,6 +39,11 @@ import pl.tpolgrabia.urbanexplorer.R;
public class WikiLocationsFragment extends Fragment {
private static final String CLASS_TAG = WikiLocationsFragment.class.getSimpleName();
private LocationManager locationService;
private TextView currentLocation;
private Button fetchPlaces;
public WikiLocationsFragment() {
// Required empty public constructor
}
@ -24,7 +53,130 @@ public class WikiLocationsFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_wiki_locations, container, false);
final View inflatedView = inflater.inflate(R.layout.fragment_wiki_locations, container, false);
inflatedView.findViewById(R.id.wiki_fetch_places).setOnClickListener(
new View.OnClickListener() {
@Override
public void onClick(View v) {
// TODO replace this
Toast.makeText(getActivity(), "Fetch wiki objects", Toast.LENGTH_SHORT);
}
}
);
locationService = (LocationManager) getActivity().getSystemService(LOCATION_SERVICE);
currentLocation = (TextView) inflatedView.findViewById(R.id.wiki_current_location);
fetchPlaces = (Button)inflatedView.findViewById(R.id.wiki_fetch_places);
fetchPlaces.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
final Location location = locationService.getLastKnownLocation(LocationUtils.getDefaultLocation(getActivity()));
if (location == null) {
Log.i(CLASS_TAG, "Sorry, location is still not available");
Toast.makeText(getActivity(), "Sorry, location is still not available", Toast.LENGTH_SHORT).show();
return;
}
Editable search_limit = ((EditText) inflatedView.findViewById(R.id.wiki_search_limit)).getText();
Editable radius_limit = ((EditText) inflatedView.findViewById(R.id.wiki_search_radius)).getText();
WikiUtils.fetchAppData(getActivity(),
location.getLatitude(),
location.getLongitude(),
NumberUtils.safeParseDouble(search_limit != null ? search_limit.toString() : null),
NumberUtils.safeParseLong(
radius_limit != null ? radius_limit.toString() : null),
new WikiAppResponseCallback() {
@Override
public void callback(WikiStatus status, final List<WikiAppObject> appObjects) {
// handling here wiki locations
if (status != WikiStatus.SUCCESS) {
Toast.makeText(getActivity(), "Sorry, currently we have problem with interfacing wiki" +
": " + status + ". Try again later", Toast.LENGTH_SHORT).show();
return;
}
// 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 WikiAppObject item = appObjects.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(), appObjects));
}
}
);
}
});
MainActivity mainActivity = (MainActivity) getActivity();
mainActivity.getLocationCallback().addCallback(new StandardLocationListenerCallback() {
@Override
public void callback(Location location) {
updateLocationInfo();
}
});
return inflatedView;
}
@Override
public void onResume() {
super.onResume();
updateLocationInfo();
}
public void updateLocationInfo() {
final Location location = locationService.getLastKnownLocation(LocationUtils.getDefaultLocation(getActivity()));
if (location != null) {
currentLocation.setText("Location: " + location.getLatitude() + "," + location.getLongitude());
}
}
@Override
public void onPause() {
super.onPause();
}
}

22
app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/LocationUtils.java Normal file
View File

@ -0,0 +1,22 @@
package pl.tpolgrabia.urbanexplorer.utils;
import android.content.Context;
import android.location.LocationManager;
/**
* Created by tpolgrabia on 28.08.16.
*/
public class LocationUtils {
public static String getDefaultLocation(Context ctx) {
LocationManager locationService = (LocationManager) ctx.getSystemService(Context.LOCATION_SERVICE);
if (locationService.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
return LocationManager.GPS_PROVIDER;
}
if (locationService.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
return LocationManager.NETWORK_PROVIDER;
}
return null;
}
}

26
app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/NumberUtils.java
View File

@ -4,16 +4,32 @@ package pl.tpolgrabia.urbanexplorer.utils;
* Created by tpolgrabia on 27.08.16.
*/
public class NumberUtils {
public static Long safeParseLong(CharSequence charSequence) {
if (charSequence == null) {
return 1L;
public static Long safeParseLong(String s) {
if (s == null || "".equals(s.trim())) {
return null;
}
String trimmed = s.trim();
try {
return Long.parseLong(charSequence.toString());
return Long.parseLong(trimmed);
} catch (NumberFormatException e) {
return 1L;
return null;
}
}
public static Double safeParseDouble(String s) {
if (s == null || "".equals(s.trim())) {
return null;
}
String trimmed = s.trim();
try {
return Double.parseDouble(trimmed);
} catch (NumberFormatException e) {
return null;
}
}
}

73
app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/PanoramioUtils.java
View File

@ -1,15 +1,21 @@
package pl.tpolgrabia.urbanexplorer.utils;
import android.content.Context;
import android.util.Log;
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.dto.PanoramioImageInfo;
import pl.tpolgrabia.urbanexplorer.dto.PanoramioMapLocation;
import pl.tpolgrabia.urbanexplorer.dto.PanoramioResponse;
import pl.tpolgrabia.urbanexplorer.callbacks.PanoramioResponseCallback;
import pl.tpolgrabia.urbanexplorer.callbacks.PanoramioResponseStatus;
import pl.tpolgrabia.urbanexplorer.dto.panoramio.PanoramioImageInfo;
import pl.tpolgrabia.urbanexplorer.dto.panoramio.PanoramioMapLocation;
import pl.tpolgrabia.urbanexplorer.dto.panoramio.PanoramioResponse;
import pl.tpolgrabia.urbanexplorer.exceptions.PanoramioResponseNotExpected;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
@ -18,7 +24,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();

13
app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/WikiAppResponseCallback.java Normal file
View File

@ -0,0 +1,13 @@
package pl.tpolgrabia.urbanexplorer.utils;
import pl.tpolgrabia.urbanexplorer.callbacks.WikiStatus;
import pl.tpolgrabia.urbanexplorer.dto.wiki.app.WikiAppObject;
import java.util.List;
/**
* Created by tpolgrabia on 11.09.16.
*/
public interface WikiAppResponseCallback {
void callback(WikiStatus status, List<WikiAppObject> appObjects);
}

327
app/src/main/java/pl/tpolgrabia/urbanexplorer/utils/WikiUtils.java Normal file
View File

@ -0,0 +1,327 @@
package pl.tpolgrabia.urbanexplorer.utils;
import android.content.Context;
import android.util.Log;
import android.widget.Toast;
import com.androidquery.AQuery;
import com.androidquery.callback.AjaxCallback;
import com.androidquery.callback.AjaxStatus;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import pl.tpolgrabia.urbanexplorer.callbacks.WikiResponseCallback;
import pl.tpolgrabia.urbanexplorer.callbacks.WikiStatus;
import pl.tpolgrabia.urbanexplorer.dto.wiki.app.WikiAppObject;
import pl.tpolgrabia.urbanexplorer.dto.wiki.generator.WikiLocation;
import pl.tpolgrabia.urbanexplorer.dto.wiki.generator.WikiPage;
import pl.tpolgrabia.urbanexplorer.dto.wiki.generator.WikiResponse;
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 java.util.*;
/**
* Created by tpolgrabia on 28.08.16.
*/
public class WikiUtils {
private static final String CLASS_TAG = WikiUtils.class.getSimpleName();
private static final String WIKI_FORMAT = "json";
private static final long WIKI_MIN_RADIUS = 10L;
private static final Long WIKI_MAX_RESULTS_LIMIT = 500L;
private static final Long WIKI_MIN_RESULTS = 10L;
private static final Double WIKI_STD_RADIUS = 10000.0;
private static final Long WIKI_STD_LIMIT = 10L;
public static void fetchNearPlaces(Context ctx,
final double latitude,
final double longitude,
final Long resultsLimit,
final Long radiusLimit,
final WikiResponseCallback callback) {
final AQuery aq = new AQuery(ctx);
aq.ajax("TODO", JSONObject.class, new AjaxCallback<JSONObject>(){
@Override
public void callback(String url, JSONObject object, AjaxStatus status) {
// TODO handle response
final String qurl = "https://en.wikipedia.org/w/api.php?" +
"action=query" +
"&prop=coordinates%7Cpageimages%7Cpageterms" +
"&colimit=50" +
"&piprop=thumbnail" +
"&pithumbsize=144" +
"&pilimit=50" +
"&wbptterms=description" +
"&generator=geosearch" +
"&ggscoord=" + latitude + "%7C" + longitude +
"&ggsradius=" + Math.max(WIKI_MIN_RADIUS, ifNullSet(radiusLimit, 10000L)) +
"&ggslimit=" + Math.min(WIKI_MIN_RESULTS, Math.max(WIKI_MAX_RESULTS_LIMIT,
checkIfNullLong(resultsLimit))) +
"&format=" + WIKI_FORMAT;
aq.ajax(qurl, JSONObject.class, new AjaxCallback<JSONObject>() {
@Override
public void callback(String url, JSONObject object, AjaxStatus status) {
if (status.getCode() == 200) {
try {
callback.callback(WikiStatus.SUCCESS, fetchWikiResponse(object));
} catch (JSONException e) {
Log.e(CLASS_TAG, "JSon error: " + object.toString(), e);
}
} else {
callback.callback(WikiStatus.NETWORK_ERROR, null);
}
}
});
}
});
}
private static <T> T ifNullSet(T val, T def) {
return val == null ? def : val;
}
private static Long checkIfNullLong(Long lval) {
return lval != null ? lval : 0L;
}
public static WikiResponse fetchWikiResponse(JSONObject object) throws JSONException {
if (object == null) {
return null;
}
WikiResponse wikiResponse = new WikiResponse();
wikiResponse.setBatchComplete(Boolean.valueOf(object.getString("batchcomplete")));
wikiResponse.setPages(fetchPages(object.getJSONObject("query").getJSONObject("pages")));
return wikiResponse;
}
public static List<WikiPage> fetchPages(JSONObject jpages) throws JSONException {
List<WikiPage> pages = new ArrayList<>();
Iterator<String> pagesIds = jpages.keys();
while (pagesIds.hasNext()) {
String pageId = pagesIds.next();
pages.add(fetchPage(jpages.getJSONObject(pageId)));
}
return pages;
}
public static WikiPage fetchPage(JSONObject jpage) throws JSONException {
WikiPage wikiPage = new WikiPage();
wikiPage.setCoordinates(fetchCoordinates(jpage.optJSONArray("coordinates")));
wikiPage.setIndex(jpage.optLong("index"));
wikiPage.setNs(jpage.optLong("ns"));
wikiPage.setPageId(jpage.optLong("pageid"));
wikiPage.setThumbnail(fetchThumbnail(jpage.optJSONObject("thumbnail")));
wikiPage.setTitle(jpage.optString("title"));
return wikiPage;
}
public static WikiThumbnail fetchThumbnail(JSONObject jthumbnail) throws JSONException {
if (jthumbnail == null) {
return null;
}
WikiThumbnail wikiThumbnail = new WikiThumbnail();
wikiThumbnail.setWidth(jthumbnail.getLong("width"));
wikiThumbnail.setHeight(jthumbnail.getLong("height"));
wikiThumbnail.setSource(jthumbnail.getString("source"));
return wikiThumbnail;
}
public static List<WikiLocation> fetchCoordinates(JSONArray jcoordinates) throws JSONException {
if (jcoordinates == null) {
return null;
}
List<WikiLocation> wikiLocations = new ArrayList<WikiLocation>();
int n = jcoordinates.length();
for (int i = 0; i < n; i++) {
wikiLocations.add(fetchCoordinate(jcoordinates.getJSONObject(i)));
}
return wikiLocations;
}
public static WikiLocation fetchCoordinate(JSONObject jlocation) throws JSONException {
WikiLocation wikiLocation = new WikiLocation();
wikiLocation.setLatitude(jlocation.getDouble("lat"));
wikiLocation.setLongitude(jlocation.getDouble("lon"));
wikiLocation.setPrimary(jlocation.getString("primary"));
wikiLocation.setGlobe(jlocation.getString("globe"));
return wikiLocation;
}
public static void fetchGeoSearchWikiMetadata(Context ctx,
Double latitude,
Double longitude,
Double radius,
Long limit,
final WikiGeoResponseCallback callback) {
if (radius == null) {
radius = WIKI_STD_RADIUS;
}
if (limit == null) {
limit = WIKI_STD_LIMIT;
}
AQuery aq = new AQuery(ctx);
aq.ajax("https://en.wikipedia.org/w/api.php?action=query&list=geosearch&gscoord=52.2181737%7C21.1530673&gsradius=10000&gslimit=10&format=json", JSONObject.class, new AjaxCallback<JSONObject>() {
@Override
public void callback(String url, JSONObject object, AjaxStatus status) {
Log.v(CLASS_TAG, "Finished waiting for " + url
+ " with status " + status.getCode() + ":" + status.getMessage()
+ " and response: " + object);
if (status.getCode() == 200) {
try {
callback.callback(WikiStatus.SUCCESS, fetchWikiGeoResponse(object));
} catch (Throwable t) {
Log.e(CLASS_TAG, "General error during fetching", t);
callback.callback(WikiStatus.GENERAL_ERROR, null);
}
} else {
Log.e(CLASS_TAG, "Couldn't fetch wiki metadata " + object
+ ", status: " + status.getCode() + ": " + status.getMessage() + " from url: " + url);
callback.callback(WikiStatus.NETWORK_ERROR, null);
}
super.callback(url, object, status);
}
});
}
public static WikiGeoResponse fetchWikiGeoResponse(JSONObject object) {
WikiGeoResponse response = new WikiGeoResponse();
response.setBatchComplete(object.optBoolean("batch_complete"));
response.setQuery(fetchQueriesData(object.optJSONObject("query").optJSONArray("geosearch")));
return response;
}
public static List<WikiGeoObject> fetchQueriesData(JSONArray object) {
List<WikiGeoObject> geoObjects = new ArrayList<>();
int n = object.length();
int idx;
for (idx = 0; idx < n; idx++) {
JSONObject geoPage = object.optJSONObject(idx);
geoObjects.add(fetchWikiGeoObject(geoPage));
}
return geoObjects;
}
public static WikiGeoObject fetchWikiGeoObject(JSONObject geoPage) {
WikiGeoObject object = new WikiGeoObject();
object.setPageId(geoPage.optLong("pageid"));
object.setNs(geoPage.optLong("ns"));
object.setTitle(geoPage.optString("title"));
object.setLatitude(geoPage.optDouble("lat"));
object.setLongitude(geoPage.optDouble("lon"));
object.setDistance(geoPage.optDouble("dist"));
object.setPrimary(geoPage.optString("primary"));
return object;
}
public static void fetchAppData(final Context ctx,
final Double latitude,
final Double longitude,
final Double radius,
final Long limit,
final WikiAppResponseCallback callback) {
fetchGeoSearchWikiMetadata(ctx, latitude, longitude, radius, limit, new WikiGeoResponseCallback() {
@Override
public void callback(WikiStatus status, WikiGeoResponse response) {
Log.v(CLASS_TAG, "Fetching finished with status: " + status + " and values: " + response);
if (status != WikiStatus.SUCCESS) {
Toast.makeText(ctx, "Sorry, couldn't fetch wiki metadata", Toast.LENGTH_SHORT).show();
return;
}
final List<WikiGeoObject> geoItems = response.getQuery();
if (geoItems == null) {
return;
}
List<Long> pageIds = new ArrayList<Long>();
for (WikiGeoObject wikiGeoObject : geoItems) {
pageIds.add(wikiGeoObject.getPageId());
}
final Map<Long, WikiGeoObject> geoItemsMap = new HashMap<>();
for (WikiGeoObject geoItem : geoItems) {
geoItemsMap.put(geoItem.getPageId(), geoItem);
}
fetchPageInfos(ctx,
pageIds,
new WikiResponseCallback() {
@Override
public void callback(WikiStatus status, WikiResponse response) {
if (status != WikiStatus.SUCCESS) {
callback.callback(WikiStatus.NETWORK_ERROR, null);
return;
}
List<WikiAppObject> results = new ArrayList<WikiAppObject>();
List<WikiPage> pages = response.getPages();
for (WikiPage page : pages) {
WikiAppObject appObject = new WikiAppObject();
appObject.setTitle(page.getTitle());
appObject.setDistance(geoItemsMap.get(page.getPageId()).getDistance());
appObject.setLatitude(page.getCoordinates().get(0).getLatitude());
appObject.setLongitude(page.getCoordinates().get(0).getLongitude());
final WikiThumbnail thumbonail = page.getThumbnail();
final String thumSource = thumbonail != null ? thumbonail.getSource() : null;
appObject.setThumbnail(thumSource);
appObject.setUrl(thumSource);
appObject.setPageId(page.getPageId());
results.add(appObject);
}
// TODO here add callback invocation with result
callback.callback(WikiStatus.SUCCESS, results);
}
});
}
});
}
public static void fetchPageInfos(Context ctx, List<Long> pageIds, final WikiResponseCallback callback) {
AQuery aq = new AQuery(ctx);
aq.ajax("https://en.wikipedia.org/w/api.php" +
"?action=query" +
"&prop=coordinates%7Cpageimages%7Cpageterms" +
"&colimit=50" +
"&piprop=thumbnail" +
"&pithumbsize=144" +
"&pilimit=50" +
"&wbptterms=description" +
"&pageids=" + StringUtils.join(pageIds, "|") +
"&format=json", JSONObject.class, new AjaxCallback<JSONObject>() {
@Override
public void callback(String url, JSONObject object, AjaxStatus status) {
if (status.getCode() == 200) {
try {
callback.callback(WikiStatus.SUCCESS, fetchWikiResponse(object));
} catch (Throwable t) {
Log.e(CLASS_TAG, "General error", t);
callback.callback(WikiStatus.GENERAL_ERROR, null);
}
} else {
callback.callback(WikiStatus.NETWORK_ERROR, null);
}
}
});
}
}

25
app/src/main/java/pl/tpolgrabia/urbanexplorer/workers/FetchingPhotosWorker.java Normal file
View File

@ -0,0 +1,25 @@
package pl.tpolgrabia.urbanexplorer.workers;
import android.os.AsyncTask;
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
/**
* Created by tpolgrabia on 11.09.16.
*/
public class FetchingPhotosWorker extends AsyncTask<Boolean, Integer, Boolean> {
private HomeFragment homeFragment;
public FetchingPhotosWorker(HomeFragment homeFragment) {
this.homeFragment = homeFragment;
}
@Override
protected Boolean doInBackground(Boolean... params) {
for (Boolean arg : params) {
}
return null;
}
}

4
app/src/main/res/color/blue.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#0000ff" />
</selector>

BIN
app/src/main/res/drawable/nav_left.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
app/src/main/res/drawable/nav_right.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

37
app/src/main/res/layout/fragment_home.xml
View File

@ -38,6 +38,7 @@
</LinearLayout>
<ListView
android:id="@+id/locations"
android:layout_width="match_parent"
@ -46,42 +47,6 @@
</ListView>
<TextView android:id="@+id/locations_result_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"/>
<LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
<ImageView android:id="@+id/prev"
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@drawable/nav_left"/>
<EditText
android:id="@+id/locations_page_id"
android:layout_width="40dp"
android:gravity="center"
android:layout_height="match_parent"
android:text="1"/>
<EditText
android:id="@+id/locations_page_size"
android:layout_width="40dp"
android:gravity="center"
android:layout_height="match_parent"
android:text="10"/>
<ImageView android:id="@+id/next"
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@drawable/nav_right"/>
</LinearLayout>
<Button android:id="@+id/update_places"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Fetch interesting places" />
</LinearLayout>

3
app/src/main/res/layout/fragment_panoramio_shower.xml
View File

@ -50,7 +50,8 @@
<TextView android:id="@+id/photo_location"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:textColor="@color/blue" />
</LinearLayout>
<LinearLayout android:layout_width="match_parent"

43
app/src/main/res/layout/fragment_wiki_locations.xml
View File

@ -1,13 +1,44 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="pl.tpolgrabia.urbanexplorer.fragments.WikiLocationsFragment">
<TextView android:id="@+id/wiki_current_location"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Location:"/>
<!-- TODO: Update blank fragment layout -->
<TextView
<LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content">
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/wiki_search_radius"/>
<EditText android:id="@+id/wiki_search_radius"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"/>
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/wiki_search_limit"/>
<EditText android:id="@+id/wiki_search_limit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"/>
</LinearLayout>
<ListView android:id="@+id/wiki_places"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
</ListView>
<Button android:id="@+id/wiki_fetch_places"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment"/>
android:layout_height="wrap_content"
android:text="Fetch wiki places in the neighbourhood"/>
</FrameLayout>
</LinearLayout>

30
app/src/main/res/layout/wiki_locations_item.xml Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView android:id="@+id/wiki_locs_item_img_preview"
android:layout_width="120dp"
android:layout_height="120dp"/>
<LinearLayout android:id="@+id/wiki_locs_item_desc_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView android:id="@+id/wiki_locs_item_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Fill Title" />
<TextView android:id="@+id/wiki_locs_item_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Fill Distance" />
</LinearLayout>
</LinearLayout>

2
app/src/main/res/values/strings.xml
View File

@ -13,4 +13,6 @@
<string name="save">Save</string>
<string name="location_yrange">Location y-range</string>
<string name="location_xrange">Location x-range</string>
<string name="wiki_search_radius">Search radius</string>
<string name="wiki_search_limit">Search results\' limit</string>
</resources>