feat: Adapt bout display layout

Oberhauser-Dev · Oct 5, 2024 · 3f4b5bf · 3f4b5bf
1 parent 06bfb4d
commit 3f4b5bf
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/wrestling_scoreboard_client/lib/view/screens/display/bout/bout_actions.dart b/wrestling_scoreboard_client/lib/view/screens/display/bout/bout_actions.dart
@@ -70,7 +70,7 @@ class ActionsWidget extends ConsumerWidget {
                         color: color,
                         child: ScaledText(
                           action.actionValue,
-                          fontSize: 22,
+                          fontSize: 28,
                           softWrap: false,
                         ),
                       ),

diff --git a/wrestling_scoreboard_client/lib/view/screens/display/bout/bout_display.dart b/wrestling_scoreboard_client/lib/view/screens/display/bout/bout_display.dart
@@ -271,17 +271,19 @@ class BoutState extends ConsumerState<BoutScreen> {
                 child: ScaledText(
                   pStatus?.fullName(context) ?? localizations.participantVacant,
                   color: pStatus == null ? Colors.white30 : Colors.white,
-                  fontSize: 28,
+                  fontSize: 40,
                   minFontSize: 20,
                 ),
               )),
           SizedBox(
               child: Center(
                   child: ScaledText(
-                      (pStatus?.participation.weight != null
-                          ? '${pStatus?.participation.weight!.toStringAsFixed(1)} $weightUnit'
-                          : AppLocalizations.of(context)!.participantUnknownWeight),
-                      color: pStatus?.participation.weight == null ? Colors.white30 : Colors.white))),
+            (pStatus?.participation.weight != null
+                ? '${pStatus?.participation.weight!.toStringAsFixed(1)} $weightUnit'
+                : AppLocalizations.of(context)!.participantUnknownWeight),
+            color: pStatus?.participation.weight == null ? Colors.white30 : Colors.white,
+            fontSize: 22,
+          ))),
         ],
       ),
     );
@@ -299,7 +301,7 @@ class BoutState extends ConsumerState<BoutScreen> {
                 child: Center(
                   child: ScaledText(
                     pStatus!.classificationPoints.toString(),
-                    fontSize: 46,
+                    fontSize: 54,
                     minFontSize: 30,
                   ),
                 ),
@@ -486,19 +488,22 @@ class BoutState extends ConsumerState<BoutScreen> {
                                     child: Center(
                                         child: ScaledText(
                                   '${AppLocalizations.of(context)!.bout} ${widget.boutIndex + 1}',
+                                  fontSize: 22,
                                   minFontSize: 10,
                                 ))),
                               ]),
                               if (bout.weightClass != null)
                                 Center(
                                     child: ScaledText(
                                   '${bout.weightClass!.style.localize(context)}',
+                                  fontSize: 22,
                                   minFontSize: 10,
                                 )),
                               if (bout.weightClass != null)
                                 Center(
                                     child: ScaledText(
                                   bout.weightClass!.name,
+                                  fontSize: 26,
                                   minFontSize: 10,
                                 )),
                             ])),
@@ -518,7 +523,7 @@ class BoutState extends ConsumerState<BoutScreen> {
                               child: TimeDisplay(
                                 stopwatch,
                                 stopwatchColor,
-                                fontSize: 100,
+                                fontSize: 128,
                                 maxDuration: boutConfig.totalPeriodDuration,
                               ),
                             ),

diff --git a/wrestling_scoreboard_client/lib/view/screens/display/bout/technical_points.dart b/wrestling_scoreboard_client/lib/view/screens/display/bout/technical_points.dart
@@ -15,6 +15,7 @@ class TechnicalPoints extends StatelessWidget {
   final ParticipantStateModel pStatusModel;
   final Bout bout;
   final BoutConfig boutConfig;
+  final timerFontSize = 32.0;
 
   const TechnicalPoints({
     required this.role,
@@ -32,6 +33,7 @@ class TechnicalPoints extends StatelessWidget {
       color: role.color(),
       height: cellHeight,
       child: Column(
+        mainAxisSize: MainAxisSize.max,
         children: [
           Expanded(
             flex: 70,
@@ -41,33 +43,34 @@ class TechnicalPoints extends StatelessWidget {
                 return FittedText(
                   (ParticipantState.getTechnicalPoints(actions, role)).toString(),
                   softWrap: false,
+                  style: const TextStyle(height: 1.2),
                 );
               },
             ),
           ),
           if (pStatusModel.activityStopwatch != null)
             Expanded(
-                flex: 40,
+                flex: 30,
                 child: Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [
-                  ScaledText(AppLocalizations.of(context)!.activityTimeAbbr, fontSize: 18),
+                  ScaledText(AppLocalizations.of(context)!.activityTimeAbbr, fontSize: timerFontSize),
                   TimeDisplay(
                     pStatusModel.activityStopwatch!,
                     white,
-                    fontSize: 18,
+                    fontSize: timerFontSize,
                     maxDuration: boutConfig.activityDuration,
                   )
                 ])),
           if (pStatusModel.isInjury)
             Expanded(
-              flex: 40,
+              flex: 30,
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                 children: [
-                  ScaledText(AppLocalizations.of(context)!.injuryTimeShort, fontSize: 18),
+                  ScaledText(AppLocalizations.of(context)!.injuryTimeShort, fontSize: timerFontSize),
                   TimeDisplay(
                     pStatusModel.injuryStopwatch,
                     white,
-                    fontSize: 18,
+                    fontSize: timerFontSize,
                     maxDuration: boutConfig.injuryDuration,
                   )
                 ],

diff --git a/wrestling_scoreboard_client/lib/view/screens/display/common.dart b/wrestling_scoreboard_client/lib/view/screens/display/common.dart
@@ -30,7 +30,7 @@ class ClassificationPointsDisplay extends ConsumerWidget {
             builder: (context, participationStates) {
               return ScaledText(
                 TeamMatch.getClassificationPoints(participationStates).toString(),
-                fontSize: 28,
+                fontSize: 36,
                 minFontSize: 16,
                 softWrap: false,
               );