diff --git a/lib/features/onboarding/view/onboarding_single_page.dart b/lib/features/onboarding/view/onboarding_single_page.dart index ae170d1..71df7cf 100644 --- a/lib/features/onboarding/view/onboarding_single_page.dart +++ b/lib/features/onboarding/view/onboarding_single_page.dart @@ -7,11 +7,11 @@ import 'package:url_launcher/url_launcher.dart'; import 'package:whispering_pages/api/api_provider.dart'; import 'package:whispering_pages/api/authenticated_user_provider.dart'; import 'package:whispering_pages/api/server_provider.dart'; +import 'package:whispering_pages/features/onboarding/view/user_login.dart'; import 'package:whispering_pages/router/router.dart'; import 'package:whispering_pages/settings/api_settings_provider.dart'; import 'package:whispering_pages/settings/models/models.dart' as model; import 'package:whispering_pages/shared/widgets/add_new_server.dart'; -import 'package:whispering_pages/features/onboarding/view/user_login.dart'; class OnboardingSinglePage extends HookConsumerWidget { const OnboardingSinglePage({ @@ -90,7 +90,7 @@ class OnboardingSinglePage extends HookConsumerWidget { ); // redirect to the library page - GoRouter.of(context).goNamed(Routes.home); + GoRouter.of(context).goNamed(Routes.home.name); } else { ScaffoldMessenger.of(context).showSnackBar( const SnackBar( diff --git a/lib/main.dart b/lib/main.dart index fb5bc3e..97bcec7 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -57,7 +57,7 @@ class MyApp extends ConsumerWidget { } return MaterialApp.router( - debugShowCheckedModeBanner: false, + // debugShowCheckedModeBanner: false, theme: lightTheme, darkTheme: darkTheme, themeMode: ref.watch(appSettingsProvider).isDarkMode diff --git a/lib/router/constants.dart b/lib/router/constants.dart index 33ab776..f9c361f 100644 --- a/lib/router/constants.dart +++ b/lib/router/constants.dart @@ -3,7 +3,10 @@ part of 'router.dart'; class Routes { - static const home = 'home'; + static const home = _SimpleRoute( + pathName: '', + name: 'home', + ); static const onboarding = _SimpleRoute( pathName: 'login', name: 'onboarding', diff --git a/lib/router/router.dart b/lib/router/router.dart index a4d1224..0f54ede 100644 --- a/lib/router/router.dart +++ b/lib/router/router.dart @@ -1,10 +1,9 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; +import 'package:whispering_pages/features/item_viewer/view/library_item_page.dart'; +import 'package:whispering_pages/features/onboarding/view/onboarding_single_page.dart'; import 'package:whispering_pages/pages/app_settings.dart'; import 'package:whispering_pages/pages/home_page.dart'; -import 'package:whispering_pages/features/item_viewer/view/library_item_page.dart'; -import 'package:whispering_pages/pages/library_page.dart'; -import 'package:whispering_pages/features/onboarding/view/onboarding_single_page.dart'; import 'scaffold_with_nav_bar.dart'; import 'transitions/slide.dart'; @@ -21,6 +20,7 @@ class MyAppRouter { const MyAppRouter(); GoRouter get config => GoRouter( + initialLocation: Routes.home.path, routes: [ // sign in page GoRoute( @@ -47,20 +47,11 @@ class MyAppRouter { navigatorKey: _sectionHomeNavigatorKey, routes: [ GoRoute( - path: '/', - name: Routes.home, + path: Routes.home.path, + name: Routes.home.name, // builder: (context, state) => const HomePage(), pageBuilder: defaultPageBuilder(const HomePage()), ), - // /library/:libraryId - GoRoute( - path: Routes.library.path, - name: Routes.library.name, - builder: (context, state) => LibraryPage( - libraryId: - state.pathParameters[Routes.library.pathParamName]!, - ), - ), GoRoute( path: Routes.libraryItem.path, name: Routes.libraryItem.name, diff --git a/lib/router/scaffold_with_nav_bar.dart b/lib/router/scaffold_with_nav_bar.dart index dc04f3c..b11f170 100644 --- a/lib/router/scaffold_with_nav_bar.dart +++ b/lib/router/scaffold_with_nav_bar.dart @@ -1,5 +1,3 @@ -import 'dart:math'; - import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; @@ -28,7 +26,7 @@ class ScaffoldWithNavBar extends HookConsumerWidget { var percentExpanded = (playerProgress - playerMinHeight) / (playerMaxHeight - playerMinHeight); // Clamp the value between 0 and 1 - percentExpanded = max(0, min(1, percentExpanded)); + percentExpanded = percentExpanded.clamp(0.0, 1.0); return Scaffold( body: Stack(