diff --git a/bloc_flutter/lib/screens/add_edit_screen.dart b/bloc_flutter/lib/screens/add_edit_screen.dart index 611399e4..9913145a 100644 --- 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 { 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 { 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 index d11cd801..87cbd219 100644 --- a/bloc_flutter/lib/screens/detail_screen.dart +++ b/bloc_flutter/lib/screens/detail_screen.dart @@ -93,13 +93,13 @@ class DetailScreenState extends State { 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 index e88a4e43..a2e2db3c 100644 --- 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 index 8780d73a..837d0019 100644 --- a/bloc_flutter/lib/widgets/stats_counter.dart +++ b/bloc_flutter/lib/widgets/stats_counter.dart @@ -39,7 +39,7 @@ class StatsCounterState extends State { 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,7 +49,7 @@ class StatsCounterState extends State { builder: (context, snapshot) => Text( '${snapshot.data ?? 0}', key: ArchSampleKeys.statsNumCompleted, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ), ), @@ -57,7 +57,7 @@ class StatsCounterState extends State { 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 { 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 index 716f87a5..6915efd1 100644 --- 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 index 8c67e96a..fa9256a9 100644 --- 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 { 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 { 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 index 701f409d..f2f2dd8d 100644 --- 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 index f81ace89..eff2067c 100644 --- 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(context); return BlocBuilder( diff --git a/bloc_library/lib/widgets/stats.dart b/bloc_library/lib/widgets/stats.dart index 59b6940d..10f4e130 100644 --- a/bloc_library/lib/widgets/stats.dart +++ b/bloc_library/lib/widgets/stats.dart @@ -31,7 +31,7 @@ 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( @@ -39,14 +39,14 @@ class Stats extends StatelessWidget { 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( @@ -54,7 +54,7 @@ class Stats extends StatelessWidget { 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 index 8f7c8e0f..979ae72c 100644 --- 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 index 51c6a6c7..fcab5b28 100644 --- 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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/built_redux/lib/presentation/add_edit_screen.dart b/built_redux/lib/presentation/add_edit_screen.dart index 0f5b9b87..4f8680dd 100644 --- 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 { 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 { 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 index e2bc3143..ee5da4de 100644 --- 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 index dc2b5e59..253ca0d5 100644 --- 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 index 4218058b..12f4724d 100644 --- a/built_redux/lib/presentation/stats_counter.dart +++ b/built_redux/lib/presentation/stats_counter.dart @@ -34,7 +34,7 @@ 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( @@ -42,14 +42,14 @@ class StatsCounter extends StatelessWidget { 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( @@ -57,7 +57,7 @@ class StatsCounter extends StatelessWidget { 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 index a1d9c07c..0b9c1aa5 100644 --- 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 index d12e1b0f..c620b4b7 100644 --- 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 { 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 { 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 index d6e96a36..26952ca3 100644 --- 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 index b50ef9dc..e85f19ba 100644 --- 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 { 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 index 229c13dd..71fc9954 100644 --- 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( diff --git a/change_notifier_provider/lib/home/stats_view.dart b/change_notifier_provider/lib/home/stats_view.dart index f6566284..3f06da58 100644 --- 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,7 +27,7 @@ class StatsView extends StatelessWidget { builder: (context, numCompleted, _) => Text( '$numCompleted', key: ArchSampleKeys.statsNumCompleted, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ), ), @@ -35,7 +35,7 @@ class StatsView extends StatelessWidget { 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, ), ), ) diff --git a/change_notifier_provider/lib/home/todo_list_view.dart b/change_notifier_provider/lib/home/todo_list_view.dart index ef34d820..9f2f18fd 100644 --- a/change_notifier_provider/lib/home/todo_list_view.dart +++ b/change_notifier_provider/lib/home/todo_list_view.dart @@ -53,14 +53,14 @@ class TodoListView 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/firebase_flutter_repository/.flutter-plugins-dependencies b/firebase_flutter_repository/.flutter-plugins-dependencies index e3b89dcd..5bac16a7 100644 --- a/firebase_flutter_repository/.flutter-plugins-dependencies +++ b/firebase_flutter_repository/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"cloud_firestore","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/cloud_firestore-0.13.1+1/","dependencies":["firebase_core"]},{"name":"firebase_auth","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/firebase_auth-0.15.4/","dependencies":["firebase_core"]},{"name":"firebase_core","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.4.3+3/","dependencies":[]}],"android":[{"name":"cloud_firestore","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/cloud_firestore-0.13.1+1/","dependencies":["firebase_core"]},{"name":"firebase_auth","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/firebase_auth-0.15.4/","dependencies":["firebase_core"]},{"name":"firebase_core","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.4.3+3/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"firebase_auth_web","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/firebase_auth_web-0.1.2/","dependencies":[]},{"name":"firebase_core_web","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/firebase_core_web-0.1.1+2/","dependencies":[]}]},"dependencyGraph":[{"name":"cloud_firestore","dependencies":["firebase_core"]},{"name":"firebase_auth","dependencies":["firebase_core","firebase_auth_web"]},{"name":"firebase_auth_web","dependencies":[]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]}],"date_created":"2020-02-10 11:23:47.330621","version":"1.14.7-pre.38"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"cloud_firestore","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\cloud_firestore-0.13.7\\\\","dependencies":["firebase_core"]},{"name":"firebase_auth","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-0.15.5+3\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-0.4.5\\\\","dependencies":[]}],"android":[{"name":"cloud_firestore","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\cloud_firestore-0.13.7\\\\","dependencies":["firebase_core"]},{"name":"firebase_auth","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-0.15.5+3\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-0.4.5\\\\","dependencies":[]}],"macos":[{"name":"cloud_firestore","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\cloud_firestore-0.13.7\\\\","dependencies":["firebase_core"]},{"name":"firebase_auth","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-0.15.5+3\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-0.4.5\\\\","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"cloud_firestore_web","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\cloud_firestore_web-0.1.1+2\\\\","dependencies":[]},{"name":"firebase_auth_web","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth_web-0.1.3+1\\\\","dependencies":[]},{"name":"firebase_core_web","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core_web-0.1.1+2\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"cloud_firestore","dependencies":["firebase_core","cloud_firestore_web"]},{"name":"cloud_firestore_web","dependencies":["firebase_core"]},{"name":"firebase_auth","dependencies":["firebase_core","firebase_auth_web"]},{"name":"firebase_auth_web","dependencies":[]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]}],"date_created":"2020-07-02 13:26:35.353903","version":"1.19.0-6.0.pre.27"} \ No newline at end of file diff --git a/firestore_redux/.flutter-plugins-dependencies b/firestore_redux/.flutter-plugins-dependencies index ba421a8f..eee5f1ed 100644 --- a/firestore_redux/.flutter-plugins-dependencies +++ b/firestore_redux/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"cloud_firestore","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/cloud_firestore-0.13.1+1/","dependencies":["firebase_core"]},{"name":"firebase_auth","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/firebase_auth-0.15.4/","dependencies":["firebase_core"]},{"name":"firebase_core","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.4.3+3/","dependencies":[]},{"name":"path_provider","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.0/","dependencies":[]}],"android":[{"name":"cloud_firestore","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/cloud_firestore-0.13.1+1/","dependencies":["firebase_core"]},{"name":"firebase_auth","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/firebase_auth-0.15.4/","dependencies":["firebase_core"]},{"name":"firebase_core","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.4.3+3/","dependencies":[]},{"name":"path_provider","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.0/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"firebase_auth_web","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/firebase_auth_web-0.1.2/","dependencies":[]},{"name":"firebase_core_web","path":"/Users/remirousselet/.pub-cache/hosted/pub.dartlang.org/firebase_core_web-0.1.1+2/","dependencies":[]}]},"dependencyGraph":[{"name":"cloud_firestore","dependencies":["firebase_core"]},{"name":"firebase_auth","dependencies":["firebase_core","firebase_auth_web"]},{"name":"firebase_auth_web","dependencies":[]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"path_provider","dependencies":[]}],"date_created":"2020-02-10 11:23:57.149758","version":"1.14.7-pre.38"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"cloud_firestore","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\cloud_firestore-0.13.7\\\\","dependencies":["firebase_core"]},{"name":"firebase_auth","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-0.15.5+3\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-0.4.5\\\\","dependencies":[]},{"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":"cloud_firestore","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\cloud_firestore-0.13.7\\\\","dependencies":["firebase_core"]},{"name":"firebase_auth","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-0.15.5+3\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-0.4.5\\\\","dependencies":[]},{"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":"cloud_firestore","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\cloud_firestore-0.13.7\\\\","dependencies":["firebase_core"]},{"name":"firebase_auth","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-0.15.5+3\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-0.4.5\\\\","dependencies":[]},{"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":[{"name":"cloud_firestore_web","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\cloud_firestore_web-0.1.1+2\\\\","dependencies":[]},{"name":"firebase_auth_web","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth_web-0.1.3+1\\\\","dependencies":[]},{"name":"firebase_core_web","path":"C:\\\\Users\\\\Dishant\\\\Downloads\\\\flutter_windows_1.17.3-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core_web-0.1.1+2\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"cloud_firestore","dependencies":["firebase_core","cloud_firestore_web"]},{"name":"cloud_firestore_web","dependencies":["firebase_core"]},{"name":"firebase_auth","dependencies":["firebase_core","firebase_auth_web"]},{"name":"firebase_auth_web","dependencies":[]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"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:27:11.757400","version":"1.19.0-6.0.pre.27"} \ No newline at end of file diff --git a/firestore_redux/lib/presentation/add_edit_screen.dart b/firestore_redux/lib/presentation/add_edit_screen.dart index fa15f4b7..4b2e1dca 100644 --- a/firestore_redux/lib/presentation/add_edit_screen.dart +++ b/firestore_redux/lib/presentation/add_edit_screen.dart @@ -50,7 +50,7 @@ class _AddEditScreenState extends State { 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 { initialValue: isEditing ? widget.todo.note : '', key: ArchSampleKeys.noteField, maxLines: 10, - style: textTheme.subhead, + style: textTheme.subtitle1, decoration: InputDecoration( hintText: localizations.notesHint, ), diff --git a/firestore_redux/lib/presentation/details_screen.dart b/firestore_redux/lib/presentation/details_screen.dart index af689d83..c8c3373e 100644 --- a/firestore_redux/lib/presentation/details_screen.dart +++ b/firestore_redux/lib/presentation/details_screen.dart @@ -68,14 +68,14 @@ 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/firestore_redux/lib/presentation/filter_button.dart b/firestore_redux/lib/presentation/filter_button.dart index bee83068..4f4554ac 100644 --- a/firestore_redux/lib/presentation/filter_button.dart +++ b/firestore_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); final button = _Button( onSelected: onSelected, diff --git a/firestore_redux/lib/presentation/stats_counter.dart b/firestore_redux/lib/presentation/stats_counter.dart index 95346166..197ddd15 100644 --- a/firestore_redux/lib/presentation/stats_counter.dart +++ b/firestore_redux/lib/presentation/stats_counter.dart @@ -36,7 +36,7 @@ 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( @@ -44,14 +44,14 @@ class StatsCounter extends StatelessWidget { 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( @@ -59,7 +59,7 @@ class StatsCounter extends StatelessWidget { child: Text( '$numActive', key: ArchSampleKeys.statsNumActive, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ) ], diff --git a/firestore_redux/lib/presentation/todo_item.dart b/firestore_redux/lib/presentation/todo_item.dart index c46b271b..010276ea 100644 --- a/firestore_redux/lib/presentation/todo_item.dart +++ b/firestore_redux/lib/presentation/todo_item.dart @@ -39,7 +39,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, ), ), ), @@ -48,7 +48,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, ), ), ); diff --git a/freezed_provider_value_notifier/lib/add_todo_screen.dart b/freezed_provider_value_notifier/lib/add_todo_screen.dart index cf887a07..16ade454 100644 --- a/freezed_provider_value_notifier/lib/add_todo_screen.dart +++ b/freezed_provider_value_notifier/lib/add_todo_screen.dart @@ -46,7 +46,7 @@ class _AddTodoScreenState extends State { 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 { TextFormField( key: ArchSampleKeys.noteField, controller: _notesEditingController, - style: textTheme.subhead, + style: textTheme.subtitle1, decoration: InputDecoration(hintText: localizations.notesHint), maxLines: 10, ) diff --git a/freezed_provider_value_notifier/lib/details_screen.dart b/freezed_provider_value_notifier/lib/details_screen.dart index 7841a375..0ce8819d 100644 --- a/freezed_provider_value_notifier/lib/details_screen.dart +++ b/freezed_provider_value_notifier/lib/details_screen.dart @@ -63,13 +63,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/freezed_provider_value_notifier/lib/edit_todo_screen.dart b/freezed_provider_value_notifier/lib/edit_todo_screen.dart index ad7b32fa..377f1e09 100644 --- a/freezed_provider_value_notifier/lib/edit_todo_screen.dart +++ b/freezed_provider_value_notifier/lib/edit_todo_screen.dart @@ -49,7 +49,7 @@ class _EditTodoScreenState extends State { 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/freezed_provider_value_notifier/lib/home/filter_button.dart b/freezed_provider_value_notifier/lib/home/filter_button.dart index 701f4382..1096f875 100644 --- a/freezed_provider_value_notifier/lib/home/filter_button.dart +++ b/freezed_provider_value_notifier/lib/home/filter_button.dart @@ -40,9 +40,9 @@ class FilterButton extends StatelessWidget { BuildContext context, TodoList 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( key: ArchSampleKeys.allFilter, diff --git a/freezed_provider_value_notifier/lib/home/stats_view.dart b/freezed_provider_value_notifier/lib/home/stats_view.dart index 868b7b10..ba1420f5 100644 --- a/freezed_provider_value_notifier/lib/home/stats_view.dart +++ b/freezed_provider_value_notifier/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,7 +27,7 @@ class StatsView extends StatelessWidget { builder: (context, numCompleted, _) => Text( '$numCompleted', key: ArchSampleKeys.statsNumCompleted, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ), ), @@ -35,7 +35,7 @@ class StatsView extends StatelessWidget { 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, ), ), ) diff --git a/freezed_provider_value_notifier/lib/home/todo_list_view.dart b/freezed_provider_value_notifier/lib/home/todo_list_view.dart index 806e926e..cf67d392 100644 --- a/freezed_provider_value_notifier/lib/home/todo_list_view.dart +++ b/freezed_provider_value_notifier/lib/home/todo_list_view.dart @@ -54,14 +54,14 @@ class TodoListView 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/frideos_library/.flutter-plugins-dependencies b/frideos_library/.flutter-plugins-dependencies index 4ded62f8..f165ee92 100644 --- a/frideos_library/.flutter-plugins-dependencies +++ b/frideos_library/.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:24:01.218565","version":"1.14.7-pre.38"} \ No newline at end of file +{"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:27:45.307624","version":"1.19.0-6.0.pre.27"} \ No newline at end of file diff --git a/frideos_library/lib/screens/add_edit_screen.dart b/frideos_library/lib/screens/add_edit_screen.dart index 872a18f9..df5587fa 100644 --- a/frideos_library/lib/screens/add_edit_screen.dart +++ b/frideos_library/lib/screens/add_edit_screen.dart @@ -59,7 +59,7 @@ class _AddEditScreenState extends State { initialValue: isEditing ? snapshot.data.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, ), @@ -72,7 +72,7 @@ class _AddEditScreenState extends State { initialValue: isEditing ? snapshot.data.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/frideos_library/lib/screens/detail_screen.dart b/frideos_library/lib/screens/detail_screen.dart index 3d5c7929..8b976591 100644 --- a/frideos_library/lib/screens/detail_screen.dart +++ b/frideos_library/lib/screens/detail_screen.dart @@ -64,13 +64,13 @@ class DetailScreen 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/frideos_library/lib/widgets/filter_button.dart b/frideos_library/lib/widgets/filter_button.dart index ae2f4597..f2ed8687 100644 --- a/frideos_library/lib/widgets/filter_button.dart +++ b/frideos_library/lib/widgets/filter_button.dart @@ -15,8 +15,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/frideos_library/lib/widgets/stats_counter.dart b/frideos_library/lib/widgets/stats_counter.dart index 6014fd4b..934dcb4a 100644 --- a/frideos_library/lib/widgets/stats_counter.dart +++ b/frideos_library/lib/widgets/stats_counter.dart @@ -20,7 +20,7 @@ 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( @@ -30,7 +30,7 @@ class StatsCounter extends StatelessWidget { builder: (context, snapshot) => Text( '${snapshot.data ?? 0}', key: ArchSampleKeys.statsNumCompleted, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ), ), @@ -38,7 +38,7 @@ class StatsCounter extends StatelessWidget { 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( @@ -49,7 +49,7 @@ class StatsCounter extends StatelessWidget { return Text( '${snapshot.data ?? 0}', key: ArchSampleKeys.statsNumActive, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ); }, ), diff --git a/frideos_library/lib/widgets/todo_item.dart b/frideos_library/lib/widgets/todo_item.dart index 5181dc25..e6707da9 100644 --- a/frideos_library/lib/widgets/todo_item.dart +++ b/frideos_library/lib/widgets/todo_item.dart @@ -33,14 +33,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/inherited_widget/lib/screens/add_edit_screen.dart b/inherited_widget/lib/screens/add_edit_screen.dart index 2fe51e63..0c872dcd 100644 --- a/inherited_widget/lib/screens/add_edit_screen.dart +++ b/inherited_widget/lib/screens/add_edit_screen.dart @@ -52,7 +52,7 @@ class _AddEditScreenState extends State { initialValue: isEditing ? widget.todo.task : '', key: ArchSampleKeys.taskField, autofocus: !isEditing, - style: Theme.of(context).textTheme.headline, + style: Theme.of(context).textTheme.headline5, decoration: InputDecoration( hintText: localizations.newTodoHint, ), @@ -67,7 +67,7 @@ class _AddEditScreenState extends State { initialValue: isEditing ? widget.todo.note : '', key: ArchSampleKeys.noteField, maxLines: 10, - style: textTheme.subhead, + style: textTheme.subtitle1, decoration: InputDecoration( hintText: localizations.notesHint, ), diff --git a/inherited_widget/lib/screens/detail_screen.dart b/inherited_widget/lib/screens/detail_screen.dart index 9f05db5a..6a6e6622 100644 --- a/inherited_widget/lib/screens/detail_screen.dart +++ b/inherited_widget/lib/screens/detail_screen.dart @@ -64,13 +64,13 @@ class DetailScreen 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/inherited_widget/lib/widgets/filter_button.dart b/inherited_widget/lib/widgets/filter_button.dart index c6fc9bcc..4930d3b6 100644 --- a/inherited_widget/lib/widgets/filter_button.dart +++ b/inherited_widget/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/inherited_widget/lib/widgets/stats_counter.dart b/inherited_widget/lib/widgets/stats_counter.dart index b73add39..899185f6 100644 --- a/inherited_widget/lib/widgets/stats_counter.dart +++ b/inherited_widget/lib/widgets/stats_counter.dart @@ -24,7 +24,7 @@ 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( @@ -32,14 +32,14 @@ class StatsCounter extends StatelessWidget { 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( @@ -47,7 +47,7 @@ class StatsCounter extends StatelessWidget { child: Text( '$numActive', key: ArchSampleKeys.statsNumActive, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ) ], diff --git a/inherited_widget/lib/widgets/todo_item.dart b/inherited_widget/lib/widgets/todo_item.dart index 7e071c9c..a6ffb7c6 100644 --- a/inherited_widget/lib/widgets/todo_item.dart +++ b/inherited_widget/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/mobx/lib/add_todo_screen.dart b/mobx/lib/add_todo_screen.dart index 0234c3d3..0a820160 100644 --- a/mobx/lib/add_todo_screen.dart +++ b/mobx/lib/add_todo_screen.dart @@ -46,7 +46,7 @@ class _AddTodoScreenState extends State { 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 { TextFormField( key: ArchSampleKeys.noteField, controller: _notesEditingController, - style: textTheme.subhead, + style: textTheme.subtitle1, decoration: InputDecoration(hintText: localizations.notesHint), maxLines: 10, ) diff --git a/mobx/lib/details_screen.dart b/mobx/lib/details_screen.dart index 65b80462..5a39dcb6 100644 --- a/mobx/lib/details_screen.dart +++ b/mobx/lib/details_screen.dart @@ -71,7 +71,7 @@ class DetailsScreen extends StatelessWidget { builder: (context) => Text( todo.task, key: ArchSampleKeys.detailsTodoItemTask, - style: Theme.of(context).textTheme.headline, + style: Theme.of(context).textTheme.headline5, ), ), ), @@ -79,7 +79,7 @@ class DetailsScreen extends StatelessWidget { builder: (_) => Text( todo.note, key: ArchSampleKeys.detailsTodoItemNote, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ) ], diff --git a/mobx/lib/edit_todo_screen.dart b/mobx/lib/edit_todo_screen.dart index 9ab67e2c..3819d939 100644 --- a/mobx/lib/edit_todo_screen.dart +++ b/mobx/lib/edit_todo_screen.dart @@ -31,7 +31,7 @@ class _EditTodoScreenState extends State { TextFormField( key: ArchSampleKeys.taskField, initialValue: widget.todo.task, - style: Theme.of(context).textTheme.headline, + style: Theme.of(context).textTheme.headline5, decoration: InputDecoration( hintText: ArchSampleLocalizations.of(context).newTodoHint, ), diff --git a/mobx/lib/home/filter_button.dart b/mobx/lib/home/filter_button.dart index d06d1e56..34c58ca6 100644 --- a/mobx/lib/home/filter_button.dart +++ b/mobx/lib/home/filter_button.dart @@ -42,9 +42,9 @@ class FilterButton extends StatelessWidget { BuildContext context, TodoStore 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( diff --git a/mobx/lib/home/stats_view.dart b/mobx/lib/home/stats_view.dart index fab86e7d..65d2772d 100644 --- a/mobx/lib/home/stats_view.dart +++ b/mobx/lib/home/stats_view.dart @@ -20,7 +20,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( @@ -29,7 +29,7 @@ class StatsView extends StatelessWidget { builder: (context) => Text( '${store.numCompleted}', key: ArchSampleKeys.statsNumCompleted, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ), ), @@ -37,7 +37,7 @@ class StatsView extends StatelessWidget { 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( @@ -46,7 +46,7 @@ class StatsView extends StatelessWidget { builder: (context) => Text( '${store.numPending}', key: ArchSampleKeys.statsNumActive, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ), ) diff --git a/mobx/lib/home/todo_list_view.dart b/mobx/lib/home/todo_list_view.dart index 10ba77a9..19602374 100644 --- a/mobx/lib/home/todo_list_view.dart +++ b/mobx/lib/home/todo_list_view.dart @@ -55,7 +55,7 @@ class TodoListView extends StatelessWidget { builder: (context) => Text( todo.task, key: ArchSampleKeys.todoItemTask(todo.id), - style: Theme.of(context).textTheme.title, + style: Theme.of(context).textTheme.headline6, ), ), subtitle: Observer( @@ -64,7 +64,7 @@ class TodoListView extends StatelessWidget { 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/mvc/.flutter-plugins-dependencies b/mvc/.flutter-plugins-dependencies index b728d6fd..771afe38 100644 --- a/mvc/.flutter-plugins-dependencies +++ b/mvc/.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:24:16.829310","version":"1.14.7-pre.38"} \ No newline at end of file +{"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:28:39.454942","version":"1.19.0-6.0.pre.27"} \ No newline at end of file diff --git a/mvc/lib/src/screens/add_edit_screen.dart b/mvc/lib/src/screens/add_edit_screen.dart index a63eb74c..d427bb7d 100644 --- a/mvc/lib/src/screens/add_edit_screen.dart +++ b/mvc/lib/src/screens/add_edit_screen.dart @@ -57,7 +57,7 @@ class _AddEditScreenState extends State { initialValue: 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), validator: (val) => val.trim().isEmpty @@ -69,7 +69,7 @@ class _AddEditScreenState extends State { initialValue: 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/mvc/lib/src/screens/detail_screen.dart b/mvc/lib/src/screens/detail_screen.dart index 231889d2..ead8894d 100644 --- a/mvc/lib/src/screens/detail_screen.dart +++ b/mvc/lib/src/screens/detail_screen.dart @@ -68,13 +68,13 @@ class DetailScreen 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/mvc/lib/src/widgets/filter_button.dart b/mvc/lib/src/widgets/filter_button.dart index 25a504b1..c8904f2d 100644 --- a/mvc/lib/src/widgets/filter_button.dart +++ b/mvc/lib/src/widgets/filter_button.dart @@ -37,9 +37,9 @@ class FilterButton extends StatelessWidget { List> _items(BuildContext context) { 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( diff --git a/mvc/lib/src/widgets/stats_counter.dart b/mvc/lib/src/widgets/stats_counter.dart index 5dab115b..5db41f19 100644 --- a/mvc/lib/src/widgets/stats_counter.dart +++ b/mvc/lib/src/widgets/stats_counter.dart @@ -28,7 +28,7 @@ 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( @@ -36,14 +36,14 @@ class StatsCounter extends StatelessWidget { 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( @@ -51,7 +51,7 @@ class StatsCounter extends StatelessWidget { child: Text( '$numActive', key: ArchSampleKeys.statsNumActive, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ) ], diff --git a/mvc/lib/src/widgets/todo_item.dart b/mvc/lib/src/widgets/todo_item.dart index e44b8e1c..e57720a2 100644 --- a/mvc/lib/src/widgets/todo_item.dart +++ b/mvc/lib/src/widgets/todo_item.dart @@ -34,14 +34,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/mvi_flutter/lib/screens/add_edit_screen.dart b/mvi_flutter/lib/screens/add_edit_screen.dart index 589487fa..4a2d7610 100644 --- a/mvi_flutter/lib/screens/add_edit_screen.dart +++ b/mvi_flutter/lib/screens/add_edit_screen.dart @@ -54,7 +54,7 @@ class _AddEditScreenState extends State { 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 { 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/mvi_flutter/lib/screens/detail_screen.dart b/mvi_flutter/lib/screens/detail_screen.dart index 535f1165..80bf3210 100644 --- a/mvi_flutter/lib/screens/detail_screen.dart +++ b/mvi_flutter/lib/screens/detail_screen.dart @@ -105,13 +105,13 @@ class DetailScreenState extends State with DetailView { 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/mvi_flutter/lib/widgets/filter_button.dart b/mvi_flutter/lib/widgets/filter_button.dart index dab3f906..118d21e6 100644 --- a/mvi_flutter/lib/widgets/filter_button.dart +++ b/mvi_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/mvi_flutter/lib/widgets/stats_counter.dart b/mvi_flutter/lib/widgets/stats_counter.dart index 1804c569..9d6b977b 100644 --- a/mvi_flutter/lib/widgets/stats_counter.dart +++ b/mvi_flutter/lib/widgets/stats_counter.dart @@ -55,7 +55,7 @@ class StatsCounterState extends State { 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( @@ -63,14 +63,14 @@ class StatsCounterState extends State { child: Text( '${snapshot.data?.numComplete ?? 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( @@ -78,7 +78,7 @@ class StatsCounterState extends State { child: Text( '${snapshot.data?.numActive ?? 0}', key: ArchSampleKeys.statsNumActive, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ) ], diff --git a/mvi_flutter/lib/widgets/todo_item.dart b/mvi_flutter/lib/widgets/todo_item.dart index 91490780..06d90576 100644 --- a/mvi_flutter/lib/widgets/todo_item.dart +++ b/mvi_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/mvu/.flutter-plugins-dependencies b/mvu/.flutter-plugins-dependencies index 30693179..54908975 100644 --- a/mvu/.flutter-plugins-dependencies +++ b/mvu/.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:24:26.886816","version":"1.14.7-pre.38"} \ No newline at end of file +{"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:29:44.768718","version":"1.19.0-6.0.pre.27"} \ No newline at end of file diff --git a/mvu/lib/details/view.dart b/mvu/lib/details/view.dart index 11c4bf9c..80af36c2 100644 --- a/mvu/lib/details/view.dart +++ b/mvu/lib/details/view.dart @@ -44,13 +44,13 @@ Widget view(BuildContext context, Dispatch dispatch, child: Text( model.todo.task, key: ArchSampleKeys.detailsTodoItemTask, - style: Theme.of(context).textTheme.headline, + style: Theme.of(context).textTheme.headline5, ), ), Text( model.todo.note, key: ArchSampleKeys.detailsTodoItemNote, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ) ], ), diff --git a/mvu/lib/edit/view.dart b/mvu/lib/edit/view.dart index e8af30c4..5371a05f 100644 --- a/mvu/lib/edit/view.dart +++ b/mvu/lib/edit/view.dart @@ -23,7 +23,7 @@ Widget view(BuildContext context, Dispatch dispatch, key: ArchSampleKeys.taskField, controller: model.task, autofocus: !isEditing, - style: textTheme.headline, + style: textTheme.headline5, decoration: InputDecoration( hintText: localizations.newTodoHint, ), @@ -35,7 +35,7 @@ Widget view(BuildContext context, Dispatch dispatch, key: ArchSampleKeys.noteField, controller: model.note, maxLines: 10, - style: textTheme.subhead, + style: textTheme.subtitle1, decoration: InputDecoration( hintText: localizations.notesHint, ), diff --git a/mvu/lib/stats/view.dart b/mvu/lib/stats/view.dart index 09a40318..e47260e6 100644 --- a/mvu/lib/stats/view.dart +++ b/mvu/lib/stats/view.dart @@ -23,7 +23,7 @@ Widget view( 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( @@ -31,14 +31,14 @@ Widget view( child: Text( '${model.completedCount}', 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( @@ -46,7 +46,7 @@ Widget view( child: Text( '${model.activeCount}', key: ArchSampleKeys.statsNumActive, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ) ], diff --git a/mvu/lib/todos/view.dart b/mvu/lib/todos/view.dart index 40707793..ddbcb4d9 100644 --- a/mvu/lib/todos/view.dart +++ b/mvu/lib/todos/view.dart @@ -18,10 +18,10 @@ Widget buildExtraActionsMenu( Widget buildFilterMenu( BuildContext context, Dispatch dispatch, TodosModel model) { - 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 PopupMenuButton( @@ -106,14 +106,14 @@ Widget _item(BuildContext context, Dispatch dispatch, title: Text( model.task, key: ArchSampleKeys.todoItemTask(model.id), - style: Theme.of(context).textTheme.title, + style: Theme.of(context).textTheme.headline6, ), subtitle: Text( model.note, key: ArchSampleKeys.todoItemNote(model.id), maxLines: 1, overflow: TextOverflow.ellipsis, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ), ); diff --git a/redux/lib/presentation/add_edit_screen.dart b/redux/lib/presentation/add_edit_screen.dart index a53fd98b..2c87032b 100644 --- a/redux/lib/presentation/add_edit_screen.dart +++ b/redux/lib/presentation/add_edit_screen.dart @@ -50,7 +50,7 @@ class _AddEditScreenState extends State { 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 { initialValue: isEditing ? widget.todo.note : '', key: ArchSampleKeys.noteField, maxLines: 10, - style: textTheme.subhead, + style: textTheme.subtitle1, decoration: InputDecoration( hintText: localizations.notesHint, ), diff --git a/redux/lib/presentation/details_screen.dart b/redux/lib/presentation/details_screen.dart index 34162960..b3b7b135 100644 --- a/redux/lib/presentation/details_screen.dart +++ b/redux/lib/presentation/details_screen.dart @@ -68,14 +68,14 @@ 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/redux/lib/presentation/filter_button.dart b/redux/lib/presentation/filter_button.dart index 03345913..231dd271 100644 --- a/redux/lib/presentation/filter_button.dart +++ b/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); final button = _Button( onSelected: onSelected, diff --git a/redux/lib/presentation/stats_counter.dart b/redux/lib/presentation/stats_counter.dart index 55fe82e5..ea1fb45e 100644 --- a/redux/lib/presentation/stats_counter.dart +++ b/redux/lib/presentation/stats_counter.dart @@ -36,7 +36,7 @@ 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( @@ -44,14 +44,14 @@ class StatsCounter extends StatelessWidget { 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( @@ -59,7 +59,7 @@ class StatsCounter extends StatelessWidget { child: Text( '$numActive', key: ArchSampleKeys.statsNumActive, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ) ], diff --git a/redux/lib/presentation/todo_item.dart b/redux/lib/presentation/todo_item.dart index b8d16386..b0f51803 100644 --- a/redux/lib/presentation/todo_item.dart +++ b/redux/lib/presentation/todo_item.dart @@ -39,7 +39,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, ), ), ), @@ -48,7 +48,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, ), ), ); diff --git a/scoped_model/.flutter-plugins-dependencies b/scoped_model/.flutter-plugins-dependencies index d4d3c8cc..e558948c 100644 --- a/scoped_model/.flutter-plugins-dependencies +++ b/scoped_model/.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:24:35.748663","version":"1.14.7-pre.38"} \ No newline at end of file +{"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:30:12.925353","version":"1.19.0-6.0.pre.27"} \ No newline at end of file diff --git a/scoped_model/lib/screens/add_edit_screen.dart b/scoped_model/lib/screens/add_edit_screen.dart index d50679b0..02aadd06 100644 --- a/scoped_model/lib/screens/add_edit_screen.dart +++ b/scoped_model/lib/screens/add_edit_screen.dart @@ -57,7 +57,7 @@ class _AddEditScreenState extends State { initialValue: task?.task ?? '', key: ArchSampleKeys.taskField, autofocus: !isEditing, - style: textTheme.headline, + style: textTheme.headline5, decoration: InputDecoration( hintText: localizations.newTodoHint, ), @@ -72,7 +72,7 @@ class _AddEditScreenState extends State { initialValue: task?.note ?? '', key: ArchSampleKeys.noteField, maxLines: 10, - style: textTheme.subhead, + style: textTheme.subtitle1, decoration: InputDecoration( hintText: localizations.notesHint, ), diff --git a/scoped_model/lib/screens/detail_screen.dart b/scoped_model/lib/screens/detail_screen.dart index 3949ec68..90050c1f 100644 --- a/scoped_model/lib/screens/detail_screen.dart +++ b/scoped_model/lib/screens/detail_screen.dart @@ -67,13 +67,13 @@ class DetailScreen 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/scoped_model/lib/widgets/filter_button.dart b/scoped_model/lib/widgets/filter_button.dart index 690ee73b..138ce36d 100644 --- a/scoped_model/lib/widgets/filter_button.dart +++ b/scoped_model/lib/widgets/filter_button.dart @@ -37,9 +37,9 @@ class FilterButton extends StatelessWidget { BuildContext context, TodoListModel model) { 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( diff --git a/scoped_model/lib/widgets/stats_counter.dart b/scoped_model/lib/widgets/stats_counter.dart index 9a9df978..a2bd359e 100644 --- a/scoped_model/lib/widgets/stats_counter.dart +++ b/scoped_model/lib/widgets/stats_counter.dart @@ -31,7 +31,7 @@ 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( @@ -39,14 +39,14 @@ class StatsCounter extends StatelessWidget { 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( @@ -54,7 +54,7 @@ class StatsCounter extends StatelessWidget { child: Text( '$numActive', key: ArchSampleKeys.statsNumActive, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ) ], diff --git a/scoped_model/lib/widgets/todo_item.dart b/scoped_model/lib/widgets/todo_item.dart index c4985e50..4beafbcb 100644 --- a/scoped_model/lib/widgets/todo_item.dart +++ b/scoped_model/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/simple_bloc_flutter/lib/screens/add_edit_screen.dart b/simple_bloc_flutter/lib/screens/add_edit_screen.dart index c73ddaae..b3a6f3d5 100644 --- a/simple_bloc_flutter/lib/screens/add_edit_screen.dart +++ b/simple_bloc_flutter/lib/screens/add_edit_screen.dart @@ -54,7 +54,7 @@ class _AddEditScreenState extends State { 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 { 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/simple_bloc_flutter/lib/screens/detail_screen.dart b/simple_bloc_flutter/lib/screens/detail_screen.dart index 75b23238..cd3729db 100644 --- a/simple_bloc_flutter/lib/screens/detail_screen.dart +++ b/simple_bloc_flutter/lib/screens/detail_screen.dart @@ -92,13 +92,13 @@ class DetailScreenState extends State { 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/simple_bloc_flutter/lib/widgets/filter_button.dart b/simple_bloc_flutter/lib/widgets/filter_button.dart index a0bf6120..668d38b7 100644 --- a/simple_bloc_flutter/lib/widgets/filter_button.dart +++ b/simple_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/simple_bloc_flutter/lib/widgets/stats_counter.dart b/simple_bloc_flutter/lib/widgets/stats_counter.dart index 17d2d98d..7e322c51 100644 --- a/simple_bloc_flutter/lib/widgets/stats_counter.dart +++ b/simple_bloc_flutter/lib/widgets/stats_counter.dart @@ -39,7 +39,7 @@ class StatsCounterState extends State { 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,7 +49,7 @@ class StatsCounterState extends State { builder: (context, snapshot) => Text( '${snapshot.data ?? 0}', key: ArchSampleKeys.statsNumCompleted, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ), ), @@ -57,7 +57,7 @@ class StatsCounterState extends State { 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 { return Text( '${snapshot.data ?? 0}', key: ArchSampleKeys.statsNumActive, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ); }, ), diff --git a/simple_bloc_flutter/lib/widgets/todo_item.dart b/simple_bloc_flutter/lib/widgets/todo_item.dart index da9b7069..e79887e6 100644 --- a/simple_bloc_flutter/lib/widgets/todo_item.dart +++ b/simple_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/states_rebuilder/lib/ui/pages/add_edit_screen.dart/add_edit_screen.dart b/states_rebuilder/lib/ui/pages/add_edit_screen.dart/add_edit_screen.dart index c3089261..ebaf4aa9 100644 --- a/states_rebuilder/lib/ui/pages/add_edit_screen.dart/add_edit_screen.dart +++ b/states_rebuilder/lib/ui/pages/add_edit_screen.dart/add_edit_screen.dart @@ -52,7 +52,7 @@ class _AddEditPageState extends State { 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), validator: (val) => val.trim().isEmpty @@ -64,7 +64,7 @@ class _AddEditPageState extends State { 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/states_rebuilder/lib/ui/pages/detail_screen/detail_screen.dart b/states_rebuilder/lib/ui/pages/detail_screen/detail_screen.dart index ea3f244b..cdda4afb 100644 --- a/states_rebuilder/lib/ui/pages/detail_screen/detail_screen.dart +++ b/states_rebuilder/lib/ui/pages/detail_screen/detail_screen.dart @@ -74,13 +74,13 @@ class DetailScreen 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/states_rebuilder/lib/ui/pages/home_screen/filter_button.dart b/states_rebuilder/lib/ui/pages/home_screen/filter_button.dart index 0687f5af..5f8d5a9c 100644 --- a/states_rebuilder/lib/ui/pages/home_screen/filter_button.dart +++ b/states_rebuilder/lib/ui/pages/home_screen/filter_button.dart @@ -19,10 +19,10 @@ class FilterButton extends StatelessWidget { final todosServiceRM = Injector.getAsReactive(context: 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); final button = _Button( onSelected: (filter) { diff --git a/states_rebuilder/lib/ui/pages/home_screen/stats_counter.dart b/states_rebuilder/lib/ui/pages/home_screen/stats_counter.dart index 1b134031..13b87edd 100644 --- a/states_rebuilder/lib/ui/pages/home_screen/stats_counter.dart +++ b/states_rebuilder/lib/ui/pages/home_screen/stats_counter.dart @@ -24,7 +24,7 @@ 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( @@ -32,14 +32,14 @@ class StatsCounter extends StatelessWidget { child: Text( '${todosService.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( @@ -47,7 +47,7 @@ class StatsCounter extends StatelessWidget { child: Text( '${todosService.numActive}', key: ArchSampleKeys.statsNumActive, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ) ], diff --git a/states_rebuilder/lib/ui/pages/home_screen/todo_item.dart b/states_rebuilder/lib/ui/pages/home_screen/todo_item.dart index 4091623d..7253e742 100644 --- a/states_rebuilder/lib/ui/pages/home_screen/todo_item.dart +++ b/states_rebuilder/lib/ui/pages/home_screen/todo_item.dart @@ -50,14 +50,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/todos_app_core/.flutter-plugins-dependencies b/todos_app_core/.flutter-plugins-dependencies index 8885f09e..8079d527 100644 --- a/todos_app_core/.flutter-plugins-dependencies +++ b/todos_app_core/.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:24:47.749791","version":"1.14.7-pre.38"} \ No newline at end of file +{"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:30:59.429019","version":"1.19.0-6.0.pre.27"} \ No newline at end of file diff --git a/todos_app_core/lib/src/theme.dart b/todos_app_core/lib/src/theme.dart index b03c5b87..fe5a5471 100644 --- a/todos_app_core/lib/src/theme.dart +++ b/todos_app_core/lib/src/theme.dart @@ -8,7 +8,7 @@ class ArchSampleTheme { static ThemeData get theme { final themeData = ThemeData.dark(); final textTheme = themeData.textTheme; - final body1 = textTheme.body1.copyWith(decorationColor: Colors.transparent); + final body1 = textTheme.bodyText2.copyWith(decorationColor: Colors.transparent); return ThemeData.dark().copyWith( primaryColor: Colors.grey[800], @@ -25,7 +25,7 @@ class ArchSampleTheme { actionTextColor: Colors.cyan[300], ), textTheme: textTheme.copyWith( - body1: body1, + bodyText2: body1, ), ); } diff --git a/vanilla/lib/screens/add_edit_screen.dart b/vanilla/lib/screens/add_edit_screen.dart index 8c9e93f7..28deed4b 100644 --- a/vanilla/lib/screens/add_edit_screen.dart +++ b/vanilla/lib/screens/add_edit_screen.dart @@ -54,7 +54,7 @@ class _AddEditScreenState extends State { 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), validator: (val) => val.trim().isEmpty @@ -66,7 +66,7 @@ class _AddEditScreenState extends State { 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/vanilla/lib/screens/detail_screen.dart b/vanilla/lib/screens/detail_screen.dart index 0c3b0958..c60c29d0 100644 --- a/vanilla/lib/screens/detail_screen.dart +++ b/vanilla/lib/screens/detail_screen.dart @@ -68,13 +68,13 @@ class DetailScreen 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/vanilla/lib/widgets/filter_button.dart b/vanilla/lib/widgets/filter_button.dart index beff7085..5facec90 100644 --- a/vanilla/lib/widgets/filter_button.dart +++ b/vanilla/lib/widgets/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); final button = _Button( onSelected: onSelected, diff --git a/vanilla/lib/widgets/stats_counter.dart b/vanilla/lib/widgets/stats_counter.dart index d058d2a5..d84ae00e 100644 --- a/vanilla/lib/widgets/stats_counter.dart +++ b/vanilla/lib/widgets/stats_counter.dart @@ -24,7 +24,7 @@ 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( @@ -32,14 +32,14 @@ class StatsCounter extends StatelessWidget { 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( @@ -47,7 +47,7 @@ class StatsCounter extends StatelessWidget { child: Text( '$numActive', key: ArchSampleKeys.statsNumActive, - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.subtitle1, ), ) ], diff --git a/vanilla/lib/widgets/todo_item.dart b/vanilla/lib/widgets/todo_item.dart index 391bc3ff..3b5c245a 100644 --- a/vanilla/lib/widgets/todo_item.dart +++ b/vanilla/lib/widgets/todo_item.dart @@ -36,14 +36,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, ), ), );