Skip to content

Commit 72bd827

Browse files
arthurbenemannarthurbenemann
committed
Merge branch 'master' into beta
Conflicts: Android/AndroidManifest.xml Android/src/org/droidplanner/android/activities/ConfigurationActivity.java Android/src/org/droidplanner/android/activities/EditorActivity.java
2 parents 660faef + 7f71cc0 commit 72bd827

File tree

248 files changed

+2840
-2711
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

248 files changed

+2840
-2711
lines changed

‎.eclipse.formatter.xml‎

Lines changed: 291 additions & 0 deletions
Large diffs are not rendered by default.

‎Android/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
package="org.droidplanner"
5-
android:versionCode="84"
5+
android:versionCode="85"
66
android:versionName="please run version.sh to get the version name">
77

88
<uses-sdk

‎Android/libs/droneapi-java.jar‎

-35 Bytes
Binary file not shown.

‎Android/res/drawable/action_texture.xml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎Android/res/layout/droneshare_account.xml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent"
5+
android:orientation="vertical"
6+
android:padding="10dp" >
7+
8+
<TextView
9+
android:id="@+id/dsHeaderNormal"
10+
android:layout_width="wrap_content"
11+
android:layout_height="wrap_content"
12+
android:text="@string/dsinfo"
13+
android:textAppearance="?android:attr/textAppearanceMedium"
14+
android:visibility="gone" />
15+
16+
<TextView
17+
android:id="@+id/dsHeaderAlert"
18+
android:layout_width="wrap_content"
19+
android:layout_height="wrap_content"
20+
android:autoLink="web"
21+
android:text="@string/dsheader"
22+
android:textAppearance="?android:attr/textAppearanceMedium" />
23+
24+
<RadioGroup
25+
android:id="@+id/pickAccount"
26+
android:layout_width="wrap_content"
27+
android:layout_height="wrap_content"
28+
android:paddingLeft="10dp"
29+
android:paddingTop="10dp" >
30+
31+
<RadioButton
32+
android:id="@+id/radioCreateNew"
33+
android:layout_width="wrap_content"
34+
android:layout_height="wrap_content"
35+
android:checked="true"
36+
android:text="@string/create_a_new_account" />
37+
38+
<RadioButton
39+
android:id="@+id/radioLoginExisting"
40+
android:layout_width="wrap_content"
41+
android:layout_height="wrap_content"
42+
android:text="@string/login_to_an_existing_account" />
43+
44+
<RadioButton
45+
android:id="@+id/radioNoDroneshare"
46+
android:layout_width="wrap_content"
47+
android:layout_height="wrap_content"
48+
android:text="@string/do_not_use_droneshare" />
49+
50+
</RadioGroup>
51+
52+
<EditText
53+
android:id="@+id/username"
54+
android:layout_width="match_parent"
55+
android:layout_height="wrap_content"
56+
android:hint="@string/username"
57+
android:inputType="textEmailAddress"
58+
android:paddingTop="15dp" />
59+
60+
<EditText
61+
android:id="@+id/password"
62+
android:layout_width="match_parent"
63+
android:layout_height="wrap_content"
64+
android:hint="@string/password"
65+
android:inputType="textPassword"
66+
android:paddingTop="15dp" />
67+
68+
<EditText
69+
android:id="@+id/email"
70+
android:layout_width="match_parent"
71+
android:layout_height="wrap_content"
72+
android:hint="@string/email_address"
73+
android:inputType="textEmailAddress"
74+
android:paddingTop="15dp" >
75+
76+
<requestFocus />
77+
</EditText>
78+
79+
</LinearLayout>

‎Android/res/layout/fragment_telemetry.xml‎

Lines changed: 29 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -11,87 +11,72 @@
1111
android:layout_width="wrap_content"
1212
android:layout_height="wrap_content"
1313
android:layout_gravity="center_horizontal"
14-
android:paddingLeft="5dp"
15-
android:paddingRight="5dp"
16-
android:paddingBottom="5dp"
17-
android:paddingTop="5dp">
14+
android:paddingLeft="1dp"
15+
android:paddingRight="1dp"
16+
android:paddingBottom="1dp"
17+
android:paddingTop="2dp">
1818

1919
<TextView
20-
android:id="@+id/rollValueText"
20+
android:id="@+id/yawValueText"
2121
style="@style/RPYtextLabels"
22-
android:layout_width="70dp"
22+
android:layout_width="55dp"
2323
android:layout_height="wrap_content"
2424
android:layout_alignParentLeft="true"
2525
android:layout_alignParentStart="true"
2626
android:layout_marginBottom="3dp"
27-
android:drawableLeft="@drawable/roll_icon"
2827
android:background="@drawable/round_rect_bg"
29-
android:paddingTop="1dp"
30-
android:paddingBottom="1dp"
31-
android:paddingRight="10dp"
32-
android:paddingEnd="10dp"
33-
android:paddingLeft="1dp"
34-
android:paddingStart="1dp"
28+
android:drawableLeft="@drawable/yaw_icon"
29+
android:focusable="true"
30+
android:gravity="left|center_vertical"
3531
android:text="@string/default_angle_value"
36-
android:drawablePadding="2dp"
37-
android:textSize="16sp"/>
32+
android:textSize="16sp" />
3833

3934
<TextView
4035
android:id="@+id/pitchValueText"
4136
style="@style/RPYtextLabels"
42-
android:layout_width="70dp"
37+
android:layout_width="55dp"
4338
android:layout_height="wrap_content"
39+
android:layout_alignLeft="@+id/yawValueText"
40+
android:layout_alignStart="@+id/yawValueText"
41+
android:layout_below="@+id/yawValueText"
4442
android:layout_marginBottom="3dp"
45-
android:layout_alignLeft="@+id/rollValueText"
46-
android:layout_alignStart="@+id/rollValueText"
47-
android:layout_below="@+id/rollValueText"
48-
android:drawableLeft="@drawable/pitch_icon"
4943
android:background="@drawable/round_rect_bg"
50-
android:paddingTop="1dp"
51-
android:paddingBottom="1dp"
52-
android:paddingRight="10dp"
53-
android:paddingEnd="10dp"
54-
android:paddingLeft="1dp"
55-
android:paddingStart="1dp"
44+
android:drawableLeft="@drawable/pitch_icon"
5645
android:drawablePadding="2dp"
46+
android:gravity="left|center_vertical"
5747
android:text="@string/default_angle_value"
58-
android:textSize="16sp"/>
48+
android:textSize="16sp" />
5949

6050
<TextView
61-
android:id="@+id/yawValueText"
51+
android:id="@+id/rollValueText"
6252
style="@style/RPYtextLabels"
63-
android:layout_width="70dp"
53+
android:layout_width="55dp"
6454
android:layout_height="wrap_content"
65-
android:layout_marginBottom="3dp"
66-
android:layout_alignLeft="@+id/rollValueText"
67-
android:layout_alignStart="@+id/rollValueText"
55+
android:layout_alignLeft="@+id/pitchValueText"
56+
android:layout_alignStart="@+id/pitchValueText"
6857
android:layout_below="@+id/pitchValueText"
69-
android:drawableLeft="@drawable/yaw_icon"
58+
android:layout_marginBottom="3dp"
7059
android:background="@drawable/round_rect_bg"
71-
android:paddingTop="1dp"
72-
android:paddingBottom="1dp"
73-
android:paddingRight="10dp"
74-
android:paddingEnd="10dp"
75-
android:paddingLeft="1dp"
76-
android:paddingStart="1dp"
60+
android:drawableLeft="@drawable/roll_icon"
7761
android:drawablePadding="2dp"
62+
android:gravity="left|center_vertical"
7863
android:text="@string/default_angle_value"
79-
android:textSize="16sp"/>
64+
android:textSize="16sp" />
8065

8166
<org.droidplanner.android.widgets.AttitudeIndicator
8267
android:id="@+id/aiView"
8368
android:layout_width="80dp"
8469
android:layout_height="80dp"
85-
android:layout_toRightOf="@+id/rollValueText"
86-
android:layout_alignTop="@+id/rollValueText"
87-
android:layout_alignBottom="@+id/yawValueText"
70+
android:layout_toRightOf="@+id/yawValueText"
71+
android:layout_alignTop="@+id/yawValueText"
72+
android:layout_alignBottom="@+id/rollValueText"
8873
tools:ignore="ContentDescription"/>
8974

9075
<!-- ************** GROUND SPEED ********************* -->
9176

9277
<RelativeLayout
9378
android:id="@+id/ground_speed_layout"
94-
android:layout_below="@+id/yawValueText"
79+
android:layout_below="@+id/rollValueText"
9580
android:layout_marginBottom="3dp"
9681
android:layout_width="wrap_content"
9782
android:layout_height="wrap_content"

‎Android/res/menu/menu_mission.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
3+
<item
4+
android:id="@+id/menu_zoom_fit_mission"
5+
android:showAsAction="never"
6+
android:title="@string/zoom_fit"/>
7+
<item
8+
android:id="@+id/menu_open_mission"
9+
android:showAsAction="never"
10+
android:title="@string/open_mission_file"/>
11+
<item
12+
android:id="@+id/menu_save_mission"
13+
android:showAsAction="never"
14+
android:title="@string/save_mission_file"/>
15+
</menu>

‎Android/res/values/dimens.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<!-- Dimension for the telemetry ui elements -->
4-
<dimen name="largeTelemetryTextSize">30sp</dimen>
4+
<dimen name="largeTelemetryTextSize">18sp</dimen>
55

66
<!-- Dimension for the flight control buttons -->
77
<dimen name="flightControlMargin">0dp</dimen>

‎Android/res/values/preferences_keys.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,7 @@ This file is used to store the preferences keys so that it's accessible and modi
3232
<string name="pref_pebble_install_key">pref_pebble_install_key</string>
3333
<string name="pref_keep_screen_bright_key">pref_keep_screen_bright</string>
3434
<string name="pref_permanent_notification_key">pref_permanent_notification</string>
35+
<string name="pref_ui_gps_hdop_key">pref_ui_gps_hdop</string>
36+
<string name="pref_ui_language_english_key">pref_ui_language_english</string>
37+
<string name="pref_drone_settings_key">pref_drone_settings</string>
3538
</resources>

‎Android/res/values/strings.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,11 +387,30 @@
387387
<string name="pref_permanent_notification_title">Enable permanent notification</string>
388388
<string name="pref_permanent_notification_summary">Enable to make status bar notification permanent when connected.</string>
389389

390+
<string name="zoom_fit">Zoom to Fit</string>
391+
<string name="open_mission_file">Open Mission File</string>
392+
<string name="save_mission_file">Save Mission File</string>
393+
390394
<string name="pref_bluetooth">BLUETOOTH CONNECTION</string>
391395
<string name="pref_bluetooth_device_address">Bluetooth device</string>
392396
<string name="pref_forget_bluetooth_device_address">Forget default device</string>
393397
<string name="pref_forget_bluetooth_device_address_confirm">Are you sure?</string>
394398
<string name="pref_bluetooth_forget">Forget</string>
399+
395400
<string name="pref_ui_gps_hdop_summary">Display HDOP instead of FIX in satellite info bar item</string>
396401
<string name="pref_ui_gps_hdop_title">Display Satellite HDOP</string>
402+
<string name="dsheader">Would you be interested in using the free www.droneshare.com service?</string>
403+
<string name="dsinfo">Droneshare is a free webservice which allows you to analyze and optionally share flights.</string>
404+
<string name="create_a_new_account">Create a new account</string>
405+
<string name="login_to_an_existing_account">Login to an existing account</string>
406+
<string name="username">Username</string>
407+
<string name="password">Password</string>
408+
<string name="do_not_use_droneshare">Do not use droneshare</string>
409+
<string name="email_address">Email address</string>
410+
<string name="droneshare_password">Droneshare password</string>
411+
<string name="enter_or_pick_a_password">Enter or pick a password</string>
412+
<string name="if_that_user_does_not_exist_it_will_be_created">If that user does not exist, it will be created</string>
413+
<string name="droneshare_username">Droneshare username</string>
414+
<string name="droneshare_enabled">Droneshare enabled</string>
415+
<string name="do_you_want_to_use_droneshare_">Do you want to use droneshare?</string>
397416
</resources>

0 commit comments

Comments
 (0)