diff options
| author | Iván Ávalos <avalos@disroot.org> | 2022-01-11 20:49:59 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2022-01-11 20:49:59 -0600 |
| commit | 90d9c04e66f7e7564ee1639d6b01bb34fe05239d (patch) | |
| tree | 4acde4e1afa8ac4e01dc426de34409e786749c99 /androidApp/src/main/res | |
| parent | 08a22e81ea4fb05cd48052d0814ea40730b5cc49 (diff) | |
| download | etbsa-trackermap-mobile-90d9c04e66f7e7564ee1639d6b01bb34fe05239d.tar.gz etbsa-trackermap-mobile-90d9c04e66f7e7564ee1639d6b01bb34fe05239d.tar.bz2 etbsa-trackermap-mobile-90d9c04e66f7e7564ee1639d6b01bb34fe05239d.zip | |
More layout tweaks and fixes
Diffstat (limited to 'androidApp/src/main/res')
| -rw-r--r-- | androidApp/src/main/res/layout/unit_map_fragment.xml | 62 | ||||
| -rw-r--r-- | androidApp/src/main/res/values/dimen.xml | 2 |
2 files changed, 34 insertions, 30 deletions
diff --git a/androidApp/src/main/res/layout/unit_map_fragment.xml b/androidApp/src/main/res/layout/unit_map_fragment.xml index a920b14..87eb4ac 100644 --- a/androidApp/src/main/res/layout/unit_map_fragment.xml +++ b/androidApp/src/main/res/layout/unit_map_fragment.xml @@ -31,50 +31,54 @@ app:contentPaddingRight="@dimen/card_padding" android:visibility="gone"> - <RelativeLayout + <LinearLayout android:id="@+id/mainContent" android:layout_width="match_parent" android:layout_height="wrap_content" + android:orientation="vertical" android:animateLayoutChanges="true"> - <ImageView - android:id="@+id/statusIcon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="5dp" - android:src="@drawable/device_status" - app:tint="?android:textColorPrimary" - tools:ignore="ContentDescription" /> - - <ImageView - android:id="@+id/engineStopIcon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toEndOf="@id/statusIcon" - android:visibility="gone" - android:layout_marginEnd="5dp" - android:src="@drawable/device_unlocked" - tools:ignore="ContentDescription" /> - - <TextView - android:id="@+id/unitName" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@id/engineStopIcon" - style="@style/TextAppearance.AppCompat.Body2" - tools:text="1AAUTO" /> + android:orientation="horizontal"> + + <ImageView + android:id="@+id/statusIcon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="5dp" + android:src="@drawable/device_status" + app:tint="?android:textColorPrimary" + tools:ignore="ContentDescription" /> + + <ImageView + 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" + tools:ignore="ContentDescription" /> + + <TextView + android:id="@+id/unitName" + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="@style/TextAppearance.AppCompat.Body2" + tools:text="1AAUTO" /> + + </LinearLayout> <GridLayout android:id="@+id/gridLayout" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@id/unitName" /> + android:layout_height="wrap_content" /> <LinearLayout android:id="@+id/itemOptions" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/gridLayout" android:layout_marginVertical="@dimen/padding" android:gravity="center" android:orientation="horizontal" @@ -112,7 +116,7 @@ </LinearLayout> - </RelativeLayout> + </LinearLayout> </androidx.cardview.widget.CardView> diff --git a/androidApp/src/main/res/values/dimen.xml b/androidApp/src/main/res/values/dimen.xml index 9507352..8acc9a3 100644 --- a/androidApp/src/main/res/values/dimen.xml +++ b/androidApp/src/main/res/values/dimen.xml @@ -11,7 +11,7 @@ <dimen name="card_margin">16dp</dimen> <!-- Card Buttons --> - <dimen name="card_action_text">11sp</dimen> + <dimen name="card_action_text">12sp</dimen> <!-- Search --> <dimen name="search_horizontal_margin">8dp</dimen> |