Skip to content

Commit

Permalink
Revert "UI Action bar cleanup"
Browse files Browse the repository at this point in the history
  • Loading branch information
arthurbenemann committed Oct 27, 2014
1 parent dcf1988 commit 0c6e44c
Show file tree
Hide file tree
Showing 67 changed files with 1,755 additions and 999 deletions.
Binary file removed Android/res/drawable-hdpi/ic_action_laptop.png
Binary file not shown.
Binary file removed Android/res/drawable-hdpi/ic_editor_draw_black.png
Binary file not shown.
Binary file removed Android/res/drawable-hdpi/ic_editor_poly_black.png
Binary file not shown.
Binary file removed Android/res/drawable-hdpi/ic_editor_trash_black.png
Binary file not shown.
Binary file removed Android/res/drawable-hdpi/ic_editor_wp_black.png
Binary file not shown.
Binary file removed Android/res/drawable-mdpi/ic_action_laptop.png
Binary file not shown.
Binary file removed Android/res/drawable-mdpi/ic_editor_draw_black.png
Binary file not shown.
Binary file removed Android/res/drawable-mdpi/ic_editor_poly_black.png
Binary file not shown.
Binary file removed Android/res/drawable-mdpi/ic_editor_trash_black.png
Binary file not shown.
Binary file removed Android/res/drawable-mdpi/ic_editor_wp_black.png
Binary file not shown.
Binary file removed Android/res/drawable-xhdpi/ic_action_laptop.png
Binary file not shown.
Binary file removed Android/res/drawable-xhdpi/ic_editor_draw_black.png
Binary file not shown.
Binary file removed Android/res/drawable-xhdpi/ic_editor_poly_black.png
Binary file not shown.
Binary file removed Android/res/drawable-xhdpi/ic_editor_trash_black.png
Binary file not shown.
Binary file removed Android/res/drawable-xhdpi/ic_editor_wp_black.png
Binary file not shown.
Binary file removed Android/res/drawable-xxhdpi/ic_action_laptop.png
Binary file not shown.
205 changes: 205 additions & 0 deletions Android/res/layout-port/fragment_tuning.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/configLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="2">

<org.droidplanner.android.widgets.graph.Chart
android:id="@+id/chartBottom"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:layout_below="@+id/chartTop"
/>

<org.droidplanner.android.widgets.graph.Chart
android:id="@+id/chartTop"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignBottom="@+id/firstDivider"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
/>

<View
android:id="@+id/firstDivider"
android:layout_width="fill_parent"
android:layout_height="3dp"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:background="#3F9BBF"/>

<TextView
android:id="@+id/titleBottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignTop="@+id/chartBottom"
android:text="Large Text"
android:textAppearance="?android:attr/textAppearanceLarge"/>

<TextView
android:id="@+id/titleTop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:text="Roll:"
android:textAppearance="?android:attr/textAppearanceLarge"/>

</RelativeLayout>

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/opaque_white">

<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:layout_alignParentTop="true"
android:entries="@array/ExampleWaypointType"
/>

<TextView
android:id="@+id/title_rect"
android:layout_width="match_parent"
android:layout_height="@dimen/tuning_mission_header_title_height"
android:layout_alignParentTop="true"
android:background="@drawable/wp_title_rectangle"
style="@style/missionHeaderTitle"
android:gravity="center"
android:text="ROLL / PITCH"/>

<ImageView
android:id="@+id/menuHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignBottom="@id/title_rect"
android:src="@drawable/ic_menu_hint"
android:layout_margin="10dp"
tools:ignore="ContentDescription"
/>

</RelativeLayout>

<TextView
android:id="@+id/textView1"
style="@style/ModeDetailText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/mode_desc_rectangle"
android:padding="10dp"
android:text="@string/tune_roll"/>

<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@color/opaque_white"
>

<LinearLayout
android:id="@+id/tunningSeekBars"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dp">

<org.droidplanner.android.widgets.SeekBarWithText.SeekBarWithText
android:id="@+id/SeekBarRollPitchStabP"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/textView1"
android:layout_weight="1"
app:formatString="%1.1f"
app:inc="0.1"
app:max="5.0"
app:min="2.0"
app:title="Stab P.\t"
/>

<org.droidplanner.android.widgets.SeekBarWithText.SeekBarWithText
android:id="@+id/SeekBarRollPitchControl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/SeekBarRollPitchDampenning"
android:layout_weight="1"
app:formatString="%1.2f"
app:inc="0.01"
app:max="0.4"
app:min="0.08"
app:title="Rate P.\t"
/>

<org.droidplanner.android.widgets.SeekBarWithText.SeekBarWithText
android:id="@+id/SeekBarRollPitchControl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/SeekBarYawControl"
android:layout_weight="1"
app:formatString="%1.2f"
app:inc="0.01"
app:max="0.6"
app:min="0.00"
app:title="Rate I.\t\t"
/>

<org.droidplanner.android.widgets.SeekBarWithText.SeekBarWithText
android:id="@+id/SeekBarThrottleAccel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/SeekBarRollPitchControl"
android:layout_weight="1"
app:formatString="%1.3f"
app:inc="0.001"
app:max=".014"
app:min="0.0"
app:title="Rate D.\t"
/>

</LinearLayout>
</ScrollView>

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/opaque_white"
android:gravity="center"
android:orientation="horizontal">

<Button
android:id="@+id/backgroundMissionItem"
style="@style/modeControl"
android:layout_width="@dimen/setup_action_button_width"
android:layout_height="wrap_content"
android:layout_marginRight="16dp"
android:background="@drawable/button_blue"
android:text="@string/button_setup_reset"/>

<Button
android:id="@+id/button2"
style="@style/modeControl"
android:layout_width="@dimen/setup_action_button_width"
android:layout_height="wrap_content"
android:background="@drawable/button_green_drawable"
android:text="@string/button_setup_send"/>
</LinearLayout>

</LinearLayout>
1 change: 0 additions & 1 deletion Android/res/layout/activity_flight.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
android:layout_height="match_parent"
android:scaleType="fitEnd"
android:paddingTop="@dimen/slide_button_padding_top"
android:paddingBottom="@dimen/slide_button_padding_bottom"
android:src="@drawable/drawer_tab"
tools:ignore="ContentDescription"/>

Expand Down
12 changes: 5 additions & 7 deletions Android/res/layout/card_wheel_horizontal_view_title.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>

<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:text="@string/altitude_label"
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/missionItemNumberPickerTitle"/>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:text="@string/altitude_label"
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/missionItemNumberPickerTitle"/>
69 changes: 31 additions & 38 deletions Android/res/layout/common_editor_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,58 +20,51 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:fitsSystemWindows="true"
android:id="@+id/infoWindowContainer"
>

<TextView
android:id="@+id/editorInfoWindow"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/editor_info_window"
android:textSize="16sp"
android:layout_toLeftOf="@+id/waypoint_type_spinner_container"
android:layout_toStartOf="@+id/waypoint_type_spinner_container"
android:layout_alignTop="@+id/waypoint_type_spinner_container"
android:layout_alignBottom="@+id/waypoint_type_spinner_container"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:background="@color/bottom_top_bar"
android:gravity="center_vertical|start"
android:textColor="@android:color/white"
android:paddingStart="5dp"
android:paddingLeft="5dp"
style="@style/editorMissionOverviewText"
android:visibility="visible"
android:layout_alignParentTop="true"
/>

<FrameLayout
android:id="@+id/waypoint_type_spinner_container"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
<include
android:id="@+id/editorSplineToggleContainer"
android:layout_width="wrap_content"
android:minWidth="170dp"
android:layout_height="45dp"
style="@style/missionItemDetailCard"
android:background="@color/bottom_top_bar"
android:gravity="center">

<Spinner
android:id="@+id/waypoint_type_spinner"
android:layout_width="match_parent"
android:layout_height="match_parent"
style="@android:style/Widget.Holo.Spinner"
/>
</FrameLayout>
android:layout_height="wrap_content"
layout="@layout/editor_spline_toggle"
android:layout_below="@+id/editorInfoWindow"
android:layout_alignWithParentIfMissing="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"/>

<include
android:layout_width="wrap_content"
android:layout_height="wrap_content"
layout="@layout/button_my_location"
android:layout_margin="8dp"
android:layout_alignParentRight="true"
android:layout_below="@+id/editorInfoWindow"
android:layout_alignWithParentIfMissing="true" />
</org.droidplanner.android.widgets.FitsSystemWindowsRelativeLayout>

<include
<fragment
android:id="@+id/flightActionsFragment"
android:name="org.droidplanner.android.fragments.EditorToolsFragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
layout="@layout/button_my_location"
android:layout_margin="8dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_below="@+id/infoWindowContainer"/>
android:layout_above="@+id/missionFragment1"
android:layout_centerVertical="true"
android:layout_below="@+id/editorInfoWindow"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_margin="5dp"
tools:layout="@layout/fragment_editor_tools"
/>

<org.droidplanner.android.widgets.FitsSystemWindowsFrameLayout
android:layout_width="match_parent"
Expand Down
14 changes: 0 additions & 14 deletions Android/res/layout/editor_spinner_entry.xml

This file was deleted.

27 changes: 27 additions & 0 deletions Android/res/layout/editor_spline_toggle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>

<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
>

<RadioButton
android:id="@+id/normalWpToggle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/normal_waypoint_toggle"
style="@style/editorToggleStyle"
android:checked="true"
/>

<RadioButton
android:id="@+id/splineWpToggle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/spline_waypoint_toggle"
style="@style/editorToggleStyle"
/>


</RadioGroup>
Loading

0 comments on commit 0c6e44c

Please sign in to comment.