diff options
Diffstat (limited to 'androidApp/src/main/res/layout')
| -rw-r--r-- | androidApp/src/main/res/layout/unit_details_information.xml | 24 | ||||
| -rw-r--r-- | androidApp/src/main/res/layout/unit_item.xml | 10 |
2 files changed, 18 insertions, 16 deletions
diff --git a/androidApp/src/main/res/layout/unit_details_information.xml b/androidApp/src/main/res/layout/unit_details_information.xml index 24f792c..422b77e 100644 --- a/androidApp/src/main/res/layout/unit_details_information.xml +++ b/androidApp/src/main/res/layout/unit_details_information.xml @@ -1,19 +1,30 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:scrollbars="vertical"> + android:layout_height="match_parent"> + + <ProgressBar + android:id="@+id/reportLoading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/margin" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> <com.google.android.material.card.MaterialCardView - android:layout_width="match_parent" + android:layout_width="0dp" android:layout_height="wrap_content" app:cardCornerRadius="@dimen/card_border_radius" app:cardElevation="@dimen/card_elevation" app:cardUseCompatPadding="true" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" app:contentPadding="@dimen/card_padding"> <LinearLayout @@ -30,8 +41,9 @@ android:textColor="@color/colorPrimaryDark" android:layout_marginBottom="@dimen/padding" tools:text="1AAUTO" /> + </LinearLayout> </com.google.android.material.card.MaterialCardView> -</LinearLayout>
\ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/androidApp/src/main/res/layout/unit_item.xml b/androidApp/src/main/res/layout/unit_item.xml index d46e7a1..e827940 100644 --- a/androidApp/src/main/res/layout/unit_item.xml +++ b/androidApp/src/main/res/layout/unit_item.xml @@ -32,16 +32,6 @@ style="?android:borderlessButtonStyle"/> <com.google.android.material.button.MaterialButton - android:id="@+id/reportsButton" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_weight="1" - android:text="@string/unit_reports" - android:textColor="@color/colorAccent" - android:textSize="@dimen/card_action_text" - style="?android:borderlessButtonStyle"/> - - <com.google.android.material.button.MaterialButton android:id="@+id/commandsButton" android:layout_width="wrap_content" android:layout_height="match_parent" |