added visual cue to the editor mission items list when in delete mode.

DroidPlanner · Jan 28, 2015 · 217b46b · 217b46b
1 parent 27c3ec0
commit 217b46b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/Android/build.gradle b/Android/build.gradle
@@ -28,7 +28,7 @@ android {
         applicationId 'org.droidplanner.android'
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 30015
+        versionCode 30016
         versionName getGitVersion()
     }
 

diff --git a/Android/res/drawable/button_mission_default.xml b/Android/res/drawable/button_mission_default.xml
@@ -3,7 +3,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <corners android:radius="4dp" />
+    <corners android:radius="2dp" />
     <gradient
         android:startColor="#ff007845"
         android:endColor="#ff55aa89"

diff --git a/Android/res/drawable/button_mission_selected.xml b/Android/res/drawable/button_mission_selected.xml
@@ -3,7 +3,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <corners android:radius="4dp" />
+    <corners android:radius="2dp" />
     <gradient
         android:startColor="#ff0058c1"
         android:endColor="#ff0096d8"

diff --git a/Android/res/layout/fragment_editor_list_item.xml b/Android/res/layout/fragment_editor_list_item.xml
@@ -18,8 +18,6 @@ Used to Style the horizontal list of mission items.
     android:layout_marginBottom="1dp"
     android:layout_marginLeft="2dp"
     android:layout_marginStart="2dp"
-    android:layout_marginRight="2dp"
-    android:layout_marginEnd="2dp"
     >
 
     <TextView

diff --git a/Android/src/org/droidplanner/android/activities/EditorActivity.java b/Android/src/org/droidplanner/android/activities/EditorActivity.java
@@ -30,6 +30,7 @@
 import org.droidplanner.android.dialogs.EditInputDialog;
 import org.droidplanner.android.dialogs.openfile.OpenFileDialog;
 import org.droidplanner.android.dialogs.openfile.OpenMissionDialog;
+import org.droidplanner.android.fragments.EditorListFragment;
 import org.droidplanner.android.fragments.EditorMapFragment;
 import org.droidplanner.android.fragments.EditorToolsFragment;
 import org.droidplanner.android.fragments.EditorToolsFragment.EditorTools;
@@ -111,6 +112,7 @@ public void onReceive(Context context, Intent intent) {
 
     private View mLocationButtonsContainer;
     private ImageButton itemDetailToggle;
+    private EditorListFragment editorListFragment;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -121,6 +123,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         gestureMapFragment = ((GestureMapFragment) fragmentManager.findFragmentById(R.id.gestureMapFragment));
         editorToolsFragment = (EditorToolsFragment) fragmentManager.findFragmentById(R.id.editor_tools_fragment);
+        editorListFragment = (EditorListFragment) fragmentManager.findFragmentById(R.id.mission_list_fragment);
 
         infoView = (TextView) findViewById(R.id.editorInfoWindow);
 
@@ -410,7 +413,9 @@ public void skipMarkerClickEvents(boolean skip) {
     }
 
     private void setupTool() {
-        getToolImpl().setup();
+        final EditorToolsFragment.EditorToolsImpl toolImpl = getToolImpl();
+        toolImpl.setup();
+        editorListFragment.enableDeleteMode(toolImpl.getEditorTools() == EditorTools.TRASH);
     }
 
     @Override
@@ -505,7 +510,7 @@ public void onItemClick(MissionItemProxy item, boolean zoomToFit) {
     }
 
     @Override
-    public void zoomToFitSelected(){
+    public void zoomToFitSelected() {
         final EditorMapFragment planningMapFragment = gestureMapFragment.getMapFragment();
         List<MissionItemProxy> selected = missionProxy.selection.getSelected();
         if (selected.isEmpty()) {

diff --git a/Android/src/org/droidplanner/android/fragments/EditorListFragment.java b/Android/src/org/droidplanner/android/fragments/EditorListFragment.java
@@ -74,6 +74,13 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
 
     }
 
+    public void enableDeleteMode(boolean isEnabled){
+        if(isEnabled)
+            recyclerView.setBackgroundResource(android.R.color.holo_red_light);
+        else
+            recyclerView.setBackgroundResource(R.color.editor_bar);
+    }
+
     @Override
     public void onStart() {
         super.onStart();

diff --git a/Android/src/org/droidplanner/android/utils/unit/UnitManager.java b/Android/src/org/droidplanner/android/utils/unit/UnitManager.java
@@ -14,8 +14,6 @@
  */
 public class UnitManager {
 
-    private static final UnitSystem unitSystem = new MetricUnitSystem();
-
     private static DroidPlannerPrefs dpPrefs;
     private static MetricUnitSystem metricUnitSystem;
     private static ImperialUnitSystem imperialUnitSystem;