From 3472b4bcd758b35f82eafb936b2199ec29f4c4a5 Mon Sep 17 00:00:00 2001 From: Alex <78383757+Lextical@users.noreply.github.com> Date: Sun, 12 Apr 2026 00:51:49 -0600 Subject: [PATCH] Faded text for disabled spinners in staff --- .../detailfragments/AdoptionDetailFragment.java | 2 +- .../listfragments/detailfragments/PetDetailFragment.java | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/AdoptionDetailFragment.java b/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/AdoptionDetailFragment.java index e3467215..18fab4ec 100644 --- a/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/AdoptionDetailFragment.java +++ b/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/AdoptionDetailFragment.java @@ -217,7 +217,7 @@ public class AdoptionDetailFragment extends Fragment { if (employees != null) SpinnerUtils.populateSpinner(requireContext(), binding.spinnerAdoptionEmployee, employees, DropdownDTO::getLabel, "-- Select Staff --", state.selectedEmployeeId, DropdownDTO::getId); - if (isStaff()) binding.spinnerAdoptionStore.setEnabled(false); + if (isStaff()) UIUtils.setViewsEnabled(false, binding.spinnerAdoptionStore); isUpdatingUI = false; } diff --git a/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/PetDetailFragment.java b/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/PetDetailFragment.java index 3b202345..8b28cd1d 100644 --- a/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/PetDetailFragment.java +++ b/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/PetDetailFragment.java @@ -92,7 +92,7 @@ public class PetDetailFragment extends Fragment { boolean storeEnabled = state == null || state.isStoreEnabled; Long selectedStoreId = (staffCreating && storeEnabled) ? tokenManager.getPrimaryStoreId() : (state != null ? state.selectedStoreId : null); updateStoreSpinnerSelection(selectedStoreId); - if (staffCreating && storeEnabled) binding.spinnerStore.setEnabled(false); + if (staffCreating && storeEnabled) UIUtils.setViewsEnabled(false, binding.spinnerStore); }); viewModel.getSpeciesList().observe(getViewLifecycleOwner(), list -> { @@ -356,13 +356,11 @@ public class PetDetailFragment extends Fragment { if (isStaff() && !state.isEditing && state.isStoreEnabled) { updateStoreSpinnerSelection(tokenManager.getPrimaryStoreId()); - binding.spinnerStore.setEnabled(false); + UIUtils.setViewsEnabled(false, binding.spinnerStore); } if (isStaff() && state.isEditing && viewModel.isOriginallyOwnedOrAdopted()) { - binding.spinnerCustomer.setEnabled(false); - binding.spinnerPetStatus.setEnabled(false); - binding.spinnerStore.setEnabled(false); + UIUtils.setViewsEnabled(false, binding.spinnerCustomer, binding.spinnerPetStatus, binding.spinnerStore); } isUpdatingUI = false;