From 290655d1046d225a2a3088eeabdb8607acff3097 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Fri, 20 Aug 2021 14:40:25 -0500 Subject: [PATCH 01/33] Update todo_category_list_view.dart and todo_list_view.dart adding callback methods --- lib/ui/todo_category_list_view.dart | 16 +++++++--------- lib/ui/todo_list_view.dart | 22 ++++++++++------------ 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/lib/ui/todo_category_list_view.dart b/lib/ui/todo_category_list_view.dart index 7069f90..03d2915 100644 --- a/lib/ui/todo_category_list_view.dart +++ b/lib/ui/todo_category_list_view.dart @@ -1,7 +1,6 @@ import 'package:crud_todo_app/model/category_model.dart'; import 'package:crud_todo_app/provider_dependency.dart'; import 'package:crud_todo_app/ui/dialog/category_dialog.dart'; -import 'package:crud_todo_app/ui/todo_list_view.dart'; import 'package:crud_todo_app/common/extension.dart'; import 'package:crud_todo_app/ui/widgets/category_item.dart'; import 'package:crud_todo_app/viewmodel/category/category_provider.dart'; @@ -9,8 +8,13 @@ import 'package:crud_todo_app/viewmodel/category/category_state.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +typedef NavigatorToDetail = void Function(Category); + class TodoCategoryListView extends ConsumerWidget { - const TodoCategoryListView({Key? key}) : super(key: key); + const TodoCategoryListView({Key? key, required this.onGoToDetail}) + : super(key: key); + + final NavigatorToDetail onGoToDetail; @override Widget build(BuildContext context, WidgetRef ref) { @@ -44,7 +48,7 @@ class TodoCategoryListView extends ConsumerWidget { for (final item in categories) CategoryItem( item: item, - onClick: () => _goToTodo(context, item), + onClick: () => onGoToDetail(item), ), ], ) @@ -73,12 +77,6 @@ class TodoCategoryListView extends ConsumerWidget { ); } - Future _goToTodo(BuildContext context, Category category) async { - await Navigator.of(context).push( - MaterialPageRoute(builder: (_) => TodoListView(category: category)), - ); - } - Future _showCategoryDialog(BuildContext context) async { await showDialog( context: context, diff --git a/lib/ui/todo_list_view.dart b/lib/ui/todo_list_view.dart index 572ee1f..4c363db 100644 --- a/lib/ui/todo_list_view.dart +++ b/lib/ui/todo_list_view.dart @@ -1,7 +1,6 @@ import 'package:crud_todo_app/model/category_model.dart'; import 'package:crud_todo_app/model/todo_model.dart'; import 'package:crud_todo_app/provider_dependency.dart'; -import 'package:crud_todo_app/ui/add_todo_view.dart'; import 'package:crud_todo_app/common/extension.dart'; import 'package:crud_todo_app/ui/widgets/todo_item.dart'; import 'package:crud_todo_app/viewmodel/todo/todo_provider.dart'; @@ -9,10 +8,17 @@ import 'package:crud_todo_app/viewmodel/todo/todo_state.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +typedef NavigatorToTodo = void Function(Category, Todo?); + class TodoListView extends HookConsumerWidget { - const TodoListView({Key? key, required this.category}) : super(key: key); + const TodoListView({ + Key? key, + required this.category, + required this.onGoToTodo, + }) : super(key: key); final Category category; + final NavigatorToTodo onGoToTodo; @override Widget build(BuildContext context, WidgetRef ref) { @@ -107,7 +113,7 @@ class TodoListView extends HookConsumerWidget { child: todos.isNotEmpty ? TodoList( todoList: todos, - onEditItem: (todo) => _goToTodo(context, todo: todo), + onEditItem: (todo) => onGoToTodo(category, todo), ).paddingSymmetric(h: 24, v: 20) : const Center( child: Text( @@ -130,20 +136,12 @@ class TodoListView extends HookConsumerWidget { ), floatingActionButton: FloatingActionButton( backgroundColor: const Color(0xFF4A78FA), - onPressed: () => _goToTodo(context), + onPressed: () => onGoToTodo(category, null), child: const Icon(Icons.add), ), ); } - Future _goToTodo(BuildContext context, {Todo? todo}) async { - await Navigator.of(context).push( - MaterialPageRoute( - builder: (_) => AddTodoView(category: category, todo: todo), - ), - ); - } - void _onChangeState(BuildContext context, TodoState state) { final action = state.maybeWhen(success: (a) => a, orElse: () => null); final error = state.maybeWhen(error: (m) => m, orElse: () => null); From f81734fa57cf2545451d21088e0537dde7e0c5d4 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Fri, 20 Aug 2021 14:41:23 -0500 Subject: [PATCH 02/33] Create crud_todo_pages.dart to wrap every screen inside a page --- lib/navigator/crud_todo_pages.dart | 53 ++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 lib/navigator/crud_todo_pages.dart diff --git a/lib/navigator/crud_todo_pages.dart b/lib/navigator/crud_todo_pages.dart new file mode 100644 index 0000000..3cef723 --- /dev/null +++ b/lib/navigator/crud_todo_pages.dart @@ -0,0 +1,53 @@ +import 'package:crud_todo_app/model/category_model.dart'; +import 'package:crud_todo_app/model/todo_model.dart'; +import 'package:crud_todo_app/ui/add_todo_view.dart'; +import 'package:crud_todo_app/ui/todo_category_list_view.dart'; +import 'package:crud_todo_app/ui/todo_list_view.dart'; +import 'package:flutter/material.dart'; + +class CategoryPage extends Page { + const CategoryPage({required this.onGoToDetail}) + : super(key: const ValueKey('CategoryPage')); + + final NavigatorToDetail onGoToDetail; + + @override + Route createRoute(BuildContext context) { + return MaterialPageRoute( + settings: this, + builder: (_) => TodoCategoryListView(onGoToDetail: onGoToDetail), + ); + } +} + +class TodoPage extends Page { + const TodoPage({required this.category, required this.onGoToTodo}) + : super(key: const ValueKey('TodoPage')); + + final Category category; + final NavigatorToTodo onGoToTodo; + + @override + Route createRoute(BuildContext context) { + return MaterialPageRoute( + settings: this, + builder: (_) => TodoListView(category: category, onGoToTodo: onGoToTodo), + ); + } +} + +class AddTodoPage extends Page { + const AddTodoPage({required this.category, this.todo}) + : super(key: const ValueKey('AddTodoPage')); + + final Category category; + final Todo? todo; + + @override + Route createRoute(BuildContext context) { + return MaterialPageRoute( + settings: this, + builder: (_) => AddTodoView(category: category, todo: todo), + ); + } +} From 3c80e71a4ffd1eedd671a4ada36801d87e6fea71 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Fri, 20 Aug 2021 14:42:31 -0500 Subject: [PATCH 03/33] Create crud_todo_router_delegate.dart to handle an independent navigator --- lib/navigator/crud_todo_router_delegate.dart | 72 ++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 lib/navigator/crud_todo_router_delegate.dart diff --git a/lib/navigator/crud_todo_router_delegate.dart b/lib/navigator/crud_todo_router_delegate.dart new file mode 100644 index 0000000..5e0c985 --- /dev/null +++ b/lib/navigator/crud_todo_router_delegate.dart @@ -0,0 +1,72 @@ +import 'package:crud_todo_app/model/category_model.dart'; +import 'package:crud_todo_app/model/todo_model.dart'; +import 'package:crud_todo_app/navigator/crud_todo_pages.dart'; +import 'package:flutter/material.dart'; + +class CrudTodoRouterDelegate extends RouterDelegate + with ChangeNotifier, PopNavigatorRouterDelegateMixin { + CrudTodoRouterDelegate() : _navigatorKey = GlobalKey(); + + // Global Key + + final GlobalKey _navigatorKey; + + @override + GlobalKey? get navigatorKey => _navigatorKey; + + // Current category selected + + Category? _currentCategory; + + Category? get currentCategory => _currentCategory; + + set currentCategory(Category? value) { + _currentCategory = value; + notifyListeners(); + } + + // Current To-Do selected by category + + Todo? _currentTodo; + + Todo? get currentTodo => _currentTodo; + + bool _isTodoSelected = false; + + bool get isTodoSelected => _isTodoSelected; + + void selectCurrentTodo(Todo? value, bool isSelected) { + _currentTodo = value; + _isTodoSelected = isSelected; + + notifyListeners(); + } + + @override + Widget build(BuildContext context) { + return Navigator( + key: navigatorKey, + pages: >[ + CategoryPage(onGoToDetail: (category) => currentCategory = category), + if (currentCategory != null) + TodoPage( + category: currentCategory!, + onGoToTodo: (category, todo) => selectCurrentTodo(todo, true), + ), + if (currentCategory != null && isTodoSelected) + AddTodoPage(category: currentCategory!, todo: currentTodo) + ], + onPopPage: (route, dynamic result) { + if (!route.didPop(result)) return false; + + if (!isTodoSelected) currentCategory = null; + selectCurrentTodo(null, false); + + return true; + }, + ); + } + + @override + Future setNewRoutePath(dynamic configuration) async {} +} From 6e7ff7441d6f48cd28dab9b361d6972d086309e8 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Fri, 20 Aug 2021 14:43:34 -0500 Subject: [PATCH 04/33] Update main.dart adding route widget and become TodoListApp as stateful widget --- lib/main.dart | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 54cfbe0..75e3282 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:crud_todo_app/ui/todo_category_list_view.dart'; +import 'package:crud_todo_app/navigator/crud_todo_router_delegate.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; @@ -11,9 +11,16 @@ Future main() async { runApp(const ProviderScope(child: TodoListApp())); } -class TodoListApp extends StatelessWidget { +class TodoListApp extends StatefulWidget { const TodoListApp({Key? key}) : super(key: key); + @override + _TodoListAppState createState() => _TodoListAppState(); +} + +class _TodoListAppState extends State { + final _todoRouterDelegate = CrudTodoRouterDelegate(); + @override Widget build(BuildContext context) { return MaterialApp( @@ -24,7 +31,10 @@ class TodoListApp extends StatelessWidget { Theme.of(context).textTheme, ), ), - home: const TodoCategoryListView(), + home: Router( + routerDelegate: _todoRouterDelegate, + backButtonDispatcher: RootBackButtonDispatcher(), + ), ); } } From be317293fd320d26df4632b25202ccf4bb89fea3 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Fri, 20 Aug 2021 14:44:39 -0500 Subject: [PATCH 05/33] Update todo_category_list_view_test.dart and todo_list_view_test.dart changing the pump main screen --- test/ui/todo_category_list_view_test.dart | 22 ++++++--- test/ui/todo_list_view_test.dart | 54 +++++++++++++++++------ 2 files changed, 55 insertions(+), 21 deletions(-) diff --git a/test/ui/todo_category_list_view_test.dart b/test/ui/todo_category_list_view_test.dart index dc21682..ca8cb10 100644 --- a/test/ui/todo_category_list_view_test.dart +++ b/test/ui/todo_category_list_view_test.dart @@ -37,12 +37,20 @@ void main() { child: MaterialApp( home: child, navigatorObservers: [mockNavigator], + // TODO: Review unit test for Navigator 2.0 + // Navigator( + // observers: [mockNavigator], + // pages: >[ + // MaterialPage(child: child), + // ], + // onPopPage: (route, dynamic result) => route.didPop(result), + // ), ), )); } testWidgets('Show $TodoCategoryListView screen', (tester) async { - await _pumpMainScreen(tester, const TodoCategoryListView()); + await _pumpMainScreen(tester, TodoCategoryListView(onGoToDetail: (_) {})); expect(find.byIcon(Icons.menu_rounded), findsOneWidget); expect(find.text('Lists'), findsOneWidget); @@ -52,7 +60,7 @@ void main() { testWidgets( 'Show $Dialog section in $TodoCategoryListView screen ' 'when set tap in $FloatingActionButton', (tester) async { - await _pumpMainScreen(tester, const TodoCategoryListView()); + await _pumpMainScreen(tester, TodoCategoryListView(onGoToDetail: (_) {})); final finderFloatingButton = find.byType(FloatingActionButton); @@ -75,7 +83,7 @@ void main() { when(mockCategoryService.getCategories) .thenAnswer((_) => Stream.value([])); - await _pumpMainScreen(tester, const TodoCategoryListView()); + await _pumpMainScreen(tester, TodoCategoryListView(onGoToDetail: (_) {})); expect(find.byType(CircularProgressIndicator), findsOneWidget); await tester.pump(const Duration(seconds: 1)); @@ -88,7 +96,7 @@ void main() { when(categoryRepository.getCategories) .thenAnswer((_) => Stream.value([category])); - await _pumpMainScreen(tester, const TodoCategoryListView()); + await _pumpMainScreen(tester, TodoCategoryListView(onGoToDetail: (_) {})); expect(find.byType(CircularProgressIndicator), findsOneWidget); await tester.pump(const Duration(seconds: 1)); @@ -111,7 +119,7 @@ void main() { when(categoryRepository.getCategories) .thenAnswer((_) => Stream.value([category])); - await _pumpMainScreen(tester, const TodoCategoryListView()); + await _pumpMainScreen(tester, TodoCategoryListView(onGoToDetail: (_) {})); expect(find.byType(CircularProgressIndicator), findsOneWidget); await tester.pump(const Duration(seconds: 1)); @@ -126,10 +134,10 @@ void main() { expect(foundCatItem, findsOneWidget); await tester.tap(foundCatItem); - await tester.pumpAndSettle(); + await tester.pumpAndSettle(const Duration(seconds: 1)); verify(() => mockNavigator.didPush(any(), any())); - expect(find.byType(TodoListView), findsOneWidget); + // expect(find.byType(TodoListView), findsOneWidget); }); }); } diff --git a/test/ui/todo_list_view_test.dart b/test/ui/todo_list_view_test.dart index 8aaa421..6a2aef8 100644 --- a/test/ui/todo_list_view_test.dart +++ b/test/ui/todo_list_view_test.dart @@ -52,12 +52,23 @@ void main() { child: MaterialApp( home: child, navigatorObservers: [mockNavigator], + // TODO: Review unit test for Navigator 2.0 + // Navigator( + // observers: [mockNavigator], + // pages: >[ + // MaterialPage(child: child), + // ], + // onPopPage: (route, dynamic result) => route.didPop(result), + // ), ), )); } testWidgets('Show $TodoListView screen', (tester) async { - await _pumpMainScreen(tester, TodoListView(category: category)); + await _pumpMainScreen( + tester, + TodoListView(category: category, onGoToTodo: (_, __) {}), + ); expect(find.byIcon(Icons.arrow_back_ios), findsOneWidget); expect(find.byIcon(Icons.delete_forever), findsOneWidget); @@ -65,19 +76,25 @@ void main() { }); testWidgets('Redirect to $AddTodoView screen', (tester) async { - await _pumpMainScreen(tester, TodoListView(category: category)); + await _pumpMainScreen( + tester, + TodoListView(category: category, onGoToTodo: (_, __) {}), + ); await tester.tap(find.byType(FloatingActionButton)); await tester.pumpAndSettle(); verify(() => mockNavigator.didPush(any(), any())); - expect(find.byType(AddTodoView), findsOneWidget); + // expect(find.byType(AddTodoView), findsOneWidget); }); testWidgets( 'Check back button in $TodoListView screen ' 'and return to $TodoCategoryListView screen', (tester) async { - await _pumpMainScreen(tester, TodoListView(category: category)); + await _pumpMainScreen( + tester, + TodoListView(category: category, onGoToTodo: (_, __) {}), + ); await tester.tap(find.byIcon(Icons.arrow_back_ios)); await tester.pumpAndSettle(); @@ -95,7 +112,7 @@ void main() { final mainScreenConsumer = Consumer(builder: (_, ref, child) { viewModel = ref.read(categoryViewModelProvider.notifier); - return TodoListView(category: category); + return TodoListView(category: category, onGoToTodo: (_, __) {}); }); await _pumpMainScreen(tester, mainScreenConsumer); @@ -123,7 +140,7 @@ void main() { final mainScreenConsumer = Consumer(builder: (_, ref, child) { viewModel = ref.read(categoryViewModelProvider.notifier); - return TodoListView(category: category); + return TodoListView(category: category, onGoToTodo: (_, __) {}); }); await _pumpMainScreen(tester, mainScreenConsumer); @@ -140,7 +157,10 @@ void main() { when(() => mockTodoService.getTodosByCategory(any())) .thenAnswer((_) => Stream.value([])); - await _pumpMainScreen(tester, TodoListView(category: category)); + await _pumpMainScreen( + tester, + TodoListView(category: category, onGoToTodo: (_, __) {}), + ); expect(find.byType(CircularProgressIndicator), findsOneWidget); await tester.pump(const Duration(seconds: 1)); @@ -153,7 +173,10 @@ void main() { when(() => mockTodoService.getTodosByCategory(any())) .thenAnswer((_) => Stream.value([existingTodo])); - await _pumpMainScreen(tester, TodoListView(category: category)); + await _pumpMainScreen( + tester, + TodoListView(category: category, onGoToTodo: (_, __) {}), + ); expect(find.byType(CircularProgressIndicator), findsOneWidget); await tester.pump(const Duration(seconds: 1)); @@ -185,7 +208,7 @@ void main() { final mainScreenConsumer = Consumer(builder: (_, ref, child) { viewModel = ref.read(todoViewModelProvider.notifier); - return TodoListView(category: category); + return TodoListView(category: category, onGoToTodo: (_, __) {}); }); await _pumpMainScreen(tester, mainScreenConsumer); @@ -230,7 +253,7 @@ void main() { final mainScreenConsumer = Consumer(builder: (_, ref, child) { viewModel = ref.read(todoViewModelProvider.notifier); - return TodoListView(category: category); + return TodoListView(category: category, onGoToTodo: (_, __) {}); }); await _pumpMainScreen(tester, mainScreenConsumer); @@ -266,7 +289,10 @@ void main() { when(() => mockTodoService.getTodosByCategory(any())) .thenAnswer((_) => Stream.value([existingTodo])); - await _pumpMainScreen(tester, TodoListView(category: category)); + await _pumpMainScreen( + tester, + TodoListView(category: category, onGoToTodo: (_, __) {}), + ); await tester.pumpAndSettle(); final foundItemList = find.descendant( @@ -289,7 +315,7 @@ void main() { await tester.pumpAndSettle(); verify(() => mockNavigator.didPush(any(), any())); - expect(find.byType(AddTodoView), findsOneWidget); + // expect(find.byType(AddTodoView), findsOneWidget); }); testWidgets('Slide a $TodoItem and remove $Todo from list', (tester) async { @@ -304,7 +330,7 @@ void main() { final mainScreenConsumer = Consumer(builder: (_, ref, child) { viewModel = ref.read(todoViewModelProvider.notifier); - return TodoListView(category: category); + return TodoListView(category: category, onGoToTodo: (_, __) {}); }); await _pumpMainScreen(tester, mainScreenConsumer); @@ -352,7 +378,7 @@ void main() { final mainScreenConsumer = Consumer(builder: (_, ref, child) { viewModel = ref.read(todoViewModelProvider.notifier); - return TodoListView(category: category); + return TodoListView(category: category, onGoToTodo: (_, __) {}); }); await _pumpMainScreen(tester, mainScreenConsumer); From bebc2c666e91c3f7d9b6c28f3dcf79cf422fed9c Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Fri, 20 Aug 2021 14:44:56 -0500 Subject: [PATCH 06/33] Update coverage_badge.svg --- coverage_badge.svg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coverage_badge.svg b/coverage_badge.svg index db8bc59..7ec970c 100644 --- a/coverage_badge.svg +++ b/coverage_badge.svg @@ -12,7 +12,7 @@ coverage coverage - 91% - 91% + 90% + 90% From 92e92dd77093cf044cd8fa2bd1c30769e8bcfa08 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Fri, 20 Aug 2021 14:47:19 -0500 Subject: [PATCH 07/33] Update README.md file --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b854f7c..9a22691 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,9 @@ ![Coverage](./coverage_badge.svg?sanitize=true) -Create a To-do List Flutter app managing CRUD with Firebase, using RiverPod as state management and dependency injection +Create a To-do List Flutter app managing CRUD with Firebase, using RiverPod as state management and dependency injection. + +Actually the project has been implemented with **Navigator 2.0**. ### Getting Started (Firebase) * To execute the app, you have to Firebase Project already created. From 92b32e1856e9f57ae32a5f81d23bcb3419d1296c Mon Sep 17 00:00:00 2001 From: Argel Bejarano Date: Wed, 25 Aug 2021 05:58:07 -0700 Subject: [PATCH 08/33] Add animation transitions --- android/app/src/debug/AndroidManifest.xml | 7 + android/app/src/profile/AndroidManifest.xml | 7 + lib/navigator/crud_todo_pages.dart | 100 ++- macos/.gitignore | 6 + macos/Flutter/Flutter-Debug.xcconfig | 2 + macos/Flutter/Flutter-Release.xcconfig | 2 + macos/Flutter/GeneratedPluginRegistrant.swift | 16 + macos/Podfile | 40 ++ macos/Runner.xcodeproj/project.pbxproj | 572 ++++++++++++++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 89 +++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + macos/Runner/AppDelegate.swift | 9 + .../AppIcon.appiconset/Contents.json | 68 +++ .../AppIcon.appiconset/app_icon_1024.png | Bin 0 -> 46993 bytes .../AppIcon.appiconset/app_icon_128.png | Bin 0 -> 3276 bytes .../AppIcon.appiconset/app_icon_16.png | Bin 0 -> 1429 bytes .../AppIcon.appiconset/app_icon_256.png | Bin 0 -> 5933 bytes .../AppIcon.appiconset/app_icon_32.png | Bin 0 -> 1243 bytes .../AppIcon.appiconset/app_icon_512.png | Bin 0 -> 14800 bytes .../AppIcon.appiconset/app_icon_64.png | Bin 0 -> 1874 bytes macos/Runner/Base.lproj/MainMenu.xib | 339 +++++++++++ macos/Runner/Configs/AppInfo.xcconfig | 14 + macos/Runner/Configs/Debug.xcconfig | 2 + macos/Runner/Configs/Release.xcconfig | 2 + macos/Runner/Configs/Warnings.xcconfig | 13 + macos/Runner/DebugProfile.entitlements | 12 + macos/Runner/Info.plist | 32 + macos/Runner/MainFlutterWindow.swift | 15 + macos/Runner/Release.entitlements | 8 + 31 files changed, 1374 insertions(+), 4 deletions(-) create mode 100644 android/app/src/debug/AndroidManifest.xml create mode 100644 android/app/src/profile/AndroidManifest.xml create mode 100644 macos/.gitignore create mode 100644 macos/Flutter/Flutter-Debug.xcconfig create mode 100644 macos/Flutter/Flutter-Release.xcconfig create mode 100644 macos/Flutter/GeneratedPluginRegistrant.swift create mode 100644 macos/Podfile create mode 100644 macos/Runner.xcodeproj/project.pbxproj create mode 100644 macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 macos/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 macos/Runner/AppDelegate.swift create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png create mode 100644 macos/Runner/Base.lproj/MainMenu.xib create mode 100644 macos/Runner/Configs/AppInfo.xcconfig create mode 100644 macos/Runner/Configs/Debug.xcconfig create mode 100644 macos/Runner/Configs/Release.xcconfig create mode 100644 macos/Runner/Configs/Warnings.xcconfig create mode 100644 macos/Runner/DebugProfile.entitlements create mode 100644 macos/Runner/Info.plist create mode 100644 macos/Runner/MainFlutterWindow.swift create mode 100644 macos/Runner/Release.entitlements diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..ae646fe --- /dev/null +++ b/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..ae646fe --- /dev/null +++ b/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/lib/navigator/crud_todo_pages.dart b/lib/navigator/crud_todo_pages.dart index 3cef723..be1d978 100644 --- a/lib/navigator/crud_todo_pages.dart +++ b/lib/navigator/crud_todo_pages.dart @@ -29,10 +29,27 @@ class TodoPage extends Page { @override Route createRoute(BuildContext context) { - return MaterialPageRoute( + return FadeTransitionRoute( settings: this, - builder: (_) => TodoListView(category: category, onGoToTodo: onGoToTodo), + child: TodoListView(category: category, onGoToTodo: onGoToTodo), ); + + // return PageRouteBuilder( + // settings: this, + // transitionDuration: const Duration(milliseconds: 1000), + // pageBuilder: (context, animation, animation2) { + // return FadeTransition( + // opacity: animation, + // child: TodoListView(category: category, onGoToTodo: onGoToTodo), + // ); + // }, + // ); + + // return MaterialPageRoute( + // settings: this, + // builder: (_) => TodoListView(category: category, + // onGoToTodo: onGoToTodo,), + // ); } } @@ -45,9 +62,84 @@ class AddTodoPage extends Page { @override Route createRoute(BuildContext context) { - return MaterialPageRoute( + return SlideTransitionRoute( settings: this, - builder: (_) => AddTodoView(category: category, todo: todo), + child: AddTodoView(category: category, todo: todo), ); + + // return PageRouteBuilder( + // settings: this, + // reverseTransitionDuration: const Duration(milliseconds: 1000), + // transitionDuration: const Duration(milliseconds: 1000), + // pageBuilder: (context, animation, animation2) { + // return ScaleTransition( + // scale: animation, + // child: AddTodoView(category: category, todo: todo), + // ); + // }, + // ); + + // return MaterialPageRoute( + // settings: this, + // builder: (_) => AddTodoView(category: category, todo: todo), + // ); } } + +class ScaleTransitionRoute extends PageRouteBuilder { + ScaleTransitionRoute({ + required RouteSettings settings, + required this.child, + }) : super( + settings: settings, + // reverseTransitionDuration: const Duration(milliseconds: 1000), + // transitionDuration: const Duration(milliseconds: 1000), + pageBuilder: (context, anim, anim2) => ScaleTransition( + scale: anim, + child: child, + ), + ); + + final Widget child; +} + +class FadeTransitionRoute extends PageRouteBuilder { + FadeTransitionRoute({ + required RouteSettings settings, + required this.child, + }) : super( + settings: settings, + reverseTransitionDuration: const Duration(milliseconds: 1000), + transitionDuration: const Duration(milliseconds: 1000), + pageBuilder: (context, anim, anim2) => FadeTransition( + opacity: anim, + child: child, + ), + ); + + final Widget child; +} + +class SlideTransitionRoute extends PageRouteBuilder { + SlideTransitionRoute({ + required RouteSettings settings, + required this.child, + }) : super( + settings: settings, + reverseTransitionDuration: const Duration(milliseconds: 1000), + transitionDuration: const Duration(milliseconds: 1000), + pageBuilder: (context, anim, anim2) { + final tween = Tween( + begin: const Offset(0, 1), + end: Offset.zero, + ); + final curveTween = CurveTween(curve: Curves.easeInOut); + return SlideTransition( + position: anim.drive(curveTween).drive(tween), + child: child, + ); + }, + ); + + final Widget child; +} diff --git a/macos/.gitignore b/macos/.gitignore new file mode 100644 index 0000000..d2fd377 --- /dev/null +++ b/macos/.gitignore @@ -0,0 +1,6 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/xcuserdata/ diff --git a/macos/Flutter/Flutter-Debug.xcconfig b/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 0000000..4b81f9b --- /dev/null +++ b/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/Flutter-Release.xcconfig b/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 0000000..5caa9d1 --- /dev/null +++ b/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 0000000..3b7c34e --- /dev/null +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,16 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + +import cloud_firestore +import firebase_core +import path_provider_macos + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + FLTFirebaseFirestorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseFirestorePlugin")) + FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin")) + PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) +} diff --git a/macos/Podfile b/macos/Podfile new file mode 100644 index 0000000..dade8df --- /dev/null +++ b/macos/Podfile @@ -0,0 +1,40 @@ +platform :osx, '10.11' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_macos_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..fee1e38 --- /dev/null +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,572 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 51; + objects = { + +/* Begin PBXAggregateTarget section */ + 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; + buildPhases = ( + 33CC111E2044C6BF0003C045 /* ShellScript */, + ); + dependencies = ( + ); + name = "Flutter Assemble"; + productName = FLX; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 33CC110E2044A8840003C045 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 33CC10ED2044A3C60003C045 /* crud_todo_app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "crud_todo_app.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; + 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; + 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; + 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 33BA886A226E78AF003329D5 /* Configs */ = { + isa = PBXGroup; + children = ( + 33E5194F232828860026EE4D /* AppInfo.xcconfig */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, + ); + path = Configs; + sourceTree = ""; + }; + 33CC10E42044A3C60003C045 = { + isa = PBXGroup; + children = ( + 33FAB671232836740065AC1E /* Runner */, + 33CEB47122A05771004F2AC0 /* Flutter */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* crud_todo_app.app */, + ); + name = Products; + sourceTree = ""; + }; + 33CC11242044D66E0003C045 /* Resources */ = { + isa = PBXGroup; + children = ( + 33CC10F22044A3C60003C045 /* Assets.xcassets */, + 33CC10F42044A3C60003C045 /* MainMenu.xib */, + 33CC10F72044A3C60003C045 /* Info.plist */, + ); + name = Resources; + path = ..; + sourceTree = ""; + }; + 33CEB47122A05771004F2AC0 /* Flutter */ = { + isa = PBXGroup; + children = ( + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + ); + path = Flutter; + sourceTree = ""; + }; + 33FAB671232836740065AC1E /* Runner */ = { + isa = PBXGroup; + children = ( + 33CC10F02044A3C60003C045 /* AppDelegate.swift */, + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, + 33E51913231747F40026EE4D /* DebugProfile.entitlements */, + 33E51914231749380026EE4D /* Release.entitlements */, + 33CC11242044D66E0003C045 /* Resources */, + 33BA886A226E78AF003329D5 /* Configs */, + ); + path = Runner; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* crud_todo_app.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 0930; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 33CC10EC2044A3C60003C045 = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Sandbox = { + enabled = 1; + }; + }; + }; + 33CC111A2044C6BA0003C045 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Manual; + }; + }; + }; + buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 33CC10E42044A3C60003C045; + productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 33CC10EC2044A3C60003C045 /* Runner */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 33CC10EB2044A3C60003C045 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + }; + 33CC111E2044C6BF0003C045 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, + ); + outputFileListPaths = ( + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 33CC10E92044A3C60003C045 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 33CC10F52044A3C60003C045 /* Base */, + ); + name = MainMenu.xib; + path = Runner; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 338D0CE9231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Profile; + }; + 338D0CEA231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Profile; + }; + 338D0CEB231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Profile; + }; + 33CC10F92044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 33CC10FA2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 33CC10FC2044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 33CC10FD2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 33CC111C2044C6BA0003C045 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 33CC111D2044C6BA0003C045 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10F92044A3C60003C045 /* Debug */, + 33CC10FA2044A3C60003C045 /* Release */, + 338D0CE9231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10FC2044A3C60003C045 /* Debug */, + 33CC10FD2044A3C60003C045 /* Release */, + 338D0CEA231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC111C2044C6BA0003C045 /* Debug */, + 33CC111D2044C6BA0003C045 /* Release */, + 338D0CEB231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 33CC10E52044A3C60003C045 /* Project object */; +} diff --git a/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..a5e21e5 --- /dev/null +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/macos/Runner.xcworkspace/contents.xcworkspacedata b/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift new file mode 100644 index 0000000..d53ef64 --- /dev/null +++ b/macos/Runner/AppDelegate.swift @@ -0,0 +1,9 @@ +import Cocoa +import FlutterMacOS + +@NSApplicationMain +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } +} diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..a2ec33f --- /dev/null +++ b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_64.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_1024.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 0000000000000000000000000000000000000000..3c4935a7ca84f0976aca34b7f2895d65fb94d1ea GIT binary patch literal 46993 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 literal 0 HcmV?d00001 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 0000000000000000000000000000000000000000..ed4cc16421680a50164ba74381b4b35ceaa0ccfc GIT binary patch literal 3276 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 N;OXk;vd$@?2>?>Ex^Vyi literal 0 HcmV?d00001 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png new file mode 100644 index 0000000000000000000000000000000000000000..bcbf36df2f2aaaa0a63c7dabc94e600184229d0d GIT binary patch literal 5933 zcmZ{Idpwix|Np(&m_yAF>K&UIn{t*2ZOdsShYs(MibU!|=pZCJq~7E>B$QJr)hC5| zmk?V?ES039lQ~RC!kjkl-TU4?|NZ{>J$CPLUH9vHy`Hbhhnc~SD_vpzBp6Xw4`$%jfmPw(;etLCccvfU-s)1A zLl8-RiSx!#?Kwzd0E&>h;Fc z^;S84cUH7gMe#2}MHYcDXgbkI+Qh^X4BV~6y<@s`gMSNX!4@g8?ojjj5hZj5X4g9D zavr_NoeZ=4vim%!Y`GnF-?2_Gb)g$xAo>#zCOLB-jPww8a%c|r&DC=eVdE;y+HwH@ zy`JK(oq+Yw^-hLvWO4B8orWwLiKT!hX!?xw`kz%INd5f)>k1PZ`ZfM&&Ngw)HiXA| ze=+%KkiLe1hd>h!ZO2O$45alH0O|E+>G2oCiJ|3y2c$;XedBozx93BprOr$#d{W5sb*hQQ~M@+v_m!8s?9+{Q0adM?ip3qQ*P5$R~dFvP+5KOH_^A+l-qu5flE*KLJp!rtjqTVqJsmpc1 zo>T>*ja-V&ma7)K?CE9RTsKQKk7lhx$L`9d6-Gq`_zKDa6*>csToQ{&0rWf$mD7x~S3{oA z1wUZl&^{qbX>y*T71~3NWd1Wfgjg)<~BnK96Ro#om&~8mU{}D!Fu# zTrKKSM8gY^*47b2Vr|ZZe&m9Y`n+Y8lHvtlBbIjNl3pGxU{!#Crl5RPIO~!L5Y({ym~8%Ox-9g>IW8 zSz2G6D#F|L^lcotrZx4cFdfw6f){tqITj6>HSW&ijlgTJTGbc7Q#=)*Be0-s0$fCk z^YaG;7Q1dfJq#p|EJ~YYmqjs`M0jPl=E`Id{+h%Lo*|8xp6K7yfgjqiH7{61$4x~A zNnH+65?QCtL;_w(|mDNJXybin=rOy-i7A@lXEu z&jY(5jhjlP{TsjMe$*b^2kp8LeAXu~*q&5;|3v|4w4Ij_4c{4GG8={;=K#lh{#C8v z&t9d7bf{@9aUaE94V~4wtQ|LMT*Ruuu0Ndjj*vh2pWW@|KeeXi(vt!YXi~I6?r5PG z$_{M*wrccE6x42nPaJUO#tBu$l#MInrZhej_Tqki{;BT0VZeb$Ba%;>L!##cvieb2 zwn(_+o!zhMk@l~$$}hivyebloEnNQmOy6biopy`GL?=hN&2)hsA0@fj=A^uEv~TFE z<|ZJIWplBEmufYI)<>IXMv(c+I^y6qBthESbAnk?0N(PI>4{ASayV1ErZ&dsM4Z@E-)F&V0>tIF+Oubl zin^4Qx@`Un4kRiPq+LX5{4*+twI#F~PE7g{FpJ`{)K()FH+VG^>)C-VgK>S=PH!m^ zE$+Cfz!Ja`s^Vo(fd&+U{W|K$e(|{YG;^9{D|UdadmUW;j;&V!rU)W_@kqQj*Frp~ z7=kRxk)d1$$38B03-E_|v=<*~p3>)2w*eXo(vk%HCXeT5lf_Z+D}(Uju=(WdZ4xa( zg>98lC^Z_`s-=ra9ZC^lAF?rIvQZpAMz8-#EgX;`lc6*53ckpxG}(pJp~0XBd9?RP zq!J-f`h0dC*nWxKUh~8YqN{SjiJ6vLBkMRo?;|eA(I!akhGm^}JXoL_sHYkGEQWWf zTR_u*Ga~Y!hUuqb`h|`DS-T)yCiF#s<KR}hC~F%m)?xjzj6w#Za%~XsXFS@P0E3t*qs)tR43%!OUxs(|FTR4Sjz(N zppN>{Ip2l3esk9rtB#+To92s~*WGK`G+ECt6D>Bvm|0`>Img`jUr$r@##&!1Ud{r| zgC@cPkNL_na`74%fIk)NaP-0UGq`|9gB}oHRoRU7U>Uqe!U61fY7*Nj(JiFa-B7Av z;VNDv7Xx&CTwh(C2ZT{ot`!E~1i1kK;VtIh?;a1iLWifv8121n6X!{C%kw|h-Z8_U z9Y8M38M2QG^=h+dW*$CJFmuVcrvD*0hbFOD=~wU?C5VqNiIgAs#4axofE*WFYd|K;Et18?xaI|v-0hN#D#7j z5I{XH)+v0)ZYF=-qloGQ>!)q_2S(Lg3<=UsLn%O)V-mhI-nc_cJZu(QWRY)*1il%n zOR5Kdi)zL-5w~lOixilSSF9YQ29*H+Br2*T2lJ?aSLKBwv7}*ZfICEb$t>z&A+O3C z^@_rpf0S7MO<3?73G5{LWrDWfhy-c7%M}E>0!Q(Iu71MYB(|gk$2`jH?!>ND0?xZu z1V|&*VsEG9U zm)!4#oTcgOO6Hqt3^vcHx>n}%pyf|NSNyTZX*f+TODT`F%IyvCpY?BGELP#s<|D{U z9lUTj%P6>^0Y$fvIdSj5*=&VVMy&nms=!=2y<5DP8x;Z13#YXf7}G)sc$_TQQ=4BD zQ1Le^y+BwHl7T6)`Q&9H&A2fJ@IPa;On5n!VNqWUiA*XXOnvoSjEIKW<$V~1?#zts>enlSTQaG2A|Ck4WkZWQoeOu(te znV;souKbA2W=)YWldqW@fV^$6EuB`lFmXYm%WqI}X?I1I7(mQ8U-pm+Ya* z|7o6wac&1>GuQfIvzU7YHIz_|V;J*CMLJolXMx^9CI;I+{Nph?sf2pX@%OKT;N@Uz9Y zzuNq11Ccdwtr(TDLx}N!>?weLLkv~i!xfI0HGWff*!12E*?7QzzZT%TX{5b7{8^*A z3ut^C4uxSDf=~t4wZ%L%gO_WS7SR4Ok7hJ;tvZ9QBfVE%2)6hE>xu9y*2%X5y%g$8 z*8&(XxwN?dO?2b4VSa@On~5A?zZZ{^s3rXm54Cfi-%4hBFSk|zY9u(3d1ButJuZ1@ zfOHtpSt)uJnL`zg9bBvUkjbPO0xNr{^{h0~$I$XQzel_OIEkgT5L!dW1uSnKsEMVp z9t^dfkxq=BneR9`%b#nWSdj)u1G=Ehv0$L@xe_eG$Ac%f7 zy`*X(p0r3FdCTa1AX^BtmPJNR4%S1nyu-AM-8)~t-KII9GEJU)W^ng7C@3%&3lj$2 z4niLa8)fJ2g>%`;;!re+Vh{3V^}9osx@pH8>b0#d8p`Dgm{I?y@dUJ4QcSB<+FAuT)O9gMlwrERIy z6)DFLaEhJkQ7S4^Qr!JA6*SYni$THFtE)0@%!vAw%X7y~!#k0?-|&6VIpFY9>5GhK zr;nM-Z`Omh>1>7;&?VC5JQoKi<`!BU_&GLzR%92V$kMohNpMDB=&NzMB&w-^SF~_# zNsTca>J{Y555+z|IT75yW;wi5A1Z zyzv|4l|xZ-Oy8r8_c8X)h%|a8#(oWcgS5P6gtuCA_vA!t=)IFTL{nnh8iW!B$i=Kd zj1ILrL;ht_4aRKF(l1%^dUyVxgK!2QsL)-{x$`q5wWjjN6B!Cj)jB=bii;9&Ee-;< zJfVk(8EOrbM&5mUciP49{Z43|TLoE#j(nQN_MaKt16dp#T6jF7z?^5*KwoT-Y`rs$ z?}8)#5Dg-Rx!PTa2R5; zx0zhW{BOpx_wKPlTu;4ev-0dUwp;g3qqIi|UMC@A?zEb3RXY`z_}gbwju zzlNht0WR%g@R5CVvg#+fb)o!I*Zpe?{_+oGq*wOmCWQ=(Ra-Q9mx#6SsqWAp*-Jzb zKvuPthpH(Fn_k>2XPu!=+C{vZsF8<9p!T}U+ICbNtO}IAqxa57*L&T>M6I0ogt&l> z^3k#b#S1--$byAaU&sZL$6(6mrf)OqZXpUPbVW%T|4T}20q9SQ&;3?oRz6rSDP4`b z(}J^?+mzbp>MQDD{ziSS0K(2^V4_anz9JV|Y_5{kF3spgW%EO6JpJ(rnnIN%;xkKf zn~;I&OGHKII3ZQ&?sHlEy)jqCyfeusjPMo7sLVr~??NAknqCbuDmo+7tp8vrKykMb z(y`R)pVp}ZgTErmi+z`UyQU*G5stQRsx*J^XW}LHi_af?(bJ8DPho0b)^PT|(`_A$ zFCYCCF={BknK&KYTAVaHE{lqJs4g6B@O&^5oTPLkmqAB#T#m!l9?wz!C}#a6w)Z~Z z6jx{dsXhI(|D)x%Yu49%ioD-~4}+hCA8Q;w_A$79%n+X84jbf?Nh?kRNRzyAi{_oV zU)LqH-yRdPxp;>vBAWqH4E z(WL)}-rb<_R^B~fI%ddj?Qxhp^5_~)6-aB`D~Nd$S`LY_O&&Fme>Id)+iI>%9V-68 z3crl=15^%0qA~}ksw@^dpZ`p;m=ury;-OV63*;zQyRs4?1?8lbUL!bR+C~2Zz1O+E@6ZQW!wvv z|NLqSP0^*J2Twq@yws%~V0^h05B8BMNHv_ZZT+=d%T#i{faiqN+ut5Bc`uQPM zgO+b1uj;)i!N94RJ>5RjTNXN{gAZel|L8S4r!NT{7)_=|`}D~ElU#2er}8~UE$Q>g zZryBhOd|J-U72{1q;Lb!^3mf+H$x6(hJHn$ZJRqCp^In_PD+>6KWnCnCXA35(}g!X z;3YI1luR&*1IvESL~*aF8(?4deU`9!cxB{8IO?PpZ{O5&uY<0DIERh2wEoAP@bayv z#$WTjR*$bN8^~AGZu+85uHo&AulFjmh*pupai?o?+>rZ7@@Xk4muI}ZqH`n&<@_Vn zvT!GF-_Ngd$B7kLge~&3qC;TE=tEid(nQB*qzXI0m46ma*2d(Sd*M%@Zc{kCFcs;1 zky%U)Pyg3wm_g12J`lS4n+Sg=L)-Y`bU705E5wk&zVEZw`eM#~AHHW96@D>bz#7?- zV`xlac^e`Zh_O+B5-kO=$04{<cKUG?R&#bnF}-?4(Jq+?Ph!9g zx@s~F)Uwub>Ratv&v85!6}3{n$bYb+p!w(l8Na6cSyEx#{r7>^YvIj8L?c*{mcB^x zqnv*lu-B1ORFtrmhfe}$I8~h*3!Ys%FNQv!P2tA^wjbH f$KZHO*s&vt|9^w-6P?|#0pRK8NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!ItFh?!xdN1Q+aGJ{c&& zS>O>_%)r1c48n{Iv*t(u1=&kHeO=ifbFy+6aSK)V_AxLppYn8Z42d|rc6w}vOsL55 z`t&mC&y2@JTEyg!eDiFX^k#CC!jq%>erB=yHqUP0XcDOTw6ko}L zX;EmMrq(fKk*eygEuA616;0)>@A{TK|55PV@70 z$OfzS*(VJxQev3J?yY?O=ul(v`fp}?u9z`JK3ugibK>)DyCwImZOF4d{xK%%Ks1*} zv$oa)9anR%lXIBUqYnhLmT>VOzHfNP?ZwJNZ!5$s9M08RynIvaXw>@G^T9@r9^KH1 zVy??F&uuk)bH9Y4pQY!hP58i_H6 znl-NcuCpLV6ZWU;4C zu@9exF&OZi`Bovq_m%T+WhU2kvkz@^_LpycBvqm3bMpLw8X-Or5sL>0AKE1$(k_L=_Zc=CUq#=x1-QZf)G7nHu@fmsQ1eN_N3+nTEz`4HI4Z6uVlE zJH+X&det8JU?tO?upcM4Z=cV!JV;yF>FfL5Q$M|W_2Z!P`S=}Wzp|_1^#d%e?_H`> zV@%vA$+bFVqhw9`U;TfP|5|PD{||OiYdor8P*i??|NJcb%kzT_73*7WE?Ua5hAnR2 z=7WE=PhTlJ#ZeRznjTUb;`E(wkMZrj4e|Hilz-mK>9cZHQY**5TUPw~u}k;u73KI}xAx!0m-)GVia|x^d3p~s_9gh83jA&Ra<8rM%`>U3x69t&NzbwWY}7Ar?)FK#IZ0z|d0H0EkRO w3{9;}4Xg|ebq&m|3=9_N6z8I7$jwj5OsmAL;bP(Gi$Dzwp00i_>zopr02+f8CIA2c literal 0 HcmV?d00001 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png new file mode 100644 index 0000000000000000000000000000000000000000..e71a726136a47ed24125c7efc79d68a4a01961b4 GIT binary patch literal 14800 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 0000000..ecb55bc --- /dev/null +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -0,0 +1,14 @@ +// Application-level settings for the Runner target. +// +// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the +// future. If not, the values below would default to using the project name when this becomes a +// 'flutter create' template. + +// The application's name. By default this is also the title of the Flutter window. +PRODUCT_NAME = crud_todo_app + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.developer.fabian.crudTodoApp + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2021 com.developer.fabian. All rights reserved. diff --git a/macos/Runner/Configs/Debug.xcconfig b/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 0000000..36b0fd9 --- /dev/null +++ b/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/macos/Runner/Configs/Release.xcconfig b/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 0000000..dff4f49 --- /dev/null +++ b/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/macos/Runner/Configs/Warnings.xcconfig b/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 0000000..42bcbf4 --- /dev/null +++ b/macos/Runner/Configs/Warnings.xcconfig @@ -0,0 +1,13 @@ +WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_PRAGMA_PACK = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/macos/Runner/DebugProfile.entitlements b/macos/Runner/DebugProfile.entitlements new file mode 100644 index 0000000..dddb8a3 --- /dev/null +++ b/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.server + + + diff --git a/macos/Runner/Info.plist b/macos/Runner/Info.plist new file mode 100644 index 0000000..4789daa --- /dev/null +++ b/macos/Runner/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/macos/Runner/MainFlutterWindow.swift b/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 0000000..2722837 --- /dev/null +++ b/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController.init() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + + super.awakeFromNib() + } +} diff --git a/macos/Runner/Release.entitlements b/macos/Runner/Release.entitlements new file mode 100644 index 0000000..852fa1a --- /dev/null +++ b/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + From 737841ee2636c5751875e0f3b7cb6660e22fdda1 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Wed, 25 Aug 2021 19:56:11 -0500 Subject: [PATCH 09/33] Remove unused manifest files --- android/app/src/debug/AndroidManifest.xml | 7 ------- android/app/src/profile/AndroidManifest.xml | 7 ------- 2 files changed, 14 deletions(-) delete mode 100644 android/app/src/debug/AndroidManifest.xml delete mode 100644 android/app/src/profile/AndroidManifest.xml diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml deleted file mode 100644 index ae646fe..0000000 --- a/android/app/src/debug/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml deleted file mode 100644 index ae646fe..0000000 --- a/android/app/src/profile/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - From 359eda75d5a72506000c99c6933eb0133474fadf Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Wed, 25 Aug 2021 19:57:09 -0500 Subject: [PATCH 10/33] Create crud_todo_transition_route.dart to set transition classes separated --- lib/navigator/crud_todo_transition_route.dart | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 lib/navigator/crud_todo_transition_route.dart diff --git a/lib/navigator/crud_todo_transition_route.dart b/lib/navigator/crud_todo_transition_route.dart new file mode 100644 index 0000000..4d8cea3 --- /dev/null +++ b/lib/navigator/crud_todo_transition_route.dart @@ -0,0 +1,60 @@ + +import 'package:flutter/material.dart'; + +class ScaleTransitionRoute extends PageRouteBuilder { + ScaleTransitionRoute({ + required RouteSettings settings, + required this.child, + }) : super( + settings: settings, + // reverseTransitionDuration: const Duration(milliseconds: 1000), + // transitionDuration: const Duration(milliseconds: 1000), + pageBuilder: (context, anim, anim2) => ScaleTransition( + scale: anim, + child: child, + ), + ); + + final Widget child; +} + +class FadeTransitionRoute extends PageRouteBuilder { + FadeTransitionRoute({ + required RouteSettings settings, + required this.child, + }) : super( + settings: settings, + reverseTransitionDuration: const Duration(milliseconds: 1000), + transitionDuration: const Duration(milliseconds: 1000), + pageBuilder: (context, anim, anim2) => FadeTransition( + opacity: anim, + child: child, + ), + ); + + final Widget child; +} + +class SlideTransitionRoute extends PageRouteBuilder { + SlideTransitionRoute({ + required RouteSettings settings, + required this.child, + }) : super( + settings: settings, + reverseTransitionDuration: const Duration(milliseconds: 1000), + transitionDuration: const Duration(milliseconds: 1000), + pageBuilder: (context, anim, anim2) { + final tween = Tween( + begin: const Offset(0, 1), + end: Offset.zero, + ); + final curveTween = CurveTween(curve: Curves.easeInOut); + return SlideTransition( + position: anim.drive(curveTween).drive(tween), + child: child, + ); + }, + ); + + final Widget child; +} From f86ce484f332f863fabb041dce82a6faf55ca859 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Wed, 25 Aug 2021 19:59:16 -0500 Subject: [PATCH 11/33] Set pages with transition in crud_todo_pages.dart --- lib/navigator/crud_todo_pages.dart | 72 ++---------------------------- 1 file changed, 3 insertions(+), 69 deletions(-) diff --git a/lib/navigator/crud_todo_pages.dart b/lib/navigator/crud_todo_pages.dart index be1d978..dd984c2 100644 --- a/lib/navigator/crud_todo_pages.dart +++ b/lib/navigator/crud_todo_pages.dart @@ -1,5 +1,6 @@ import 'package:crud_todo_app/model/category_model.dart'; import 'package:crud_todo_app/model/todo_model.dart'; +import 'package:crud_todo_app/navigator/crud_todo_transition_route.dart'; import 'package:crud_todo_app/ui/add_todo_view.dart'; import 'package:crud_todo_app/ui/todo_category_list_view.dart'; import 'package:crud_todo_app/ui/todo_list_view.dart'; @@ -34,6 +35,7 @@ class TodoPage extends Page { child: TodoListView(category: category, onGoToTodo: onGoToTodo), ); + /// Uncomment it and comment code above to use individually // return PageRouteBuilder( // settings: this, // transitionDuration: const Duration(milliseconds: 1000), @@ -44,12 +46,6 @@ class TodoPage extends Page { // ); // }, // ); - - // return MaterialPageRoute( - // settings: this, - // builder: (_) => TodoListView(category: category, - // onGoToTodo: onGoToTodo,), - // ); } } @@ -67,6 +63,7 @@ class AddTodoPage extends Page { child: AddTodoView(category: category, todo: todo), ); + /// Uncomment it and comment code above to use individually // return PageRouteBuilder( // settings: this, // reverseTransitionDuration: const Duration(milliseconds: 1000), @@ -78,68 +75,5 @@ class AddTodoPage extends Page { // ); // }, // ); - - // return MaterialPageRoute( - // settings: this, - // builder: (_) => AddTodoView(category: category, todo: todo), - // ); } } - -class ScaleTransitionRoute extends PageRouteBuilder { - ScaleTransitionRoute({ - required RouteSettings settings, - required this.child, - }) : super( - settings: settings, - // reverseTransitionDuration: const Duration(milliseconds: 1000), - // transitionDuration: const Duration(milliseconds: 1000), - pageBuilder: (context, anim, anim2) => ScaleTransition( - scale: anim, - child: child, - ), - ); - - final Widget child; -} - -class FadeTransitionRoute extends PageRouteBuilder { - FadeTransitionRoute({ - required RouteSettings settings, - required this.child, - }) : super( - settings: settings, - reverseTransitionDuration: const Duration(milliseconds: 1000), - transitionDuration: const Duration(milliseconds: 1000), - pageBuilder: (context, anim, anim2) => FadeTransition( - opacity: anim, - child: child, - ), - ); - - final Widget child; -} - -class SlideTransitionRoute extends PageRouteBuilder { - SlideTransitionRoute({ - required RouteSettings settings, - required this.child, - }) : super( - settings: settings, - reverseTransitionDuration: const Duration(milliseconds: 1000), - transitionDuration: const Duration(milliseconds: 1000), - pageBuilder: (context, anim, anim2) { - final tween = Tween( - begin: const Offset(0, 1), - end: Offset.zero, - ); - final curveTween = CurveTween(curve: Curves.easeInOut); - return SlideTransition( - position: anim.drive(curveTween).drive(tween), - child: child, - ); - }, - ); - - final Widget child; -} From 5c24fc0628b5653701e3feaf44a54b3fad015f92 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Wed, 25 Aug 2021 20:09:19 -0500 Subject: [PATCH 12/33] Change attribute todo by currentTodo --- lib/navigator/crud_todo_pages.dart | 26 +++++++++++++++++--- lib/navigator/crud_todo_router_delegate.dart | 2 +- lib/ui/add_todo_view.dart | 16 +++++++----- test/ui/add_todo_view_test.dart | 16 ++++++------ 4 files changed, 41 insertions(+), 19 deletions(-) diff --git a/lib/navigator/crud_todo_pages.dart b/lib/navigator/crud_todo_pages.dart index dd984c2..20f0fcf 100644 --- a/lib/navigator/crud_todo_pages.dart +++ b/lib/navigator/crud_todo_pages.dart @@ -46,21 +46,30 @@ class TodoPage extends Page { // ); // }, // ); + + /// Uncomment it and comment code above to use individually + // return MaterialPageRoute( + // settings: this, + // builder: (_) => TodoListView( + // category: category, + // onGoToTodo: onGoToTodo, + // ), + // ); } } class AddTodoPage extends Page { - const AddTodoPage({required this.category, this.todo}) + const AddTodoPage({required this.category, this.currentTodo}) : super(key: const ValueKey('AddTodoPage')); final Category category; - final Todo? todo; + final Todo? currentTodo; @override Route createRoute(BuildContext context) { return SlideTransitionRoute( settings: this, - child: AddTodoView(category: category, todo: todo), + child: AddTodoView(category: category, currentTodo: currentTodo), ); /// Uncomment it and comment code above to use individually @@ -71,9 +80,18 @@ class AddTodoPage extends Page { // pageBuilder: (context, animation, animation2) { // return ScaleTransition( // scale: animation, - // child: AddTodoView(category: category, todo: todo), + // child: AddTodoView(category: category, currentTodo: currentTodo), // ); // }, // ); + + /// Uncomment it and comment code above to use individually + // return MaterialPageRoute( + // settings: this, + // builder: (_) => AddTodoView( + // category: category, + // currentTodo: currentTodo, + // ), + // ); } } diff --git a/lib/navigator/crud_todo_router_delegate.dart b/lib/navigator/crud_todo_router_delegate.dart index 5e0c985..76b9c33 100644 --- a/lib/navigator/crud_todo_router_delegate.dart +++ b/lib/navigator/crud_todo_router_delegate.dart @@ -54,7 +54,7 @@ class CrudTodoRouterDelegate extends RouterDelegate onGoToTodo: (category, todo) => selectCurrentTodo(todo, true), ), if (currentCategory != null && isTodoSelected) - AddTodoPage(category: currentCategory!, todo: currentTodo) + AddTodoPage(category: currentCategory!, currentTodo: currentTodo) ], onPopPage: (route, dynamic result) { if (!route.didPop(result)) return false; diff --git a/lib/ui/add_todo_view.dart b/lib/ui/add_todo_view.dart index aa72d03..6fbca21 100644 --- a/lib/ui/add_todo_view.dart +++ b/lib/ui/add_todo_view.dart @@ -12,11 +12,11 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; class AddTodoView extends HookConsumerWidget { - const AddTodoView({Key? key, required this.category, this.todo}) + const AddTodoView({Key? key, required this.category, this.currentTodo}) : super(key: key); final Category category; - final Todo? todo; + final Todo? currentTodo; @override Widget build(BuildContext context, WidgetRef ref) { @@ -33,10 +33,14 @@ class AddTodoView extends HookConsumerWidget { body: SingleChildScrollView( child: Column( children: [ - SubjectTodo(todo: todo).paddingSymmetric(h: 30, v: 30), - DateTodo(todo: todo).paddingSymmetric(h: 30, v: 20), + SubjectTodo(todo: currentTodo).paddingSymmetric(h: 30, v: 30), + DateTodo(todo: currentTodo).paddingSymmetric(h: 30, v: 20), CategoryTodo(category: category).paddingSymmetric(h: 30, v: 20), - SubmitTodo(catId: category.id!, todoId: todo?.id, enabled: isValid), + SubmitTodo( + catId: category.id!, + todoId: currentTodo?.id, + enabled: isValid, + ), ], ), ).paddingSymmetric(v: 20), @@ -50,7 +54,7 @@ class AddTodoView extends HookConsumerWidget { automaticallyImplyLeading: false, backgroundColor: Colors.transparent, title: Text( - todo == null ? 'New Task' : 'Update Task', + currentTodo == null ? 'New Task' : 'Update Task', style: const TextStyle( fontSize: 20, fontWeight: FontWeight.w400, diff --git a/test/ui/add_todo_view_test.dart b/test/ui/add_todo_view_test.dart index 6b1dcb2..7c7c865 100644 --- a/test/ui/add_todo_view_test.dart +++ b/test/ui/add_todo_view_test.dart @@ -44,7 +44,7 @@ void main() { testWidgets('Show $AddTodoView screen', (tester) async { await _pumpMainScreen( tester, - AddTodoView(category: category, todo: existingTodo), + AddTodoView(category: category, currentTodo: existingTodo), ); expect(find.text('Update Task'), findsOneWidget); @@ -60,7 +60,7 @@ void main() { 'and return to $TodoListView screen', (tester) async { await _pumpMainScreen( tester, - AddTodoView(category: category, todo: existingTodo), + AddTodoView(category: category, currentTodo: existingTodo), ); await tester.tap(find.byIcon(Icons.close)); @@ -72,7 +72,7 @@ void main() { testWidgets('Show $DatePickerDialog when tap $DateTodo', (tester) async { await _pumpMainScreen( tester, - AddTodoView(category: category, todo: existingTodo), + AddTodoView(category: category, currentTodo: existingTodo), ); await tester.tap(find.byType(DateTodo)); @@ -86,7 +86,7 @@ void main() { '$SubjectTodo or $DateTodo widgets are empty', (tester) async { await _pumpMainScreen( tester, - AddTodoView(category: category, todo: existingTodo), + AddTodoView(category: category, currentTodo: existingTodo), ); final foundSubmitButton = find.byType(SubmitTodo); @@ -103,7 +103,7 @@ void main() { '$SubjectTodo or $DateTodo widgets are not empty', (tester) async { await _pumpMainScreen( tester, - AddTodoView(category: category, todo: existingTodo), + AddTodoView(category: category, currentTodo: existingTodo), ); final foundSubmitButton = find.byType(SubmitTodo); @@ -123,7 +123,7 @@ void main() { await _pumpMainScreen(tester, Consumer(builder: (_, ref, child) { viewModel = ref.read(todoViewModelProvider.notifier); - return AddTodoView(category: category, todo: addingTodo); + return AddTodoView(category: category, currentTodo: addingTodo); })); await tester.enterText(find.byType(SubjectTodo), 'Test TODO'); @@ -151,7 +151,7 @@ void main() { await _pumpMainScreen(tester, Consumer(builder: (_, ref, child) { viewModel = ref.read(todoViewModelProvider.notifier); - return AddTodoView(category: category, todo: existingTodo); + return AddTodoView(category: category, currentTodo: existingTodo); })); await tester.enterText(find.byType(SubjectTodo), 'Test TODO'); @@ -180,7 +180,7 @@ void main() { await _pumpMainScreen(tester, Consumer(builder: (_, ref, child) { viewModel = ref.read(todoViewModelProvider.notifier); - return AddTodoView(category: category, todo: existingTodo); + return AddTodoView(category: category, currentTodo: existingTodo); })); await tester.enterText(find.byType(SubjectTodo), 'Test TODO'); From d9ab598484584983622b669c95ecfd1aade90651 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Tue, 31 Aug 2021 22:06:32 -0500 Subject: [PATCH 13/33] Update state values and set observer in crud_todo_router_delegate.dart --- lib/navigator/crud_todo_router_delegate.dart | 41 ++++++++++---------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/lib/navigator/crud_todo_router_delegate.dart b/lib/navigator/crud_todo_router_delegate.dart index 76b9c33..4d1a1ce 100644 --- a/lib/navigator/crud_todo_router_delegate.dart +++ b/lib/navigator/crud_todo_router_delegate.dart @@ -1,12 +1,12 @@ -import 'package:crud_todo_app/model/category_model.dart'; -import 'package:crud_todo_app/model/todo_model.dart'; import 'package:crud_todo_app/navigator/crud_todo_pages.dart'; import 'package:flutter/material.dart'; -class CrudTodoRouterDelegate extends RouterDelegate - with ChangeNotifier, PopNavigatorRouterDelegateMixin { +class CrudTodoRouterDelegate extends RouterDelegate + with ChangeNotifier, PopNavigatorRouterDelegateMixin { CrudTodoRouterDelegate() : _navigatorKey = GlobalKey(); + final _heroController = HeroController(); + // Global Key final GlobalKey _navigatorKey; @@ -16,27 +16,27 @@ class CrudTodoRouterDelegate extends RouterDelegate // Current category selected - Category? _currentCategory; + String? _currentCategoryId; - Category? get currentCategory => _currentCategory; + String? get currentCategoryId => _currentCategoryId; - set currentCategory(Category? value) { - _currentCategory = value; + set currentCategoryId(String? value) { + _currentCategoryId = value; notifyListeners(); } // Current To-Do selected by category - Todo? _currentTodo; + String? _currentTodoId; - Todo? get currentTodo => _currentTodo; + String? get currentTodoId => _currentTodoId; bool _isTodoSelected = false; bool get isTodoSelected => _isTodoSelected; - void selectCurrentTodo(Todo? value, bool isSelected) { - _currentTodo = value; + void selectCurrentTodo(String? value, bool isSelected) { + _currentTodoId = value; _isTodoSelected = isSelected; notifyListeners(); @@ -46,20 +46,21 @@ class CrudTodoRouterDelegate extends RouterDelegate Widget build(BuildContext context) { return Navigator( key: navigatorKey, + observers: [_heroController], pages: >[ - CategoryPage(onGoToDetail: (category) => currentCategory = category), - if (currentCategory != null) + CategoryPage(onGoToDetail: (id) => currentCategoryId = id), + if (currentCategoryId != null) TodoPage( - category: currentCategory!, - onGoToTodo: (category, todo) => selectCurrentTodo(todo, true), + categoryId: currentCategoryId!, + onGoToTodo: (categoryId, todoId) => selectCurrentTodo(todoId, true), ), - if (currentCategory != null && isTodoSelected) - AddTodoPage(category: currentCategory!, currentTodo: currentTodo) + if (currentCategoryId != null && isTodoSelected) + FormTodoPage(categoryId: currentCategoryId!, todoId: currentTodoId) ], onPopPage: (route, dynamic result) { if (!route.didPop(result)) return false; - if (!isTodoSelected) currentCategory = null; + if (!isTodoSelected) currentCategoryId = null; selectCurrentTodo(null, false); return true; @@ -68,5 +69,5 @@ class CrudTodoRouterDelegate extends RouterDelegate } @override - Future setNewRoutePath(dynamic configuration) async {} + Future setNewRoutePath(Object configuration) async {} } From c2fd4663b23cb4ab6a4d8203d4474f23d029ed8e Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Tue, 31 Aug 2021 23:25:58 -0500 Subject: [PATCH 14/33] Create page for unknown view in crud_todo_pages.dart --- lib/navigator/crud_todo_pages.dart | 47 +++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/lib/navigator/crud_todo_pages.dart b/lib/navigator/crud_todo_pages.dart index a0af303..195f5c1 100644 --- a/lib/navigator/crud_todo_pages.dart +++ b/lib/navigator/crud_todo_pages.dart @@ -2,6 +2,7 @@ import 'package:crud_todo_app/navigator/crud_todo_transition_route.dart'; import 'package:crud_todo_app/ui/category_list_view.dart'; import 'package:crud_todo_app/ui/form_todo_view.dart'; import 'package:crud_todo_app/ui/todo_list_view.dart'; +import 'package:crud_todo_app/ui/unknown_view.dart'; import 'package:flutter/material.dart'; class CategoryPage extends Page { @@ -40,7 +41,10 @@ class TodoPage extends Page { // pageBuilder: (context, animation, animation2) { // return FadeTransition( // opacity: animation, - // child: TodoListView(category: category, onGoToTodo: onGoToTodo), + // child: TodoListView( + // categoryId: categoryId, + // onGoToTodo: onGoToTodo, + // ), // ); // }, // ); @@ -49,7 +53,7 @@ class TodoPage extends Page { // return MaterialPageRoute( // settings: this, // builder: (_) => TodoListView( - // category: category, + // categoryId: categoryId, // onGoToTodo: onGoToTodo, // ), // ); @@ -70,6 +74,38 @@ class FormTodoPage extends Page { child: FormTodoView(categoryId: categoryId, todoId: todoId), ); + /// Uncomment it and comment code above to use individually + // return PageRouteBuilder( + // settings: this, + // reverseTransitionDuration: const Duration(milliseconds: 1000), + // transitionDuration: const Duration(milliseconds: 1000), + // pageBuilder: (context, animation, animation2) { + // final tween = Tween(begin: const Offset(0, 1), end: Offset.zero); + // final curveTween = CurveTween(curve: Curves.easeInOut); + // + // return SlideTransition( + // position: animation.drive(curveTween).drive(tween), + // child: FormTodoView(categoryId: categoryId, todoId: todoId), + // ); + // }, + // ); + + /// Uncomment it and comment code above to use individually + // return MaterialPageRoute( + // settings: this, + // builder: (_) => FormTodoView(categoryId: categoryId, todoId: todoId), + // ); + } +} + +class UnknownPage extends Page { + @override + Route createRoute(BuildContext context) { + return ScaleTransitionRoute( + settings: this, + child: const UnknownView(), + ); + /// Uncomment it and comment code above to use individually // return PageRouteBuilder( // settings: this, @@ -78,7 +114,7 @@ class FormTodoPage extends Page { // pageBuilder: (context, animation, animation2) { // return ScaleTransition( // scale: animation, - // child: AddTodoView(category: category, currentTodo: currentTodo), + // child: const UnknownView(), // ); // }, // ); @@ -86,10 +122,7 @@ class FormTodoPage extends Page { /// Uncomment it and comment code above to use individually // return MaterialPageRoute( // settings: this, - // builder: (_) => AddTodoView( - // category: category, - // currentTodo: currentTodo, - // ), + // builder: (_) => const UnknownView(), // ); } } From cc2e0813cb3d2e5879b0c707de55428dca82ef26 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Tue, 31 Aug 2021 23:53:33 -0500 Subject: [PATCH 15/33] Modify ValueKey in some pages in crud_todo_pages.dart --- lib/navigator/crud_todo_pages.dart | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/navigator/crud_todo_pages.dart b/lib/navigator/crud_todo_pages.dart index 195f5c1..5559b54 100644 --- a/lib/navigator/crud_todo_pages.dart +++ b/lib/navigator/crud_todo_pages.dart @@ -21,8 +21,8 @@ class CategoryPage extends Page { } class TodoPage extends Page { - const TodoPage({required this.categoryId, required this.onGoToTodo}) - : super(key: const ValueKey('TodoPage')); + TodoPage({required this.categoryId, required this.onGoToTodo}) + : super(key: ValueKey('TodoPage_$categoryId')); final String categoryId; final NavigatorToTodo onGoToTodo; @@ -61,8 +61,8 @@ class TodoPage extends Page { } class FormTodoPage extends Page { - const FormTodoPage({required this.categoryId, this.todoId}) - : super(key: const ValueKey('AddTodoPage')); + FormTodoPage({required this.categoryId, this.todoId}) + : super(key: ValueKey('FormTodoPage_${categoryId}_${todoId ?? 'none'}')); final String categoryId; final String? todoId; @@ -99,6 +99,8 @@ class FormTodoPage extends Page { } class UnknownPage extends Page { + const UnknownPage() : super(key: const ValueKey('UnknownPage')); + @override Route createRoute(BuildContext context) { return ScaleTransitionRoute( From 966c0eb747826396e2f11da6d86b070649b01f61 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Tue, 31 Aug 2021 23:54:02 -0500 Subject: [PATCH 16/33] Create crud_todo_config.dart to manage state configuration --- lib/navigator/config/crud_todo_config.dart | 83 ++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 lib/navigator/config/crud_todo_config.dart diff --git a/lib/navigator/config/crud_todo_config.dart b/lib/navigator/config/crud_todo_config.dart new file mode 100644 index 0000000..406279c --- /dev/null +++ b/lib/navigator/config/crud_todo_config.dart @@ -0,0 +1,83 @@ +import 'package:equatable/equatable.dart'; + +class CrudTodoConfig extends Equatable { + const CrudTodoConfig.categoryList() + : currentCategoryId = null, + currentTodoId = null, + isTodoNew = false, + isTodoUpdate = false, + isUnknown = false; + + const CrudTodoConfig.todoList({String? categoryId}) + : currentCategoryId = categoryId, + currentTodoId = null, + isTodoNew = false, + isTodoUpdate = false, + isUnknown = false; + + const CrudTodoConfig.addTodo({String? categoryId}) + : currentCategoryId = categoryId, + currentTodoId = null, + isTodoNew = true, + isTodoUpdate = false, + isUnknown = false; + + const CrudTodoConfig.updateTodo({String? categoryId, String? todoId}) + : currentCategoryId = categoryId, + currentTodoId = todoId, + isTodoNew = false, + isTodoUpdate = true, + isUnknown = false; + + const CrudTodoConfig.unknown() + : currentCategoryId = null, + currentTodoId = null, + isTodoNew = false, + isTodoUpdate = false, + isUnknown = true; + + final String? currentCategoryId; + final String? currentTodoId; + final bool isTodoNew; + final bool isTodoUpdate; + final bool isUnknown; + + bool get isPageUnknown => isUnknown; + + bool get isCategoryListPage => + currentCategoryId == null && + currentTodoId == null && + !isTodoNew && + !isTodoUpdate && + !isUnknown; + + bool get isTodoListPage => + currentCategoryId != null && + currentTodoId == null && + !isTodoNew && + !isTodoUpdate && + !isUnknown; + + bool get isAddTodoPage => + currentCategoryId != null && + currentTodoId == null && + isTodoNew && + !isTodoUpdate && + !isUnknown; + + bool get isUpdateTodoPage => + currentCategoryId != null && + currentTodoId != null && + !isTodoNew && + isTodoUpdate && + !isUnknown; + + @override + List get props => [ + currentCategoryId, + currentTodoId, + isTodoNew, + isTodoUpdate, + isUnknown, + ]; +} From 6b7a6f0821b618c3d3e5db285e1a9a6fadd376e4 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Tue, 31 Aug 2021 23:55:20 -0500 Subject: [PATCH 17/33] Create crud_todo_information_parser.dart to convert state in route and route in state --- .../crud_todo_information_parser.dart | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 lib/navigator/crud_todo_information_parser.dart diff --git a/lib/navigator/crud_todo_information_parser.dart b/lib/navigator/crud_todo_information_parser.dart new file mode 100644 index 0000000..bb1fa73 --- /dev/null +++ b/lib/navigator/crud_todo_information_parser.dart @@ -0,0 +1,111 @@ +import 'package:crud_todo_app/navigator/config/crud_todo_config.dart'; +import 'package:flutter/material.dart'; + +class CrudTodoPath { + static const pathCategory = 'categories'; + static const pathTodo = 'todo'; + static const pathTodoNew = 'new'; + static const pathTodoUpdate = 'update'; + static const pathUnknown = '404'; +} + +class CrudTodoInformationParser extends RouteInformationParser { + @override + Future parseRouteInformation( + RouteInformation routeInformation, + ) async { + final uri = Uri.parse(routeInformation.location ?? ''); + + if (uri.pathSegments.isEmpty) { + // Home '/' + return const CrudTodoConfig.categoryList(); + } else if (uri.pathSegments.length == 1) { + // Home '/categories' + final firstSegment = uri.pathSegments[0].toLowerCase(); + if (firstSegment == CrudTodoPath.pathCategory) { + return const CrudTodoConfig.categoryList(); + } + } else if (uri.pathSegments.length == 2) { + // Category detail '/categories/{id}' + final firstSegment = uri.pathSegments[0].toLowerCase(); + final secondSegment = uri.pathSegments[1]; + + if (firstSegment == CrudTodoPath.pathCategory) { + if (secondSegment.isNotEmpty) { + return CrudTodoConfig.todoList(categoryId: secondSegment); + } + } + } else if (uri.pathSegments.length == 3) { + // Todos '/categories/{id}/todos/ + final firstSegment = uri.pathSegments[0].toLowerCase(); + final secondSegment = uri.pathSegments[1]; + final thirdSegment = uri.pathSegments[2].toLowerCase(); + + if (firstSegment == CrudTodoPath.pathCategory) { + if (secondSegment.isNotEmpty) { + if (thirdSegment == CrudTodoPath.pathTodo) { + return CrudTodoConfig.addTodo(categoryId: secondSegment); + } + } + } + } else if (uri.pathSegments.length == 4) { + // Todos '/categories/{catId}/todos/{todoId} + final firstSegment = uri.pathSegments[0].toLowerCase(); + final secondSegment = uri.pathSegments[1]; + final thirdSegment = uri.pathSegments[2].toLowerCase(); + final lastSegment = uri.pathSegments[3]; + + if (firstSegment == CrudTodoPath.pathCategory) { + if (secondSegment.isNotEmpty) { + if (thirdSegment == CrudTodoPath.pathTodo) { + if (lastSegment.isNotEmpty) { + return CrudTodoConfig.updateTodo( + categoryId: secondSegment, + todoId: lastSegment, + ); + } + } + } + } + } + + return const CrudTodoConfig.unknown(); + } + + @override + RouteInformation? restoreRouteInformation( + CrudTodoConfig configuration, + ) { + if (configuration.isUnknown) { + return const RouteInformation(location: '/${CrudTodoPath.pathUnknown}'); + } else if (configuration.isCategoryListPage) { + const categoryPath = CrudTodoPath.pathCategory; + + return const RouteInformation(location: '/$categoryPath'); + } else if (configuration.isTodoListPage) { + const categoryPath = CrudTodoPath.pathCategory; + final currentCategoryId = configuration.currentCategoryId; + + return RouteInformation(location: '/$categoryPath/$currentCategoryId'); + } else if (configuration.isAddTodoPage) { + const categoryPath = CrudTodoPath.pathCategory; + final currentCategoryId = configuration.currentCategoryId; + const todoPath = CrudTodoPath.pathTodo; + + return RouteInformation( + location: '/$categoryPath/$currentCategoryId/$todoPath/', + ); + } else if (configuration.isUpdateTodoPage) { + const categoryPath = CrudTodoPath.pathCategory; + final currentCategoryId = configuration.currentCategoryId; + const todoPath = CrudTodoPath.pathTodo; + final currentTodoId = configuration.currentTodoId; + + return RouteInformation( + location: '/$categoryPath/$currentCategoryId/$todoPath/$currentTodoId', + ); + } + + return null; + } +} From 8e1e151ac5c423b916c8d138d6c7e093b0f7798e Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Tue, 31 Aug 2021 23:56:40 -0500 Subject: [PATCH 18/33] Update crud_todo_router_delegate.dart to get configuration and implement setNewRoutePath method --- lib/navigator/crud_todo_router_delegate.dart | 97 +++++++++++++++++--- 1 file changed, 86 insertions(+), 11 deletions(-) diff --git a/lib/navigator/crud_todo_router_delegate.dart b/lib/navigator/crud_todo_router_delegate.dart index 4d1a1ce..70a644b 100644 --- a/lib/navigator/crud_todo_router_delegate.dart +++ b/lib/navigator/crud_todo_router_delegate.dart @@ -1,8 +1,9 @@ +import 'package:crud_todo_app/navigator/config/crud_todo_config.dart'; import 'package:crud_todo_app/navigator/crud_todo_pages.dart'; import 'package:flutter/material.dart'; -class CrudTodoRouterDelegate extends RouterDelegate - with ChangeNotifier, PopNavigatorRouterDelegateMixin { +class CrudTodoRouterDelegate extends RouterDelegate + with ChangeNotifier, PopNavigatorRouterDelegateMixin { CrudTodoRouterDelegate() : _navigatorKey = GlobalKey(); final _heroController = HeroController(); @@ -42,20 +43,41 @@ class CrudTodoRouterDelegate extends RouterDelegate notifyListeners(); } + bool _is404 = false; + + bool get is404 => _is404; + + set is404(bool value) { + _is404 = value; + + if (value) { + _currentCategoryId = null; + _currentTodoId = null; + _isTodoSelected = false; + } + + notifyListeners(); + } + @override Widget build(BuildContext context) { return Navigator( key: navigatorKey, observers: [_heroController], pages: >[ - CategoryPage(onGoToDetail: (id) => currentCategoryId = id), - if (currentCategoryId != null) - TodoPage( - categoryId: currentCategoryId!, - onGoToTodo: (categoryId, todoId) => selectCurrentTodo(todoId, true), - ), - if (currentCategoryId != null && isTodoSelected) - FormTodoPage(categoryId: currentCategoryId!, todoId: currentTodoId) + if (is404) + const UnknownPage() + else ...[ + CategoryPage(onGoToDetail: (id) => currentCategoryId = id), + if (currentCategoryId != null) + TodoPage( + categoryId: currentCategoryId!, + onGoToTodo: (categoryId, todoId) => + selectCurrentTodo(todoId, true), + ), + if (currentCategoryId != null && isTodoSelected) + FormTodoPage(categoryId: currentCategoryId!, todoId: currentTodoId) + ] ], onPopPage: (route, dynamic result) { if (!route.didPop(result)) return false; @@ -69,5 +91,58 @@ class CrudTodoRouterDelegate extends RouterDelegate } @override - Future setNewRoutePath(Object configuration) async {} + CrudTodoConfig? get currentConfiguration { + if (currentCategoryId == null && currentTodoId == null && !is404) { + return const CrudTodoConfig.categoryList(); + } else if (currentCategoryId != null && currentTodoId == null && !is404) { + return CrudTodoConfig.todoList(categoryId: currentCategoryId); + } else if (currentCategoryId != null && + currentTodoId == null && + isTodoSelected && + !is404) { + return CrudTodoConfig.addTodo(categoryId: currentCategoryId); + } else if (currentCategoryId != null && currentTodoId != null && !is404) { + return CrudTodoConfig.updateTodo( + categoryId: currentCategoryId, + todoId: currentTodoId, + ); + } else if (is404) { + return const CrudTodoConfig.unknown(); + } + + return null; + } + + @override + Future setNewRoutePath(CrudTodoConfig configuration) async { + if (configuration.isPageUnknown) { + _changeValues(isNoFound: true); + } else if (configuration.isCategoryListPage) { + _changeValues(); + } else if (configuration.isTodoListPage) { + _changeValues(categoryId: configuration.currentCategoryId); + } else if (configuration.isAddTodoPage) { + _changeValues( + categoryId: configuration.currentCategoryId, + isSelected: true, + ); + } else if (configuration.isUpdateTodoPage) { + _changeValues( + categoryId: configuration.currentCategoryId, + todoId: configuration.currentTodoId, + isSelected: true, + ); + } + } + + void _changeValues({ + String? categoryId, + String? todoId, + bool isSelected = false, + bool isNoFound = false, + }) { + currentCategoryId = categoryId; + selectCurrentTodo(todoId, isSelected); + is404 = isNoFound; + } } From dc8ff06337f8022997486e0a06d3716ec529a25d Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Tue, 31 Aug 2021 23:57:08 -0500 Subject: [PATCH 19/33] Replace MaterialApp by MaterialApp.router in main.dart --- lib/main.dart | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 75e3282..144452a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,3 +1,4 @@ +import 'package:crud_todo_app/navigator/crud_todo_information_parser.dart'; import 'package:crud_todo_app/navigator/crud_todo_router_delegate.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/material.dart'; @@ -20,10 +21,11 @@ class TodoListApp extends StatefulWidget { class _TodoListAppState extends State { final _todoRouterDelegate = CrudTodoRouterDelegate(); + final _todoInfoParser = CrudTodoInformationParser(); @override Widget build(BuildContext context) { - return MaterialApp( + return MaterialApp.router( title: 'To-Do List App', theme: ThemeData( visualDensity: VisualDensity.adaptivePlatformDensity, @@ -31,10 +33,9 @@ class _TodoListAppState extends State { Theme.of(context).textTheme, ), ), - home: Router( - routerDelegate: _todoRouterDelegate, - backButtonDispatcher: RootBackButtonDispatcher(), - ), + routerDelegate: _todoRouterDelegate, + routeInformationParser: _todoInfoParser, + backButtonDispatcher: RootBackButtonDispatcher(), ); } } From 4aa6402d9cc9510e10b75533f37a5861723d4b1f Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Wed, 1 Sep 2021 13:02:43 -0500 Subject: [PATCH 20/33] Update README.md file --- README.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 62b08e4..c27b269 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,6 @@ Create a To-do List Flutter app managing CRUD with Firebase, using RiverPod as state management and dependency injection. -Actually the project has been implemented with **Navigator 2.0**. - ### Getting Started (Firebase) * To execute the app, you have to Firebase Project already created. * Create an app in Firebase for Android iOS, Web and Desktop (Mac) with the existing project. @@ -36,7 +34,15 @@ Actually the project has been implemented with **Navigator 2.0**. ├── finalDate (Number) ├── isCompleted (Boolean) ├── subject (String) - + +### Navigator 2.0 + +Actually the project has been implemented with **Navigator 2.0** or **Route API**. + +#### Deep linking + +For using deep links with flutter without any packages, review this [link](https://flutter.dev/docs/development/ui/navigation/deep-linking) + ### Used packages ------ From abad5febaba87c90c1c1dd89827e57a54586e00d Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Sun, 5 Sep 2021 21:16:32 -0500 Subject: [PATCH 21/33] Enable deep links in Android and iOS --- android/app/src/main/AndroidManifest.xml | 25 ++++++++++++++---------- ios/Runner/Info.plist | 17 ++++++++++++++++ 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 1d1824e..bc3b586 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -3,11 +3,6 @@ - - + + + + + + + + + + + + - + diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 766a670..71bc00f 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -18,6 +18,23 @@ $(FLUTTER_BUILD_NAME) CFBundleSignature ???? + + FlutterDeepLinkingEnabled + + CFBundleURLTypes + + + CFBundleTypeRole + Editor + CFBundleURLName + crudtodoexample.com + CFBundleURLSchemes + + crudtodoapp + + + + CFBundleVersion $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS From a08200f3d76e5c0bf6ee76f36f4dd70a69727e84 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Sun, 5 Sep 2021 21:16:54 -0500 Subject: [PATCH 22/33] Remove unused string paths --- lib/navigator/crud_todo_information_parser.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/navigator/crud_todo_information_parser.dart b/lib/navigator/crud_todo_information_parser.dart index bb1fa73..415f6ae 100644 --- a/lib/navigator/crud_todo_information_parser.dart +++ b/lib/navigator/crud_todo_information_parser.dart @@ -4,8 +4,6 @@ import 'package:flutter/material.dart'; class CrudTodoPath { static const pathCategory = 'categories'; static const pathTodo = 'todo'; - static const pathTodoNew = 'new'; - static const pathTodoUpdate = 'update'; static const pathUnknown = '404'; } From e6318b88c27a2594dd3f86e0c132205ff754b8ae Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Tue, 7 Sep 2021 14:34:26 -0500 Subject: [PATCH 23/33] Update coverage_badge.svg --- coverage_badge.svg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coverage_badge.svg b/coverage_badge.svg index 708026a..909195a 100644 --- a/coverage_badge.svg +++ b/coverage_badge.svg @@ -12,7 +12,7 @@ coverage coverage - 95% - 95% + 94% + 94% From a91ba990cf5ef9bf22da5f8cbd47eab4d57f427e Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Tue, 7 Sep 2021 15:08:43 -0500 Subject: [PATCH 24/33] Remove unused method in todo_list_view.dart --- lib/ui/todo_list_view.dart | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/lib/ui/todo_list_view.dart b/lib/ui/todo_list_view.dart index 622760a..4fcb8d7 100644 --- a/lib/ui/todo_list_view.dart +++ b/lib/ui/todo_list_view.dart @@ -1,6 +1,5 @@ import 'package:crud_todo_app/model/todo_model.dart'; import 'package:crud_todo_app/provider_dependency.dart'; -import 'package:crud_todo_app/ui/form_todo_view.dart'; import 'package:crud_todo_app/common/extension.dart'; import 'package:crud_todo_app/ui/widgets/todo_item.dart'; import 'package:crud_todo_app/viewmodel/category/category_provider.dart'; @@ -133,7 +132,7 @@ class TodoListView extends HookConsumerWidget { ? TodoList( todoList: todos, onEditItem: (todo) => - _goToTodo(context, todo: todo), + onGoToTodo(categoryId, todo.id), ).paddingSymmetric(h: 24, v: 20) : const Center( child: Text( @@ -175,21 +174,13 @@ class TodoListView extends HookConsumerWidget { floatingActionButton: dataCategory != null ? FloatingActionButton( backgroundColor: const Color(0xFF4A78FA), - onPressed: () => _goToTodo(context), + onPressed: () => onGoToTodo(categoryId, null), child: const Icon(Icons.add), ) : null, ); } - Future _goToTodo(BuildContext context, {Todo? todo}) async { - await Navigator.of(context).push( - MaterialPageRoute( - builder: (_) => FormTodoView(categoryId: categoryId, todoId: todo?.id), - ), - ); - } - void _onChangeState(BuildContext context, TodoState state) { final action = state.maybeWhen(success: (a) => a, orElse: () => null); final error = state.maybeWhen(error: (m) => m, orElse: () => null); From 5edd912578654f0e722ed3a31724ed16337fc27f Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Tue, 7 Sep 2021 21:25:17 -0500 Subject: [PATCH 25/33] Update todo_list_view_test.dart --- test/ui/todo_list_view_test.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ui/todo_list_view_test.dart b/test/ui/todo_list_view_test.dart index 732c2ac..4acbd0f 100644 --- a/test/ui/todo_list_view_test.dart +++ b/test/ui/todo_list_view_test.dart @@ -129,7 +129,7 @@ void main() { await tester.pumpAndSettle(); verify(() => mockNavigator.didPush(any(), any())); - expect(find.byType(FormTodoView), findsOneWidget); + // expect(find.byType(FormTodoView), findsOneWidget); }); testWidgets( @@ -388,7 +388,7 @@ void main() { await tester.pumpAndSettle(); verify(() => mockNavigator.didPush(any(), any())); - expect(find.byType(FormTodoView), findsOneWidget); + // expect(find.byType(FormTodoView), findsOneWidget); }); testWidgets('Slide a $TodoItem and remove $Todo from list', (tester) async { From afa1b6338b2ce5d0bae71b1cd878a6615638f788 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Tue, 7 Sep 2021 21:27:32 -0500 Subject: [PATCH 26/33] Update coverage_badge.svg --- coverage_badge.svg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coverage_badge.svg b/coverage_badge.svg index 909195a..5fbb2eb 100644 --- a/coverage_badge.svg +++ b/coverage_badge.svg @@ -12,7 +12,7 @@ coverage coverage - 94% - 94% + 93% + 93% From a07b4379264deb318e43feb47805f0f5363c8967 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Thu, 9 Sep 2021 12:33:07 -0500 Subject: [PATCH 27/33] Refactor crud_todo_router_delegate.dart and crud_todo_information_parser.dart --- .../crud_todo_information_parser.dart | 40 ++++---- lib/navigator/crud_todo_router_delegate.dart | 92 +++++++++---------- 2 files changed, 62 insertions(+), 70 deletions(-) diff --git a/lib/navigator/crud_todo_information_parser.dart b/lib/navigator/crud_todo_information_parser.dart index 415f6ae..bbf995e 100644 --- a/lib/navigator/crud_todo_information_parser.dart +++ b/lib/navigator/crud_todo_information_parser.dart @@ -2,9 +2,9 @@ import 'package:crud_todo_app/navigator/config/crud_todo_config.dart'; import 'package:flutter/material.dart'; class CrudTodoPath { - static const pathCategory = 'categories'; - static const pathTodo = 'todo'; - static const pathUnknown = '404'; + static const category = 'categories'; + static const todo = 'todo'; + static const unknown = '404'; } class CrudTodoInformationParser extends RouteInformationParser { @@ -20,7 +20,7 @@ class CrudTodoInformationParser extends RouteInformationParser { } else if (uri.pathSegments.length == 1) { // Home '/categories' final firstSegment = uri.pathSegments[0].toLowerCase(); - if (firstSegment == CrudTodoPath.pathCategory) { + if (firstSegment == CrudTodoPath.category) { return const CrudTodoConfig.categoryList(); } } else if (uri.pathSegments.length == 2) { @@ -28,34 +28,34 @@ class CrudTodoInformationParser extends RouteInformationParser { final firstSegment = uri.pathSegments[0].toLowerCase(); final secondSegment = uri.pathSegments[1]; - if (firstSegment == CrudTodoPath.pathCategory) { + if (firstSegment == CrudTodoPath.category) { if (secondSegment.isNotEmpty) { return CrudTodoConfig.todoList(categoryId: secondSegment); } } } else if (uri.pathSegments.length == 3) { - // Todos '/categories/{id}/todos/ + // Todos new '/categories/{id}/todos/ final firstSegment = uri.pathSegments[0].toLowerCase(); final secondSegment = uri.pathSegments[1]; final thirdSegment = uri.pathSegments[2].toLowerCase(); - if (firstSegment == CrudTodoPath.pathCategory) { + if (firstSegment == CrudTodoPath.category) { if (secondSegment.isNotEmpty) { - if (thirdSegment == CrudTodoPath.pathTodo) { + if (thirdSegment == CrudTodoPath.todo) { return CrudTodoConfig.addTodo(categoryId: secondSegment); } } } } else if (uri.pathSegments.length == 4) { - // Todos '/categories/{catId}/todos/{todoId} + // Todos update '/categories/{catId}/todos/{todoId} final firstSegment = uri.pathSegments[0].toLowerCase(); final secondSegment = uri.pathSegments[1]; final thirdSegment = uri.pathSegments[2].toLowerCase(); final lastSegment = uri.pathSegments[3]; - if (firstSegment == CrudTodoPath.pathCategory) { + if (firstSegment == CrudTodoPath.category) { if (secondSegment.isNotEmpty) { - if (thirdSegment == CrudTodoPath.pathTodo) { + if (thirdSegment == CrudTodoPath.todo) { if (lastSegment.isNotEmpty) { return CrudTodoConfig.updateTodo( categoryId: secondSegment, @@ -71,32 +71,30 @@ class CrudTodoInformationParser extends RouteInformationParser { } @override - RouteInformation? restoreRouteInformation( - CrudTodoConfig configuration, - ) { + RouteInformation? restoreRouteInformation(CrudTodoConfig configuration) { if (configuration.isUnknown) { - return const RouteInformation(location: '/${CrudTodoPath.pathUnknown}'); + return const RouteInformation(location: '/${CrudTodoPath.unknown}'); } else if (configuration.isCategoryListPage) { - const categoryPath = CrudTodoPath.pathCategory; + const categoryPath = CrudTodoPath.category; return const RouteInformation(location: '/$categoryPath'); } else if (configuration.isTodoListPage) { - const categoryPath = CrudTodoPath.pathCategory; + const categoryPath = CrudTodoPath.category; final currentCategoryId = configuration.currentCategoryId; return RouteInformation(location: '/$categoryPath/$currentCategoryId'); } else if (configuration.isAddTodoPage) { - const categoryPath = CrudTodoPath.pathCategory; + const categoryPath = CrudTodoPath.category; final currentCategoryId = configuration.currentCategoryId; - const todoPath = CrudTodoPath.pathTodo; + const todoPath = CrudTodoPath.todo; return RouteInformation( location: '/$categoryPath/$currentCategoryId/$todoPath/', ); } else if (configuration.isUpdateTodoPage) { - const categoryPath = CrudTodoPath.pathCategory; + const categoryPath = CrudTodoPath.category; final currentCategoryId = configuration.currentCategoryId; - const todoPath = CrudTodoPath.pathTodo; + const todoPath = CrudTodoPath.todo; final currentTodoId = configuration.currentTodoId; return RouteInformation( diff --git a/lib/navigator/crud_todo_router_delegate.dart b/lib/navigator/crud_todo_router_delegate.dart index 70a644b..fcf2461 100644 --- a/lib/navigator/crud_todo_router_delegate.dart +++ b/lib/navigator/crud_todo_router_delegate.dart @@ -17,27 +17,27 @@ class CrudTodoRouterDelegate extends RouterDelegate // Current category selected - String? _currentCategoryId; + String? _categoryId; - String? get currentCategoryId => _currentCategoryId; + String? get categoryId => _categoryId; - set currentCategoryId(String? value) { - _currentCategoryId = value; + set categoryId(String? value) { + _categoryId = value; notifyListeners(); } // Current To-Do selected by category - String? _currentTodoId; + String? _todoId; - String? get currentTodoId => _currentTodoId; + String? get todoId => _todoId; bool _isTodoSelected = false; bool get isTodoSelected => _isTodoSelected; void selectCurrentTodo(String? value, bool isSelected) { - _currentTodoId = value; + _todoId = value; _isTodoSelected = isSelected; notifyListeners(); @@ -51,14 +51,23 @@ class CrudTodoRouterDelegate extends RouterDelegate _is404 = value; if (value) { - _currentCategoryId = null; - _currentTodoId = null; + _categoryId = null; + _todoId = null; _isTodoSelected = false; } notifyListeners(); } + bool get isCategoryList => categoryId == null && todoId == null && !is404; + + bool get isTodoList => categoryId != null && todoId == null && !is404; + + bool get isTodoNew => + categoryId != null && todoId == null && isTodoSelected && !is404; + + bool get isTodoUpdate => categoryId != null && todoId != null && !is404; + @override Widget build(BuildContext context) { return Navigator( @@ -68,21 +77,20 @@ class CrudTodoRouterDelegate extends RouterDelegate if (is404) const UnknownPage() else ...[ - CategoryPage(onGoToDetail: (id) => currentCategoryId = id), - if (currentCategoryId != null) + CategoryPage(onGoToDetail: (catId) => categoryId = catId), + if (categoryId != null) TodoPage( - categoryId: currentCategoryId!, - onGoToTodo: (categoryId, todoId) => - selectCurrentTodo(todoId, true), + categoryId: categoryId!, + onGoToTodo: (catId, todoId) => selectCurrentTodo(todoId, true), ), - if (currentCategoryId != null && isTodoSelected) - FormTodoPage(categoryId: currentCategoryId!, todoId: currentTodoId) + if (categoryId != null && isTodoSelected) + FormTodoPage(categoryId: categoryId!, todoId: todoId) ] ], onPopPage: (route, dynamic result) { if (!route.didPop(result)) return false; - if (!isTodoSelected) currentCategoryId = null; + if (!isTodoSelected) categoryId = null; selectCurrentTodo(null, false); return true; @@ -92,20 +100,14 @@ class CrudTodoRouterDelegate extends RouterDelegate @override CrudTodoConfig? get currentConfiguration { - if (currentCategoryId == null && currentTodoId == null && !is404) { + if (isCategoryList) { return const CrudTodoConfig.categoryList(); - } else if (currentCategoryId != null && currentTodoId == null && !is404) { - return CrudTodoConfig.todoList(categoryId: currentCategoryId); - } else if (currentCategoryId != null && - currentTodoId == null && - isTodoSelected && - !is404) { - return CrudTodoConfig.addTodo(categoryId: currentCategoryId); - } else if (currentCategoryId != null && currentTodoId != null && !is404) { - return CrudTodoConfig.updateTodo( - categoryId: currentCategoryId, - todoId: currentTodoId, - ); + } else if (isTodoList) { + return CrudTodoConfig.todoList(categoryId: categoryId); + } else if (isTodoNew) { + return CrudTodoConfig.addTodo(categoryId: categoryId); + } else if (isTodoUpdate) { + return CrudTodoConfig.updateTodo(categoryId: categoryId, todoId: todoId); } else if (is404) { return const CrudTodoConfig.unknown(); } @@ -116,33 +118,25 @@ class CrudTodoRouterDelegate extends RouterDelegate @override Future setNewRoutePath(CrudTodoConfig configuration) async { if (configuration.isPageUnknown) { - _changeValues(isNoFound: true); + _values(noFound: true); } else if (configuration.isCategoryListPage) { - _changeValues(); + _values(); } else if (configuration.isTodoListPage) { - _changeValues(categoryId: configuration.currentCategoryId); + _values(catId: configuration.currentCategoryId); } else if (configuration.isAddTodoPage) { - _changeValues( - categoryId: configuration.currentCategoryId, - isSelected: true, - ); + _values(catId: configuration.currentCategoryId, selected: true); } else if (configuration.isUpdateTodoPage) { - _changeValues( - categoryId: configuration.currentCategoryId, + _values( + catId: configuration.currentCategoryId, todoId: configuration.currentTodoId, - isSelected: true, + selected: true, ); } } - void _changeValues({ - String? categoryId, - String? todoId, - bool isSelected = false, - bool isNoFound = false, - }) { - currentCategoryId = categoryId; - selectCurrentTodo(todoId, isSelected); - is404 = isNoFound; + void _values({String? catId, String? todoId, bool? selected, bool? noFound}) { + categoryId = catId; + selectCurrentTodo(todoId, selected ?? false); + is404 = noFound ?? false; } } From 09d17253798d71c34146bd8d849ade8273c26a6f Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Thu, 9 Sep 2021 13:48:23 -0500 Subject: [PATCH 28/33] Fix validation when page is add todo --- lib/navigator/crud_todo_router_delegate.dart | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/navigator/crud_todo_router_delegate.dart b/lib/navigator/crud_todo_router_delegate.dart index fcf2461..1756dff 100644 --- a/lib/navigator/crud_todo_router_delegate.dart +++ b/lib/navigator/crud_todo_router_delegate.dart @@ -43,6 +43,8 @@ class CrudTodoRouterDelegate extends RouterDelegate notifyListeners(); } + // Current unknown page or 404 not found + bool _is404 = false; bool get is404 => _is404; @@ -59,14 +61,17 @@ class CrudTodoRouterDelegate extends RouterDelegate notifyListeners(); } - bool get isCategoryList => categoryId == null && todoId == null && !is404; + bool get isCategoryList => + categoryId == null && todoId == null && !isTodoSelected && !is404; - bool get isTodoList => categoryId != null && todoId == null && !is404; + bool get isTodoList => + categoryId != null && todoId == null && !isTodoSelected && !is404; bool get isTodoNew => categoryId != null && todoId == null && isTodoSelected && !is404; - bool get isTodoUpdate => categoryId != null && todoId != null && !is404; + bool get isTodoUpdate => + categoryId != null && todoId != null && isTodoSelected && !is404; @override Widget build(BuildContext context) { From 8e68649b83a1b3bc68ec7098f995eec74afc78a9 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Fri, 10 Sep 2021 19:56:26 -0500 Subject: [PATCH 29/33] Update README.md file --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index c27b269..6711e71 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,16 @@ Actually the project has been implemented with **Navigator 2.0** or **Route API* For using deep links with flutter without any packages, review this [link](https://flutter.dev/docs/development/ui/navigation/deep-linking) +Run deep links in **iOS**, use the command below: +```bash +xcrun simctl openurl booted crudtodoapp://crudtodoexample.com/categories/{categoryId}/todo/{todoId} +``` + +Run deep links in **Android**, use the command below: +```bash +~/Library/Android/sdk/platform-tools/adb shell am start -a android.intent.action.VIEW \ -c android.intent.category.BROWSABLE \ -d crudtodoapp://crudtodoexample.com/categories/{categoryId}/todo/{todoId} +``` + ### Used packages ------ From f4f77ab9005f3d881fc5a3b8f333d95e89676d5f Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Sun, 12 Sep 2021 14:25:22 -0500 Subject: [PATCH 30/33] Create widget test in unknown_view_test.dart --- test/ui/unknown_view_test.dart | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 test/ui/unknown_view_test.dart diff --git a/test/ui/unknown_view_test.dart b/test/ui/unknown_view_test.dart new file mode 100644 index 0000000..e7ba177 --- /dev/null +++ b/test/ui/unknown_view_test.dart @@ -0,0 +1,33 @@ +import 'package:crud_todo_app/ui/unknown_view.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:hooks_riverpod/hooks_riverpod.dart'; + +import '../test_utils/mocks.dart'; + +void main() { + late MockNavigator mockNavigator; + + setUpAll(() { + mockNavigator = MockNavigator(); + }); + + Future _pumpMainScreen(WidgetTester tester, Widget child) async { + await tester.pumpWidget(ProviderScope( + child: MaterialApp( + home: child, + navigatorObservers: [mockNavigator], + ), + )); + } + + group('$UnknownView UI screen', () { + testWidgets('Show $UnknownView screen', (tester) async { + await _pumpMainScreen(tester, const UnknownView()); + + expect(find.text('Not found'), findsOneWidget); + expect(find.byType(Image), findsOneWidget); + expect(find.textContaining('Screen not found'), findsOneWidget); + }); + }); +} From d06ba160c3da039fbf9f485fc43a7d7ff2245a96 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Sun, 12 Sep 2021 14:26:16 -0500 Subject: [PATCH 31/33] Update coverage_badge.svg --- coverage_badge.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coverage_badge.svg b/coverage_badge.svg index 5fbb2eb..f535152 100644 --- a/coverage_badge.svg +++ b/coverage_badge.svg @@ -6,13 +6,13 @@ - - + + coverage coverage - 93% - 93% + 73% + 73% From 84be1637aca01c6399e3ee38eb379c95f3e68362 Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Sun, 12 Sep 2021 16:23:34 -0500 Subject: [PATCH 32/33] Update coverage_badge.svg --- coverage_badge.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coverage_badge.svg b/coverage_badge.svg index f535152..708026a 100644 --- a/coverage_badge.svg +++ b/coverage_badge.svg @@ -6,13 +6,13 @@ - - + + coverage coverage - 73% - 73% + 95% + 95% From c0201b6e82690694fd28a945cac84dbd4427296d Mon Sep 17 00:00:00 2001 From: Fabian Varela Bonett Date: Tue, 12 Oct 2021 14:38:01 -0500 Subject: [PATCH 33/33] Update coverage_badge.svg --- coverage_badge.svg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coverage_badge.svg b/coverage_badge.svg index 708026a..cf1694f 100644 --- a/coverage_badge.svg +++ b/coverage_badge.svg @@ -12,7 +12,7 @@ coverage coverage - 95% - 95% + 96% + 96%