From a669e2b9a3595f944bf34284002e3a120f9141e3 Mon Sep 17 00:00:00 2001
From: Shobhit Agarwal <ashobhit@google.com>
Date: Mon, 2 Oct 2023 04:06:46 +0530
Subject: [PATCH] Fix spacing for job cards (#1948)

* Tweak spacing for job loi card

* Tweak spacing for suggest loi card

---------

Co-authored-by: Gino Miceli <228050+gino-m@users.noreply.github.com>
---
 ground/src/main/res/layout/loi_card_item.xml   | 14 ++++++++------
 .../main/res/layout/suggest_loi_card_item.xml  | 18 ++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/ground/src/main/res/layout/loi_card_item.xml b/ground/src/main/res/layout/loi_card_item.xml
index 777e3d6132..569ad7a684 100644
--- a/ground/src/main/res/layout/loi_card_item.xml
+++ b/ground/src/main/res/layout/loi_card_item.xml
@@ -27,37 +27,38 @@
     android:layout_marginStart="@dimen/job_card_start_end_margin"
     android:layout_marginEnd="@dimen/job_card_start_end_margin"
     android:orientation="vertical"
-    app:strokeWidth="0dp"
     app:cardCornerRadius="@dimen/job_card_corner_radius"
-    app:cardElevation="2dp">
+    app:cardElevation="2dp"
+    app:strokeWidth="0dp">
     <androidx.constraintlayout.widget.ConstraintLayout
       android:id="@+id/wrapper_view"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:orientation="vertical"
       android:padding="16dp">
       <TextView
         android:id="@+id/jobName"
+        style="@style/JobCardTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        style="@style/JobCardTitle"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Map the terrain" />
       <TextView
         android:id="@+id/loiName"
+        style="@style/JobCardDescription"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        style="@style/JobCardDescription"
+        android:layout_marginTop="4dp"
         app:layout_constraintStart_toStartOf="@id/jobName"
         app:layout_constraintTop_toBottomOf="@id/jobName"
         tools:text="Quilombolas" />
       <TextView
         android:id="@+id/submissions"
+        style="@style/JobCardAdditionalText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        style="@style/JobCardAdditionalText"
+        android:layout_marginTop="4dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/loiName"
         tools:text="No submissions" />
@@ -65,6 +66,7 @@
         android:id="@+id/collectData"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
         android:clickable="false"
         android:text="@string/collect_data"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/ground/src/main/res/layout/suggest_loi_card_item.xml b/ground/src/main/res/layout/suggest_loi_card_item.xml
index 91fe9c3b36..7d810defae 100644
--- a/ground/src/main/res/layout/suggest_loi_card_item.xml
+++ b/ground/src/main/res/layout/suggest_loi_card_item.xml
@@ -28,9 +28,9 @@
     android:layout_marginEnd="@dimen/job_card_start_end_margin"
     android:backgroundTint="?attr/colorSecondaryContainer"
     android:orientation="vertical"
-    app:strokeWidth="0dp"
     app:cardCornerRadius="@dimen/job_card_corner_radius"
-    app:cardElevation="2dp">
+    app:cardElevation="2dp"
+    app:strokeWidth="0dp">
     <androidx.constraintlayout.widget.ConstraintLayout
       android:id="@+id/wrapper_view"
       android:layout_width="match_parent"
@@ -39,40 +39,42 @@
       android:padding="16dp">
       <TextView
         android:id="@+id/jobName"
+        style="@style/JobCardTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        style="@style/JobCardTitle"
         app:layout_constraintBottom_toTopOf="@+id/newSite"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Map the terrain" />
       <TextView
         android:id="@+id/newSite"
+        style="@style/JobCardDescription"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
         android:text="@string/new_site"
-        style="@style/JobCardDescription"
-        android:layout_marginTop="@dimen/loi_card_item_margin"
         android:textColor="?attr/colorOnSurface"
+        app:layout_constraintBottom_toTopOf="@+id/newSiteHintText"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/jobName"
-        app:layout_constraintBottom_toTopOf="@+id/newSiteHintText"
         tools:text="Suggest area of interest" />
       <TextView
         android:id="@+id/newSiteHintText"
+        style="@style/JobCardAdditionalText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
         android:text="@string/new_site_hint_text"
-        style="@style/JobCardAdditionalText"
+        app:layout_constraintBottom_toTopOf="@+id/collectData"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/newSite"
-        app:layout_constraintBottom_toTopOf="@+id/collectData"
         tools:text="Add new site and submit related data" />
       <Button
         android:id="@+id/collectData"
         style="@style/Widget.App.Button.Inverse"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
         android:clickable="false"
         android:text="@string/collect_data"
         app:layout_constraintBottom_toBottomOf="parent"