Styling revamp using CupertinoThemeData and CupertinoTextThemeData (#593)

experimental/veggieseasons/lib/screens/details.dart

@@ -28,12 +28,11 @@ class ServingInfoChart extends StatelessWidget {
       builder: (context, snapshot) {
         final target = snapshot?.data ?? 2000;
         final percent = standardPercentage * 2000 ~/ target;
-        final themeData = CupertinoTheme.of(context);
 
         return Text(
           '$percent% DV',
+          style: CupertinoTheme.of(context).textTheme.textStyle,
           textAlign: TextAlign.end,
-          style: Styles.detailsServingValueText(themeData),
         );
       },
     );
@@ -54,7 +53,7 @@ class ServingInfoChart extends StatelessWidget {
             ),
             child: Text(
               'Serving info',
-              style: Styles.detailsServingHeaderText,
+              style: CupertinoTheme.of(context).textTheme.textStyle,
             ),
           ),
         ),
@@ -79,7 +78,7 @@ class ServingInfoChart extends StatelessWidget {
                         child: Text(
                           veggie.servingSize,
                           textAlign: TextAlign.end,
-                          style: Styles.detailsServingValueText(themeData),
+                          style: CupertinoTheme.of(context).textTheme.textStyle,
                         ),
                       ),
                     ],
@@ -95,8 +94,8 @@ class ServingInfoChart extends StatelessWidget {
                       TableCell(
                         child: Text(
                           '${veggie.caloriesPerServing} kCal',
+                          style: CupertinoTheme.of(context).textTheme.textStyle,
                           textAlign: TextAlign.end,
-                          style: Styles.detailsServingValueText(themeData),
                         ),
                       ),
                     ],
@@ -184,7 +183,7 @@ class InfoView extends StatelessWidget {
                     style: (snapshot.hasData &&
                             snapshot.data.contains(veggie.category))
                         ? Styles.detailsPreferredCategoryText(themeData)
-                        : Styles.detailsCategoryText(themeData),
+                        : themeData.textTheme.textStyle,
                   );
                 },
               ),
@@ -210,7 +209,7 @@ class InfoView extends StatelessWidget {
           SizedBox(height: 8),
           Text(
             veggie.shortDescription,
-            style: Styles.detailsDescriptionText(themeData),
+            style: CupertinoTheme.of(context).textTheme.textStyle,
           ),
           ServingInfoChart(veggie, prefs),
           SizedBox(height: 24),
@@ -249,7 +248,8 @@ class DetailsScreen extends StatefulWidget {
   static Route<void> _routeBuilder(BuildContext context, Object arguments) {
     final veggieId = arguments as int;
     return CupertinoPageRoute(
-      builder: (context) => DetailsScreen(id: veggieId, restorationId: 'details'),
+      builder: (context) =>
+          DetailsScreen(id: veggieId, restorationId: 'details'),
       fullscreenDialog: true,
     );
   }
@@ -324,8 +324,12 @@ class _DetailsScreenState extends State<DetailsScreen> with RestorationMixin {
                   SizedBox(height: 20),
                   CupertinoSegmentedControl<int>(
                     children: {
-                      0: Text('Facts & Info'),
-                      1: Text('Trivia'),
+                      0: Text(
+                        'Facts & Info',
+                      ),
+                      1: Text(
+                        'Trivia',
+                      )
                     },
                     groupValue: _selectedViewIndex.value,
                     onValueChanged: (value) {

experimental/veggieseasons/lib/screens/favorites.dart

@@ -7,7 +7,6 @@ import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';
 import 'package:veggieseasons/data/app_state.dart';
 import 'package:veggieseasons/data/veggie.dart';
-import 'package:veggieseasons/styles.dart';
 import 'package:veggieseasons/widgets/veggie_headline.dart';
 
 class FavoritesScreen extends StatelessWidget {
@@ -32,8 +31,7 @@ class FavoritesScreen extends StatelessWidget {
                     padding: const EdgeInsets.symmetric(horizontal: 24),
                     child: Text(
                       'You haven\'t added any favorite veggies to your garden yet.',
-                      style: Styles.headlineDescription(
-                          CupertinoTheme.of(context)),
+                      style: CupertinoTheme.of(context).textTheme.textStyle,
                     ),
                   )
                 : ListView(

experimental/veggieseasons/lib/screens/list.dart

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
@@ -40,43 +41,48 @@ class ListScreen extends StatelessWidget {
         final appState = Provider.of<AppState>(context);
         final prefs = Provider.of<Preferences>(context);
         final themeData = CupertinoTheme.of(context);
-        return SafeArea(
-          bottom: false,
-          child: ListView.builder(
-            restorationId: 'list',
-            itemCount: appState.allVeggies.length + 2,
-            itemBuilder: (context, index) {
-              if (index == 0) {
-                return Padding(
-                  padding: const EdgeInsets.fromLTRB(16, 24, 16, 16),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(dateString.toUpperCase(), style: Styles.minorText),
-                      Text('In season today',
-                          style: Styles.headlineText(themeData)),
-                    ],
-                  ),
-                );
-              } else if (index <= appState.availableVeggies.length) {
-                return _generateVeggieRow(
-                  appState.availableVeggies[index - 1],
-                  prefs,
-                );
-              } else if (index <= appState.availableVeggies.length + 1) {
-                return Padding(
-                  padding: const EdgeInsets.fromLTRB(16, 24, 16, 16),
-                  child: Text('Not in season',
-                      style: Styles.headlineText(themeData)),
-                );
-              } else {
-                var relativeIndex =
-                    index - (appState.availableVeggies.length + 2);
-                return _generateVeggieRow(
-                    appState.unavailableVeggies[relativeIndex], prefs,
-                    inSeason: false);
-              }
-            },
+        return AnnotatedRegion<SystemUiOverlayStyle>(
+          value: SystemUiOverlayStyle(
+              statusBarBrightness: MediaQuery.platformBrightnessOf(context)),
+          child: SafeArea(
+            bottom: false,
+            child: ListView.builder(
+              restorationId: 'list',
+              itemCount: appState.allVeggies.length + 2,
+              itemBuilder: (context, index) {
+                if (index == 0) {
+                  return Padding(
+                    padding: const EdgeInsets.fromLTRB(16, 24, 16, 16),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(dateString.toUpperCase(),
+                            style: Styles.minorText(themeData)),
+                        Text('In season today',
+                            style: Styles.headlineText(themeData)),
+                      ],
+                    ),
+                  );
+                } else if (index <= appState.availableVeggies.length) {
+                  return _generateVeggieRow(
+                    appState.availableVeggies[index - 1],
+                    prefs,
+                  );
+                } else if (index <= appState.availableVeggies.length + 1) {
+                  return Padding(
+                    padding: const EdgeInsets.fromLTRB(16, 24, 16, 16),
+                    child: Text('Not in season',
+                        style: Styles.headlineText(themeData)),
+                  );
+                } else {
+                  var relativeIndex =
+                      index - (appState.availableVeggies.length + 2);
+                  return _generateVeggieRow(
+                      appState.unavailableVeggies[relativeIndex], prefs,
+                      inSeason: false);
+                }
+              },
+            ),
           ),
         );
       },

experimental/veggieseasons/lib/screens/search.dart

@@ -3,11 +3,11 @@
 // found in the LICENSE file.
 
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';
 import 'package:veggieseasons/data/app_state.dart';
 import 'package:veggieseasons/data/veggie.dart';
-import 'package:veggieseasons/styles.dart';
 import 'package:veggieseasons/widgets/search_bar.dart';
 import 'package:veggieseasons/widgets/veggie_headline.dart';
 
@@ -63,7 +63,7 @@ class _SearchScreenState extends State<SearchScreen> with RestorationMixin {
           padding: const EdgeInsets.symmetric(horizontal: 24),
           child: Text(
             'No veggies matching your search terms were found.',
-            style: Styles.headlineDescription(CupertinoTheme.of(context)),
+            style: CupertinoTheme.of(context).textTheme.textStyle,
           ),
         ),
       );
@@ -101,15 +101,19 @@ class _SearchScreenState extends State<SearchScreen> with RestorationMixin {
     return UnmanagedRestorationScope(
       child: CupertinoTabView(
         builder: (context) {
-          return SafeArea(
-            bottom: false,
-            child: Stack(
-              children: [
-                _buildSearchResults(model.searchVeggies(terms)),
-                _createSearchBox(),
-              ],
-            ),
-          );
+          return AnnotatedRegion<SystemUiOverlayStyle>(
+              value: SystemUiOverlayStyle(
+                  statusBarBrightness:
+                      MediaQuery.platformBrightnessOf(context)),
+              child: SafeArea(
+                bottom: false,
+                child: Stack(
+                  children: [
+                    _buildSearchResults(model.searchVeggies(terms)),
+                    _createSearchBox(),
+                  ],
+                ),
+              ));
         },
       ),
     );