feat: Adapt the fight action controls

Oberhauser-Dev · Dec 4, 2023 · b6654ba · b6654ba
1 parent be4db09
commit b6654ba
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 42 deletions.
diff --git a/wrestling_scoreboard_client/lib/ui/fight/fight_action_controls.dart b/wrestling_scoreboard_client/lib/ui/fight/fight_action_controls.dart
@@ -13,9 +13,6 @@ class FightActionControls extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    double width = MediaQuery.of(context).size.width;
-    double padding = width / 512;
-
     bool isRed = role == FightRole.red;
     MaterialColor color = isRed ? Colors.red : Colors.blue;
     void Function()? prepareCallback(FightScreenActionIntent intentRed, FightScreenActionIntent intentBlue) {
@@ -24,52 +21,51 @@ class FightActionControls extends StatelessWidget {
 
     var actions = <Widget>[
       displayActionControl(
-          '1',
-          prepareCallback(const FightScreenActionIntent.redOne(), const FightScreenActionIntent.blueOne()),
-          color,
-          padding),
+        '1',
+        prepareCallback(const FightScreenActionIntent.redOne(), const FightScreenActionIntent.blueOne()),
+        color,
+      ),
       displayActionControl(
-          '2',
-          prepareCallback(const FightScreenActionIntent.redTwo(), const FightScreenActionIntent.blueTwo()),
-          color,
-          padding),
+        '2',
+        prepareCallback(const FightScreenActionIntent.redTwo(), const FightScreenActionIntent.blueTwo()),
+        color,
+      ),
       displayActionControl(
-          '4',
-          prepareCallback(const FightScreenActionIntent.redFour(), const FightScreenActionIntent.blueFour()),
-          color,
-          padding),
+        '4',
+        prepareCallback(const FightScreenActionIntent.redFour(), const FightScreenActionIntent.blueFour()),
+        color,
+      ),
       displayActionControl(
-          'P',
-          prepareCallback(const FightScreenActionIntent.redPassivity(), const FightScreenActionIntent.bluePassivity()),
-          color,
-          padding),
+        'P',
+        prepareCallback(const FightScreenActionIntent.redPassivity(), const FightScreenActionIntent.bluePassivity()),
+        color,
+      ),
       displayActionControl(
-          'O',
-          prepareCallback(const FightScreenActionIntent.redCaution(), const FightScreenActionIntent.blueCaution()),
-          color,
-          padding),
+        'O',
+        prepareCallback(const FightScreenActionIntent.redCaution(), const FightScreenActionIntent.blueCaution()),
+        color,
+      ),
       /*displayActionControl(
           'D',
           prepareCallback(const FightScreenActionIntent.RedDismissal(), FightScreenActionIntent.BlueDismissal()),
           color,
           padding),*/
       displayActionControl(
-          AppLocalizations.of(context)!.activityTimeAbbr, // AZ Activity Time, Aktivitätszeit
-          prepareCallback(
-              const FightScreenActionIntent.redActivityTime(), const FightScreenActionIntent.blueActivityTime()),
-          color,
-          padding),
+        AppLocalizations.of(context)!.activityTimeAbbr, // AZ Activity Time, Aktivitätszeit
+        prepareCallback(
+            const FightScreenActionIntent.redActivityTime(), const FightScreenActionIntent.blueActivityTime()),
+        color,
+      ),
       displayActionControl(
-          AppLocalizations.of(context)!.injuryTimeShort, // VZ Injury Time, Verletzungszeit
-          prepareCallback(
-              const FightScreenActionIntent.redInjuryTime(), const FightScreenActionIntent.blueInjuryTime()),
-          color,
-          padding),
+        AppLocalizations.of(context)!.injuryTimeShort, // VZ Injury Time, Verletzungszeit
+        prepareCallback(const FightScreenActionIntent.redInjuryTime(), const FightScreenActionIntent.blueInjuryTime()),
+        color,
+      ),
       displayActionControl(
-          '⎌',
-          prepareCallback(const FightScreenActionIntent.redUndo(), const FightScreenActionIntent.blueUndo()),
-          color,
-          padding),
+        '⎌',
+        prepareCallback(const FightScreenActionIntent.redUndo(), const FightScreenActionIntent.blueUndo()),
+        color,
+      ),
     ];
     return IntrinsicWidth(
       child: Column(
@@ -79,18 +75,19 @@ class FightActionControls extends StatelessWidget {
     );
   }
 
-  displayActionControl(String text, void Function()? callback, MaterialColor color, double padding) {
+  displayActionControl(String text, void Function()? callback, MaterialColor color) {
     return Expanded(
         child: OutlinedButton(
             style: OutlinedButton.styleFrom(
               minimumSize: Size.zero,
+              visualDensity: VisualDensity.compact,
               foregroundColor: Colors.white,
               backgroundColor: color,
               side: BorderSide(color: color.shade900, width: 1),
               padding: EdgeInsets.zero,
               shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(0))),
             ),
             onPressed: callback,
-            child: ScaledText(text, fontSize: 10, minFontSize: 6, softWrap: false)));
+            child: ScaledText(text, fontSize: 10, minFontSize: 8, softWrap: false)));
   }
 }
diff --git a/wrestling_scoreboard_client/lib/ui/fight/fight_display.dart b/wrestling_scoreboard_client/lib/ui/fight/fight_display.dart
@@ -450,10 +450,9 @@ class FightState extends State<FightScreen> {
                   padding: bottomPadding,
                   children: [
                     displayTechnicalPoints(_r, FightRole.red),
-                    Expanded(flex: 2, child: FightActionControls(FightRole.red, fight.r == null ? null : handleAction)),
+                    FightActionControls(FightRole.red, fight.r == null ? null : handleAction),
                     Expanded(flex: 50, child: Center(child: TimeDisplay(stopwatch, stopwatchColor, fontSize: 100))),
-                    Expanded(
-                        flex: 2, child: FightActionControls(FightRole.blue, fight.b == null ? null : handleAction)),
+                    FightActionControls(FightRole.blue, fight.b == null ? null : handleAction),
                     displayTechnicalPoints(_b, FightRole.blue),
                   ],
                 ),