From 7d0b5e437d9ebe04e50d577413e0fbeca0cf70c7 Mon Sep 17 00:00:00 2001
From: preet90 <gurpreet.s.saggu@gmail.com>
Date: Mon, 13 Nov 2017 12:16:20 +1100
Subject: [PATCH] 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
---
 .../res/layout-w540dp/actionbar_toolbar.xml   | 11 +++++++++
 .../fragment_action_bar_telem.xml             | 14 +++++------
 Android/res/layout/activity_flight.xml        |  4 ++--
 .../res/layout/fragment_action_bar_telem.xml  | 24 +++++++++----------
 Android/res/values-w540dp/dimens.xml          |  2 +-
 Android/res/values/dimens.xml                 |  3 ++-
 6 files changed, 35 insertions(+), 23 deletions(-)
 create mode 100644 Android/res/layout-w540dp/actionbar_toolbar.xml

diff --git a/Android/res/layout-w540dp/actionbar_toolbar.xml b/Android/res/layout-w540dp/actionbar_toolbar.xml
new file mode 100644
index 0000000000..47a5f51364
--- /dev/null
+++ b/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"/>
\ No newline at end of file
diff --git a/Android/res/layout-w540dp/fragment_action_bar_telem.xml b/Android/res/layout-w540dp/fragment_action_bar_telem.xml
index 601ba70616..45821ced9a 100644
--- a/Android/res/layout-w540dp/fragment_action_bar_telem.xml
+++ b/Android/res/layout-w540dp/fragment_action_bar_telem.xml
@@ -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"
@@ -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"
@@ -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
@@ -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"
@@ -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"
@@ -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"
diff --git a/Android/res/layout/activity_flight.xml b/Android/res/layout/activity_flight.xml
index 29f7fc4aa0..340d37caa5 100644
--- a/Android/res/layout/activity_flight.xml
+++ b/Android/res/layout/activity_flight.xml
@@ -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"
diff --git a/Android/res/layout/fragment_action_bar_telem.xml b/Android/res/layout/fragment_action_bar_telem.xml
index 60c96bd29f..0bce605c1f 100644
--- a/Android/res/layout/fragment_action_bar_telem.xml
+++ b/Android/res/layout/fragment_action_bar_telem.xml
@@ -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">
 
@@ -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"
@@ -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"
@@ -53,7 +53,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">
 
@@ -61,7 +61,7 @@
                 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"
@@ -80,7 +80,7 @@
 
         <FrameLayout
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/info_bar_height"
             android:layout_weight="1"
             android:minHeight="40dp">
 
@@ -88,7 +88,7 @@
                 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"
@@ -99,7 +99,7 @@
 
         <FrameLayout
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/info_bar_height"
             android:layout_weight="1"
             android:minHeight="40dp">
 
@@ -107,7 +107,7 @@
                 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"
@@ -119,7 +119,7 @@
 
         <FrameLayout
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/info_bar_height"
             android:layout_weight="1"
             android:minHeight="40dp">
 
@@ -127,7 +127,7 @@
                 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"
diff --git a/Android/res/values-w540dp/dimens.xml b/Android/res/values-w540dp/dimens.xml
index e8aa814115..e2bd5bdc79 100644
--- a/Android/res/values-w540dp/dimens.xml
+++ b/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>
\ No newline at end of file
diff --git a/Android/res/values/dimens.xml b/Android/res/values/dimens.xml
index cf50e22f39..aecf3b570c 100644
--- a/Android/res/values/dimens.xml
+++ b/Android/res/values/dimens.xml
@@ -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>
@@ -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>