Merge pull request #113 from richardthe3rd/claude/style-app-bar-heading-01KUsFjPf8Qm4nDpjgVb7R88

Style app bar to match heading colors

Author: richardthe3rd

lib/screens/brewery_screen.dart

@@ -53,11 +53,19 @@ class _BreweryScreenState extends State<BreweryScreen> {
     final theme = Theme.of(context);
 
     return Scaffold(
-      appBar: AppBar(),
       body: CustomScrollView(
         slivers: [
-          SliverToBoxAdapter(
-            child: _buildHeader(context, producer, breweryDrinks.length),
+          SliverAppBar(
+            expandedHeight: 244,
+            pinned: true,
+            backgroundColor: theme.colorScheme.primaryContainer,
+            foregroundColor: theme.colorScheme.onPrimaryContainer,
+            title: Text(producer.name),
+            flexibleSpace: FlexibleSpaceBar(
+              background: SafeArea(
+                child: _buildHeader(context, producer, breweryDrinks.length),
+              ),
+            ),
           ),
           SliverToBoxAdapter(
             child: Padding(
@@ -157,6 +165,7 @@ class _BreweryScreenState extends State<BreweryScreen> {
           Padding(
             padding: const EdgeInsets.all(24),
             child: Column(
+              mainAxisSize: MainAxisSize.min,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Row(

lib/screens/drink_detail_screen.dart

@@ -43,34 +43,49 @@ class _DrinkDetailScreenState extends State<DrinkDetailScreen> {
       );
     }
 
+    final theme = Theme.of(context);
+
     return Scaffold(
-      appBar: AppBar(
-        actions: [
-          IconButton(
-            icon: const Icon(Icons.share),
-            onPressed: () => _shareDrink(context, drink, provider.currentFestival),
+      body: CustomScrollView(
+        slivers: [
+          SliverAppBar(
+            expandedHeight: 220,
+            pinned: true,
+            backgroundColor: theme.colorScheme.primaryContainer,
+            foregroundColor: theme.colorScheme.onPrimaryContainer,
+            title: Text(drink.name),
+            actions: [
+              IconButton(
+                icon: const Icon(Icons.share),
+                onPressed: () => _shareDrink(context, drink, provider.currentFestival),
+              ),
+              IconButton(
+                icon: Icon(
+                  drink.isFavorite ? Icons.favorite : Icons.favorite_border,
+                ),
+                onPressed: () => provider.toggleFavorite(drink),
+              ),
+            ],
+            flexibleSpace: FlexibleSpaceBar(
+              background: SafeArea(
+                child: _buildHeader(context, drink),
+              ),
+            ),
           ),
-          IconButton(
-            icon: Icon(
-              drink.isFavorite ? Icons.favorite : Icons.favorite_border,
+          SliverToBoxAdapter(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                _buildRatingSection(context, drink, provider),
+                _buildInfoChips(context, drink),
+                if (drink.notes != null) _buildDescription(context, drink),
+                if (drink.allergenText != null) _buildAllergens(context, drink),
+                _buildBrewerySection(context, drink, provider),
+              ],
             ),
-            onPressed: () => provider.toggleFavorite(drink),
           ),
         ],
       ),
-      body: SingleChildScrollView(
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            _buildHeader(context, drink),
-            _buildRatingSection(context, drink, provider),
-            _buildInfoChips(context, drink),
-            if (drink.notes != null) _buildDescription(context, drink),
-            if (drink.allergenText != null) _buildAllergens(context, drink),
-            _buildBrewerySection(context, drink, provider),
-          ],
-        ),
-      ),
     );
   }
 
@@ -158,6 +173,7 @@ class _DrinkDetailScreenState extends State<DrinkDetailScreen> {
           Padding(
             padding: const EdgeInsets.all(24),
             child: Column(
+              mainAxisSize: MainAxisSize.min,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Text(

lib/screens/style_screen.dart

@@ -50,13 +50,19 @@ class _StyleScreenState extends State<StyleScreen> {
     final theme = Theme.of(context);
 
     return Scaffold(
-      appBar: AppBar(
-        title: Text(widget.style),
-      ),
       body: CustomScrollView(
         slivers: [
-          SliverToBoxAdapter(
-            child: _buildHeader(context, widget.style, styleDrinks.length, avgAbv, mainCategory),
+          SliverAppBar(
+            expandedHeight: 220,
+            pinned: true,
+            backgroundColor: theme.colorScheme.primaryContainer,
+            foregroundColor: theme.colorScheme.onPrimaryContainer,
+            title: Text(widget.style),
+            flexibleSpace: FlexibleSpaceBar(
+              background: SafeArea(
+                child: _buildHeader(context, widget.style, styleDrinks.length, avgAbv, mainCategory),
+              ),
+            ),
           ),
           SliverToBoxAdapter(
             child: Padding(
@@ -157,6 +163,7 @@ class _StyleScreenState extends State<StyleScreen> {
           Padding(
             padding: const EdgeInsets.all(24),
             child: Column(
+              mainAxisSize: MainAxisSize.min,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Row(

test/drink_detail_screen_test.dart

@@ -91,7 +91,7 @@ void main() {
       await tester.pumpWidget(createTestWidget('drink1'));
       await tester.pumpAndSettle();
 
-      expect(find.text('Test Beer'), findsOneWidget);
+      expect(find.text('Test Beer'), findsNWidgets(2)); // Appears in app bar title and content
       expect(find.text('Test Brewery'), findsNWidgets(2)); // Appears in header and brewery section
       expect(find.text('Cambridge, UK'), findsNWidgets(2)); // Appears in header and brewery section
     });
@@ -295,7 +295,7 @@ void main() {
       await tester.pumpAndSettle();
 
       // Verify the drink name is there but no description text
-      expect(find.text('Simple Beer'), findsOneWidget);
+      expect(find.text('Simple Beer'), findsWidgets);
     });
 
     testWidgets('displays rating value when drink has rating',