diff --git a/lib/main.dart b/lib/main.dart index 1c17f1af..6ae3f5f3 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,33 +1,11 @@ -import 'package:flutter/material.dart'; -import 'package:on_time_front/core/di/di_setup.dart'; -import 'package:on_time_front/presentation/shared/router/go_router.dart'; -import 'package:on_time_front/presentation/shared/theme/theme.dart'; - -void main() async { - configureDependencies(); - runApp(MyApp()); - WidgetsFlutterBinding.ensureInitialized(); -} - -class MyApp extends StatelessWidget { - const MyApp({super.key}); - - @override - Widget build(BuildContext context) { - return MaterialApp.router( - routerConfig: goRouterConfig, - theme: themeData, - ); - } -} - // import 'package:flutter/material.dart'; -// import 'package:flutter_riverpod/flutter_riverpod.dart'; -// import 'package:on_time_front/presentation/preparation/screens/schedule_list_screen.dart'; +// import 'package:on_time_front/core/di/di_setup.dart'; +// import 'package:on_time_front/presentation/shared/router/go_router.dart'; // import 'package:on_time_front/presentation/shared/theme/theme.dart'; // void main() async { -// runApp(const ProviderScope(child: MyApp())); +// configureDependencies(); +// runApp(MyApp()); // WidgetsFlutterBinding.ensureInitialized(); // } @@ -36,12 +14,34 @@ class MyApp extends StatelessWidget { // @override // Widget build(BuildContext context) { -// return MaterialApp( +// return MaterialApp.router( +// routerConfig: goRouterConfig, // theme: themeData, -// home: Scaffold( -// backgroundColor: Colors.grey, -// body: ScheduleListScreen(), -// ), // ); // } // } + +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:on_time_front/presentation/preparation/screens/schedule_list_screen.dart'; +import 'package:on_time_front/presentation/shared/theme/theme.dart'; + +void main() async { + runApp(const ProviderScope(child: MyApp())); + WidgetsFlutterBinding.ensureInitialized(); +} + +class MyApp extends StatelessWidget { + const MyApp({super.key}); + + @override + Widget build(BuildContext context) { + return MaterialApp( + theme: themeData, + home: Scaffold( + backgroundColor: Colors.grey, + body: ScheduleListScreen(), + ), + ); + } +} diff --git a/pubspec.lock b/pubspec.lock index ee482fb4..ecd19331 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -458,7 +458,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.17" - version: "2.0.16" flutter_swipe_action_cell: dependency: "direct main" description: