Skip to content

Commit

Permalink
Streamlining App Bar (DroidPlanner#1876)
Browse files Browse the repository at this point in the history
* removed left right margins from the main/flight activity to make the app bar full width
* reduced the height of action bar
* Set the height of textview and framelayout
* action bar toolbar with different size for landscape
* reduced the size of app bar in landscape view
  • Loading branch information
preet90 authored and billbonney committed Nov 13, 2017
1 parent 959112e commit 7d0b5e4
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 23 deletions.
11 changes: 11 additions & 0 deletions Android/res/layout-w540dp/actionbar_toolbar.xml
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/actionbar_toolbar"
android:layout_width="match_parent"
android:layout_height="@dimen/action_bar_telem_height"
android:minHeight="@dimen/action_bar_telem_height"
android:gravity="center_vertical|start"
android:background="@drawable/telem_bar_bg"
app:theme="@style/ThemeOverlay.AppCompat.ActionBar"/>
14 changes: 7 additions & 7 deletions Android/res/layout-w540dp/fragment_action_bar_telem.xml
Expand Up @@ -19,7 +19,7 @@
android:id="@+id/bar_battery"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/action_bar_telem_height"
android:layout_gravity="center"
android:drawableLeft="@drawable/ic_battery_circle_8_24dp"
android:drawablePadding="@dimen/info_bar_drawable_padding"
Expand All @@ -39,7 +39,7 @@
android:id="@+id/bar_flight_mode"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/action_bar_telem_height"
android:layout_gravity="center"
android:drawableLeft="@drawable/ic_navigation_grey_700_18dp"
android:drawableStart="@drawable/ic_navigation_grey_700_18dp"
Expand All @@ -58,14 +58,14 @@
android:id="@+id/bar_signal"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/action_bar_telem_height"
android:layout_gravity="center"
android:drawableLeft="@drawable/ic_signal_cellular_null_grey_700_18dp"
android:drawablePadding="@dimen/info_bar_drawable_padding"
android:drawableStart="@drawable/ic_signal_cellular_null_grey_700_18dp"
android:text="@string/empty_content"
android:textSize="@dimen/info_bar_text_size"
tools:text="100 %" />
tools:text="100 %"/>
</FrameLayout>

<FrameLayout
Expand All @@ -78,7 +78,7 @@
android:id="@+id/bar_home"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/action_bar_telem_height"
android:layout_gravity="center"
android:drawableLeft="@drawable/ic_home_grey_700_18dp"
android:drawableStart="@drawable/ic_home_grey_700_18dp"
Expand All @@ -98,7 +98,7 @@
android:id="@+id/bar_altitude"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/action_bar_telem_height"
android:layout_gravity="center"
android:drawableLeft="@drawable/ic_file_upload_grey_700_18dp"
android:drawablePadding="@dimen/info_bar_drawable_padding"
Expand All @@ -118,7 +118,7 @@
android:id="@+id/bar_gps"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/action_bar_telem_height"
android:layout_gravity="center"
android:drawableLeft="@drawable/ic_gps_off_grey_700_18dp"
android:drawablePadding="@dimen/info_bar_drawable_padding"
Expand Down
4 changes: 2 additions & 2 deletions Android/res/layout/activity_flight.xml
Expand Up @@ -10,8 +10,8 @@

<org.droidplanner.android.view.FitsSystemWindowsFrameLayout
android:layout_gravity="top"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginLeft="0dp"
android:layout_marginRight="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/actionbar_container"
Expand Down
24 changes: 12 additions & 12 deletions Android/res/layout/fragment_action_bar_telem.xml
Expand Up @@ -14,7 +14,7 @@

<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/info_bar_height"
android:layout_weight="1"
android:minHeight="40dp">

Expand All @@ -23,7 +23,7 @@
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:minWidth="85dp"
android:layout_height="wrap_content"
android:layout_height="@dimen/info_bar_height"
android:layout_gravity="center"
android:drawableLeft="@drawable/ic_battery_circle_8_24dp"
android:drawablePadding="@dimen/info_bar_drawable_padding"
Expand All @@ -35,14 +35,14 @@

<FrameLayout
android:layout_width="@dimen/info_bar_flight_mode_width"
android:layout_height="wrap_content"
android:layout_height="@dimen/info_bar_height"
android:minHeight="40dp">

<TextView
android:id="@+id/bar_flight_mode"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/info_bar_height"
android:layout_gravity="center"
android:drawableLeft="@drawable/ic_navigation_grey_700_18dp"
android:drawableStart="@drawable/ic_navigation_grey_700_18dp"
Expand All @@ -53,15 +53,15 @@

<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/info_bar_height"
android:layout_weight="1"
android:minHeight="40dp">

<TextView
android:id="@+id/bar_signal"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/info_bar_height"
android:minWidth="75dp"
android:layout_gravity="center"
android:drawableLeft="@drawable/ic_signal_cellular_null_grey_700_18dp"
Expand All @@ -80,15 +80,15 @@

<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="@dimen/info_bar_height"
android:layout_weight="1"
android:minHeight="40dp">

<TextView
android:id="@+id/bar_home"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/info_bar_height"
android:layout_gravity="center"
android:drawableLeft="@drawable/ic_home_grey_700_18dp"
android:drawableStart="@drawable/ic_home_grey_700_18dp"
Expand All @@ -99,15 +99,15 @@

<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="@dimen/info_bar_height"
android:layout_weight="1"
android:minHeight="40dp">

<TextView
android:id="@+id/bar_altitude"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/info_bar_height"
android:layout_gravity="center"
android:drawableLeft="@drawable/ic_file_upload_grey_700_18dp"
android:drawablePadding="@dimen/info_bar_drawable_padding"
Expand All @@ -119,15 +119,15 @@

<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="@dimen/info_bar_height"
android:layout_weight="1"
android:minHeight="40dp">

<TextView
android:id="@+id/bar_gps"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/info_bar_height"
android:layout_gravity="center"
android:drawableLeft="@drawable/ic_gps_off_grey_700_18dp"
android:drawablePadding="@dimen/info_bar_drawable_padding"
Expand Down
2 changes: 1 addition & 1 deletion Android/res/values-w540dp/dimens.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="action_bar_telem_height">56dp</dimen>
<dimen name="action_bar_telem_height">32dp</dimen>
</resources>
3 changes: 2 additions & 1 deletion Android/res/values/dimens.xml
Expand Up @@ -33,6 +33,7 @@

<!-- Dimensions for the setup tuning screen -->
<!-- Dimension for the info bar -->
<dimen name="info_bar_height">32dp</dimen>
<dimen name="info_bar_text_size">11sp</dimen>
<dimen name="info_bar_drawable_padding">0dp</dimen>
<dimen name="info_bar_flight_mode_width">110dp</dimen>
Expand All @@ -46,7 +47,7 @@
<dimen name="flight_actions_container_height">200dp</dimen>

<dimen name="toolbar_min_height">56dp</dimen>
<dimen name="action_bar_telem_height">96dp</dimen>
<dimen name="action_bar_telem_height">64dp</dimen>
<dimen name="action_drawer_width">260dp</dimen>
<dimen name="action_drawer_margin_bottom">80dp</dimen>

Expand Down

0 comments on commit 7d0b5e4

Please sign in to comment.