Teams page

Author: SiekamCebule

lib/commands/ui/simulation/simulation_screen_navigation_cubit.dart

@@ -34,6 +34,7 @@ enum SimulationScreenNavigationTarget {
   archive,
   calendar,
   stats,
+  teams,
   settings,
   exit,
 }
@@ -46,6 +47,7 @@ final navigationTargetsBySimulationMode = {
     SimulationScreenNavigationTarget.archive,
     SimulationScreenNavigationTarget.calendar,
     SimulationScreenNavigationTarget.stats,
+    SimulationScreenNavigationTarget.teams,
     SimulationScreenNavigationTarget.settings,
     SimulationScreenNavigationTarget.exit,
   ],
@@ -56,6 +58,7 @@ final navigationTargetsBySimulationMode = {
     SimulationScreenNavigationTarget.archive,
     SimulationScreenNavigationTarget.calendar,
     SimulationScreenNavigationTarget.stats,
+    SimulationScreenNavigationTarget.teams,
     SimulationScreenNavigationTarget.settings,
     SimulationScreenNavigationTarget.exit,
   ],
@@ -65,6 +68,7 @@ final navigationTargetsBySimulationMode = {
     SimulationScreenNavigationTarget.archive,
     SimulationScreenNavigationTarget.calendar,
     SimulationScreenNavigationTarget.stats,
+    SimulationScreenNavigationTarget.teams,
     SimulationScreenNavigationTarget.settings,
     SimulationScreenNavigationTarget.exit,
   ],

lib/filters/hills/hill_matching_algorithms.dart

@@ -1,7 +1,8 @@
-import 'package:sj_manager/filters/matching_algorithms/db_item_matching_by_text_algorithm.dart';
+import 'package:sj_manager/filters/matching_algorithms/matching_by_text_algorithm.dart';
 import 'package:sj_manager/models/user_db/hill/hill.dart';
+import 'package:sj_manager/utils/filtering.dart';
 
-class DefaultHillMatchingByTextAlgorithm extends DbItemMatchingByTextAlgorithm<Hill> {
+class DefaultHillMatchingByTextAlgorithm extends MatchingByTextAlgorithm<Hill> {
   const DefaultHillMatchingByTextAlgorithm({required super.text});
 
   @override
@@ -10,22 +11,7 @@ class DefaultHillMatchingByTextAlgorithm extends DbItemMatchingByTextAlgorithm<H
     String hillName = item.name.toLowerCase();
     String hillLocality = item.locality.toLowerCase();
 
-    bool containsAllLetters(String source, String target) {
-      Map<String, int> targetLetterCount = {};
-
-      for (var letter in target.split('')) {
-        targetLetterCount[letter] = (targetLetterCount[letter] ?? 0) + 1;
-      }
-
-      for (var letter in targetLetterCount.keys) {
-        if (targetLetterCount[letter]! > RegExp(letter).allMatches(source).length) {
-          return false;
-        }
-      }
-      return true;
-    }
-
-    return containsAllLetters(hillName, searchText) ||
-        containsAllLetters(hillLocality, searchText);
+    return hillName.containsAllLetters(from: searchText) ||
+        hillLocality.containsAllLetters(from: searchText);
   }
 }

lib/filters/hills/hills_filter.dart

@@ -1,4 +1,4 @@
-import 'package:sj_manager/filters/matching_algorithms/db_item_matching_by_text_algorithm.dart';
+import 'package:sj_manager/filters/matching_algorithms/matching_by_text_algorithm.dart';
 import 'package:sj_manager/filters/mixins.dart';
 import 'package:sj_manager/models/user_db/hill/hill_type_by_size.dart';
 import 'package:sj_manager/filters/filter.dart';
@@ -41,7 +41,7 @@ final class HillsFilterBySearch extends HillsFilter with SearchFilter {
     required this.searchAlgorithm,
   });
 
-  final DbItemMatchingByTextAlgorithm<Hill> searchAlgorithm;
+  final MatchingByTextAlgorithm<Hill> searchAlgorithm;
 
   @override
   bool get isValid => searchAlgorithm.text.isNotEmpty;

lib/filters/jumpers/jumper_matching_algorithms.dart

@@ -1,32 +1,14 @@
-import 'package:sj_manager/filters/matching_algorithms/db_item_matching_by_text_algorithm.dart';
+import 'package:sj_manager/filters/matching_algorithms/matching_by_text_algorithm.dart';
 import 'package:sj_manager/models/user_db/jumper/jumper.dart';
+import 'package:sj_manager/utils/filtering.dart';
 
-final class DefaultJumperMatchingByTextAlgorithm
-    extends DbItemMatchingByTextAlgorithm<Jumper> {
+final class DefaultJumperMatchingByTextAlgorithm extends MatchingByTextAlgorithm<Jumper> {
   const DefaultJumperMatchingByTextAlgorithm({required super.text});
 
   @override
   bool matches(Jumper item) {
     String searchText = text.toLowerCase();
     String fullName = '${item.name} ${item.surname}'.toLowerCase();
-
-    bool containsAllLetters(String source, String target) {
-      Map<String, int> targetLetterCount = {};
-
-      // Count occurrences of each letter in the target (searchText)
-      for (var letter in target.split('')) {
-        targetLetterCount[letter] = (targetLetterCount[letter] ?? 0) + 1;
-      }
-
-      // Check if source contains all letters from target with required frequency
-      for (var letter in targetLetterCount.keys) {
-        if (targetLetterCount[letter]! > RegExp(letter).allMatches(source).length) {
-          return false;
-        }
-      }
-      return true;
-    }
-
-    return containsAllLetters(fullName, searchText);
+    return fullName.containsAllLetters(from: searchText);
   }
 }

lib/filters/jumpers/jumpers_filter.dart

@@ -1,5 +1,5 @@
 import 'package:sj_manager/filters/filter.dart';
-import 'package:sj_manager/filters/matching_algorithms/db_item_matching_by_text_algorithm.dart';
+import 'package:sj_manager/filters/matching_algorithms/matching_by_text_algorithm.dart';
 import 'package:sj_manager/filters/mixins.dart';
 import 'package:sj_manager/models/user_db/country/country.dart';
 import 'package:sj_manager/models/user_db/jumper/jumper.dart';
@@ -59,7 +59,7 @@ final class JumpersFilterBySearch extends JumpersFilter with SearchFilter {
     required this.searchAlgorithm,
   });
 
-  final DbItemMatchingByTextAlgorithm<Jumper> searchAlgorithm;
+  final MatchingByTextAlgorithm<Jumper> searchAlgorithm;
 
   @override
   bool get isValid => searchAlgorithm.text.isNotEmpty;

lib/filters/matching_algorithms/db_item_matching_by_text_algorithm.dart renamed to lib/filters/matching_algorithms/matching_by_text_algorithm.dart

@@ -1,7 +1,7 @@
 import 'package:sj_manager/filters/matching_algorithms/match_algorithm.dart';
 
-abstract class DbItemMatchingByTextAlgorithm<T> extends ItemMatchAlgorithm<T> {
-  const DbItemMatchingByTextAlgorithm({
+abstract class MatchingByTextAlgorithm<T> extends ItemMatchAlgorithm<T> {
+  const MatchingByTextAlgorithm({
     required this.text,
   });
 

lib/ui/database_item_editors/fields/my_search_bar.dart

@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+
+class MySearchBar extends StatelessWidget {
+  const MySearchBar({
+    super.key,
+    this.controller,
+    this.autofocus = true,
+    this.hintText,
+    this.backgroundColor,
+  });
+
+  final TextEditingController? controller;
+  final bool autofocus;
+  final String? hintText;
+  final Color? backgroundColor;
+
+  @override
+  Widget build(BuildContext context) {
+    return SearchBar(
+      controller: controller,
+      backgroundColor: WidgetStatePropertyAll(backgroundColor),
+      overlayColor: WidgetStateColor.resolveWith((states) {
+        if (states.contains(WidgetState.hovered)) {
+          return Theme.of(context).colorScheme.surfaceContainerLowest;
+        } else {
+          return Colors.transparent;
+        }
+      }),
+      elevation: const WidgetStatePropertyAll(0),
+      autoFocus: autofocus,
+      hintText: hintText,
+    );
+  }
+}

lib/ui/screens/simulation/large/__large.dart

@@ -53,6 +53,11 @@ class _LargeState extends State<_Large> {
                               widget: _TeamScreen(
                             initialMode: settings.arguments as TeamScreenMode,
                           )),
+                        '/simulation/teams' => buildPageRoute(
+                            widget: const _TeamsScreen(
+                              initialSex: TeamsScreenSelectedSex.both,
+                            ),
+                          ),
                         _ => null,
                       };
                     },

lib/ui/screens/simulation/large/__navigation_rail.dart

@@ -36,7 +36,7 @@ class _NavigationRailState extends State<_NavigationRail> {
         NavigationRailDestination(
           icon: const Icon(Symbols.group),
           label: Text(
-            'Drużyna',
+            'Kadra',
             style: regularRailDestinationLabelStyle,
           ),
         ),
@@ -72,6 +72,13 @@ class _NavigationRailState extends State<_NavigationRail> {
           ),
           disabled: true,
         ),
+        NavigationRailDestination(
+          icon: const Icon(Symbols.groups),
+          label: Text(
+            'Drużyny',
+            style: regularRailDestinationLabelStyle,
+          ),
+        ),
         NavigationRailDestination(
           icon: const Icon(Symbols.settings),
           label: Text(
@@ -102,14 +109,18 @@ class _NavigationRailState extends State<_NavigationRail> {
               '/simulation/team',
               arguments: TeamScreenMode.overview,
             );
+          case SimulationScreenNavigationTarget.teams:
+            widget.navigatorKey.currentState!.pushReplacementNamed(
+              '/simulation/teams',
+            );
           case SimulationScreenNavigationTarget.exit:
             widget.exit();
           default:
             throw ArgumentError(
               'Prosimy o zgłoszenie nam tego błędu. Próbowano przejść do ekranu $navigationTarget (niezaimplementowano)',
             );
         }
-        if (selecetedIndex != 7) {
+        if (navigationTarget != SimulationScreenNavigationTarget.exit) {
           context
               .read<SimulationScreenNavigationCubit>()
               .change(screen: navigationTarget);