Merge branch 'master' into release

DroidPlanner · Feb 25, 2014 · 1fd0b41 · 1fd0b41
2 parents b5105f3 + 8e5e73e
commit 1fd0b41
Show file tree

Hide file tree

Showing 44 changed files with 976 additions and 232 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,19 @@
+# DroidPlanner ChangeLog
+Our convention for release control is the following (for a release like DPvA.B.C_RCx):
+* A - Main version, changes just with big changes in the app structure or/and layout
+* B - Minor version, add's some significant feature to the app
+* C - Minor changes with bugfixes, or small refactorings, from previous "A" or "B" changes.
+* x - Releases Candidates (RC) are build from the main releases, but may have some feature's disabled. The "x" is used if multiple RC are needed for a new version of the app.
+
+All the changes are logged below (preferable with the pull request numbers in parenteses):
+
+# Releases
+## Droidplanner v2.2.1
+* Fix errors in Land, Takeoff and RTH mission items (#655)
+* German Translation and Language Selector in settings (#650)
+* Fix Gradle build (#648)
+* Starting to add unit testing to the code (#646)
+
 ## Droidplanner v2.2.0
 * Added support for phones (#618)
 * Fixing typos and whitespaces on strings.xml (#640)

diff --git a/DroidPlanner/AndroidManifest.xml b/DroidPlanner/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.droidplanner"
-          android:versionCode="61"
+          android:versionCode="62"
           android:versionName="please run version.sh to get the version name">
 
     <uses-sdk

diff --git a/DroidPlanner/build.gradle b/DroidPlanner/build.gradle
@@ -34,9 +34,5 @@ android {
         debug.setRoot('build-types/debug')
         release.setRoot('build-types/release')
     }
-    signingConfigs {
-        debug {
-            storeFile file('/home/fhuya/.android/debug.keystore')
-        }
-    }
+
 }
diff --git a/DroidPlanner/res/layout-land/fragment_mission_control.xml b/DroidPlanner/res/layout-land/fragment_mission_control.xml
@@ -16,7 +16,7 @@
 	    android:drawableTop="@drawable/ic_control"
 		android:visibility="gone"
         android:layout_weight="1"
-	    android:text="Control" />
+	    android:text="@string/mission_control_control" />
 
 	<Button
 	    android:id="@+id/mc_planningBtn"
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
 	    android:drawableTop="@drawable/ic_edit"
         android:layout_weight="1"
-	    android:text="Edit" />
+	    android:text="@string/mission_control_edit" />
 
 
 	<Button
@@ -35,7 +35,7 @@
         android:layout_height="wrap_content"
 	    android:drawableTop="@drawable/ic_home"
         android:layout_weight="1"
-	    android:text="Home" />
+	    android:text="@string/mission_control_home" />
 
 
 	<Button
@@ -44,7 +44,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 	    android:drawableTop="@drawable/ic_land"
-	    android:text="Land"
+	    android:text="@string/mission_control_land"
         android:layout_weight="1"
 	    tools:ignore="ContentDescription" />
 
@@ -54,7 +54,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 	    android:drawableTop="@drawable/ic_takeoff"
-	    android:text="Takeoff"
+	    android:text="@string/mission_control_takeoff"
 		android:visibility="gone"
         android:layout_weight="1"
 	    tools:ignore="ContentDescription" />
@@ -65,7 +65,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 	    android:drawableTop="@drawable/ic_loiter"
-	    android:text="Loiter"
+	    android:text="@string/mission_control_loiter"
         android:layout_weight="1"
 	    tools:ignore="ContentDescription" />
 
@@ -75,7 +75,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 	    android:drawableTop="@drawable/ic_follow"
-	    android:text="Follow"
+	    android:text="@string/mission_control_follow"
         android:layout_weight="1"
 	    tools:ignore="ContentDescription" />
 

diff --git a/DroidPlanner/res/layout-port/fragment_mission_control.xml b/DroidPlanner/res/layout-port/fragment_mission_control.xml
@@ -16,7 +16,7 @@
 	    android:drawableTop="@drawable/ic_control"
 		android:visibility="gone"
         android:layout_weight="1"
-	    android:text="Control" />
+	    android:text="@string/mission_control_control" />
 
 	<Button
 	    android:id="@+id/mc_planningBtn"
@@ -25,7 +25,7 @@
 	    android:layout_height="wrap_content"
 	    android:drawableTop="@drawable/ic_edit"
         android:layout_weight="1"
-	    android:text="Edit" />
+	    android:text="@string/mission_control_edit" />
 
 
 	<Button
@@ -35,7 +35,7 @@
         android:layout_height="wrap_content"
 	    android:drawableTop="@drawable/ic_home"
         android:layout_weight="1"
-	    android:text="Home" />
+	    android:text="@string/mission_control_home" />
 
 
 	<Button
@@ -44,7 +44,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 	    android:drawableTop="@drawable/ic_land"
-	    android:text="Land"
+	    android:text="@string/mission_control_land"
         android:layout_weight="1"
 	    tools:ignore="ContentDescription" />
 
@@ -54,7 +54,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 	    android:drawableTop="@drawable/ic_takeoff"
-	    android:text="Takeoff"
+	    android:text="@string/mission_control_takeoff"
 		android:visibility="gone"
         android:layout_weight="1"
 	    tools:ignore="ContentDescription" />
@@ -65,7 +65,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 	    android:drawableTop="@drawable/ic_loiter"
-	    android:text="Loiter"
+	    android:text="@string/mission_control_loiter"
         android:layout_weight="1"
 	    tools:ignore="ContentDescription" />
 
@@ -75,7 +75,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 	    android:drawableTop="@drawable/ic_follow"
-	    android:text="Follow"
+	    android:text="@string/mission_control_follow"
         android:layout_weight="1"
 	    tools:ignore="ContentDescription" />
 

diff --git a/...nner/res/layout-port/fragment_tunning.xml → ...anner/res/layout-port/fragment_tuning.xml b/...nner/res/layout-port/fragment_tunning.xml → ...anner/res/layout-port/fragment_tuning.xml
diff --git a/DroidPlanner/res/layout-sw540dp/activity_editor.xml b/DroidPlanner/res/layout-sw540dp/activity_editor.xml
@@ -18,7 +18,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:text="Distance: 200m, Flight time: 3:30s"
+        android:text="@string/editor_info_window"
 		style="@style/editorMissionOverviewText"
         />
 

diff --git a/DroidPlanner/res/layout-sw540dp/fragment_mission_control.xml b/DroidPlanner/res/layout-sw540dp/fragment_mission_control.xml
@@ -15,7 +15,7 @@
 	    android:drawableTop="@drawable/ic_control"
 		android:visibility="gone"
         android:layout_weight="1"
-	    android:text="Control" />
+	    android:text="@string/mission_control_control" />
 
 	<Button
 	    android:id="@+id/mc_planningBtn"
@@ -24,7 +24,7 @@
 	    android:layout_height="match_parent"
 	    android:drawableTop="@drawable/ic_edit"
         android:layout_weight="1"
-	    android:text="Edit" />
+	    android:text="@string/mission_control_edit" />
 
 
 	<Button
@@ -34,7 +34,7 @@
 	    android:layout_height="match_parent"
 	    android:drawableTop="@drawable/ic_home"
         android:layout_weight="1"
-	    android:text="Home" />
+	    android:text="@string/mission_control_home" />
 
 
 	<Button
@@ -43,7 +43,7 @@
 	    android:layout_width="75dp"
 	    android:layout_height="match_parent"
 	    android:drawableTop="@drawable/ic_land"
-	    android:text="Land"
+	    android:text="@string/mission_control_land"
         android:layout_weight="1"
 	    tools:ignore="ContentDescription" />
 
@@ -53,7 +53,7 @@
 	    android:layout_width="75dp"
 	    android:layout_height="match_parent"
 	    android:drawableTop="@drawable/ic_takeoff"
-	    android:text="Takeoff"
+	    android:text="@string/mission_control_takeoff"
 		android:visibility="gone"
         android:layout_weight="1"
 	    tools:ignore="ContentDescription" />
@@ -64,7 +64,7 @@
 	    android:layout_width="75dp"
 	    android:layout_height="match_parent"
 	    android:drawableTop="@drawable/ic_loiter"
-	    android:text="Loiter"
+	    android:text="@string/mission_control_loiter"
         android:layout_weight="1"
 	    tools:ignore="ContentDescription" />
 
@@ -74,7 +74,7 @@
 	    android:layout_width="75dp"
 	    android:layout_height="match_parent"
 	    android:drawableTop="@drawable/ic_follow"
-	    android:text="Follow"
+	    android:text="@string/mission_control_follow"
         android:layout_weight="1"
 	    tools:ignore="ContentDescription" />
 

diff --git a/DroidPlanner/res/layout/activity_editor.xml b/DroidPlanner/res/layout/activity_editor.xml
@@ -18,7 +18,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:text="Distance: 200m, Flight time: 3:30s"
+        android:text="@string/editor_info_window"
 		style="@style/editorMissionOverviewText"
         />
 

diff --git a/DroidPlanner/res/layout/fragment_editor_detail_land.xml b/DroidPlanner/res/layout/fragment_editor_detail_land.xml
@@ -54,7 +54,8 @@
 				android:layout_marginLeft="12dp"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="LAND" />
+				android:text="@string/waypointType_Land"
+                android:textAllCaps="true" />
 
 			<TextView
 				android:id="@+id/DistanceLabel"
@@ -63,13 +64,14 @@
 				android:layout_below="@id/WaypointType"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="Distance to home " />
+				android:text="@string/distance_to_home" />
 
 			<TextView
 				android:id="@+id/DistanceValue"
 				style="@style/missionHeaderValue"
 				android:layout_toRightOf="@id/DistanceLabel"
 				android:layout_alignBaseline="@id/DistanceLabel"
+                android:layout_marginLeft="12dp"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="20m" />

diff --git a/DroidPlanner/res/layout/fragment_editor_detail_loitern.xml b/DroidPlanner/res/layout/fragment_editor_detail_loitern.xml
@@ -55,7 +55,8 @@
 				android:layout_marginLeft="12dp"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="CIRCLE" />
+				android:text="@string/waypointType_Circle"
+                android:textAllCaps="true" />
 
 			<TextView
 				android:id="@+id/DistanceLabel"
@@ -64,13 +65,14 @@
 				android:layout_below="@id/WaypointType"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="Distance to home " />
+				android:text="@string/distance_to_home" />
 
 			<TextView
 				android:id="@+id/DistanceValue"
 				style="@style/missionHeaderValue"
 				android:layout_toRightOf="@id/DistanceLabel"
 				android:layout_alignBaseline="@id/DistanceLabel"
+                android:layout_marginLeft="12dp"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="20m" />

diff --git a/DroidPlanner/res/layout/fragment_editor_detail_loitert.xml b/DroidPlanner/res/layout/fragment_editor_detail_loitert.xml
@@ -55,7 +55,8 @@
 				android:layout_marginLeft="12dp"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="LOITER" />
+				android:text="@string/waypointType_Loiter"
+                android:textAllCaps="true" />
 
 			<TextView
 				android:id="@+id/DistanceLabel"
@@ -64,13 +65,14 @@
 				android:layout_below="@id/WaypointType"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="Distance to home " />
+				android:text="@string/distance_to_home" />
 
 			<TextView
 				android:id="@+id/DistanceValue"
 				style="@style/missionHeaderValue"
 				android:layout_toRightOf="@id/DistanceLabel"
 				android:layout_alignBaseline="@id/DistanceLabel"
+                android:layout_marginLeft="12dp"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="20m" />

diff --git a/DroidPlanner/res/layout/fragment_editor_detail_roi.xml b/DroidPlanner/res/layout/fragment_editor_detail_roi.xml
@@ -55,7 +55,8 @@
 				android:layout_marginLeft="12dp"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="Region of Interest" />
+				android:text="@string/waypointType_ROI"
+                android:textAllCaps="true" />
 
 			<TextView
 				android:id="@+id/DistanceLabel"

diff --git a/DroidPlanner/res/layout/fragment_editor_detail_rtl.xml b/DroidPlanner/res/layout/fragment_editor_detail_rtl.xml
@@ -55,7 +55,8 @@
 				android:layout_marginLeft="12dp"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="RETURN TO LAUNCH" />
+				android:text="@string/waypointType_RTL"
+                android:textAllCaps="true" />
 
 			<TextView
 				android:id="@+id/DistanceLabel"
@@ -64,13 +65,14 @@
 				android:layout_below="@id/WaypointType"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="Distance to home " />
+				android:text="@string/distance_to_home" />
 
 			<TextView
 				android:id="@+id/DistanceValue"
 				style="@style/missionHeaderValue"
 				android:layout_toRightOf="@id/DistanceLabel"
 				android:layout_alignBaseline="@id/DistanceLabel"
+                android:layout_marginLeft="12dp"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="20m" />

diff --git a/DroidPlanner/res/layout/fragment_editor_detail_survey.xml b/DroidPlanner/res/layout/fragment_editor_detail_survey.xml
@@ -53,7 +53,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="12dp"
-                android:text="Survey Polygon" />
+                android:text="@string/waypointType_Survey"
+                android:textAllCaps="true" />
 
             <TextView
                 android:id="@+id/DistanceLabel"
@@ -62,11 +63,12 @@
                 android:layout_height="wrap_content"
                 android:layout_alignLeft="@id/WaypointType"
                 android:layout_below="@id/WaypointType"
-                android:text="Area " />
+                android:text="@string/area" />
 
             <TextView
                 android:id="@+id/DistanceValue"
                 style="@style/missionHeaderValue"
+                android:layout_marginLeft="12dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignBaseline="@id/DistanceLabel"