@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
55import 'package:scouting_site/pages/home_page.dart' ;
66import 'package:scouting_site/pages/summation/averages/averages_page.dart' ;
77import 'package:scouting_site/pages/summation/scouting_entries_page.dart' ;
8+ import 'package:scouting_site/services/scouting/scouting.dart' ;
89import 'package:scouting_site/theme.dart' ;
910
1011AppBar getScoutAppBar (String title) {
@@ -44,21 +45,32 @@ AppBar getScoutAppBar(String title) {
4445}
4546
4647void navigateTo (BuildContext context, Widget page) {
47- Navigator .pushReplacement (
48- context,
49- MaterialPageRoute (
50- builder: (context) => page,
51- ),
52- );
48+ if (ModalRoute .of (context)? .settings.name != page.runtimeType.toString ()) {
49+ Navigator .pushReplacement (
50+ context,
51+ MaterialPageRoute (
52+ builder: (context) => page,
53+ settings: RouteSettings (name: page.runtimeType.toString ()),
54+ ),
55+ );
56+ } else {
57+ ScaffoldMessenger .of (context).hideCurrentSnackBar ();
58+ Navigator .pop (context);
59+ }
5360}
5461
5562Drawer getScoutHamburgerMenu (BuildContext context) {
5663 return Drawer (
5764 child: ListView (
5865 padding: EdgeInsets .zero,
5966 children: [
60- const DrawerHeader (
61- child: Text ("" ),
67+ DrawerHeader (
68+ child: Column (
69+ children: [
70+ const Text ("Scouting on: ${Scouting .competitionName }" ),
71+ Text ("Scouter Name: ${Scouting .data .scouter }" ),
72+ ],
73+ ),
6274 ),
6375 ListTile (
6476 leading: const Icon (Icons .biotech_rounded),
0 commit comments