diff --git a/lib/core/custom_theme.dart b/lib/core/custom_theme.dart index bfc4f3c..74b735f 100644 --- a/lib/core/custom_theme.dart +++ b/lib/core/custom_theme.dart @@ -2,11 +2,13 @@ import 'package:flutter/cupertino.dart'; class CustomTheme { static Color white = CupertinoColors.white; + static Color red = CupertinoColors.destructiveRed; static Color primaryColor = CupertinoColors.systemGreen; static Color backgroundColor = const Color(0xFF101010); static Color mainElementBackgroundColor = CupertinoColors.darkBackgroundGray; static Color playerTileColor = CupertinoColors.secondaryLabel; static Color buttonBackgroundColor = const Color(0xFF202020); + static Color kamikazeColor = CupertinoColors.systemYellow; // Line Colors for GraphView static const Color graphColor1 = Color(0xFFF44336); diff --git a/lib/presentation/views/active_game_view.dart b/lib/presentation/views/active_game_view.dart index b05daba..ab18c76 100644 --- a/lib/presentation/views/active_game_view.dart +++ b/lib/presentation/views/active_game_view.dart @@ -311,11 +311,12 @@ class _ActiveGameViewState extends State { content: Text(AppLocalizations.of(context).end_game_message), actions: [ CupertinoDialogAction( + isDestructiveAction: true, child: Text( AppLocalizations.of(context).end_game, style: const TextStyle( - fontWeight: FontWeight.bold, - color: CupertinoColors.destructiveRed), + fontWeight: FontWeight.bold, + ), ), onPressed: () { setState(() { diff --git a/lib/presentation/views/create_game_view.dart b/lib/presentation/views/create_game_view.dart index 193cdff..a868998 100644 --- a/lib/presentation/views/create_game_view.dart +++ b/lib/presentation/views/create_game_view.dart @@ -176,9 +176,9 @@ class _CreateGameViewState extends State { children: [ CupertinoButton( padding: EdgeInsets.zero, - child: const Icon( + child: Icon( CupertinoIcons.minus_circle_fill, - color: CupertinoColors.destructiveRed, + color: CustomTheme.red, size: 25, ), onPressed: () { diff --git a/lib/presentation/views/main_menu_view.dart b/lib/presentation/views/main_menu_view.dart index 0ad5cfa..0603622 100644 --- a/lib/presentation/views/main_menu_view.dart +++ b/lib/presentation/views/main_menu_view.dart @@ -109,7 +109,7 @@ class _MainMenuViewState extends State { return Dismissible( key: Key(session.id), background: Container( - color: CupertinoColors.destructiveRed, + color: CustomTheme.red, alignment: Alignment.centerRight, padding: const EdgeInsets.only(right: 20.0), child: const Icon( diff --git a/lib/presentation/views/round_view.dart b/lib/presentation/views/round_view.dart index 0c4d454..b20255b 100644 --- a/lib/presentation/views/round_view.dart +++ b/lib/presentation/views/round_view.dart @@ -236,12 +236,10 @@ class _RoundViewState extends State { _endOfRoundNavigation(context, true); } }, - child: Text( - AppLocalizations.of(context).kamikaze, - style: const TextStyle( - color: CupertinoColors.destructiveRed, - ), - ), + child: Text(AppLocalizations.of(context).kamikaze, + style: TextStyle( + color: CustomTheme.kamikazeColor, + )), ), ), ), @@ -300,7 +298,8 @@ class _RoundViewState extends State { return 0; // If it's the first round, the order should be the same as the players list. } - final List scores = widget.gameSession.roundList[widget.roundNumber - 2].scoreUpdates; + final List scores = + widget.gameSession.roundList[widget.roundNumber - 2].scoreUpdates; final int winnerIndex = scores.indexOf(0); // Fallback if no player has 0 points, which should not happen in a valid game. @@ -348,7 +347,10 @@ class _RoundViewState extends State { _kamikazePlayerIndex = index; Navigator.pop(context, true); }, - child: Text(name), + child: Text( + name, + style: TextStyle(color: CustomTheme.kamikazeColor), + ), ); }).toList(), cancelButton: CupertinoActionSheetAction( diff --git a/pubspec.yaml b/pubspec.yaml index abca6e8..df8ca8e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: cabo_counter description: "Mobile app for the card game Cabo" publish_to: 'none' -version: 0.5.4+605 +version: 0.5.5+606 environment: sdk: ^3.5.4