Merge pull request #1159 from ne0fhyk/fix_issue_1123

Fix issue 1123

Android/res/layout/fragment_editor_detail_circle.xml

@@ -2,7 +2,6 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:custom="http://schemas.android.com/apk/res-auto"
     style="@style/missionItemDetailLayout"
     >
     <org.droidplanner.android.widgets.spinners.SpinnerSelfSelect
@@ -116,7 +115,7 @@
                 android:id="@+id/loiterRadiusPicker"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/loiter_radius"
+                android:text="@string/circle_radius"
                 style="@style/missionItemDetailCard"/>
 
             <org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView

Android/res/layout/fragment_editor_detail_generic.xml

@@ -1,46 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/opaque_white"
-    android:orientation="vertical" >
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/missionItemDetailLayout">
 
     <org.droidplanner.android.widgets.spinners.SpinnerSelfSelect
         android:id="@+id/spinnerWaypointType"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
-        android:entries="@array/ExampleWaypointType" />
+        android:layout_alignParentTop="true"
+        android:entries="@array/ExampleWaypointType"/>
 
-    <ScrollView
-        android:id="@+id/scrollView1"
+    <TextView
+        android:id="@+id/WaypointType"
+        style="@style/missionHeaderTitle"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="64dp"
+        android:layout_alignParentTop="true"
+        android:layout_centerVertical="true"
+        android:gravity="center_vertical"
+        android:paddingLeft="25dp"
+        android:paddingRight="25dp"
+        android:background="@drawable/wp_title_rectangle"
+        android:text="Select Waypoint Type"
+        android:textAllCaps="true"/>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <org.droidplanner.android.widgets.SeekBarWithText.SeekBarWithText
-                android:id="@+id/altitudeView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="2dp"
-                custom:inc="1"
-                custom:max="200"
-                custom:min="0"
-                custom:title="@string/waypoint_altitude"
-                custom:unit="m" >
-            </org.droidplanner.android.widgets.SeekBarWithText.SeekBarWithText>
+    <ImageView
+        android:id="@+id/menuHint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignBottom="@id/WaypointType"
+        android:src="@drawable/ic_menu_hint"
+        android:layout_margin="10dp"
+        />
 
-            <TextView
-                android:id="@+id/textView1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/waypointInfo_Generic" />
-        </LinearLayout>
-    </ScrollView>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/WaypointType"
+        style="@style/ModeDetailText"
+        android:background="@drawable/mode_desc_rectangle"
+        android:text="Click on the spinner to select a type for the selected waypoints."/>
 
-</LinearLayout>
+</RelativeLayout>

Android/res/layout/fragment_editor_detail_waypoint.xml

@@ -98,7 +98,7 @@
             android:orientation="vertical" >
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/ModeDetailText"
                 android:background="@drawable/mode_desc_rectangle"

Android/res/menu/action_mode_editor.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/menu_action_multi_edit"
+        android:title="@string/menu_action_multi_edit"
+        android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_copy"/>
+
+    <item
+        android:id="@+id/menu_action_reverse"
+        android:title="@string/menu_action_reverse"
+        android:icon="@drawable/ic_action_playback_schuffle"
+        android:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/menu_action_delete"
+        android:title="@string/menu_action_delete"
+        android:icon="@drawable/ic_action_trash"
+        android:showAsAction="ifRoom"/>
+
+</menu>

Android/res/values/strings.xml

@@ -209,6 +209,7 @@
     <string name="waypoint_delay">Delay before next waypoint</string>
     <string name="loiter_radius">Loiter Radius</string>
     <string name="loiter_ccw">CCW</string>
+    <string name="circle_radius">Circle Radius</string>
     <string name="waypoint_altitude">Altitude</string>
     <string name="waypoint_angle">Yaw Angle</string>
     <string name="waypoint_finalaltitude">Target Altitude</string>
@@ -483,5 +484,8 @@
     <string name="dialog_confirm_arming_title">Arm propellers?</string>
     <string name="dialog_confirm_arming_msg">Warning! Propellers will spin and drone may begin to fly.</string>
     <string name="radius_label">Radius</string>
+    <string name="menu_action_delete">Delete</string>
+    <string name="menu_action_reverse">Reverse</string>
+    <string name="menu_action_multi_edit">Multi-Edit</string>
 
 </resources>