diff --git a/android/gradle.properties b/android/gradle.properties index eeed3ef5a3d04530f5624cce71b2a57976938aed..ed86f0f26922ea79f4d0c8e0e84f6d74259952bb 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -app.versionName=0.0.21 -app.versionCode=21 +app.versionName=0.0.22 +app.versionCode=22 diff --git a/fastlane/metadata/android/en-US/changelogs/22.txt b/fastlane/metadata/android/en-US/changelogs/22.txt new file mode 100644 index 0000000000000000000000000000000000000000..cf7ab304c203814e90376609e78bc4b91c7f155f --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/22.txt @@ -0,0 +1 @@ +Improve main game colors. diff --git a/fastlane/metadata/android/fr-FR/changelogs/22.txt b/fastlane/metadata/android/fr-FR/changelogs/22.txt new file mode 100644 index 0000000000000000000000000000000000000000..3cbdc931fd21274063bc4a289990ef0dbb72f1cc --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/22.txt @@ -0,0 +1 @@ +Amélioration des couleurs principales du jeu. diff --git a/lib/config/colors.dart b/lib/config/colors.dart new file mode 100644 index 0000000000000000000000000000000000000000..988ca612285d28a0b3c4d68538708f8afc8f21ad --- /dev/null +++ b/lib/config/colors.dart @@ -0,0 +1,10 @@ +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 +} diff --git a/lib/ui/widgets/show_move.dart b/lib/ui/widgets/show_move.dart index 37b0bfdb4d1f916acfc08dcf3afa368cd3a1c599..c40dd3a6db62039285ae784c6683094bfc1224f8 100644 --- a/lib/ui/widgets/show_move.dart +++ b/lib/ui/widgets/show_move.dart @@ -1,6 +1,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; +import 'package:twister/config/colors.dart'; import 'package:twister/models/move.dart'; import 'package:twister/models/twister_color.dart'; import 'package:twister/models/twister_member.dart'; @@ -14,15 +15,15 @@ class ShowMove extends StatelessWidget { Color getColor(Move move) { switch (move.color?.value) { case TwisterAllowedColors.blue: - return Colors.blue; + return TwisterColors.blue; case TwisterAllowedColors.green: - return Colors.green; + return TwisterColors.green; case TwisterAllowedColors.red: - return Colors.red; + return TwisterColors.red; case TwisterAllowedColors.yellow: - return Colors.yellow; + return TwisterColors.yellow; default: - return Colors.grey; + return TwisterColors.grey; } } diff --git a/pubspec.yaml b/pubspec.yaml index e6a8bc41e5a09e4432ab7c7e9a1dce819d52aef7..de43673dbcb70ab2b794083f14fe61803e40ac25 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: twister game companion publish_to: 'none' -version: 0.0.21+21 +version: 0.0.22+22 environment: sdk: '^3.0.0'