diff options
Diffstat (limited to 'androidApp/src/main/res/layout/unit_map_fragment.xml')
| -rw-r--r-- | androidApp/src/main/res/layout/unit_map_fragment.xml | 45 |
1 files changed, 33 insertions, 12 deletions
diff --git a/androidApp/src/main/res/layout/unit_map_fragment.xml b/androidApp/src/main/res/layout/unit_map_fragment.xml index 8395013..e2bee95 100644 --- a/androidApp/src/main/res/layout/unit_map_fragment.xml +++ b/androidApp/src/main/res/layout/unit_map_fragment.xml @@ -30,20 +30,25 @@ app:contentPaddingTop="@dimen/card_padding" app:contentPaddingLeft="@dimen/card_padding" app:contentPaddingRight="@dimen/card_padding" - android:visibility="gone"> + android:animateLayoutChanges="true" + android:visibility="gone" + tools:visibility="visible"> - <LinearLayout + <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/mainContent" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:animateLayoutChanges="true"> + android:orientation="vertical"> <LinearLayout - android:layout_width="match_parent" + android:id="@+id/titleLayout" + android:layout_width="0dp" android:layout_height="wrap_content" android:gravity="center_vertical" - android:orientation="horizontal"> + android:orientation="horizontal" + app:layout_constraintEnd_toStartOf="@+id/closeButton" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> <ImageView android:id="@+id/statusIcon" @@ -58,24 +63,36 @@ android:id="@+id/engineStopIcon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:visibility="gone" android:layout_marginEnd="5dp" android:src="@drawable/device_unlocked" + android:visibility="gone" tools:ignore="ContentDescription" /> <TextView android:id="@+id/unitName" + style="@style/TextAppearance.AppCompat.Body2" android:layout_width="match_parent" android:layout_height="wrap_content" - style="@style/TextAppearance.AppCompat.Body2" tools:text="1AAUTO" /> </LinearLayout> + <ImageView + android:id="@+id/closeButton" + android:layout_width="14sp" + android:layout_height="14sp" + android:contentDescription="@string/shared_close" + android:src="@drawable/icon_close" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + <GridLayout android:id="@+id/gridLayout" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_constraintTop_toBottomOf="@id/titleLayout" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" /> <LinearLayout android:id="@+id/itemOptions" @@ -84,7 +101,11 @@ android:layout_marginVertical="@dimen/padding" android:gravity="center" android:orientation="horizontal" - android:visibility="visible"> + android:visibility="visible" + app:layout_constraintTop_toBottomOf="@id/gridLayout" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="parent"> <com.google.android.material.button.MaterialButton android:id="@+id/detailsButton" @@ -118,7 +139,7 @@ </LinearLayout> - </LinearLayout> + </androidx.constraintlayout.widget.ConstraintLayout> </androidx.cardview.widget.CardView> |