Revert "Merge branch 'feature/193-statisticsview-rework' into development"
All checks were successful
Push Pipeline / update_version (push) Successful in 6s
Push Pipeline / generate_licenses (push) Successful in 38s
Push Pipeline / generate_localizations (push) Successful in 29s
Push Pipeline / test (push) Successful in 1m35s
Push Pipeline / sort_arb_files (push) Successful in 31s
Push Pipeline / format (push) Successful in 55s
Push Pipeline / build (push) Successful in 4m58s
All checks were successful
Push Pipeline / update_version (push) Successful in 6s
Push Pipeline / generate_licenses (push) Successful in 38s
Push Pipeline / generate_localizations (push) Successful in 29s
Push Pipeline / test (push) Successful in 1m35s
Push Pipeline / sort_arb_files (push) Successful in 31s
Push Pipeline / format (push) Successful in 55s
Push Pipeline / build (push) Successful in 4m58s
This reverts commit24f49e17b9, reversing changes made todba6c218d6. # Conflicts: # pubspec.yaml
This commit is contained in:
@@ -24,48 +24,48 @@ String translateRulesetToString(Ruleset ruleset, BuildContext context) {
|
||||
}
|
||||
}
|
||||
|
||||
/// Translates a [AppColor] enum value to its corresponding localized string.
|
||||
String translateAppColorToString(AppColor color, BuildContext context) {
|
||||
/// Translates a [GameColor] enum value to its corresponding localized string.
|
||||
String translateGameColorToString(GameColor color, BuildContext context) {
|
||||
final loc = AppLocalizations.of(context);
|
||||
switch (color) {
|
||||
case AppColor.red:
|
||||
case GameColor.red:
|
||||
return loc.color_red;
|
||||
case AppColor.blue:
|
||||
case GameColor.blue:
|
||||
return loc.color_blue;
|
||||
case AppColor.green:
|
||||
case GameColor.green:
|
||||
return loc.color_green;
|
||||
case AppColor.yellow:
|
||||
case GameColor.yellow:
|
||||
return loc.color_yellow;
|
||||
case AppColor.purple:
|
||||
case GameColor.purple:
|
||||
return loc.color_purple;
|
||||
case AppColor.orange:
|
||||
case GameColor.orange:
|
||||
return loc.color_orange;
|
||||
case AppColor.pink:
|
||||
case GameColor.pink:
|
||||
return loc.color_pink;
|
||||
case AppColor.teal:
|
||||
case GameColor.teal:
|
||||
return loc.color_teal;
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns the [Color] object corresponding to a [AppColor] enum value.
|
||||
Color getColorFromAppColor(AppColor color) {
|
||||
/// Returns the [Color] object corresponding to a [GameColor] enum value.
|
||||
Color getColorFromGameColor(GameColor color) {
|
||||
switch (color) {
|
||||
case AppColor.red:
|
||||
case GameColor.red:
|
||||
return Colors.red;
|
||||
case AppColor.blue:
|
||||
case GameColor.blue:
|
||||
return Colors.blue;
|
||||
case AppColor.green:
|
||||
case GameColor.green:
|
||||
return Colors.green;
|
||||
case AppColor.yellow:
|
||||
case GameColor.yellow:
|
||||
return const Color(0xFFF7CA28);
|
||||
case AppColor.purple:
|
||||
case GameColor.purple:
|
||||
return Colors.purple;
|
||||
case AppColor.orange:
|
||||
case GameColor.orange:
|
||||
return const Color(0xFFef681f);
|
||||
case AppColor.pink:
|
||||
return const Color(0xFFE91E63);
|
||||
case AppColor.teal:
|
||||
return const Color(0xFF00BCD4);
|
||||
case GameColor.pink:
|
||||
return Colors.pink;
|
||||
case GameColor.teal:
|
||||
return Colors.teal;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user