diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart index b5a7959..8bf3c11 100644 --- a/lib/pages/home_page.dart +++ b/lib/pages/home_page.dart @@ -112,6 +112,15 @@ class _HomePageState extends State { child: SingleChildScrollView( child: Column( children: [ + const SizedBox(height: 5), + DialogTextInput( + label: "Event Key", + onSubmit: (value) { + Scouting.competitionName = value; + localStorage?.setString("compName", value); + }, + initialText: Scouting.competitionName, + ), const SizedBox(height: 5), DialogTextInput( label: "Scouter name", diff --git a/lib/pages/summation/averages/insights_page.dart b/lib/pages/summation/averages/insights_page.dart index 24d771a..d126f13 100644 --- a/lib/pages/summation/averages/insights_page.dart +++ b/lib/pages/summation/averages/insights_page.dart @@ -39,7 +39,6 @@ class _InsightsPageState extends State { @override Widget build(BuildContext context) { switch (_sortBy) { - // BUG: sorting breaks team names case "total_score": sortByTotalScore(widget.calculatedFormsData); break; @@ -59,7 +58,7 @@ class _InsightsPageState extends State { child: Column( mainAxisAlignment: MainAxisAlignment.start, children: [ - const SizedBox(height: 5), + const SizedBox(height: 10), TextButton( child: Row( mainAxisSize: MainAxisSize.min, diff --git a/lib/services/scouting/scouting.dart b/lib/services/scouting/scouting.dart index 1ad7ff2..701e82d 100644 --- a/lib/services/scouting/scouting.dart +++ b/lib/services/scouting/scouting.dart @@ -24,7 +24,7 @@ class Scouting { static List _matchPagesContexts = []; - static const String competitionName = "2025isde1"; + static String competitionName = "2025isde1"; static int _currentPage = -1; @@ -242,6 +242,7 @@ class Scouting { } static void initializeData() { + competitionName = localStorage?.getString("compName") ?? competitionName; data.scouter = localStorage?.getString("scouter"); } diff --git a/lib/widgets/scout_app_bar.dart b/lib/widgets/scout_app_bar.dart index 04efa70..b503142 100644 --- a/lib/widgets/scout_app_bar.dart +++ b/lib/widgets/scout_app_bar.dart @@ -1,5 +1,6 @@ // Flutter imports: import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; // Project imports: import 'package:scouting_site/pages/home_page.dart'; @@ -67,13 +68,13 @@ Drawer getScoutHamburgerMenu(BuildContext context) { DrawerHeader( child: Column( children: [ - const Text("Scouting on: ${Scouting.competitionName}"), + Text("Scouting on: ${Scouting.competitionName}"), Text("Scouter Name: ${Scouting.data.scouter}"), ], ), ), ListTile( - leading: const Icon(Icons.biotech_rounded), + leading: const Icon(FontAwesomeIcons.binoculars), title: const Text("Scout"), onTap: () { navigateTo(context, const HomePage()); diff --git a/pubspec.lock b/pubspec.lock index ff00c1c..3a3859b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -504,6 +504,14 @@ packages: description: flutter source: sdk version: "0.0.0" + font_awesome_flutter: + dependency: "direct main" + description: + name: font_awesome_flutter + sha256: d3a89184101baec7f4600d58840a764d2ef760fe1c5a20ef9e6b0e9b24a07a3a + url: "https://pub.dev" + source: hosted + version: "10.8.0" frontend_server_client: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index d705d83..6705713 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: scouting_site -description: "A new Flutter project." +description: "A generic scouting site for FIRST teams" # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev @@ -57,6 +57,7 @@ dependencies: carousel_slider: ^5.0.0 camera: ^0.11.0+2 geekyants_flutter_gauges: ^1.0.4 + font_awesome_flutter: ^10.8.0 dev_dependencies: flutter_test: