diff --git a/app/src/main/ic_poi-web.png b/app/src/main/ic_poi-web.png new file mode 100644 index 0000000..5f97717 --- /dev/null +++ b/app/src/main/ic_poi-web.png Binary files differ diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java index e6c1a61..d4d0e4f 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java @@ -6,8 +6,11 @@ import android.app.DialogFragment; import android.content.DialogInterface; import android.content.Intent; +import android.content.res.Resources; import android.graphics.Color; import android.graphics.Typeface; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.LayerDrawable; import android.location.Criteria; import android.location.Location; import android.location.LocationListener; @@ -67,6 +70,7 @@ private static final int GPS_MIN_TIME = 5000; private static final int GPS_MIN_DIST = 5; + private Resources res; private FloatingActionButton fab; private WeatherClient weatherClient; @@ -96,6 +100,8 @@ super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + res = getResources(); + FrameLayout frameLayout = (FrameLayout) findViewById(R.id.container); dbHandler = new DatabaseHandler(this); @@ -216,8 +222,13 @@ positionMarker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM); positionMarker.setTitle(getString(R.string.osm_marker_title)); positionMarker.setSnippet("Latitude: " + gp.getLatitude() + "\n" + "Longitude: " + gp.getLongitude()); - positionMarker.setImage(getDrawable(entryImgs[type])); - positionMarker.setIcon(getDrawable(entryImgs[type])); + positionMarker.setImage(res.getDrawable(entryImgs[type])); + Drawable[] iconLayer = new Drawable[2]; + iconLayer[0] = res.getDrawable(R.mipmap.ic_poi); + iconLayer[1] = res.getDrawable(entryImgs[type]); + LayerDrawable icon = new LayerDrawable(iconLayer); + positionMarker.setIcon(icon); + //positionMarker.setIcon(res.getDrawable(entryImgs[type])); mapView.getOverlays().add(positionMarker); mapView.invalidate(); } diff --git a/app/src/main/res/mipmap-hdpi/ic_poi.png b/app/src/main/res/mipmap-hdpi/ic_poi.png new file mode 100644 index 0000000..b5c6c9b --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_poi.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_poi.png b/app/src/main/res/mipmap-mdpi/ic_poi.png new file mode 100644 index 0000000..e87c844 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_poi.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_poi.png b/app/src/main/res/mipmap-xhdpi/ic_poi.png new file mode 100644 index 0000000..71fd7ed --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_poi.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_poi.png b/app/src/main/res/mipmap-xxhdpi/ic_poi.png new file mode 100644 index 0000000..9063aef --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_poi.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_poi.png b/app/src/main/res/mipmap-xxxhdpi/ic_poi.png new file mode 100644 index 0000000..03a80cc --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_poi.png Binary files differ