diff --git a/lib/main.dart b/lib/main.dart index bcd3c169..58f3196b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -9,7 +9,6 @@ import 'package:wonders/logic/locale_logic.dart'; import 'package:wonders/logic/timeline_logic.dart'; import 'package:wonders/logic/unsplash_logic.dart'; import 'package:wonders/logic/wonders_logic.dart'; -import 'package:wonders/nav_spike.dart'; import 'package:wonders/ui/common/app_shortcuts.dart'; void main() async { @@ -21,11 +20,8 @@ void main() async { // Start app registerSingletons(); - // Spike: - runApp(NavSpikeApp()); - - //runApp(WondersApp()); - //await appLogic.bootstrap(); + runApp(WondersApp()); + await appLogic.bootstrap(); // Remove splash screen when bootstrap is complete FlutterNativeSplash.remove(); diff --git a/lib/nav_spike.dart b/lib/nav_spike.dart deleted file mode 100644 index 49799bbf..00000000 --- a/lib/nav_spike.dart +++ /dev/null @@ -1,54 +0,0 @@ -import 'package:advanced_navigator/advanced_navigator.dart'; -import 'package:wonders/common_libs.dart'; - -final GoRouter _router = GoRouter( - initialLocation: '/a', - routes: [ - GoRoute( - path: '/a', - builder: (BuildContext context, GoRouterState state) => Screen(name: 'A'), - ), - GoRoute( - path: '/b', - builder: (BuildContext context, GoRouterState state) => Screen(name: 'B'), - ), - GoRoute( - path: '/c', - builder: (BuildContext context, GoRouterState state) => Screen(name: 'C'), - ), - ], -); - -/// The main app. -class NavSpikeApp extends StatelessWidget { - const NavSpikeApp({super.key}); - - @override - Widget build(BuildContext context) => MaterialApp.router(routerConfig: _router); -} - -/// The home screen -class Screen extends StatelessWidget { - const Screen({super.key, required this.name}); - final String name; - - @override - Widget build(BuildContext context) { - void navigate(String name) => context.push(name); - - return Scaffold( - appBar: AppBar(title: Text(name)), - body: Center( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text(name, style: TextStyle(fontSize: 48)), - ElevatedButton(onPressed: () => navigate('/a'), child: const Text('A')), - ElevatedButton(onPressed: () => navigate('/b'), child: const Text('B')), - ElevatedButton(onPressed: () => navigate('/c'), child: const Text('C')), - ], - ), - ), - ); - } -}