From 05a19ac7c0bfe2f1f65f8be25a6083a796d2efc1 Mon Sep 17 00:00:00 2001
From: Alex <78383757+Lextical@users.noreply.github.com>
Date: Wed, 8 Apr 2026 20:14:52 -0600
Subject: [PATCH] Appointments should be fully user frendly now

---
 .../AppointmentDetailFragment.java            |  2 +-
 .../layout/fragment_appointment_detail.xml    | 71 +++++++++----------
 2 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/AppointmentDetailFragment.java b/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/AppointmentDetailFragment.java
index 72d291e8..8e0f2be8 100644
--- a/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/AppointmentDetailFragment.java
+++ b/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/AppointmentDetailFragment.java
@@ -319,7 +319,7 @@ public class AppointmentDetailFragment extends Fragment {
             binding.tvAppointmentId.setVisibility(View.GONE);
 
             UIUtils.setViewsEnabled(true, binding.spinnerCustomer, binding.spinnerStore, binding.spinnerService);
-            UIUtils.setViewsEnabled(false, binding.spinnerPet, binding.spinnerStaff);
+            UIUtils.setViewsEnabled(false, binding.spinnerPet, binding.spinnerStaff, binding.spinnerAppointmentStatus);
             UIUtils.setViewsAlpha(1.0f, binding.tvLabelCustomer, binding.tvLabelStore, binding.tvLabelPet, binding.tvLabelService, binding.tvLabelStaff);
         }
     }
diff --git a/android/app/src/main/res/layout/fragment_appointment_detail.xml b/android/app/src/main/res/layout/fragment_appointment_detail.xml
index 4248311c..7d5ec31d 100644
--- a/android/app/src/main/res/layout/fragment_appointment_detail.xml
+++ b/android/app/src/main/res/layout/fragment_appointment_detail.xml
@@ -65,8 +65,6 @@
                     android:layout_gravity="end"
                     android:layout_marginBottom="8dp"/>
 
-
-
                 <!-- Customer -->
                 <TextView
                     android:id="@+id/tvLabelCustomer"
@@ -83,6 +81,22 @@
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="16dp"/>
 
+                <!-- Pet -->
+                <TextView
+                    android:id="@+id/tvLabelPet"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Pet"
+                    android:textColor="@color/text_dark"
+                    android:textSize="12sp"
+                    android:layout_marginBottom="4dp"/>
+
+                <Spinner
+                    android:id="@+id/spinnerPet"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="16dp"/>
+
                 <!-- Store -->
                 <TextView
                     android:id="@+id/tvLabelStore"
@@ -99,41 +113,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="16dp"/>
 
-                <!-- Pet -->
-
-                <TextView
-                    android:id="@+id/tvLabelPet"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Pet"
-                    android:textColor="@color/text_dark"
-                    android:textSize="12sp"
-                    android:layout_marginBottom="4dp"/>
-
-
-                <Spinner
-                    android:id="@+id/spinnerPet"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="16dp"/>
-
-                <!-- Service -->
-
-                <TextView
-                    android:id="@+id/tvLabelService"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Service"
-                    android:textColor="@color/text_dark"
-                    android:textSize="12sp"
-                    android:layout_marginBottom="4dp"/>
-
-                <Spinner
-                    android:id="@+id/spinnerService"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="16dp"/>
-
                 <!-- Staff -->
                 <TextView
                     android:id="@+id/tvLabelStaff"
@@ -150,8 +129,23 @@
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="16dp"/>
 
-                <!-- Appointment Date -->
+                <!-- Service -->
+                <TextView
+                    android:id="@+id/tvLabelService"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Service"
+                    android:textColor="@color/text_dark"
+                    android:textSize="12sp"
+                    android:layout_marginBottom="4dp"/>
 
+                <Spinner
+                    android:id="@+id/spinnerService"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="16dp"/>
+
+                <!-- Appointment Date -->
                 <TextView
                     android:id="@+id/tvLabelDate"
                     android:layout_width="wrap_content"
@@ -222,6 +216,7 @@
 
                 <!-- Status -->
                 <TextView
+                    android:id="@+id/tvLabelStatus"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="Status"