Merge pull request #198 from richardthe3rd/claude/fix-details-screen-layout-tqzdg

Redesign detail screens with unified layout pattern

Author: richardthe3rd

lib/domain/repositories/api_drink_repository.dart

@@ -4,29 +4,33 @@ import 'drink_repository.dart';
 
 /// Implementation of DrinkRepository using API services
 ///
-/// Delegates to BeerApiService, FavoritesService, and RatingsService.
+/// Delegates to BeerApiService, FavoritesService, RatingsService, and TastingLogService.
 class ApiDrinkRepository implements DrinkRepository {
   final BeerApiService _apiService;
   final FavoritesService _favoritesService;
   final RatingsService _ratingsService;
+  final TastingLogService _tastingLogService;
 
   ApiDrinkRepository({
     required BeerApiService apiService,
     required FavoritesService favoritesService,
     required RatingsService ratingsService,
+    required TastingLogService tastingLogService,
   })  : _apiService = apiService,
         _favoritesService = favoritesService,
-        _ratingsService = ratingsService;
+        _ratingsService = ratingsService,
+        _tastingLogService = tastingLogService;
 
   @override
   Future<List<Drink>> getDrinks(Festival festival) async {
     final drinks = await _apiService.fetchAllDrinks(festival);
 
-    // Populate favorite status and ratings in a single pass
+    // Populate favorite status, ratings, and tasted status in a single pass
     final favorites = _favoritesService.getFavorites(festival.id);
     for (final drink in drinks) {
       drink.isFavorite = favorites.contains(drink.id);
       drink.rating = _ratingsService.getRating(festival.id, drink.id);
+      drink.isTasted = _tastingLogService.hasTasted(festival.id, drink.id);
     }
 
     return drinks;
@@ -56,4 +60,20 @@ class ApiDrinkRepository implements DrinkRepository {
   Future<void> removeRating(String festivalId, String drinkId) {
     return _ratingsService.removeRating(festivalId, drinkId);
   }
+
+  @override
+  Future<bool> hasTasted(String festivalId, String drinkId) {
+    return Future.value(_tastingLogService.hasTasted(festivalId, drinkId));
+  }
+
+  @override
+  Future<bool> toggleTasted(String festivalId, String drinkId) async {
+    await _tastingLogService.toggleTasted(festivalId, drinkId);
+    return _tastingLogService.hasTasted(festivalId, drinkId);
+  }
+
+  @override
+  Future<List<String>> getTastedDrinks(String festivalId) {
+    return Future.value(_tastingLogService.getTastedDrinkIds(festivalId));
+  }
 }

lib/domain/repositories/drink_repository.dart

@@ -2,12 +2,12 @@ import '../../models/models.dart';
 
 /// Repository interface for drink data access
 ///
-/// Abstracts data access for drinks, favorites, and ratings.
+/// Abstracts data access for drinks, favorites, ratings, and tasting logs.
 /// Implementations can use different data sources (API, local DB, cache).
 abstract class DrinkRepository {
   /// Fetch all drinks for a festival
   ///
-  /// Returns drinks with favorite and rating status already populated.
+  /// Returns drinks with favorite, rating, and tasting status already populated.
   Future<List<Drink>> getDrinks(Festival festival);
 
   /// Get list of favorited drink IDs for a festival
@@ -26,4 +26,15 @@ abstract class DrinkRepository {
 
   /// Remove rating for a drink
   Future<void> removeRating(String festivalId, String drinkId);
+
+  /// Check if a drink has been tasted at a festival
+  Future<bool> hasTasted(String festivalId, String drinkId);
+
+  /// Toggle tasted status for a drink
+  ///
+  /// Returns the new tasted status (true if now tasted, false if untasted).
+  Future<bool> toggleTasted(String festivalId, String drinkId);
+
+  /// Get list of tasted drink IDs for a festival
+  Future<List<String>> getTastedDrinks(String festivalId);
 }

lib/models/drink.dart

@@ -210,13 +210,15 @@ class Drink {
   final String festivalId;
   bool isFavorite;
   int? rating;
+  bool isTasted;
 
   Drink({
     required this.product,
     required this.producer,
     required this.festivalId,
     this.isFavorite = false,
     this.rating,
+    this.isTasted = false,
   });
 
   String get id => product.id;

lib/providers/beer_provider.dart

@@ -167,11 +167,13 @@ class BeerProvider extends ChangeNotifier {
     if (_drinkRepository == null) {
       final favoritesService = FavoritesService(prefs);
       final ratingsService = RatingsService(prefs);
+      final tastingLogService = TastingLogService(prefs);
       final apiService = BeerApiService();
       _drinkRepository = ApiDrinkRepository(
         apiService: apiService,
         favoritesService: favoritesService,
         ratingsService: ratingsService,
+        tastingLogService: tastingLogService,
       );
     }
 
@@ -496,6 +498,26 @@ class BeerProvider extends ChangeNotifier {
     notifyListeners();
   }
 
+  /// Toggle tasted status for a drink
+  Future<void> toggleTasted(Drink drink) async {
+    if (_drinkRepository == null) return;
+
+    final newStatus = await _drinkRepository!.toggleTasted(
+      currentFestival.id,
+      drink.id,
+    );
+    drink.isTasted = newStatus;
+
+    notifyListeners();
+
+    // Log analytics event
+    if (newStatus) {
+      unawaited(analyticsService.logTastedAdded(drink));
+    } else {
+      unawaited(analyticsService.logTastedRemoved(drink));
+    }
+  }
+
   /// Get a drink by ID
   Drink? getDrinkById(String id) {
     try {