Implements base drawer layout menu

2 files changed, 80 insertions, 62 deletions

diff --git a/androidApp/src/main/res/layout/unit_map_fragment.xml b/androidApp/src/main/res/layout/unit_map_fragment.xml
index 6c2720b..9149fc6 100644
--- a/androidApp/src/main/res/layout/unit_map_fragment.xml
+++ b/androidApp/src/main/res/layout/unit_map_fragment.xml
@@ -26,7 +26,9 @@
         app:cardUseCompatPadding="true"
         app:cardElevation="@dimen/card_elevation"
         app:cardCornerRadius="@dimen/card_border_radius"
-        app:contentPadding="@dimen/card_padding"
+        app:contentPaddingTop="@dimen/card_padding"
+        app:contentPaddingLeft="@dimen/card_padding"
+        app:contentPaddingRight="@dimen/card_padding"
         android:visibility="gone">
 
         <RelativeLayout
@@ -137,7 +139,6 @@
                     android:src="@drawable/position_datetime"
                     app:tint="?android:textColorSecondary" />
 
-
                 <TextView
                     android:id="@+id/lastDate"
                     android:layout_width="match_parent"
@@ -166,6 +167,7 @@
                     android:layout_weight="1"
                     android:text="@string/unit_details"
                     android:textColor="@color/colorAccent"
+                    android:textSize="12sp"
                     style="?borderlessButtonStyle" />
 
                 <com.google.android.material.button.MaterialButton
@@ -176,6 +178,7 @@
                     android:layout_weight="1"
                     android:text="@string/unit_reports"
                     android:textColor="@color/colorAccent"
+                    android:textSize="12sp"
                     style="?borderlessButtonStyle" />
 
                 <com.google.android.material.button.MaterialButton
@@ -185,6 +188,7 @@
                     android:layout_weight="1"
                     android:text="@string/unit_commands"
                     android:textColor="@color/colorAccent"
+                    android:textSize="12sp"
                     style="?borderlessButtonStyle" />
 
             </LinearLayout>
diff --git a/androidApp/src/main/res/layout/units_activity.xml b/androidApp/src/main/res/layout/units_activity.xml
index f0fd2ee..fb39ebe 100644
--- a/androidApp/src/main/res/layout/units_activity.xml
+++ b/androidApp/src/main/res/layout/units_activity.xml
@@ -1,73 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<androidx.drawerlayout.widget.DrawerLayout
     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"
+    android:id="@+id/drawerLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    tools:openDrawer="start">
 
-    <FrameLayout
-        android:id="@+id/displayContainer"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginTop="@dimen/fab_margin"
-        app:layout_constraintTop_toBottomOf="@id/displayModeToggle"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <FrameLayout
+            android:id="@+id/displayContainer"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginTop="@dimen/fab_margin"
+            app:layout_constraintTop_toBottomOf="@id/displayModeToggle"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/profileButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:backgroundTint="@android:color/white"
-        app:borderWidth="0dp"
-        app:fabSize="mini"
-        android:layout_marginStart="@dimen/fab_margin"
-        android:layout_marginTop="@dimen/fab_margin"
-        app:elevation="@dimen/fab_elevation"
-        android:src="@drawable/icon_menu"
-        android:contentDescription="@string/open_drawer"/>
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/drawerButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:backgroundTint="@android:color/white"
+            app:borderWidth="0dp"
+            app:fabSize="mini"
+            android:layout_marginStart="@dimen/fab_margin"
+            android:layout_marginTop="@dimen/fab_margin"
+            app:elevation="@dimen/fab_elevation"
+            android:src="@drawable/icon_menu"
+            android:contentDescription="@string/open_drawer"/>
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintTop_toTopOf="@id/displayModeToggle"
+            app:layout_constraintStart_toEndOf="@id/drawerButton"
+            app:layout_constraintEnd_toStartOf="@id/displayModeToggle"
+            app:layout_constraintBottom_toBottomOf="@id/displayModeToggle"
+            android:layout_marginVertical="@dimen/search_vertical_margin"
+            android:layout_marginHorizontal="@dimen/search_horizontal_margin"
+            app:cardCornerRadius="@dimen/card_border_radius"
+            app:cardElevation="@dimen/card_elevation">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/searchInput"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:hint="@string/units_search"
+                android:paddingHorizontal="16dp"
+                android:background="@null"
+                android:inputType="text"
+                android:lines="1"
+                android:imeOptions="actionSearch" />
 
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintTop_toTopOf="@id/displayModeToggle"
-        app:layout_constraintStart_toEndOf="@id/profileButton"
-        app:layout_constraintEnd_toStartOf="@id/displayModeToggle"
-        app:layout_constraintBottom_toBottomOf="@id/displayModeToggle"
-        android:layout_marginVertical="@dimen/search_vertical_margin"
-        android:layout_marginHorizontal="@dimen/search_horizontal_margin"
-        app:cardCornerRadius="@dimen/card_border_radius"
-        app:cardElevation="@dimen/card_elevation">
+        </com.google.android.material.card.MaterialCardView>
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/searchInput"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:hint="@string/units_search"
-            android:paddingHorizontal="16dp"
-            android:background="@null"
-            android:inputType="text"
-            android:lines="1"
-            android:imeOptions="actionSearch" />
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/displayModeToggle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:backgroundTint="@android:color/white"
+            app:borderWidth="0dp"
+            app:fabSize="mini"
+            android:layout_marginEnd="@dimen/fab_margin"
+            android:layout_marginTop="@dimen/fab_margin"
+            app:elevation="@dimen/fab_elevation"
+            tools:ignore="ContentDescription" />
 
-    </com.google.android.material.card.MaterialCardView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/displayModeToggle"
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/navigationView"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:backgroundTint="@android:color/white"
-        app:borderWidth="0dp"
-        app:fabSize="mini"
-        android:layout_marginEnd="@dimen/fab_margin"
-        android:layout_marginTop="@dimen/fab_margin"
-        app:elevation="@dimen/fab_elevation"
-        tools:ignore="ContentDescription" />
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        app:menu="@menu/navigation_menu" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file