Blue location marker

Pygmalion69 · Sep 4, 2020 · f149d22 · f149d22
1 parent 7d62746
commit f149d22
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "org.nitri.opentopo"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 24
-        versionName "1.11.1"
+        versionCode 25
+        versionName "1.11.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/app/src/main/java/org/nitri/opentopo/MapFragment.java b/app/src/main/java/org/nitri/opentopo/MapFragment.java
@@ -240,11 +240,16 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
             mLocationOverlay = new MyLocationNewOverlay(new GpsMyLocationProvider(getActivity()),
                     mMapView);
 
-            Bitmap bmCrosshairs = BitmapFactory.decodeResource(getResources(),
-                    R.drawable.ic_crosshairs);
+            Bitmap bmMapLocation = BitmapFactory.decodeResource(getResources(),
+                    R.drawable.ic_map_location);
 
-            mLocationOverlay.setPersonIcon(bmCrosshairs);
-            mLocationOverlay.setPersonHotspot(bmCrosshairs.getWidth() / 2f, bmCrosshairs.getHeight() / 2f);
+            Bitmap bmMapBearing = BitmapFactory.decodeResource(getResources(),
+                    R.drawable.ic_map_bearing);
+
+            mLocationOverlay.setPersonIcon(bmMapLocation);
+            mLocationOverlay.setPersonHotspot(bmMapLocation.getWidth() / 2f, bmMapLocation.getHeight() / 2f);
+
+            mLocationOverlay.setDirectionArrow(bmMapLocation, bmMapBearing);
 
             mScaleBarOverlay = new ScaleBarOverlay(mMapView);
             mScaleBarOverlay.setCentred(true);
@@ -306,8 +311,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         } else {
             mLocationViewModel.getCurrentLocation().setValue(mLocationManager.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER));
         }
-
-
     }
 
     private void animateToLatLon(double lat, double lon) {

diff --git a/app/src/main/res/drawable-hdpi/ic_map_bearing.png b/app/src/main/res/drawable-hdpi/ic_map_bearing.png
diff --git a/app/src/main/res/drawable-hdpi/ic_map_location.png b/app/src/main/res/drawable-hdpi/ic_map_location.png
diff --git a/app/src/main/res/drawable-mdpi/ic_map_bearing.png b/app/src/main/res/drawable-mdpi/ic_map_bearing.png
diff --git a/app/src/main/res/drawable-mdpi/ic_map_location.png b/app/src/main/res/drawable-mdpi/ic_map_location.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_map_bearing.png b/app/src/main/res/drawable-xhdpi/ic_map_bearing.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_map_location.png b/app/src/main/res/drawable-xhdpi/ic_map_location.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_map_bearing.png b/app/src/main/res/drawable-xxhdpi/ic_map_bearing.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_map_location.png b/app/src/main/res/drawable-xxhdpi/ic_map_location.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_map_bearing.png b/app/src/main/res/drawable-xxxhdpi/ic_map_bearing.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_map_location.png b/app/src/main/res/drawable-xxxhdpi/ic_map_location.png