Add a Show my location button, and more

drip-android-observer-master/Android/app/src/main/java/org/dripdronescanner/android/app/AircraftMapView.java

@@ -9,6 +9,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.util.Log;
+import android.widget.ImageButton;
 
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.res.ResourcesCompat;
@@ -34,6 +35,7 @@ import org.osmdroid.views.overlay.Marker;
 
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Objects;
 
 public class AircraftMapView extends Fragment {
     private static final String TAG = "AircraftMapView";
@@ -78,7 +80,7 @@ public class AircraftMapView extends Fragment {
         Context ctx = getContext();
         Configuration.getInstance().load(ctx, PreferenceManager.getDefaultSharedPreferences(ctx));
 
-        View v = inflater.inflate(R.layout.activity_main, null);
+        View v = inflater.inflate(R.layout.activity_main, container, false);
         map = v.findViewById(R.id.map_view);
         map.setTileSource(TileSourceFactory.MAPNIK);
 
@@ -98,7 +100,7 @@ public class AircraftMapView extends Fragment {
                 return;
             }
 
-            overlay = new MyLocationNewOverlay(new GpsMyLocationProvider(getContext()), map);
+            overlay = new MyLocationNewOverlay(new GpsMyLocationProvider(Objects.requireNonNull(getContext())), map);
             overlay.enableMyLocation();
             overlay.enableFollowLocation();
             map.getOverlays().add(overlay);
@@ -106,6 +108,12 @@ public class AircraftMapView extends Fragment {
             map.setMultiTouchControls(true);
             map.getController().setZoom(DESIRED_ZOOM);
         });
+
+        ImageButton centerMapButton = v.findViewById(R.id.ic_center_map);
+        centerMapButton.setOnClickListener(v12 -> {
+            map.getController().animateTo(overlay.getMyLocation());
+        });
+
         return v;
     }
 
@@ -131,7 +139,7 @@ public class AircraftMapView extends Fragment {
         if (getActivity() == null)
             return;
 
-        model = new ViewModelProvider(this).get(AircraftViewModel.class);
+        model = new ViewModelProvider(getActivity()).get(AircraftViewModel.class);
         model.getAllAircraft().observe(getViewLifecycleOwner(), allAircraftObserver);
         model.getActiveAircraft().observe(getViewLifecycleOwner(), new Observer<AircraftObject>() {
             MapObserver last = null;
@@ -202,11 +210,13 @@ public class AircraftMapView extends Fragment {
             aircraft.location.removeObserver(this);
             aircraft.system.removeObserver(systemObserver);
             if (marker != null) {
-                marker.remove(map);
+                marker.setAlpha(0.0f); // TODO: This is a temporary fix to make sure the marker disappears.
+                map.getOverlays().remove(marker);
                 marker = null;
             }
             if (markerPilot != null) {
-                markerPilot.remove(map);
+                markerPilot.setAlpha(0.0f); // TODO
+                map.getOverlays().remove(markerPilot);
                 markerPilot = null;
             }
             if (polyline != null) {
@@ -233,7 +243,7 @@ public class AircraftMapView extends Fragment {
 
                     markerPilot = new Marker(map);
                     markerPilot.setPosition(new GeoPoint(sys.getOperatorLatitude(), sys.getOperatorLongitude()));
-                    markerPilot.setIcon(ResourcesCompat.getDrawable(getResources(), R.drawable.ic_airplan, null));
+                    markerPilot.setIcon(ResourcesCompat.getDrawable(getResources(), R.drawable.ic_pilot, null));
                     markerPilot.setTitle("pilot " + id);
                     markerPilot.setAlpha(0.5f);
                     markerPilot.setRelatedObject(aircraft);
@@ -280,6 +290,9 @@ public class AircraftMapView extends Fragment {
             map.getOverlays().add(polyline);
 
             if (zoom) {
+                if (overlay.isFollowLocationEnabled())
+                    overlay.disableFollowLocation();
+
                 map.getController().animateTo(new GeoPoint(loc.getLatitude(), loc.getLongitude()));
             }
         }

drip-android-observer-master/Android/app/src/main/res/layout/activity_main.xml

@@ -12,21 +12,27 @@
 	android:layout_height="match_parent"
 	tools:context=".MainActivity">
 
-	<!--<com.google.android.gms.maps.MapView
+	<org.osmdroid.views.MapView
 		android:id="@+id/map_view"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="0dp"
 		app:layout_constraintLeft_toLeftOf="parent"
 		app:layout_constraintRight_toRightOf="parent"
-		app:layout_constraintTop_toTopOf="parent"></com.google.android.gms.maps.MapView>-->
-	<org.osmdroid.views.MapView
-		android:id="@+id/map_view"
+		app:layout_constraintTop_toTopOf="parent"/>
+
+	<ImageButton
+		android:id="@+id/ic_center_map"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginTop="0dp"
+		android:layout_marginTop="10dp"
+		android:background="#00ffffff"
+		android:contentDescription="@string/center_map_description"
+		android:cropToPadding="true"
+		android:src="@drawable/ic_center_map"
+		app:layout_constraintHorizontal_bias="0.97"
 		app:layout_constraintLeft_toLeftOf="parent"
 		app:layout_constraintRight_toRightOf="parent"
-		app:layout_constraintTop_toTopOf="parent"/>
+		app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

drip-android-observer-master/Android/app/src/main/res/values/strings.xml

@@ -47,5 +47,6 @@
     <string name="accept_button">Accept</string>
     <string name="accept_content">For Intel internal usage only\n\nThis application uses a Google Maps key paid for by Intel\n\nDO NOT DISTRIBUTE\n\nAccept</string>
     <string name="settings">Settings</string>
+    <string name="center_map_description">Center to my location button.</string>
 
 </resources>