Merge pull request #252 from richardthe3rd/copilot/add-vegan-data-feed-support

feat: Add vegan field support to drink model and detail UI

Author: richardthe3rd

docs/code/api/beer-list-schema.json

@@ -115,6 +115,11 @@
           "description": "Location/bar where the beverage is served",
           "examples": ["Main Bar", "Arctic", "Cider Bar", "Mead Bar", "International Bar", "Cask Bar", "Low/No Bar"]
         },
+        "is_vegan": {
+          "type": ["boolean", "integer", "string", "null"],
+          "description": "Whether the drink is suitable for vegans. May be provided as boolean, integer (0/1), or string ('true'/'false'/'yes'/'no'/'1'/'0'). Legacy key 'vegan' may appear in older data and is treated as a fallback.",
+          "examples": [true, false, 1, 0, "yes", "no", null]
+        },
         "allergens": {
           "type": "object",
           "description": "Allergen information (keys are allergen names, values are truthy indicators)",

docs/code/api/data-api-reference.md

@@ -147,6 +147,7 @@ Each product (individual beverage) contains:
 | `notes` | string | No | Flavor description | "Crisp Heritage malts..." |
 | `status_text` | string | No | Availability status | "Plenty left", "Arrived" |
 | `bar` | string/boolean | No | Venue/location | "Arctic", "Main Bar", true/false |
+| `is_vegan` | boolean/integer/string | No | Vegan suitability | `true`, `false`, `1`, `0`, `"yes"` |
 | `allergens` | object | No | Allergen flags | `{"gluten": 1, "sulphites": 1}` |
 
 ### Dispense Methods
@@ -270,6 +271,7 @@ Product.fromJson(json) → {
   notes: json['notes'],
   statusText: json['status_text'],
   bar: json['bar'],  // Handles String, int, or boolean
+  vegan: json['is_vegan'] ?? json['vegan'],  // Handles bool, int, or String; 'vegan' is legacy fallback
   allergens: parseAllergens(json['allergens']),  // Handles int, bool, or num
 }
 ```
@@ -280,7 +282,8 @@ Product.fromJson(json) → {
 2. **Allergens** values can be `int`, `bool`, or `num`
 3. **Year founded** can be `int` or `String`
 4. **Bar** can be `String`, `int`, or `boolean`
-5. Handle null values gracefully with `?.` and `??`
+5. **is_vegan** can be `bool`, `int`/`num`, or `String` (`"yes"`/`"no"`/`"true"`/`"false"`/`"1"`/`"0"`); legacy key `vegan` is also supported as a fallback
+6. Handle null values gracefully with `?.` and `??`
 
 ---
 
@@ -404,3 +407,4 @@ Product.fromJson(json) → {
 | Version | Date | Changes |
 |---------|------|---------|
 | 1.0.0 | 2025-11-29 | Initial documentation for Flutter app |
+| 1.1.0 | 2026-05-11 | Add `is_vegan` field (with legacy `vegan` fallback) |

lib/models/drink.dart

@@ -62,6 +62,7 @@ class Product {
   final String? notes;
   final String? statusText;
   final String? bar;
+  final bool? vegan;
   final Map<String, int> allergens;
 
   const Product({
@@ -74,6 +75,7 @@ class Product {
     this.notes,
     this.statusText,
     this.bar,
+    this.vegan,
     this.allergens = const {},
   });
 
@@ -118,6 +120,22 @@ class Product {
       bar = barValue.toString();
     }
 
+    // Parse vegan field robustly - can be bool, int/num, or string.
+    bool? parsedVegan;
+    final veganValue = json['is_vegan'] ?? json['vegan'];
+    if (veganValue is bool) {
+      parsedVegan = veganValue;
+    } else if (veganValue is num) {
+      parsedVegan = veganValue != 0;
+    } else if (veganValue is String) {
+      final normalized = veganValue.toLowerCase();
+      if (normalized == 'true' || normalized == '1' || normalized == 'yes') {
+        parsedVegan = true;
+      } else if (normalized == 'false' || normalized == '0' || normalized == 'no') {
+        parsedVegan = false;
+      }
+    }
+
     return Product(
       id: json['id'].toString(),
       name: json['name'].toString(),
@@ -128,6 +146,7 @@ class Product {
       notes: json['notes']?.toString(),
       statusText: json['status_text']?.toString(),
       bar: bar,
+      vegan: parsedVegan,
       allergens: allergens,
     );
   }
@@ -143,6 +162,7 @@ class Product {
       if (notes != null) 'notes': notes,
       if (statusText != null) 'status_text': statusText,
       if (bar != null) 'bar': bar,
+      if (vegan != null) 'is_vegan': vegan,
       'allergens': allergens,
     };
   }
@@ -232,6 +252,7 @@ class Drink {
   String? get notes => product.notes;
   String? get statusText => product.statusText;
   String? get bar => product.bar;
+  bool? get vegan => product.vegan;
   Map<String, int> get allergens => product.allergens;
   AvailabilityStatus? get availabilityStatus => product.availabilityStatus;
   String? get allergenText => product.allergenText;

lib/screens/drink_detail_screen.dart

@@ -178,6 +178,14 @@ class _DrinkDetailScreenState extends State<DrinkDetailScreen> {
                 ? theme.colorScheme.error
                 : theme.colorScheme.primary,
           ),
+        // Vegan indicator
+        if (drink.vegan == true)
+          HeroInfoRow(
+            icon: Icons.eco,
+            text: 'Vegan',
+            iconColor: theme.colorScheme.primary,
+            semanticLabel: 'This drink is vegan',
+          ),
       ],
     );
   }

lib/widgets/hero_info_card.dart

@@ -56,11 +56,15 @@ class HeroInfoRow extends StatelessWidget {
   /// Optional text style
   final TextStyle? textStyle;
 
+  /// Optional semantic label announced by screen readers
+  final String? semanticLabel;
+
   const HeroInfoRow({
     required this.icon,
     required this.text,
     this.iconColor,
     this.textStyle,
+    this.semanticLabel,
     super.key,
   });
 
@@ -72,7 +76,7 @@ class HeroInfoRow extends StatelessWidget {
       color: theme.colorScheme.onPrimaryContainer,
     );
 
-    return Row(
+    final content = Row(
       children: [
         Icon(
           icon,
@@ -88,5 +92,14 @@ class HeroInfoRow extends StatelessWidget {
         ),
       ],
     );
+
+    if (semanticLabel == null) return content;
+
+    return Semantics(
+      label: semanticLabel,
+      // Prevent the row text from being announced in addition to semanticLabel.
+      excludeSemantics: true,
+      child: content,
+    );
   }
 }

test/drink_detail_screen_test.dart

@@ -40,6 +40,7 @@ void main() {
       dispense: 'cask',
       style: 'IPA',
       bar: 'Main Bar',
+      vegan: true,
       notes: 'A hoppy beer with citrus notes',
       allergens: {'gluten': 1, 'sulphites': 1},
     );
@@ -112,18 +113,25 @@ void main() {
 
     testWidgets('displays drink details chips',
         (WidgetTester tester) async {
-      when(mockDrinkRepository.getDrinks(any))
-          .thenAnswer((_) async => [drink]);
-      await provider.loadDrinks();
+      final semanticsHandle = tester.ensureSemantics();
+      try {
+        when(mockDrinkRepository.getDrinks(any))
+            .thenAnswer((_) async => [drink]);
+        await provider.loadDrinks();
 
-      await tester.pumpWidget(createTestWidget('drink1'));
-      await tester.pumpAndSettle();
+        await tester.pumpWidget(createTestWidget('drink1'));
+        await tester.pumpAndSettle();
 
-      // New layout shows combined information in HeroInfoCard
-      expect(find.textContaining('5.0%'), findsOneWidget);
-      expect(find.textContaining('IPA'), findsWidgets); // Appears in HeroInfoCard and style chip
-      expect(find.textContaining('Cask'), findsOneWidget);
-      expect(find.textContaining('Available at Main Bar'), findsOneWidget);
+        // New layout shows combined information in HeroInfoCard
+        expect(find.textContaining('5.0%'), findsOneWidget);
+        expect(find.textContaining('IPA'), findsWidgets); // Appears in HeroInfoCard and style chip
+        expect(find.textContaining('Cask'), findsOneWidget);
+        expect(find.textContaining('Available at Main Bar'), findsOneWidget);
+        expect(find.text('Vegan'), findsOneWidget);
+        expect(find.bySemanticsLabel('This drink is vegan'), findsOneWidget);
+      } finally {
+        semanticsHandle.dispose();
+      }
     });
 
     testWidgets('displays status text in chips when available',

test/models_test.dart

@@ -14,6 +14,7 @@ void main() {
         'notes': 'A test beer',
         'status_text': 'Plenty left',
         'bar': 'Main Bar',
+        'is_vegan': true,
         'allergens': {'gluten': 1},
       };
 
@@ -28,6 +29,7 @@ void main() {
       expect(product.notes, 'A test beer');
       expect(product.statusText, 'Plenty left');
       expect(product.bar, 'Main Bar');
+      expect(product.vegan, isTrue);
       expect(product.allergens, {'gluten': 1});
     });
 
@@ -46,6 +48,7 @@ void main() {
       expect(product.notes, isNull);
       expect(product.statusText, isNull);
       expect(product.bar, isNull);
+      expect(product.vegan, isNull);
       expect(product.allergens, isEmpty);
     });
 
@@ -185,6 +188,126 @@ void main() {
       });
     });
 
+    group('vegan field parsing', () {
+      test('parses legacy vegan key when is_vegan is absent', () {
+        final product = Product.fromJson({
+          'id': '1',
+          'name': 'a',
+          'category': 'beer',
+          'dispense': 'cask',
+          'abv': '4.0',
+          'vegan': true,
+        });
+        expect(product.vegan, isTrue);
+      });
+
+      test('prefers is_vegan when both keys are present', () {
+        final product = Product.fromJson({
+          'id': '1',
+          'name': 'a',
+          'category': 'beer',
+          'dispense': 'cask',
+          'abv': '4.0',
+          'is_vegan': false,
+          'vegan': true,
+        });
+        expect(product.vegan, isFalse);
+      });
+
+      test('parses numeric one as true', () {
+        final product = Product.fromJson({
+          'id': '1',
+          'name': 'a',
+          'category': 'beer',
+          'dispense': 'cask',
+          'abv': '4.0',
+          'is_vegan': 1,
+        });
+        expect(product.vegan, isTrue);
+      });
+
+      test('parses numeric zero as false', () {
+        final product = Product.fromJson({
+          'id': '1',
+          'name': 'a',
+          'category': 'beer',
+          'dispense': 'cask',
+          'abv': '4.0',
+          'is_vegan': 0,
+        });
+        expect(product.vegan, isFalse);
+      });
+
+      test('parses supported string values', () {
+        final yesProduct = Product.fromJson({
+          'id': '1',
+          'name': 'a',
+          'category': 'beer',
+          'dispense': 'cask',
+          'abv': '4.0',
+          'is_vegan': 'yes',
+        });
+        final noProduct = Product.fromJson({
+          'id': '2',
+          'name': 'b',
+          'category': 'beer',
+          'dispense': 'cask',
+          'abv': '4.0',
+          'is_vegan': 'no',
+        });
+        final trueProduct = Product.fromJson({
+          'id': '3',
+          'name': 'c',
+          'category': 'beer',
+          'dispense': 'cask',
+          'abv': '4.0',
+          'is_vegan': 'true',
+        });
+        final falseProduct = Product.fromJson({
+          'id': '4',
+          'name': 'd',
+          'category': 'beer',
+          'dispense': 'cask',
+          'abv': '4.0',
+          'is_vegan': 'false',
+        });
+        final oneProduct = Product.fromJson({
+          'id': '5',
+          'name': 'e',
+          'category': 'beer',
+          'dispense': 'cask',
+          'abv': '4.0',
+          'is_vegan': '1',
+        });
+        final zeroProduct = Product.fromJson({
+          'id': '6',
+          'name': 'f',
+          'category': 'beer',
+          'dispense': 'cask',
+          'abv': '4.0',
+          'is_vegan': '0',
+        });
+        expect(yesProduct.vegan, isTrue);
+        expect(noProduct.vegan, isFalse);
+        expect(trueProduct.vegan, isTrue);
+        expect(falseProduct.vegan, isFalse);
+        expect(oneProduct.vegan, isTrue);
+        expect(zeroProduct.vegan, isFalse);
+      });
+
+      test('returns null for unsupported string values', () {
+        final product = Product.fromJson({
+          'id': '1',
+          'name': 'a',
+          'category': 'beer',
+          'dispense': 'cask',
+          'abv': '4.0',
+          'is_vegan': 'maybe',
+        });
+        expect(product.vegan, isNull);
+      });
+    });
+
     group('availability status edge cases', () {
       test('returns plenty for "arrived" status', () {
         final product = Product.fromJson({
@@ -310,6 +433,7 @@ void main() {
           notes: 'A test beer',
           statusText: 'Plenty left',
           bar: 'Main Bar',
+          vegan: true,
           allergens: {'gluten': 1},
         );
 
@@ -324,6 +448,7 @@ void main() {
         expect(json['notes'], 'A test beer');
         expect(json['status_text'], 'Plenty left');
         expect(json['bar'], 'Main Bar');
+        expect(json['is_vegan'], isTrue);
         expect(json['allergens'], {'gluten': 1});
       });
 
@@ -597,6 +722,7 @@ void main() {
       'notes': 'Hoppy and bold',
       'status_text': 'Plenty left',
       'bar': 'Bar A',
+      'is_vegan': true,
       'allergens': {'gluten': 1},
     });
 
@@ -636,6 +762,7 @@ void main() {
       expect(drink.notes, 'Hoppy and bold');
       expect(drink.statusText, 'Plenty left');
       expect(drink.bar, 'Bar A');
+      expect(drink.vegan, isTrue);
       expect(drink.allergens, {'gluten': 1});
       expect(drink.availabilityStatus, AvailabilityStatus.plenty);
       expect(drink.allergenText, 'Gluten');