aboutsummaryrefslogtreecommitdiff
path: root/androidApp/src/main/res/layout
diff options
context:
space:
mode:
authorIsidro Henoch <imhenoch@protonmail.com>2021-12-15 00:28:54 -0600
committerIsidro Henoch <imhenoch@protonmail.com>2021-12-15 00:28:54 -0600
commit2388d1873850191252854626f942692cc9696bb5 (patch)
treeaa6a3a90ed7e51abe600a0d399616bde8ec077a6 /androidApp/src/main/res/layout
parent233efdfb6aa45965ab0808aca0b823ade6f7b87f (diff)
downloadetbsa-trackermap-mobile-2388d1873850191252854626f942692cc9696bb5.tar.gz
etbsa-trackermap-mobile-2388d1873850191252854626f942692cc9696bb5.tar.bz2
etbsa-trackermap-mobile-2388d1873850191252854626f942692cc9696bb5.zip
Updates the devices list
- The unit items now react to user interaction, they display and change their appearance on click - The adapter has a callback to manage the different options - Minor changes to dimen values
Diffstat (limited to 'androidApp/src/main/res/layout')
-rw-r--r--androidApp/src/main/res/layout/login.xml8
-rw-r--r--androidApp/src/main/res/layout/login_activity.xml2
-rw-r--r--androidApp/src/main/res/layout/unit_item.xml11
3 files changed, 11 insertions, 10 deletions
diff --git a/androidApp/src/main/res/layout/login.xml b/androidApp/src/main/res/layout/login.xml
index 21c63b0..2512052 100644
--- a/androidApp/src/main/res/layout/login.xml
+++ b/androidApp/src/main/res/layout/login.xml
@@ -5,15 +5,15 @@
android:name="mx.trackermap.TrackerMap.android.session.LoginFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:cardCornerRadius="@dimen/cardview_border_radius"
- app:cardElevation="@dimen/cardview_elevation"
+ app:cardCornerRadius="@dimen/card_border_radius"
+ app:cardElevation="@dimen/card_elevation"
app:cardUseCompatPadding="true">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingVertical="@dimen/cardview_padding_vertical"
- android:paddingHorizontal="@dimen/cardview_padding_horizontal">
+ android:paddingVertical="@dimen/card_large_padding"
+ android:paddingHorizontal="@dimen/card_padding">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/usernameInputLayout"
diff --git a/androidApp/src/main/res/layout/login_activity.xml b/androidApp/src/main/res/layout/login_activity.xml
index 8021963..be143d9 100644
--- a/androidApp/src/main/res/layout/login_activity.xml
+++ b/androidApp/src/main/res/layout/login_activity.xml
@@ -24,7 +24,7 @@
app:layout_constraintTop_toBottomOf="@id/bannerImage"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- android:layout_marginHorizontal="@dimen/cardview_margin_horizontal"
+ android:layout_marginHorizontal="@dimen/card_margin"
android:layout_marginBottom="16dp"/>
</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 4534339..cdf0610 100644
--- a/androidApp/src/main/res/layout/unit_item.xml
+++ b/androidApp/src/main/res/layout/unit_item.xml
@@ -6,7 +6,7 @@
android:id="@+id/unitCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:cardCornerRadius="20dp"
+ app:cardCornerRadius="@dimen/card_border_radius"
app:cardElevation="0dp"
app:cardUseCompatPadding="true"
app:contentPadding="16dp">
@@ -14,7 +14,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:animateLayoutChanges="true">
<TextView
android:id="@+id/unitName"
@@ -64,7 +65,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="Details"
+ android:text="@string/unit_details"
android:textColor="@color/colorPrimaryDark"
app:backgroundTint="@color/darkBackground" />
@@ -74,7 +75,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:layout_weight="1"
- android:text="Reports"
+ android:text="@string/unit_reports"
android:textColor="@color/colorPrimaryDark"
app:backgroundTint="@color/darkBackground" />
@@ -83,7 +84,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="Commands"
+ android:text="@string/unit_commands"
android:textColor="@color/colorPrimaryDark"
app:backgroundTint="@color/darkBackground" />