Skip to content

Commit 7d0b5e4

Browse files
preet90billbonney
preet90
authored and
billbonney
committed
Streamlining App Bar (#1876)
* 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
1 parent 959112e commit 7d0b5e4

File tree

6 files changed

+35
-23
lines changed

6 files changed

+35
-23
lines changed

‎Android/res/layout-w540dp/actionbar_toolbar.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<android.support.v7.widget.Toolbar
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
5+
android:id="@+id/actionbar_toolbar"
6+
android:layout_width="match_parent"
7+
android:layout_height="@dimen/action_bar_telem_height"
8+
android:minHeight="@dimen/action_bar_telem_height"
9+
android:gravity="center_vertical|start"
10+
android:background="@drawable/telem_bar_bg"
11+
app:theme="@style/ThemeOverlay.AppCompat.ActionBar"/>

‎Android/res/layout-w540dp/fragment_action_bar_telem.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
android:id="@+id/bar_battery"
2020
style="?android:attr/buttonBarButtonStyle"
2121
android:layout_width="wrap_content"
22-
android:layout_height="wrap_content"
22+
android:layout_height="@dimen/action_bar_telem_height"
2323
android:layout_gravity="center"
2424
android:drawableLeft="@drawable/ic_battery_circle_8_24dp"
2525
android:drawablePadding="@dimen/info_bar_drawable_padding"
@@ -39,7 +39,7 @@
3939
android:id="@+id/bar_flight_mode"
4040
style="?android:attr/buttonBarButtonStyle"
4141
android:layout_width="match_parent"
42-
android:layout_height="wrap_content"
42+
android:layout_height="@dimen/action_bar_telem_height"
4343
android:layout_gravity="center"
4444
android:drawableLeft="@drawable/ic_navigation_grey_700_18dp"
4545
android:drawableStart="@drawable/ic_navigation_grey_700_18dp"
@@ -58,14 +58,14 @@
5858
android:id="@+id/bar_signal"
5959
style="?android:attr/buttonBarButtonStyle"
6060
android:layout_width="wrap_content"
61-
android:layout_height="wrap_content"
61+
android:layout_height="@dimen/action_bar_telem_height"
6262
android:layout_gravity="center"
6363
android:drawableLeft="@drawable/ic_signal_cellular_null_grey_700_18dp"
6464
android:drawablePadding="@dimen/info_bar_drawable_padding"
6565
android:drawableStart="@drawable/ic_signal_cellular_null_grey_700_18dp"
6666
android:text="@string/empty_content"
6767
android:textSize="@dimen/info_bar_text_size"
68-
tools:text="100 %" />
68+
tools:text="100 %"/>
6969
</FrameLayout>
7070

7171
<FrameLayout
@@ -78,7 +78,7 @@
7878
android:id="@+id/bar_home"
7979
style="?android:attr/buttonBarButtonStyle"
8080
android:layout_width="match_parent"
81-
android:layout_height="wrap_content"
81+
android:layout_height="@dimen/action_bar_telem_height"
8282
android:layout_gravity="center"
8383
android:drawableLeft="@drawable/ic_home_grey_700_18dp"
8484
android:drawableStart="@drawable/ic_home_grey_700_18dp"
@@ -98,7 +98,7 @@
9898
android:id="@+id/bar_altitude"
9999
style="?android:attr/buttonBarButtonStyle"
100100
android:layout_width="wrap_content"
101-
android:layout_height="wrap_content"
101+
android:layout_height="@dimen/action_bar_telem_height"
102102
android:layout_gravity="center"
103103
android:drawableLeft="@drawable/ic_file_upload_grey_700_18dp"
104104
android:drawablePadding="@dimen/info_bar_drawable_padding"
@@ -118,7 +118,7 @@
118118
android:id="@+id/bar_gps"
119119
style="?android:attr/buttonBarButtonStyle"
120120
android:layout_width="wrap_content"
121-
android:layout_height="wrap_content"
121+
android:layout_height="@dimen/action_bar_telem_height"
122122
android:layout_gravity="center"
123123
android:drawableLeft="@drawable/ic_gps_off_grey_700_18dp"
124124
android:drawablePadding="@dimen/info_bar_drawable_padding"

‎Android/res/layout/activity_flight.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
<org.droidplanner.android.view.FitsSystemWindowsFrameLayout
1212
android:layout_gravity="top"
13-
android:layout_marginLeft="10dp"
14-
android:layout_marginRight="10dp"
13+
android:layout_marginLeft="0dp"
14+
android:layout_marginRight="0dp"
1515
android:layout_width="match_parent"
1616
android:layout_height="wrap_content"
1717
android:id="@+id/actionbar_container"

‎Android/res/layout/fragment_action_bar_telem.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<FrameLayout
1616
android:layout_width="wrap_content"
17-
android:layout_height="wrap_content"
17+
android:layout_height="@dimen/info_bar_height"
1818
android:layout_weight="1"
1919
android:minHeight="40dp">
2020

@@ -23,7 +23,7 @@
2323
style="?android:attr/buttonBarButtonStyle"
2424
android:layout_width="wrap_content"
2525
android:minWidth="85dp"
26-
android:layout_height="wrap_content"
26+
android:layout_height="@dimen/info_bar_height"
2727
android:layout_gravity="center"
2828
android:drawableLeft="@drawable/ic_battery_circle_8_24dp"
2929
android:drawablePadding="@dimen/info_bar_drawable_padding"
@@ -35,14 +35,14 @@
3535

3636
<FrameLayout
3737
android:layout_width="@dimen/info_bar_flight_mode_width"
38-
android:layout_height="wrap_content"
38+
android:layout_height="@dimen/info_bar_height"
3939
android:minHeight="40dp">
4040

4141
<TextView
4242
android:id="@+id/bar_flight_mode"
4343
style="?android:attr/buttonBarButtonStyle"
4444
android:layout_width="match_parent"
45-
android:layout_height="wrap_content"
45+
android:layout_height="@dimen/info_bar_height"
4646
android:layout_gravity="center"
4747
android:drawableLeft="@drawable/ic_navigation_grey_700_18dp"
4848
android:drawableStart="@drawable/ic_navigation_grey_700_18dp"
@@ -53,15 +53,15 @@
5353

5454
<FrameLayout
5555
android:layout_width="wrap_content"
56-
android:layout_height="wrap_content"
56+
android:layout_height="@dimen/info_bar_height"
5757
android:layout_weight="1"
5858
android:minHeight="40dp">
5959

6060
<TextView
6161
android:id="@+id/bar_signal"
6262
style="?android:attr/buttonBarButtonStyle"
6363
android:layout_width="wrap_content"
64-
android:layout_height="wrap_content"
64+
android:layout_height="@dimen/info_bar_height"
6565
android:minWidth="75dp"
6666
android:layout_gravity="center"
6767
android:drawableLeft="@drawable/ic_signal_cellular_null_grey_700_18dp"
@@ -80,15 +80,15 @@
8080

8181
<FrameLayout
8282
android:layout_width="0dp"
83-
android:layout_height="wrap_content"
83+
android:layout_height="@dimen/info_bar_height"
8484
android:layout_weight="1"
8585
android:minHeight="40dp">
8686

8787
<TextView
8888
android:id="@+id/bar_home"
8989
style="?android:attr/buttonBarButtonStyle"
9090
android:layout_width="match_parent"
91-
android:layout_height="wrap_content"
91+
android:layout_height="@dimen/info_bar_height"
9292
android:layout_gravity="center"
9393
android:drawableLeft="@drawable/ic_home_grey_700_18dp"
9494
android:drawableStart="@drawable/ic_home_grey_700_18dp"
@@ -99,15 +99,15 @@
9999

100100
<FrameLayout
101101
android:layout_width="0dp"
102-
android:layout_height="wrap_content"
102+
android:layout_height="@dimen/info_bar_height"
103103
android:layout_weight="1"
104104
android:minHeight="40dp">
105105

106106
<TextView
107107
android:id="@+id/bar_altitude"
108108
style="?android:attr/buttonBarButtonStyle"
109109
android:layout_width="wrap_content"
110-
android:layout_height="wrap_content"
110+
android:layout_height="@dimen/info_bar_height"
111111
android:layout_gravity="center"
112112
android:drawableLeft="@drawable/ic_file_upload_grey_700_18dp"
113113
android:drawablePadding="@dimen/info_bar_drawable_padding"
@@ -119,15 +119,15 @@
119119

120120
<FrameLayout
121121
android:layout_width="0dp"
122-
android:layout_height="wrap_content"
122+
android:layout_height="@dimen/info_bar_height"
123123
android:layout_weight="1"
124124
android:minHeight="40dp">
125125

126126
<TextView
127127
android:id="@+id/bar_gps"
128128
style="?android:attr/buttonBarButtonStyle"
129129
android:layout_width="wrap_content"
130-
android:layout_height="wrap_content"
130+
android:layout_height="@dimen/info_bar_height"
131131
android:layout_gravity="center"
132132
android:drawableLeft="@drawable/ic_gps_off_grey_700_18dp"
133133
android:drawablePadding="@dimen/info_bar_drawable_padding"

‎Android/res/values-w540dp/dimens.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<dimen name="action_bar_telem_height">56dp</dimen>
3+
<dimen name="action_bar_telem_height">32dp</dimen>
44
</resources>

‎Android/res/values/dimens.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
<!-- Dimensions for the setup tuning screen -->
3535
<!-- Dimension for the info bar -->
36+
<dimen name="info_bar_height">32dp</dimen>
3637
<dimen name="info_bar_text_size">11sp</dimen>
3738
<dimen name="info_bar_drawable_padding">0dp</dimen>
3839
<dimen name="info_bar_flight_mode_width">110dp</dimen>
@@ -46,7 +47,7 @@
4647
<dimen name="flight_actions_container_height">200dp</dimen>
4748

4849
<dimen name="toolbar_min_height">56dp</dimen>
49-
<dimen name="action_bar_telem_height">96dp</dimen>
50+
<dimen name="action_bar_telem_height">64dp</dimen>
5051
<dimen name="action_drawer_width">260dp</dimen>
5152
<dimen name="action_drawer_margin_bottom">80dp</dimen>
5253

0 commit comments

Comments
 (0)