diff options
Diffstat (limited to 'androidApp/src/main/res/layout/units_activity.xml')
| -rw-r--r-- | androidApp/src/main/res/layout/units_activity.xml | 135 |
1 files changed, 61 insertions, 74 deletions
diff --git a/androidApp/src/main/res/layout/units_activity.xml b/androidApp/src/main/res/layout/units_activity.xml index fb39ebe..bc8d94a 100644 --- a/androidApp/src/main/res/layout/units_activity.xml +++ b/androidApp/src/main/res/layout/units_activity.xml @@ -1,87 +1,74 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.drawerlayout.widget.DrawerLayout +<androidx.constraintlayout.widget.ConstraintLayout 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" + xmlns:tools="http://schemas.android.com/tools" android:id="@+id/drawerLayout" android:layout_width="match_parent" - android:layout_height="match_parent" - tools:openDrawer="start"> - - <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"/> + android:layout_height="match_parent"> - <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"/> + <FrameLayout + android:id="@+id/displayContainer" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_marginTop="@dimen/fab_margin" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/displayModeToggle" /> - <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.floatingactionbutton.FloatingActionButton + android:id="@+id/userButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/fab_margin" + android:layout_marginTop="@dimen/fab_margin" + android:backgroundTint="@android:color/white" + android:contentDescription="@string/open_drawer" + android:src="@drawable/device_contact" + app:borderWidth="0dp" + app:elevation="@dimen/fab_elevation" + app:fabSize="mini" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - </com.google.android.material.card.MaterialCardView> + <com.google.android.material.card.MaterialCardView + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_marginHorizontal="@dimen/search_horizontal_margin" + android:layout_marginVertical="@dimen/search_vertical_margin" + app:cardCornerRadius="@dimen/card_border_radius" + app:cardElevation="@dimen/card_elevation" + app:layout_constraintBottom_toBottomOf="@id/displayModeToggle" + app:layout_constraintEnd_toStartOf="@id/displayModeToggle" + app:layout_constraintStart_toEndOf="@id/userButton" + app:layout_constraintTop_toTopOf="@id/displayModeToggle"> - <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.textfield.TextInputEditText + android:id="@+id/searchInput" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@null" + android:hint="@string/units_search" + android:imeOptions="actionSearch" + android:inputType="text" + android:lines="1" + android:paddingHorizontal="16dp" /> - </androidx.constraintlayout.widget.ConstraintLayout> + </com.google.android.material.card.MaterialCardView> - <com.google.android.material.navigation.NavigationView - android:id="@+id/navigationView" + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/displayModeToggle" android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="start" - app:menu="@menu/navigation_menu" /> + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/fab_margin" + android:layout_marginEnd="@dimen/fab_margin" + android:backgroundTint="@android:color/white" + app:borderWidth="0dp" + app:elevation="@dimen/fab_elevation" + app:fabSize="mini" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:ignore="ContentDescription" /> -</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file |