aboutsummaryrefslogtreecommitdiff
path: root/androidApp
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2022-01-15 02:05:12 -0600
committerIván Ávalos <avalos@disroot.org>2022-01-15 02:05:12 -0600
commitc592e47abf39a70674e9b055203a4d46b3f9e99b (patch)
tree75d68d2348bca6d7613f968504af04f7f2f40269 /androidApp
parent13910db31a59625c074c4f55690460f7f0155495 (diff)
parentd16483ddb5f9989315db95fe2d70747c04ebc657 (diff)
downloadetbsa-trackermap-mobile-c592e47abf39a70674e9b055203a4d46b3f9e99b.tar.gz
etbsa-trackermap-mobile-c592e47abf39a70674e9b055203a4d46b3f9e99b.tar.bz2
etbsa-trackermap-mobile-c592e47abf39a70674e9b055203a4d46b3f9e99b.zip
Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile
Diffstat (limited to 'androidApp')
-rw-r--r--androidApp/src/main/res/layout/unit_item.xml9
-rw-r--r--androidApp/src/main/res/values/dimen.xml2
2 files changed, 6 insertions, 5 deletions
diff --git a/androidApp/src/main/res/layout/unit_item.xml b/androidApp/src/main/res/layout/unit_item.xml
index 833e56b..cccdd69 100644
--- a/androidApp/src/main/res/layout/unit_item.xml
+++ b/androidApp/src/main/res/layout/unit_item.xml
@@ -65,10 +65,9 @@
<ImageView
android:id="@+id/unitIcon"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:padding="@dimen/card_icon_padding"
- android:paddingStart="0dp"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:layout_margin="@dimen/card_icon_margin"
android:src="@drawable/map_default"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -79,6 +78,7 @@
android:id="@+id/titleLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/card_icon_margin"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintStart_toEndOf="@id/unitIcon"
@@ -116,6 +116,7 @@
android:id="@+id/gridLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/card_icon_margin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/unitIcon"
app:layout_constraintTop_toBottomOf="@id/titleLayout"
diff --git a/androidApp/src/main/res/values/dimen.xml b/androidApp/src/main/res/values/dimen.xml
index 788bf45..906c4af 100644
--- a/androidApp/src/main/res/values/dimen.xml
+++ b/androidApp/src/main/res/values/dimen.xml
@@ -9,7 +9,7 @@
<dimen name="card_large_padding">32dp</dimen>
<dimen name="card_padding">16dp</dimen>
<dimen name="card_margin">16dp</dimen>
- <dimen name="card_icon_padding">5dp</dimen>
+ <dimen name="card_icon_margin">5dp</dimen>
<!-- Card Buttons -->
<dimen name="card_action_text">12sp</dimen>