1 files changed, 22 insertions, 9 deletions

diff --git a/androidApp/src/main/res/layout/units_activity.xml b/androidApp/src/main/res/layout/units_activity.xml
index 5bfb228..4f4ee77 100644
--- a/androidApp/src/main/res/layout/units_activity.xml
+++ b/androidApp/src/main/res/layout/units_activity.xml
@@ -9,30 +9,42 @@
         android:id="@+id/displayContainer"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginTop="16dp"
+        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"/>
+
     <com.google.android.material.card.MaterialCardView
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintTop_toTopOf="@id/displayModeToggle"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toEndOf="@id/profileButton"
         app:layout_constraintEnd_toStartOf="@id/displayModeToggle"
         app:layout_constraintBottom_toBottomOf="@id/displayModeToggle"
-        android:layout_marginVertical="4dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginVertical="@dimen/search_vertical_margin"
+        android:layout_marginHorizontal="@dimen/search_horizontal_margin"
         app:cardCornerRadius="25dp"
-        app:cardElevation="5dp">
+        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="Type to search"
+            android:hint="@string/units_search"
             android:paddingHorizontal="16dp"
             android:background="@null"
             android:inputType="text"
@@ -50,7 +62,8 @@
         android:backgroundTint="@android:color/white"
         app:borderWidth="0dp"
         app:fabSize="mini"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="16dp"/>
+        android:layout_marginEnd="@dimen/fab_margin"
+        android:layout_marginTop="@dimen/fab_margin"
+        app:elevation="@dimen/fab_elevation"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file