Change the layout of the training page in team screen and do some tasks

Author: SiekamCebule

lib/ui/reusable_widgets/card_with_title.dart

@@ -5,16 +5,19 @@ class CardWithTitle extends StatelessWidget {
   const CardWithTitle({
     super.key,
     required this.title,
-    required this.content,
+    required this.child,
+    this.color,
   });
 
   final Widget title;
-  final Widget content;
+  final Widget child;
+  final Color? color;
 
   @override
   Widget build(BuildContext context) {
     return Card(
       margin: const EdgeInsets.all(0),
+      color: color,
       child: Padding(
         padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 10),
         child: Column(
@@ -23,7 +26,7 @@ class CardWithTitle extends StatelessWidget {
           children: [
             title,
             const Gap(5),
-            Expanded(child: content),
+            Expanded(child: child),
           ],
         ),
       ),

lib/ui/screens/main_screen/large/simulation_wizard/screens/__game_variant_screen.dart

@@ -29,7 +29,7 @@ class __GameVariantScreenState extends State<_GameVariantScreen> {
         Expanded(
           flex: 5,
           child: Material(
-            color: Theme.of(context).colorScheme.surfaceContainerLow,
+            color: Theme.of(context).colorScheme.surfaceContainer,
             child: ListView.builder(
               itemCount: widget.gameVariants.length,
               itemBuilder: (context, index) {

lib/ui/screens/main_screen/large/simulation_wizard/screens/__start_date_screen.dart

@@ -32,7 +32,7 @@ class _StartDateScreenState extends State<_StartDateScreen> {
         Expanded(
           flex: 5,
           child: Material(
-            color: Theme.of(context).colorScheme.surfaceContainerLow,
+            color: Theme.of(context).colorScheme.surfaceContainer,
             child: ListView.builder(
               itemCount: startDates.length,
               itemBuilder: (context, index) {

lib/ui/screens/main_screen/large/simulation_wizard/screens/__subteam_screen.dart

@@ -29,7 +29,7 @@ class _SubteamScreenState extends State<_SubteamScreen> {
         Expanded(
           flex: 5,
           child: Material(
-            color: Theme.of(context).colorScheme.surfaceContainerLow,
+            color: Theme.of(context).colorScheme.surfaceContainer,
             child: ListView.builder(
               itemCount: widget.subteamTypes.length,
               itemBuilder: (context, index) {

lib/ui/screens/simulation/large/dialogs/manage_partnerships/manage_partnerships_dialog.dart

@@ -159,7 +159,7 @@ class _JumperTile extends StatelessWidget {
     return ListTile(
       leading: SimulationJumperImage(
         jumper: jumper,
-        aspectRatio: 3 / 2,
+        width: 50,
       ),
       trailing: TextButton(
         onPressed: onAction,
@@ -170,7 +170,7 @@ class _JumperTile extends StatelessWidget {
       ),
       title: Text(jumper.nameAndSurname()),
       subtitle: Text(
-        getJumperLevelDescription(
+        translateJumperLevelDescription(
           context: context,
           levelDescription: levelReport?.levelDescription,
         ),

lib/ui/screens/simulation/large/dialogs/search_for_charges_jumpers/__list_tile.dart

@@ -20,7 +20,7 @@ class _ListTile extends StatelessWidget {
       selected: selected,
       leading: SimulationJumperImage(
         jumper: jumper,
-        aspectRatio: 3 / 2,
+        width: 50,
       ),
       trailing: CountryFlag(
         country: jumper.country,
@@ -30,7 +30,7 @@ class _ListTile extends StatelessWidget {
         jumper.nameAndSurname(),
       ),
       subtitle: Text(
-        getJumperLevelDescription(
+        translateJumperLevelDescription(
           context: context,
           levelDescription: levelReport?.levelDescription,
         ),

lib/ui/screens/simulation/large/dialogs/search_for_charges_jumpers/search_for_charges_jumpers_dialog.dart

@@ -83,7 +83,7 @@ class _SearchForChargesJumpersDialogState extends State<SearchForChargesJumpersD
           children: [
             SearchBar(
               backgroundColor: WidgetStatePropertyAll(
-                Theme.of(context).colorScheme.surfaceContainerLow,
+                Theme.of(context).colorScheme.surfaceContainer,
               ),
               overlayColor: WidgetStateColor.resolveWith((states) {
                 if (states.contains(WidgetState.hovered)) {

lib/ui/screens/simulation/large/dialogs/set_up_trainings/set_up_trainings_dialog.dart

@@ -9,7 +9,6 @@ import 'package:sj_manager/models/user_db/jumper/jumper.dart';
 import 'package:sj_manager/ui/reusable_widgets/help_icon_button.dart';
 import 'package:sj_manager/ui/reusable_widgets/sjm_dialog_ok_pop_button.dart';
 import 'package:sj_manager/ui/screens/simulation/large/dialogs/set_up_trainings/set_up_trainings_are_you_sure_dialog.dart';
-import 'package:sj_manager/ui/screens/simulation/large/widgets/team/jumper_in_team_card/jumper_in_team_training_card.dart';
 import 'package:sj_manager/utils/show_dialog.dart';
 
 class SetUpTrainingsDialog extends StatefulWidget {
@@ -102,20 +101,7 @@ class _SetUpTrainingsDialogState extends State<SetUpTrainingsDialog> {
                       width: constraints.maxWidth,
                       child: ListView(
                         children: [
-                          for (var jumper in widget.jumpers)
-                            JumperInTeamTrainingCard(
-                              jumper: jumper,
-                              trainingConfig: _trainingConfigs[jumper]!,
-                              dynamicParams: database.jumpersDynamicParameters[jumper]!,
-                              onTrainingChange: (trainingConfig) {
-                                setState(() {
-                                  _trainingConfigs[jumper] = trainingConfig;
-                                });
-                              },
-                              jumperRatings: widget.jumpersSimulationRatings[jumper]!,
-                              managerPointsCount: widget.managerPointsCount,
-                              hideTrainingRaport: true,
-                            ),
+                          Placeholder(),
                         ],
                       ),
                     ),

lib/ui/screens/simulation/large/subscreens/__team_screen.dart

@@ -8,7 +8,7 @@ class _TeamScreen extends StatefulWidget {
 }
 
 class _TeamScreenState extends State<_TeamScreen> {
-  var _selectedMode = TeamScreenJumperCardMode.overview;
+  var _selectedMode = TeamScreenMode.overview;
 
   @override
   Widget build(BuildContext context) {
@@ -18,48 +18,44 @@ class _TeamScreenState extends State<_TeamScreen> {
         database.actionsRepo.isCompleted(SimulationActionType.settingUpTraining);
     final jumpers = dbHelper.managerJumpers;
 
-    final jumpersBody = jumpers.isNotEmpty
+    final noJumpersWidget = TeamScreenNoJumpersInfoWidget(
+      mode: database.managerData.mode,
+      searchForCandidates: () =>
+          SearchForCandidatesCommand(context: context, database: database).execute(),
+    );
+
+    final generalBody = jumpers.isNotEmpty
         ? ListView(
             children: [
               for (var jumper in jumpers)
                 AnimatedSize(
                   duration: Durations.short1,
                   curve: Curves.easeIn,
-                  child: TeamScreenJumperCard(
+                  child: JumperInTeamOverviewCard(
                     jumper: jumper,
-                    mode: _selectedMode,
-                    onTrainingChange: (trainingConfig) {
-                      ChangeJumperTrainingCommand(
-                        context: context,
-                        database: database,
-                        jumper: jumper,
-                        trainingConfig: trainingConfig,
-                      ).execute();
-                    },
+                    reports: database.jumpersReports[jumper]!,
                   ),
                 ),
             ],
           )
-        : TeamScreenNoJumpersInfoWidget(
-            mode: database.managerData.mode,
+        : noJumpersWidget;
+
+    final trainingBody = JumperTrainingManagerRow(noJumpersWidget: noJumpersWidget);
+
+    final bottomNavBar = database.managerData.mode == SimulationMode.personalCoach
+        ? TeamScreenPersonalCoachBottomBar(
+            chargesCount: database.managerData.personalCoachTeam!.jumpers.length,
+            chargesLimit: sjmManagerChargesLimit,
             searchForCandidates: () =>
                 SearchForCandidatesCommand(context: context, database: database)
                     .execute(),
-          );
+            managePartnerships: () =>
+                ManagePartnershipsCommand(context: context, database: database).execute(),
+          )
+        : null;
 
     return Scaffold(
-      bottomNavigationBar: database.managerData.mode == SimulationMode.personalCoach
-          ? TeamScreenPersonalCoachBottomBar(
-              chargesCount: database.managerData.personalCoachTeam!.jumpers.length,
-              chargesLimit: sjmManagerChargesLimit,
-              searchForCandidates: () =>
-                  SearchForCandidatesCommand(context: context, database: database)
-                      .execute(),
-              managePartnerships: () =>
-                  ManagePartnershipsCommand(context: context, database: database)
-                      .execute(),
-            )
-          : null,
+      bottomNavigationBar: bottomNavBar,
       body: Column(
         children: [
           SizedBox(
@@ -93,12 +89,12 @@ class _TeamScreenState extends State<_TeamScreen> {
                 SegmentedButton(
                   segments: const [
                     ButtonSegment(
-                      value: TeamScreenJumperCardMode.overview,
+                      value: TeamScreenMode.overview,
                       label: Text('Ogólnie'),
                       icon: Icon(Symbols.dashboard),
                     ),
                     ButtonSegment(
-                      value: TeamScreenJumperCardMode.training,
+                      value: TeamScreenMode.training,
                       label: Text('Trening'),
                       icon: Icon(Symbols.fitness_center),
                     ),
@@ -139,10 +135,15 @@ class _TeamScreenState extends State<_TeamScreen> {
           ),
           const Gap(15),
           Expanded(
-            child: jumpersBody,
+            child: _selectedMode == TeamScreenMode.overview ? generalBody : trainingBody,
           ),
         ],
       ),
     );
   }
 }
+
+enum TeamScreenMode {
+  overview,
+  training,
+}

lib/ui/screens/simulation/large/subscreens/home/__next_competitions_card.dart

@@ -29,7 +29,7 @@ class _NextCompetitionCard extends StatelessWidget {
           ),
         ],
       ),
-      content: Column(
+      child: Column(
         mainAxisAlignment: MainAxisAlignment.start,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [

lib/ui/screens/simulation/large/subscreens/home/__team_overview_card.dart

@@ -69,7 +69,7 @@ class _TeamOverviewCard extends StatelessWidget {
           ),
         ],
       ),
-      content: Center(child: content),
+      child: Center(child: content),
     );
   }
 }

lib/ui/screens/simulation/large/widgets/simulation_jumper_image.dart

@@ -1,51 +1,51 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:sj_manager/l10n/helpers.dart';
 import 'package:sj_manager/models/user_db/jumper/jumper.dart';
-import 'package:sj_manager/ui/responsiveness/ui_constants.dart';
 import 'package:sj_manager/ui/reusable_widgets/database_item_images/db_item_image.dart';
-import 'package:sj_manager/ui/reusable_widgets/database_item_images/item_image_not_found_placeholder.dart';
-import 'package:sj_manager/ui/screens/database_editor/large/dialogs/item_image_help_dialog.dart';
 
 class SimulationJumperImage extends StatelessWidget {
   const SimulationJumperImage({
     super.key,
     required this.jumper,
     this.customImage,
-    this.aspectRatio,
-  });
+    this.width,
+    this.height,
+  }) : assert((width != null || height != null) && !(width != null && height != null));
 
   final Jumper jumper;
   final ImageProvider? customImage;
-  final double? aspectRatio;
+  final double? width;
+  final double? height;
 
   @override
   Widget build(BuildContext context) {
-    Widget errorBuilder(BuildContext context, Object error, StackTrace? stackTrace) {
-      return ItemImageNotFoundPlaceholder(
-        width: UiItemEditorsConstants.jumperImagePlaceholderWidth,
-        height: UiItemEditorsConstants.jumperImageHeight,
-        helpDialog: ItemImageHelpDialog(
-          content: translate(context).jumperImageHelpContent,
+    final imageFit = width != null ? BoxFit.fitWidth : BoxFit.fitHeight;
+
+    late final Widget child;
+    if (customImage != null) {
+      child = Image(
+        image: customImage!,
+        width: width,
+        height: height,
+        fit: imageFit,
+      );
+    } else {
+      child = DbItemImage<Jumper>(
+        item: jumper,
+        setup: context.read(),
+        width: width,
+        height: height,
+        fit: imageFit,
+        errorBuilder: (context, error, stackTrace) => SizedBox(
+          width: width,
+          height: height,
+          child: Placeholder(
+            color: Theme.of(context).colorScheme.onTertiary,
+          ),
         ),
       );
     }
 
-    final image = customImage == null
-        ? DbItemImage<Jumper>(
-            item: jumper,
-            setup: context.read(),
-            errorBuilder: errorBuilder,
-          )
-        : Image(
-            image: customImage!,
-            errorBuilder: errorBuilder,
-          );
-    return aspectRatio != null
-        ? AspectRatio(
-            aspectRatio: aspectRatio!,
-            child: image,
-          )
-        : image;
+    return child;
   }
 }