brianegan · thisis-dc4 · Jul 2, 2020
diff --git a/bloc_flutter/lib/screens/add_edit_screen.dart b/bloc_flutter/lib/screens/add_edit_screen.dart
@@ -54,7 +54,7 @@ class _AddEditScreenState extends State<AddEditScreen> {
                 initialValue: widget.todo != null ? widget.todo.task : '',
                 key: ArchSampleKeys.taskField,
                 autofocus: isEditing ? false : true,
-                style: Theme.of(context).textTheme.headline,
+                style: Theme.of(context).textTheme.headline5,
                 decoration: InputDecoration(
                   hintText: ArchSampleLocalizations.of(context).newTodoHint,
                 ),
@@ -67,7 +67,7 @@ class _AddEditScreenState extends State<AddEditScreen> {
                 initialValue: widget.todo != null ? widget.todo.note : '',
                 key: ArchSampleKeys.noteField,
                 maxLines: 10,
-                style: Theme.of(context).textTheme.subhead,
+                style: Theme.of(context).textTheme.subtitle1,
                 decoration: InputDecoration(
                   hintText: ArchSampleLocalizations.of(context).notesHint,
                 ),

diff --git a/bloc_flutter/lib/screens/detail_screen.dart b/bloc_flutter/lib/screens/detail_screen.dart
@@ -93,13 +93,13 @@ class DetailScreenState extends State<DetailScreen> {
                             child: Text(
                               todo.task,
                               key: ArchSampleKeys.detailsTodoItemTask,
-                              style: Theme.of(context).textTheme.headline,
+                              style: Theme.of(context).textTheme.headline5,
                             ),
                           ),
                           Text(
                             todo.note,
                             key: ArchSampleKeys.detailsTodoItemNote,
-                            style: Theme.of(context).textTheme.subhead,
+                            style: Theme.of(context).textTheme.subtitle1,
                           )
                         ],
                       ),

diff --git a/bloc_flutter/lib/widgets/filter_button.dart b/bloc_flutter/lib/widgets/filter_button.dart
@@ -17,8 +17,8 @@ class FilterButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final defaultStyle = theme.textTheme.body1;
-    final activeStyle = theme.textTheme.body1.copyWith(
+    final defaultStyle = theme.textTheme.bodyText2;
+    final activeStyle = theme.textTheme.bodyText2.copyWith(
       color: theme.accentColor,
     );
     final button = _Button(

diff --git a/bloc_flutter/lib/widgets/stats_counter.dart b/bloc_flutter/lib/widgets/stats_counter.dart
@@ -39,7 +39,7 @@ class StatsCounterState extends State<StatsCounter> {
             padding: EdgeInsets.only(bottom: 8.0),
             child: Text(
               ArchSampleLocalizations.of(context).completedTodos,
-              style: Theme.of(context).textTheme.title,
+              style: Theme.of(context).textTheme.headline6,
             ),
           ),
           Padding(
@@ -49,15 +49,15 @@ class StatsCounterState extends State<StatsCounter> {
               builder: (context, snapshot) => Text(
                 '${snapshot.data ?? 0}',
                 key: ArchSampleKeys.statsNumCompleted,
-                style: Theme.of(context).textTheme.subhead,
+                style: Theme.of(context).textTheme.subtitle1,
               ),
             ),
           ),
           Padding(
             padding: EdgeInsets.only(bottom: 8.0),
             child: Text(
               ArchSampleLocalizations.of(context).activeTodos,
-              style: Theme.of(context).textTheme.title,
+              style: Theme.of(context).textTheme.headline6,
             ),
           ),
           Padding(
@@ -68,7 +68,7 @@ class StatsCounterState extends State<StatsCounter> {
                 return Text(
                   '${snapshot.data ?? 0}',
                   key: ArchSampleKeys.statsNumActive,
-                  style: Theme.of(context).textTheme.subhead,
+                  style: Theme.of(context).textTheme.subtitle1,
                 );
               },
             ),

diff --git a/bloc_flutter/lib/widgets/todo_item.dart b/bloc_flutter/lib/widgets/todo_item.dart
@@ -35,14 +35,14 @@ class TodoItem extends StatelessWidget {
         title: Text(
           todo.task,
           key: ArchSampleKeys.todoItemTask(todo.id),
-          style: Theme.of(context).textTheme.title,
+          style: Theme.of(context).textTheme.headline6,
         ),
         subtitle: Text(
           todo.note,
           key: ArchSampleKeys.todoItemNote(todo.id),
           maxLines: 1,
           overflow: TextOverflow.ellipsis,
-          style: Theme.of(context).textTheme.subhead,
+          style: Theme.of(context).textTheme.subtitle1,
         ),
       ),
     );

diff --git a/bloc_library/lib/screens/add_edit_screen.dart b/bloc_library/lib/screens/add_edit_screen.dart
@@ -54,7 +54,7 @@ class _AddEditScreenState extends State<AddEditScreen> {
                 initialValue: isEditing ? widget.todo.task : '',
                 key: ArchSampleKeys.taskField,
                 autofocus: !isEditing,
-                style: textTheme.headline,
+                style: textTheme.headline5,
                 decoration: InputDecoration(
                   hintText: localizations.newTodoHint,
                 ),
@@ -69,7 +69,7 @@ class _AddEditScreenState extends State<AddEditScreen> {
                 initialValue: isEditing ? widget.todo.note : '',
                 key: ArchSampleKeys.noteField,
                 maxLines: 10,
-                style: textTheme.subhead,
+                style: textTheme.subtitle1,
                 decoration: InputDecoration(
                   hintText: localizations.notesHint,
                 ),

diff --git a/bloc_library/lib/screens/details_screen.dart b/bloc_library/lib/screens/details_screen.dart
@@ -79,14 +79,14 @@ class DetailsScreen extends StatelessWidget {
                                       todo.task,
                                       key: ArchSampleKeys.detailsTodoItemTask,
                                       style:
-                                          Theme.of(context).textTheme.headline,
+                                          Theme.of(context).textTheme.headline5,
                                     ),
                                   ),
                                 ),
                                 Text(
                                   todo.note,
                                   key: ArchSampleKeys.detailsTodoItemNote,
-                                  style: Theme.of(context).textTheme.subhead,
+                                  style: Theme.of(context).textTheme.subtitle1,
                                 ),
                               ],
                             ),

diff --git a/bloc_library/lib/widgets/filter_button.dart b/bloc_library/lib/widgets/filter_button.dart
@@ -15,10 +15,10 @@ class FilterButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final defaultStyle = Theme.of(context).textTheme.body1;
+    final defaultStyle = Theme.of(context).textTheme.bodyText1;
     final activeStyle = Theme.of(context)
         .textTheme
-        .body1
+        .bodyText2
         .copyWith(color: Theme.of(context).accentColor);
     final filteredTodosBloc = BlocProvider.of<FilteredTodosBloc>(context);
     return BlocBuilder(

diff --git a/bloc_library/lib/widgets/stats.dart b/bloc_library/lib/widgets/stats.dart
@@ -31,30 +31,30 @@ class Stats extends StatelessWidget {
                   padding: EdgeInsets.only(bottom: 8.0),
                   child: Text(
                     ArchSampleLocalizations.of(context).completedTodos,
-                    style: Theme.of(context).textTheme.title,
+                    style: Theme.of(context).textTheme.headline6,
                   ),
                 ),
                 Padding(
                   padding: EdgeInsets.only(bottom: 24.0),
                   child: Text(
                     '${state.numCompleted}',
                     key: ArchSampleKeys.statsNumCompleted,
-                    style: Theme.of(context).textTheme.subhead,
+                    style: Theme.of(context).textTheme.subtitle1,
                   ),
                 ),
                 Padding(
                   padding: EdgeInsets.only(bottom: 8.0),
                   child: Text(
                     ArchSampleLocalizations.of(context).activeTodos,
-                    style: Theme.of(context).textTheme.title,
+                    style: Theme.of(context).textTheme.headline6,
                   ),
                 ),
                 Padding(
                   padding: EdgeInsets.only(bottom: 24.0),
                   child: Text(
                     '${state.numActive}',
                     key: ArchSampleKeys.statsNumActive,
-                    style: Theme.of(context).textTheme.subhead,
+                    style: Theme.of(context).textTheme.subtitle1,
                   ),
                 )
               ],

diff --git a/bloc_library/lib/widgets/todo_item.dart b/bloc_library/lib/widgets/todo_item.dart
@@ -41,7 +41,7 @@ class TodoItem extends StatelessWidget {
             child: Text(
               todo.task,
               key: ArchSampleKeys.todoItemTask(todo.id),
-              style: Theme.of(context).textTheme.title,
+              style: Theme.of(context).textTheme.headline6,
             ),
           ),
         ),
@@ -51,7 +51,7 @@ class TodoItem extends StatelessWidget {
                 key: ArchSampleKeys.todoItemNote(todo.id),
                 maxLines: 1,
                 overflow: TextOverflow.ellipsis,
-                style: Theme.of(context).textTheme.subhead,
+                style: Theme.of(context).textTheme.subtitle1,
               )
             : null,
       ),

diff --git a/built_redux/.flutter-plugins-dependencies b/built_redux/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.0/","dependencies":[]}],"android":[{"name":"path_provider","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.0/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":[]}],"date_created":"2020-02-10 11:23:40.410802","version":"1.14.7-pre.38"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.11\\\\","dependencies":[]}],"android":[{"name":"path_provider","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.11\\\\","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-0.0.4+3\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]}],"windows":[],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]}],"date_created":"2020-07-02 13:26:10.098867","version":"1.19.0-6.0.pre.27"}
diff --git a/built_redux/lib/presentation/add_edit_screen.dart b/built_redux/lib/presentation/add_edit_screen.dart
@@ -50,7 +50,7 @@ class _AddEditScreenState extends State<AddEditScreen> {
                 initialValue: isEditing ? widget.todo.task : '',
                 key: ArchSampleKeys.taskField,
                 autofocus: !isEditing,
-                style: textTheme.headline,
+                style: textTheme.headline5,
                 decoration: InputDecoration(
                   hintText: localizations.newTodoHint,
                 ),
@@ -65,7 +65,7 @@ class _AddEditScreenState extends State<AddEditScreen> {
                 initialValue: isEditing ? widget.todo.note : '',
                 key: ArchSampleKeys.noteField,
                 maxLines: 10,
-                style: textTheme.subhead,
+                style: textTheme.subtitle1,
                 decoration: InputDecoration(
                   hintText: localizations.notesHint,
                 ),

diff --git a/built_redux/lib/presentation/details_screen.dart b/built_redux/lib/presentation/details_screen.dart
@@ -66,13 +66,13 @@ class DetailsScreen extends StatelessWidget {
                         child: Text(
                           todo.task,
                           key: ArchSampleKeys.detailsTodoItemTask,
-                          style: Theme.of(context).textTheme.headline,
+                          style: Theme.of(context).textTheme.headline5,
                         ),
                       ),
                       Text(
                         todo.note,
                         key: ArchSampleKeys.detailsTodoItemNote,
-                        style: Theme.of(context).textTheme.subhead,
+                        style: Theme.of(context).textTheme.subtitle1,
                       )
                     ],
                   ),

diff --git a/built_redux/lib/presentation/filter_button.dart b/built_redux/lib/presentation/filter_button.dart
@@ -16,10 +16,10 @@ class FilterButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final defaultStyle = Theme.of(context).textTheme.body1;
+    final defaultStyle = Theme.of(context).textTheme.bodyText2;
     final activeStyle = Theme.of(context)
         .textTheme
-        .body1
+        .bodyText2
         .copyWith(color: Theme.of(context).accentColor);
 
     return AnimatedOpacity(

diff --git a/built_redux/lib/presentation/stats_counter.dart b/built_redux/lib/presentation/stats_counter.dart
@@ -34,30 +34,30 @@ class StatsCounter extends StatelessWidget {
                     padding: EdgeInsets.only(bottom: 8.0),
                     child: Text(
                       ArchSampleLocalizations.of(context).completedTodos,
-                      style: Theme.of(context).textTheme.title,
+                      style: Theme.of(context).textTheme.headline6,
                     ),
                   ),
                   Padding(
                     padding: EdgeInsets.only(bottom: 24.0),
                     child: Text(
                       '$numCompleted',
                       key: ArchSampleKeys.statsNumCompleted,
-                      style: Theme.of(context).textTheme.subhead,
+                      style: Theme.of(context).textTheme.subtitle1,
                     ),
                   ),
                   Padding(
                     padding: EdgeInsets.only(bottom: 8.0),
                     child: Text(
                       ArchSampleLocalizations.of(context).activeTodos,
-                      style: Theme.of(context).textTheme.title,
+                      style: Theme.of(context).textTheme.headline6,
                     ),
                   ),
                   Padding(
                     padding: EdgeInsets.only(bottom: 24.0),
                     child: Text(
                       '$numActive',
                       key: ArchSampleKeys.statsNumActive,
-                      style: Theme.of(context).textTheme.subhead,
+                      style: Theme.of(context).textTheme.subtitle1,
                     ),
                   )
                 ],

diff --git a/built_redux/lib/presentation/todo_item.dart b/built_redux/lib/presentation/todo_item.dart
@@ -35,14 +35,14 @@ class TodoItem extends StatelessWidget {
         title: Text(
           todo.task,
           key: ArchSampleKeys.todoItemTask(todo.id),
-          style: Theme.of(context).textTheme.title,
+          style: Theme.of(context).textTheme.headline6,
         ),
         subtitle: Text(
           todo.note,
           key: ArchSampleKeys.todoItemNote(todo.id),
           maxLines: 1,
           overflow: TextOverflow.ellipsis,
-          style: Theme.of(context).textTheme.subhead,
+          style: Theme.of(context).textTheme.subtitle1,
         ),
       ),
     );

diff --git a/change_notifier_provider/lib/add_todo_screen.dart b/change_notifier_provider/lib/add_todo_screen.dart
@@ -46,7 +46,7 @@ class _AddTodoScreenState extends State<AddTodoScreen> {
                 decoration: InputDecoration(
                   hintText: localizations.newTodoHint,
                 ),
-                style: textTheme.headline,
+                style: textTheme.headline5,
                 autofocus: true,
                 validator: (val) {
                   return val.trim().isEmpty
@@ -57,7 +57,7 @@ class _AddTodoScreenState extends State<AddTodoScreen> {
               TextFormField(
                 key: ArchSampleKeys.noteField,
                 controller: _notesEditingController,
-                style: textTheme.subhead,
+                style: textTheme.subtitle1,
                 decoration: InputDecoration(hintText: localizations.notesHint),
                 maxLines: 10,
               )

diff --git a/change_notifier_provider/lib/details_screen.dart b/change_notifier_provider/lib/details_screen.dart
@@ -62,13 +62,13 @@ class DetailsScreen extends StatelessWidget {
                             child: Text(
                               todo.task,
                               key: ArchSampleKeys.detailsTodoItemTask,
-                              style: Theme.of(context).textTheme.headline,
+                              style: Theme.of(context).textTheme.headline5,
                             ),
                           ),
                           Text(
                             todo.note,
                             key: ArchSampleKeys.detailsTodoItemNote,
-                            style: Theme.of(context).textTheme.subhead,
+                            style: Theme.of(context).textTheme.subtitle1,
                           )
                         ],
                       ),

diff --git a/change_notifier_provider/lib/edit_todo_screen.dart b/change_notifier_provider/lib/edit_todo_screen.dart
@@ -50,7 +50,7 @@ class _EditTodoScreenState extends State<EditTodoScreen> {
               TextFormField(
                 controller: _taskController,
                 key: ArchSampleKeys.taskField,
-                style: Theme.of(context).textTheme.headline,
+                style: Theme.of(context).textTheme.headline5,
                 decoration: InputDecoration(
                   hintText: ArchSampleLocalizations.of(context).newTodoHint,
                 ),

diff --git a/change_notifier_provider/lib/home/filter_button.dart b/change_notifier_provider/lib/home/filter_button.dart
@@ -39,9 +39,9 @@ class FilterButton extends StatelessWidget {
       BuildContext context, TodoListModel store) {
     final activeStyle = Theme.of(context)
         .textTheme
-        .body1
+        .bodyText2
         .copyWith(color: Theme.of(context).accentColor);
-    final defaultStyle = Theme.of(context).textTheme.body1;
+    final defaultStyle = Theme.of(context).textTheme.bodyText2;
 
     return [
       PopupMenuItem<VisibilityFilter>(

diff --git a/change_notifier_provider/lib/home/stats_view.dart b/change_notifier_provider/lib/home/stats_view.dart
@@ -17,7 +17,7 @@ class StatsView extends StatelessWidget {
             padding: const EdgeInsets.only(bottom: 8.0),
             child: Text(
               ArchSampleLocalizations.of(context).completedTodos,
-              style: Theme.of(context).textTheme.title,
+              style: Theme.of(context).textTheme.headline6,
             ),
           ),
           Padding(
@@ -27,15 +27,15 @@ class StatsView extends StatelessWidget {
               builder: (context, numCompleted, _) => Text(
                 '$numCompleted',
                 key: ArchSampleKeys.statsNumCompleted,
-                style: Theme.of(context).textTheme.subhead,
+                style: Theme.of(context).textTheme.subtitle1,
               ),
             ),
           ),
           Padding(
             padding: const EdgeInsets.only(bottom: 8.0),
             child: Text(
               ArchSampleLocalizations.of(context).activeTodos,
-              style: Theme.of(context).textTheme.title,
+              style: Theme.of(context).textTheme.headline6,
             ),
           ),
           Padding(
@@ -45,7 +45,7 @@ class StatsView extends StatelessWidget {
               builder: (context, numActive, _) => Text(
                 '$numActive',
                 key: ArchSampleKeys.statsNumActive,
-                style: Theme.of(context).textTheme.subhead,
+                style: Theme.of(context).textTheme.subtitle1,
               ),
             ),
           )
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.0/","dependencies":[]}],"android":[{"name":"path_provider","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.0/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":[]}],"date_created":"2020-02-10 11:23:40.410802","version":"1.14.7-pre.38"}
		{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.11\\\\","dependencies":[]}],"android":[{"name":"path_provider","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.11\\\\","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-0.0.4+3\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]}],"windows":[],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]}],"date_created":"2020-07-02 13:26:10.098867","version":"1.19.0-6.0.pre.27"}