diff options
author | Iván Ávalos <avalos@disroot.org> | 2022-01-15 20:09:24 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2022-01-15 20:09:24 -0600 |
commit | 72c7bedaab6958b4fb3c53ae7c2d5e233181933c (patch) | |
tree | 4919b09f9c929fd14b54b5874152c1fa87bc1914 /androidApp/src/main/res/layout/unit_item.xml | |
parent | d2ab18cc01d2717bf46a378406ed1402381b3a40 (diff) | |
parent | 6aa78c8ddbcdeaace0f4596e7c717dafef036f03 (diff) | |
download | etbsa-trackermap-mobile-72c7bedaab6958b4fb3c53ae7c2d5e233181933c.tar.gz etbsa-trackermap-mobile-72c7bedaab6958b4fb3c53ae7c2d5e233181933c.tar.bz2 etbsa-trackermap-mobile-72c7bedaab6958b4fb3c53ae7c2d5e233181933c.zip |
Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile
Conflicts:
androidApp/src/main/res/layout/user_information_activity.xml
Diffstat (limited to 'androidApp/src/main/res/layout/unit_item.xml')
-rw-r--r-- | androidApp/src/main/res/layout/unit_item.xml | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/androidApp/src/main/res/layout/unit_item.xml b/androidApp/src/main/res/layout/unit_item.xml index cccdd69..6946d1d 100644 --- a/androidApp/src/main/res/layout/unit_item.xml +++ b/androidApp/src/main/res/layout/unit_item.xml @@ -15,10 +15,12 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="end" - android:padding="@dimen/card_padding" + android:padding="@dimen/padding" + android:paddingStart="0dp" android:gravity="center" android:orientation="horizontal" - android:visibility="visible"> + android:visibility="visible" + tools:ignore="RtlSymmetry"> <com.google.android.material.button.MaterialButton android:id="@+id/detailsButton" @@ -27,8 +29,21 @@ android:layout_weight="1" app:cardBackgroundColor="@color/colorAccent" android:text="@string/unit_details" + android:textSize="@dimen/card_action_text" android:textColor="@color/colorAccent" + android:minWidth="0dp" + 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" + app:cardBackgroundColor="@color/colorAccent" + android:text="@string/unit_reports" android:textSize="@dimen/card_action_text" + android:textColor="@color/colorAccent" + android:minWidth="0dp" style="?android:borderlessButtonStyle"/> <com.google.android.material.button.MaterialButton @@ -37,9 +52,10 @@ android:layout_height="match_parent" android:layout_weight="1" android:text="@string/unit_commands" - android:textColor="@color/colorAccent" android:textSize="@dimen/card_action_text" - style="?android:borderlessButtonStyle" /> + android:textColor="@color/colorAccent" + android:minWidth="0dp" + style="?android:borderlessButtonStyle"/> </LinearLayout> @@ -53,9 +69,11 @@ app:cardElevation="0dp" app:cardUseCompatPadding="true" app:contentPadding="@dimen/card_padding" + app:contentPaddingLeft="0dp" app:cardBackgroundColor="@color/darkBackground" android:clickable="true" - android:focusable="true"> + android:focusable="true" + tools:visibility="gone"> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/mainContent" @@ -67,7 +85,7 @@ android:id="@+id/unitIcon" android:layout_width="40dp" android:layout_height="40dp" - android:layout_margin="@dimen/card_icon_margin" + android:layout_marginHorizontal="@dimen/card_icon_margin" android:src="@drawable/map_default" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" |