diff --git a/app/build.gradle b/app/build.gradle index 0dcef11..10b3cd8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ android { compileSdkVersion 23 - buildToolsVersion '23.0.2' + buildToolsVersion '25.0.0' defaultConfig { applicationId "de.apps4ics.mountainnavigation" @@ -28,10 +28,13 @@ compile 'com.survivingwithandroid:weatherlib:1.6.0' compile 'com.survivingwithandroid:weatherlib_okhttpclient:1.6.0' compile 'com.squareup.okhttp:okhttp:2.0.+' - compile 'com.diogobernardino:williamchart:2.2' - compile (name:'osmbonuspack_v5.7', ext:'aar') + // compile 'com.diogobernardino:williamchart:2.2' + compile 'com.diogobernardino:williamchart:2.4.0' //TODO update to latest WC + // compile (name:'osmbonuspack_v5.7', ext:'aar') + compile 'com.github.MKergall:osmbonuspack:6.3' //TODO update to latest osm //compile 'org.slf4j:slf4j-log4j12:1.7.12' - compile 'org.osmdroid:osmdroid-android:5.1@aar' + // compile 'org.osmdroid:osmdroid-android:5.1@aar' + compile 'org.osmdroid:osmdroid-android:5.6.4' //TODO update to latest osm compile 'org.apache.commons:commons-lang3:3.3.2' compile 'com.google.code.gson:gson:2.4' } diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java index 76f498c..d063a56 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java @@ -47,6 +47,7 @@ import java.io.IOException; import java.util.Date; import java.util.List; +import java.util.Locale; import java.util.concurrent.ExecutionException; import de.apps4ics.mountainnavigation.handlers.WeatherHandler; @@ -235,7 +236,8 @@ @Override protected List
doInBackground(String... params) { String locationName = params[0]; - GeocoderNominatim geocoder = new GeocoderNominatim(DownloadActivity.this, ""); + GeocoderNominatim geocoder = new GeocoderNominatim(Locale.getDefault(), ""); +// GeocoderNominatim geocoder = new GeocoderNominatim(DownloadActivity.this, ""); try { return geocoder.getFromLocationName(locationName, 5); } catch (IOException e) { diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java index 6750528..7135c04 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java @@ -77,14 +77,17 @@ import com.db.chart.listener.OnEntryClickListener; import com.db.chart.model.LineSet; -import com.db.chart.view.AxisController; +// import com.db.chart.view.AxisController; +import com.db.chart.renderer.AxisRenderer.LabelPosition; import com.db.chart.view.ChartView; import com.db.chart.view.LineChartView; -import com.db.chart.view.animation.Animation; +import com.db.chart.animation.Animation; import org.osmdroid.api.IMapController; -import org.osmdroid.bonuspack.overlays.Marker; -import org.osmdroid.bonuspack.overlays.Polyline; +// import org.osmdroid.bonuspack.overlays.Marker; +// import org.osmdroid.bonuspack.overlays.Polyline; +import org.osmdroid.views.overlay.Marker; +import org.osmdroid.views.overlay.Polyline; import org.osmdroid.tileprovider.tilesource.TileSourceFactory; import org.osmdroid.util.GeoPoint; import org.osmdroid.views.MapView; @@ -551,10 +554,10 @@ maxDisp += (10 - (maxDisp % 10)); int step = (maxDisp - minDisp) / 2; elevationProfileNew.setAxisBorderValues(minDisp, maxDisp, step); - elevationProfileNew.setXLabels(AxisController.LabelPosition.NONE); + elevationProfileNew.setXLabels(LabelPosition.NONE); elevationProfileNew.setXAxis(false); elevationProfileNew.setYAxis(false); - elevationProfileNew.setGrid(ChartView.GridType.HORIZONTAL, new Paint()); +// elevationProfileNew.setGrid(ChartView.GridType.HORIZONTAL, new Paint()); elevationProfileNew.addData(lineSet); elevationProfileNew.setOnEntryClickListener(new OnEntryClickListener() { @@ -980,7 +983,7 @@ mapView.getOverlays().remove(currentPosition); currentPosition.setPosition(gp); - currentPosition.setSnippet(String.format(getString(R.string.osm_marker_snippet), gp.getLatitude(), gp.getLongitude(), gp.getAltitude(), 0)); + currentPosition.setSnippet(String.format(getString(R.string.osm_marker_snippet), gp.getLatitude(), gp.getLongitude(), gp.getAltitude(), "0")); mapView.getOverlays().add(currentPosition); mapView.invalidate(); mapController.setCenter(gp); diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/ModernInfoWindow.java b/app/src/main/java/de/apps4ics/mountainnavigation/ModernInfoWindow.java index 1c4f33d..c6d8270 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/ModernInfoWindow.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/ModernInfoWindow.java @@ -24,7 +24,8 @@ import android.view.View; import android.widget.Button; -import org.osmdroid.bonuspack.overlays.MarkerInfoWindow; +//import org.osmdroid.bonuspack.overlays.MarkerInfoWindow; +import org.osmdroid.views.overlay.infowindow.MarkerInfoWindow; import org.osmdroid.views.MapView; public class ModernInfoWindow extends MarkerInfoWindow { diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/HikeHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/HikeHandler.java index 5886959..ad91bcf 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/HikeHandler.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/HikeHandler.java @@ -23,8 +23,8 @@ import android.location.Location; -import org.osmdroid.bonuspack.overlays.Polyline; import org.osmdroid.util.GeoPoint; +import org.osmdroid.views.overlay.Polyline; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java index 983f970..b5a4175 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java @@ -48,11 +48,16 @@ import org.osmdroid.api.IMapController; import org.osmdroid.bonuspack.location.POI; -import org.osmdroid.bonuspack.overlays.MapEventsOverlay; -import org.osmdroid.bonuspack.overlays.MapEventsReceiver; -import org.osmdroid.bonuspack.overlays.Marker; -import org.osmdroid.bonuspack.overlays.Polygon; -import org.osmdroid.bonuspack.overlays.Polyline; +//import org.osmdroid.bonuspack.overlays.MapEventsOverlay; +//import org.osmdroid.bonuspack.overlays.MapEventsReceiver; +import org.osmdroid.views.overlay.MapEventsOverlay; +import org.osmdroid.events.MapEventsReceiver; +//import org.osmdroid.bonuspack.overlays.Marker; +//import org.osmdroid.bonuspack.overlays.Polygon; +//import org.osmdroid.bonuspack.overlays.Polyline; +import org.osmdroid.views.overlay.Marker; +import org.osmdroid.views.overlay.Polygon; +import org.osmdroid.views.overlay.Polyline; import org.osmdroid.bonuspack.routing.OSRMRoadManager; import org.osmdroid.bonuspack.routing.Road; import org.osmdroid.bonuspack.routing.RoadManager; @@ -592,7 +597,7 @@ } try { Road road = new GetRoadFromOsm().execute(waypoints.toArray(new GeoPoint[waypoints.size()])).get(); - Polyline line = RoadManager.buildRoadOverlay(road, getContext()); + Polyline line = RoadManager.buildRoadOverlay(road); MainActivity.getMapView().getOverlays().add(line); MainActivity.getMapView().invalidate(); } catch (InterruptedException e) { diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/overlays/MapDialogItemizedIconOverlay.java b/app/src/main/java/de/apps4ics/mountainnavigation/overlays/MapDialogItemizedIconOverlay.java index 8dad044..c627d87 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/overlays/MapDialogItemizedIconOverlay.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/overlays/MapDialogItemizedIconOverlay.java @@ -27,7 +27,8 @@ import android.content.res.Resources; import android.graphics.drawable.Drawable; -import org.osmdroid.bonuspack.overlays.Polyline; +//import org.osmdroid.bonuspack.overlays.Polyline; +import org.osmdroid.views.overlay.Polyline; import org.osmdroid.bonuspack.routing.Road; import org.osmdroid.bonuspack.routing.RoadManager; import org.osmdroid.util.GeoPoint; @@ -157,7 +158,7 @@ if(selected >= 2){ try { road = new GetRoadFromOsm().execute(waypoints.toArray(new GeoPoint[waypoints.size()])).get(); - line = RoadManager.buildRoadOverlay(road, context); + line = RoadManager.buildRoadOverlay(road); mapView.getOverlays().add(line); mapView.invalidate(); alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true); diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java index 88e0042..58ce5c5 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java @@ -28,7 +28,8 @@ import android.os.Bundle; import android.util.Log; -import org.osmdroid.bonuspack.overlays.Polyline; +import org.osmdroid.views.overlay.Polyline; +//import org.osmdroid.bonuspack.overlays.Polyline; import org.osmdroid.bonuspack.routing.Road; import org.osmdroid.bonuspack.routing.RoadManager; import org.osmdroid.util.GeoPoint; @@ -105,7 +106,7 @@ } try { Road road = new GetRoadFromOsm().execute(waypoints.toArray(new GeoPoint[waypoints.size()])).get(); - Polyline line = RoadManager.buildRoadOverlay(road, poiHandler.getContext()); + Polyline line = RoadManager.buildRoadOverlay(road); MainActivity.getMapView().getOverlays().add(line); MainActivity.getMapView().invalidate(); } catch (InterruptedException e) { diff --git a/app/src/main/res/drawable-hdpi/ic_grill_96.png b/app/src/main/res/drawable-hdpi/ic_grill_96.png new file mode 100644 index 0000000..307abb2 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_grill_96.png Binary files differ diff --git a/app/src/main/res/drawable-mdpi/ic_grill_96.png b/app/src/main/res/drawable-mdpi/ic_grill_96.png new file mode 100644 index 0000000..ae9c27a --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_grill_96.png Binary files differ diff --git a/app/src/main/res/drawable-xhdpi/ic_grill_96.png b/app/src/main/res/drawable-xhdpi/ic_grill_96.png new file mode 100644 index 0000000..f646f03 --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_grill_96.png Binary files differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_grill_96.png b/app/src/main/res/drawable-xxhdpi/ic_grill_96.png new file mode 100644 index 0000000..f731123 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_grill_96.png Binary files differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_grill_96.png b/app/src/main/res/drawable-xxxhdpi/ic_grill_96.png new file mode 100644 index 0000000..92171f7 --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/ic_grill_96.png Binary files differ diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 9188bc1..36b4897 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -77,7 +77,7 @@ Das Wetter in deiner Umgebung in %1$s ist \'%2$s\'! Verstanden! Dein Standort - Latitude: %1$.03f<br/>Longitude: %2$.03f<br/>Höhe: %3$dm<br/>Hinzugefügt: %4$s + Latitude: %1$.03f<br/>Longitude: %2$.03f<br/>Höhe: %3$fm<br/>Hinzugefügt: %4$s Keine Wetterdaten verfügbar Nehme auf… Aufnahme stoppen diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cae3470..b163168 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -78,7 +78,7 @@ The weather around you in %1$s is \'%2$s\'! Got it! Your position - Latitude: %1$.03f<br/>Longitude: %2$.03f<br/>Altitude: %3$d meters<br/>Added: %4$s + Latitude: %1$.03f<br/>Longitude: %2$.03f<br/>Altitude: %3$f meters<br/>Added: %4$s %1$s, %2$s No weather data available Recording… diff --git a/build.gradle b/build.gradle index 03bced9..83a6ca5 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:2.3.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +15,7 @@ allprojects { repositories { jcenter() + maven { url "https://jitpack.io" } } }