diff --git a/lib/routes/route_generator.dart b/lib/routes/route_generator.dart index be91c0e..ca22e7e 100644 --- a/lib/routes/route_generator.dart +++ b/lib/routes/route_generator.dart @@ -12,13 +12,18 @@ import 'package:didvan/pages/home/news/news_state.dart'; import 'package:didvan/pages/home/radar/radar_details/radar_details.dart'; import 'package:didvan/pages/home/radar/radar_details/radar_details_state.dart'; import 'package:didvan/pages/home/radar/radar_state.dart'; +import 'package:didvan/pages/home/settings/about_us/about_us.dart'; +import 'package:didvan/pages/home/settings/bookmarks/bookmarks.dart'; +import 'package:didvan/pages/home/settings/bookmarks/bookmark_state.dart'; +import 'package:didvan/pages/home/settings/bookmarks/filtered_bookmark/filtered_bookmark.dart'; import 'package:didvan/pages/home/settings/direct_list/direct_list.dart'; import 'package:didvan/pages/home/settings/direct_list/direct_list_state.dart'; import 'package:didvan/pages/home/settings/general_settings/settings.dart'; import 'package:didvan/pages/home/settings/general_settings/settings_state.dart'; -import 'package:didvan/pages/home/settings/profile/edit_profile.dart'; +import 'package:didvan/pages/home/settings/profile/profile.dart'; import 'package:didvan/pages/splash/splash.dart'; import 'package:didvan/routes/routes.dart'; +import 'package:didvan/widgets/image_cropper.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -57,6 +62,16 @@ class RouteGenerator { return _createRoute( const Profile(), ); + case Routes.aboutUs: + return _createRoute( + const AboutUs(), + ); + case Routes.imageCropper: + return _createRoute( + ImageCropper( + data: settings.arguments as Map, + ), + ); case Routes.generalSettings: return _createRoute( ChangeNotifierProvider( @@ -71,12 +86,13 @@ class RouteGenerator { ChangeNotifierProvider( create: (context) => RadarDetailsState(), ), - ChangeNotifierProvider.value( - value: (settings.arguments as Map)['state'], - ) + if ((settings.arguments as Map)['state'] != null) + ChangeNotifierProvider.value( + value: (settings.arguments as Map)['state'], + ) ], child: RadarDetails( - id: (settings.arguments as Map)['id'], + pageData: settings.arguments as Map, ), ), ); @@ -92,7 +108,7 @@ class RouteGenerator { ) ], child: NewsDetails( - id: (settings.arguments as Map)['id'], + pageData: settings.arguments as Map, ), ), ); @@ -119,6 +135,20 @@ class RouteGenerator { ), ), ); + case Routes.bookmarks: + return _createRoute( + ChangeNotifierProvider( + create: (context) => BookmarksState(), + child: const Bookmarks(), + ), + ); + case Routes.filteredBookmarks: + return _createRoute( + ChangeNotifierProvider.value( + value: settings.arguments as BookmarksState, + child: const FilteredBookmarks(), + ), + ); default: return _errorRoute(); } diff --git a/lib/routes/routes.dart b/lib/routes/routes.dart index 959d5a7..5bc9c90 100644 --- a/lib/routes/routes.dart +++ b/lib/routes/routes.dart @@ -1,6 +1,7 @@ class Routes { static const String splash = '/'; static const String home = '/home'; + static const String aboutUs = '/about-us'; static const String authenticaion = '/authentication'; static const String profile = '/profile'; static const String settings = '/settings'; @@ -10,4 +11,7 @@ class Routes { static const String directList = '/direct-list'; static const String direct = '/direct'; static const String comments = '/comments'; + static const String bookmarks = '/bookmarks'; + static const String filteredBookmarks = '/filtered-bookmarks'; + static const String imageCropper = '/image-cropper'; }