Skip to content
Snippets Groups Projects
Commit 6e268ed3 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '19-improve-colors' into 'master'

Resolve "Improve colors"

Closes #19

See merge request !22
parents 497749f5 785ce4fb
No related branches found
No related tags found
1 merge request!22Resolve "Improve colors"
Pipeline #5527 passed
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
app.versionName=0.0.21 app.versionName=0.0.22
app.versionCode=21 app.versionCode=22
Improve main game colors.
Amélioration des couleurs principales du jeu.
import 'package:flutter/material.dart';
class TwisterColors {
static const Color grey = Color.fromARGB(255, 0xF0, 0xE2, 0xE7); // F0E2E7
static const Color blue = Color.fromARGB(255, 0x3F, 0x84, 0xE5); // 3F84E5
static const Color green = Color.fromARGB(255, 0x3F, 0x78, 0x4C); // 3F784C
static const Color red = Color.fromARGB(255, 0xB2, 0x0D, 0x30); // B20D30
static const Color yellow = Color.fromARGB(255, 0xC1, 0x78, 0x17); // C17817
}
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:twister/config/colors.dart';
import 'package:twister/models/move.dart'; import 'package:twister/models/move.dart';
import 'package:twister/models/twister_color.dart'; import 'package:twister/models/twister_color.dart';
import 'package:twister/models/twister_member.dart'; import 'package:twister/models/twister_member.dart';
...@@ -14,15 +15,15 @@ class ShowMove extends StatelessWidget { ...@@ -14,15 +15,15 @@ class ShowMove extends StatelessWidget {
Color getColor(Move move) { Color getColor(Move move) {
switch (move.color?.value) { switch (move.color?.value) {
case TwisterAllowedColors.blue: case TwisterAllowedColors.blue:
return Colors.blue; return TwisterColors.blue;
case TwisterAllowedColors.green: case TwisterAllowedColors.green:
return Colors.green; return TwisterColors.green;
case TwisterAllowedColors.red: case TwisterAllowedColors.red:
return Colors.red; return TwisterColors.red;
case TwisterAllowedColors.yellow: case TwisterAllowedColors.yellow:
return Colors.yellow; return TwisterColors.yellow;
default: default:
return Colors.grey; return TwisterColors.grey;
} }
} }
......
...@@ -3,7 +3,7 @@ description: twister game companion ...@@ -3,7 +3,7 @@ description: twister game companion
publish_to: 'none' publish_to: 'none'
version: 0.0.21+21 version: 0.0.22+22
environment: environment:
sdk: '^3.0.0' sdk: '^3.0.0'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment