Afsan workpace (#20)

Author: syed-reza98

.cursor/settings.json

@@ -1,7 +1 @@
-{
-  "plugins": {
-    "supabase": {
-      "enabled": true
-    }
-  }
-}
+{}

.gitignore

@@ -49,6 +49,5 @@ builder.exe
 dist/petsphere-217fd880.ipa
 dist/petsphere-e6d8abd0.ipa
 .env.local
-android/gradle.properties
-android/gradle.properties
+/android/gradle.properties
 /scratch

android/gradle.properties

@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 # Android Gradle Plugin / Gradle do not run on JDK 26; without a JDK 17–21 toolchain the build fails with "26.0.2" as the only message.
- org.gradle.java.home=C:\\Program Files\\Android\\Android Studio\\jbr
+#  org.gradle.java.home=C:\\Program Files\\Android\\Android Studio\\jbr
 # Enable parallel build to speed up the build process
 org.gradle.parallel=true
 # Enable the Gradle build cache to reuse outputs from previous builds

lib/controllers/match_controller.dart

@@ -8,6 +8,22 @@ import 'auth_controller.dart';
 import 'chat_controller.dart';
 import 'pet_controller.dart';
 
+// ---------------------------------------------------------------------------
+// Discovery tab: which of the user's pets is browsing (null = active pet)
+// ---------------------------------------------------------------------------
+
+class DiscoveryPetIdNotifier extends Notifier<String?> {
+  @override
+  String? build() => null;
+
+  void select(String? petId) => state = petId;
+}
+
+final discoveryActivePetIdProvider =
+    NotifierProvider<DiscoveryPetIdNotifier, String?>(
+  DiscoveryPetIdNotifier.new,
+);
+
 // ---------------------------------------------------------------------------
 // State
 // ---------------------------------------------------------------------------
@@ -74,23 +90,53 @@ class MatchController extends Notifier<MatchState> {
   @override
   MatchState build() {
     final activePet = ref.watch(activePetProvider);
-    if (activePet == null) {
+    final myPets = ref.watch(petProvider.select((s) => s.myPets));
+
+    if (myPets.isEmpty) {
       _lastLoadedPetId = null;
+      Future.microtask(
+        () => ref.read(discoveryActivePetIdProvider.notifier).select(null),
+      );
       return MatchState();
     }
 
-    // Do not return a fresh [MatchState(isLoading: true)] on every rebuild —
-    // that wipes discovery data whenever [activePetProvider] notifies with the
-    // same pet id (new model instance). Only reset loading when the pet id changes.
-    if (_lastLoadedPetId != activePet.id) {
-      _lastLoadedPetId = activePet.id;
-      Future.microtask(() => _load(activePet.id));
-      return MatchState(isLoading: true);
+    final browsingId = ref.watch(discoveryActivePetIdProvider);
+    String? targetId = browsingId ?? activePet?.id;
+    if (targetId != null && !myPets.any((p) => p.id == targetId)) {
+      targetId = activePet?.id ?? myPets.first.id;
+      Future.microtask(
+        () => ref.read(discoveryActivePetIdProvider.notifier).select(targetId),
+      );
+    }
+    targetId ??= activePet?.id ?? myPets.first.id;
+
+    if (_lastLoadedPetId != targetId) {
+      final hadPriorLoad = _lastLoadedPetId != null;
+      _lastLoadedPetId = targetId;
+      Future.microtask(() => _load(targetId!));
+      if (!hadPriorLoad) {
+        return MatchState(isLoading: true);
+      }
+      return MatchState(
+        isLoading: true,
+        filterAnimal: state.filterAnimal,
+        filterBreed: state.filterBreed,
+        searchQuery: state.searchQuery,
+        discoveryPets: const [],
+        allDiscoveryPets: const [],
+        myRequests: state.myRequests,
+        sentRequests: state.sentRequests,
+      );
     }
 
     return state;
   }
 
+  String? _resolveDiscoveryTargetPetId() {
+    return ref.read(discoveryActivePetIdProvider) ??
+        ref.read(activePetProvider)?.id;
+  }
+
   // When [silent] is true the loading flag is NOT set, so the UI avoids a
   // full-screen spinner. Use this for background refreshes (e.g. after a like).
   Future<void> _load(String myPetId, {bool silent = false}) async {
@@ -105,13 +151,27 @@ class MatchController extends Notifier<MatchState> {
 
     _currentDiscoveryPetId = myPetId;
 
+    final myPets = ref.read(petProvider).myPets;
+    PetModel? viewerPet;
+    for (final p in myPets) {
+      if (p.id == myPetId) {
+        viewerPet = p;
+        break;
+      }
+    }
+    final viewerAnimalType = viewerPet?.animalType.trim();
+
     try {
       final futures = await Future.wait([
         matchRepository.fetchDiscoveryPets(
           myPetId: myPetId,
           userId: userId,
-          filterAnimal: state.filterAnimal,
+          allMyPetIds: myPets.map((p) => p.id).toList(),
           filterBreed: state.filterBreed,
+          viewerAnimalType:
+              (viewerAnimalType != null && viewerAnimalType.isNotEmpty)
+                  ? viewerAnimalType
+                  : null,
         ),
         matchRepository.fetchMyRequests(myPetId),
         matchRepository.fetchSentRequests(myPetId),
@@ -136,9 +196,9 @@ class MatchController extends Notifier<MatchState> {
   }
 
   Future<void> refresh() async {
-    final activePet = ref.read(activePetProvider);
-    if (activePet != null) {
-      await _load(activePet.id);
+    final target = _resolveDiscoveryTargetPetId();
+    if (target != null) {
+      await _load(target);
     }
   }
 
@@ -154,12 +214,12 @@ class MatchController extends Notifier<MatchState> {
   String? _currentDiscoveryPetId;
 
   void setFilterBreed(String? breed) {
-    final activePet = ref.read(activePetProvider);
+    final target = _resolveDiscoveryTargetPetId();
     debugPrint(
-        '[MatchController] setFilterBreed($breed) — activePet=${activePet?.name}');
-    if (activePet == null) {
+        '[MatchController] setFilterBreed($breed) — targetPetId=$target');
+    if (target == null) {
       debugPrint(
-          '[MatchController] ⚠️ activePet is NULL — filter change ignored!');
+          '[MatchController] ⚠️ No discovery target pet — filter change ignored!');
       return;
     }
     if (breed == null || breed.isEmpty) {
@@ -169,16 +229,16 @@ class MatchController extends Notifier<MatchState> {
     }
     debugPrint(
         '[MatchController] State updated: animal=${state.filterAnimal}, breed=${state.filterBreed}');
-    _load(activePet.id);
+    _load(target);
   }
 
   void setFilterAnimal(String? animal) {
-    final activePet = ref.read(activePetProvider);
+    final target = _resolveDiscoveryTargetPetId();
     debugPrint(
-        '[MatchController] setFilterAnimal($animal) — activePet=${activePet?.name}');
-    if (activePet == null) {
+        '[MatchController] setFilterAnimal($animal) — targetPetId=$target');
+    if (target == null) {
       debugPrint(
-          '[MatchController] ⚠️ activePet is NULL — filter change ignored!');
+          '[MatchController] ⚠️ No discovery target pet — filter change ignored!');
       return;
     }
     if (animal == null || animal.isEmpty) {
@@ -188,7 +248,7 @@ class MatchController extends Notifier<MatchState> {
     }
     debugPrint(
         '[MatchController] State updated: animal=${state.filterAnimal}, breed=${state.filterBreed}');
-    _load(activePet.id);
+    _load(target);
   }
 
   void setSearchQuery(String query) {
@@ -250,7 +310,7 @@ class MatchController extends Notifier<MatchState> {
     }
 
     try {
-      await matchRepository.sendLikeRequest(
+      final matchRequestId = await matchRepository.sendLikeRequest(
         senderPetId: senderPet.id,
         receiverPetId: receiverPetId,
       );
@@ -274,7 +334,7 @@ class MatchController extends Notifier<MatchState> {
               '${senderPet.name} is interested in breeding with ${receiverPet.name}.',
           type: 'match_request',
           entityType: 'match_request',
-          entityId: senderPet.id,
+          entityId: matchRequestId,
           actorPetId: senderPet.id,
         );
       }
@@ -283,6 +343,15 @@ class MatchController extends Notifier<MatchState> {
       // does NOT show a loading spinner, so the UI transition is seamless.
       _load(senderPet.id, silent: true);
       return true;
+    } on StateError catch (e) {
+      if (e.message == 'duplicate_match_request') {
+        state = state.copyWith(
+          error: 'You have already sent a request for this pet.',
+        );
+      } else {
+        state = state.copyWith(error: e.toString());
+      }
+      return false;
     } catch (e) {
       state = state.copyWith(error: 'Could not send request: $e');
       return false;

lib/models/pet_health_extended_models.dart

@@ -145,7 +145,7 @@ class MedicationDose {
 
   Color get statusColor {
     if (isGiven) return AppTheme.secondaryAccent;
-    if (isOverdue) return AppTheme.primaryAccent;
+    if (isOverdue) return AppTheme.alertAccent;
     return AppTheme.textSecondary;
   }