tabular format and crop cycle statuses

MuindiStephen · Apr 16, 2024 · 8c099e8 · 8c099e8
1 parent be63312
commit 8c099e8
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 12 deletions.
diff --git a/app/src/main/res/layout/detail_cycle_row.xml b/app/src/main/res/layout/detail_cycle_row.xml
@@ -13,46 +13,51 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TableRow>
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
             <androidx.constraintlayout.widget.ConstraintLayout>
             <TextView
                     android:id="@+id/textView75"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:text="weeding"
-                android:padding="4dp"
+                    android:padding="4dp"
                     android:layout_marginStart="8dp"
-                android:background="@drawable/custom_cell"
+                    android:background="@drawable/custom_cell"
                     android:layout_marginTop="1dp"
                     android:textSize="11sp"
                     android:fontFamily="@font/montserrat_semibold"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                android:layout_weight="1"/>
 
                 <TextView
                     android:id="@+id/textView76"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="0dp"
                     android:text="2024-04-08"
                     android:background="@drawable/custom_cell"
                     android:textSize="11sp"
                     android:padding="4dp"
+                    android:layout_weight="1"
                     android:fontFamily="@font/montserrat_semibold"
                     app:layout_constraintBottom_toBottomOf="@+id/textView75"
                     app:layout_constraintStart_toEndOf="@+id/textView75"
                     app:layout_constraintTop_toTopOf="@+id/textView75" />
 
                 <TextView
                     android:id="@+id/textView77"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="0dp"
                     android:text="2024-08-30"
                     android:background="@drawable/custom_cell"
                     android:textSize="11sp"
                     android:padding="4dp"
+                    android:layout_weight="1"
                     android:fontFamily="@font/montserrat_semibold"
                     app:layout_constraintBottom_toBottomOf="@+id/textView76"
                     app:layout_constraintStart_toEndOf="@+id/textView76"

diff --git a/app/src/main/res/layout/fragment_detailed_farm_cycle.xml b/app/src/main/res/layout/fragment_detailed_farm_cycle.xml
@@ -12,7 +12,7 @@
         android:id="@+id/showFarmId"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="24dp"
         android:layout_marginTop="40dp"
         android:fontFamily="@font/montserrat_semibold"
         android:text="@string/block_a"
@@ -48,10 +48,10 @@
         android:id="@+id/textView78"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="crop cycle/service cycle"
+        android:layout_marginTop="8dp"
         android:fontFamily="@font/montserrat_semibold"
+        android:text="crop cycle/service cycle"
         android:textSize="11sp"
-        android:layout_marginTop="8dp"
         app:layout_constraintStart_toStartOf="@+id/showFarmId"
         app:layout_constraintTop_toBottomOf="@+id/showFarmId" />
 
@@ -72,7 +72,7 @@
         android:id="@+id/viewSeparator"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="14dp"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="50dp"
         android:background="@color/main"
@@ -133,4 +133,18 @@
         app:layout_constraintBottom_toBottomOf="@+id/textView81"
         app:layout_constraintStart_toEndOf="@+id/textView81"
         app:layout_constraintTop_toTopOf="@+id/textView81" />
+
+    <Spinner
+        android:id="@+id/spinnerStatusOfFarmCycle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:background="@drawable/rounded_corner"
+        android:entries="@array/statuses"
+        android:spinnerMode="dropdown"
+        app:layout_constraintBottom_toBottomOf="@+id/textView78"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/textView78"
+        app:layout_constraintTop_toTopOf="@+id/textView78" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -62,7 +62,7 @@
     </string-array>
 
     <string-array name="statuses">
-        <item>UPCOMING</item>
+        <item>OPEN</item>
         <item>IN_PROGRESS</item>
         <item>COMPLETED</item>
         <item>OVERDUE</item>