Added vehicle specific icons and also added the option (under advance…

…d settings) for the user to choose between newly added icons and old arrow

Android/res/values/strings.xml

@@ -426,6 +426,8 @@
     <string name="pref_advance_menu_title">Advanced Menu Options</string>
     <string name="pref_enable_kill_switch_summary">If enabled, a Kill Switch option will appear in the menu, allowing immediate vehicle disarming. Only supported on multi-rotor vehicles</string>
     <string name="pref_enable_kill_switch_title">Enable Kill Switch</string>
+    <string name="pref_enable_vehicle_specific_icon_title">Enable Vehicle Specific Icons</string>
+    <string name="pref_enable_vehicle_specific_icon_summary">Enable Vehicle Specific Icons for Copter, Plane and Rover</string>
     <string name="pref_enable_udp_server_title">Enable UDP server ping</string>
     <string name="pref_udp_server_ping_summary">Enable to allow the app to periodically ping the udp server.</string>
     <string name="pref_udp_ping_receiver_ip_title">UDP ping receiver ip</string>

Android/res/xml/preferences.xml

@@ -191,6 +191,12 @@
                     android:key="pref_enable_kill_switch"
                     android:summary="@string/pref_enable_kill_switch_summary"
                     android:title="@string/pref_enable_kill_switch_title" />
+
+                <CheckBoxPreference
+                        android:defaultValue="false"
+                        android:key="pref_enable_vehicle_specific_icons"
+                        android:summary="@string/pref_enable_vehicle_specific_icon_summary"
+                        android:title="@string/pref_enable_vehicle_specific_icon_title" />
             </PreferenceCategory>
 
             <PreferenceCategory android:title="@string/pref_alt_title">

Android/src/org/droidplanner/android/fragments/DroneMap.java

@@ -188,7 +188,7 @@ public void onApiConnected() {
 		home = new GraphicHome(drone, getContext());
 		mMapFragment.addMarker(home);
 
-		graphicDrone = new GraphicDrone(drone);
+		graphicDrone = new GraphicDrone(drone, context);
 		mMapFragment.addMarker(graphicDrone);
 
 		guided = new GraphicGuided(drone);

Android/src/org/droidplanner/android/fragments/SettingsFragment.java

@@ -95,7 +95,7 @@ public class SettingsFragment extends PreferenceFragment implements OnSharedPref
     public static final String ACTION_WIDGET_PREFERENCE_UPDATED = PACKAGE_NAME + ".ACTION_WIDGET_PREFERENCE_UPDATED";
     public static final String EXTRA_ADD_WIDGET = "extra_add_widget";
     public static final String EXTRA_WIDGET_PREF_KEY = "extra_widget_pref_key";
-
+    public static final String VEHICLE_SPECIFIC_ICON_PREF_KEY = "vehicle_specific_icon_pref_key";
     private static final IntentFilter intentFilter = new IntentFilter();
 
     static {
@@ -288,6 +288,21 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                 }
             });
         }
+
+        final CheckBoxPreference vehicleSpecificIcons = (CheckBoxPreference) findPreference(DroidPlannerPrefs.PREF_ENABLE_VEHICLE_SPECIFIC_ICONS);
+        if(vehicleSpecificIcons != null) {
+            vehicleSpecificIcons.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    boolean showVehicleSpecificIcons = Boolean.valueOf(newValue.toString());
+                    SharedPreferences prefs = getContext().getSharedPreferences("towerPrefsKey", Context.MODE_PRIVATE);
+                    SharedPreferences.Editor editor = prefs.edit();
+                    editor.putBoolean(VEHICLE_SPECIFIC_ICON_PREF_KEY, showVehicleSpecificIcons);
+                    editor.commit();
+                    return true;
+                }
+            });
+        }
     }
 
     private void setupUnitSystemPreferences(){
@@ -721,4 +736,4 @@ private void openWebUrl(String url) {
             Toast.makeText(getContext(), R.string.warning_unable_to_open_web_url, Toast.LENGTH_LONG).show();
         }
     }
-}
+}

Android/src/org/droidplanner/android/graphic/map/GraphicDrone.java

@@ -1,6 +1,10 @@
 package org.droidplanner.android.graphic.map;
 
+import android.content.Context;
+import android.content.SharedPreferences;
+import com.o3dr.services.android.lib.drone.property.Type;
 import org.droidplanner.android.R;
+import org.droidplanner.android.fragments.SettingsFragment;
 import org.droidplanner.android.maps.MarkerInfo;
 
 import android.content.res.Resources;
@@ -16,11 +20,18 @@
 public class GraphicDrone extends MarkerInfo {
 
 	private Drone drone;
+	private SharedPreferences preferences;
 
 	public GraphicDrone(Drone drone) {
 		this.drone = drone;
 	}
 
+	public GraphicDrone(Drone drone, Context context) {
+		this.drone = drone;
+		preferences = context.getSharedPreferences
+				("towerPrefsKey", android.content.Context.MODE_PRIVATE);
+	}
+
 	@Override
 	public float getAnchorU() {
 		return 0.5f;
@@ -39,11 +50,17 @@ public LatLong getPosition() {
 
 	@Override
 	public Bitmap getIcon(Resources res) {
+		boolean showVehicleSpecificIcons = preferences.getBoolean
+				(SettingsFragment.VEHICLE_SPECIFIC_ICON_PREF_KEY, false);
 		if (drone.isConnected()) {
-			return BitmapFactory.decodeResource(res, R.drawable.quad);
+			if(showVehicleSpecificIcons) {
+				Type droneType = drone.getAttribute(AttributeType.TYPE);
+				return BitmapFactory.decodeResource(res, updateIcon(droneType));
+			} else {
+				return BitmapFactory.decodeResource(res, R.drawable.quad);
+			}
 		}
 		return BitmapFactory.decodeResource(res, R.drawable.quad_disconnect);
-
 	}
 
 	@Override
@@ -66,4 +83,27 @@ public boolean isValid() {
         Gps droneGps = drone.getAttribute(AttributeType.GPS);
 		return droneGps != null && droneGps.isValid();
 	}
-}
+
+	private int updateIcon(Type droneType) {
+		int drawable;
+		switch (droneType.getDroneType()) {
+			case Type.TYPE_COPTER:
+				drawable = R.drawable.redcopter;
+				break;
+
+			case Type.TYPE_PLANE:
+				drawable = R.drawable.redplane;
+				break;
+
+			case Type.TYPE_ROVER:
+				drawable = R.drawable.redrover;
+				break;
+
+			case Type.TYPE_UNKNOWN:
+			default:
+				drawable = R.drawable.quad;
+				break;
+		}
+		return drawable;
+	}
+}

Android/src/org/droidplanner/android/utils/prefs/DroidPlannerPrefs.java

@@ -110,6 +110,8 @@ public class DroidPlannerPrefs {
     public static final String PREF_ENABLE_KILL_SWITCH = "pref_enable_kill_switch";
     private static final boolean DEFAULT_ENABLE_KILL_SWITCH = false;
 
+    public static final String PREF_ENABLE_VEHICLE_SPECIFIC_ICONS = "pref_enable_vehicle_specific_icons";
+
     public static final String PREF_ENABLE_UDP_PING = "pref_enable_udp_server_ping";
     private static final boolean DEFAULT_ENABLE_UDP_PING = false;