diff --git a/src/ui/flutter_app/lib/style/colors.dart b/src/ui/flutter_app/lib/style/colors.dart index 9410692a..dc9d22b1 100644 --- a/src/ui/flutter_app/lib/style/colors.dart +++ b/src/ui/flutter_app/lib/style/colors.dart @@ -19,17 +19,20 @@ import 'package:flutter/material.dart'; class UIColors { + static const floralWhiteColor = Color(0xFFFFFAF0); static const crusoeColor = Color(0xFF165B31); static const burlyWoodColor = Color(0xFFDEB887); + static const papayaWhipColor = Color(0xFFFFEFD5); + static const forestGreenColor = Color(0xFF228B22); static const turmericColor = Color.fromARGB(0xFF, 186, 202, 68); static const logoColor = Color(0xFF6D000D); - static const primaryColor = Color(0xFF461220); + static const primaryColor = Colors.green; static const secondaryColor = Color(0x99461220); static var darkBackgroundColor = crusoeColor; - static const lightBackgroundColor = Color(0xFFEEE0CB); + static const lightBackgroundColor = papayaWhipColor; static var boardBackgroundColor = burlyWoodColor; diff --git a/src/ui/flutter_app/lib/widgets/game_settings_page.dart b/src/ui/flutter_app/lib/widgets/game_settings_page.dart index 50be72fa..8bde829f 100644 --- a/src/ui/flutter_app/lib/widgets/game_settings_page.dart +++ b/src/ui/flutter_app/lib/widgets/game_settings_page.dart @@ -289,14 +289,17 @@ class _GameSettingsPageState extends State { @override Widget build(BuildContext context) { - // final TextStyle headerStyle = - TextStyle(color: UIColors.secondaryColor, fontSize: 20.0); - final TextStyle itemStyle = TextStyle(color: UIColors.primaryColor); + TextStyle(color: UIColors.crusoeColor, fontSize: 20.0); + final TextStyle itemStyle = TextStyle(color: UIColors.crusoeColor); + final cardColor = UIColors.floralWhiteColor; return Scaffold( backgroundColor: UIColors.lightBackgroundColor, - appBar: AppBar(centerTitle: true, title: Text(S.of(context).settings)), + appBar: AppBar( + centerTitle: true, + title: Text(S.of(context).settings), + backgroundColor: UIColors.primaryColor), body: SingleChildScrollView( padding: const EdgeInsets.all(16), child: Column( @@ -306,7 +309,7 @@ class _GameSettingsPageState extends State { Text(S.of(context).skillLevel, style: headerStyle), const SizedBox(height: 10.0), Card( - color: Color(Config.boardBackgroundColor), + color: cardColor, elevation: 0.5, margin: const EdgeInsets.symmetric(vertical: 4.0, horizontal: 0), child: Column( @@ -331,7 +334,7 @@ class _GameSettingsPageState extends State { const SizedBox(height: 16), Text(S.of(context).sound, style: headerStyle), Card( - color: Color(Config.boardBackgroundColor), + color: cardColor, margin: const EdgeInsets.symmetric(vertical: 10), child: Column( children: [ @@ -354,7 +357,7 @@ class _GameSettingsPageState extends State { const SizedBox(height: 16), Text(S.of(context).whoMovesFirst, style: headerStyle), Card( - color: Color(Config.boardBackgroundColor), + color: cardColor, margin: const EdgeInsets.symmetric(vertical: 10), child: Column( children: [ @@ -374,7 +377,7 @@ class _GameSettingsPageState extends State { const SizedBox(height: 16), Text(S.of(context).misc, style: headerStyle), Card( - color: Color(Config.boardBackgroundColor), + color: cardColor, margin: const EdgeInsets.symmetric(vertical: 10), child: Column( children: [ @@ -398,7 +401,7 @@ class _GameSettingsPageState extends State { const SizedBox(height: 16), Text(S.of(context).color, style: headerStyle), Card( - color: Color(Config.boardBackgroundColor), + color: cardColor, margin: const EdgeInsets.symmetric(vertical: 10), child: Column( children: [ diff --git a/src/ui/flutter_app/lib/widgets/rule_settings_page.dart b/src/ui/flutter_app/lib/widgets/rule_settings_page.dart index 45db6868..520747c0 100644 --- a/src/ui/flutter_app/lib/widgets/rule_settings_page.dart +++ b/src/ui/flutter_app/lib/widgets/rule_settings_page.dart @@ -178,10 +178,10 @@ class _RuleSettingsPageState extends State { @override Widget build(BuildContext context) { - // final TextStyle headerStyle = - TextStyle(color: UIColors.secondaryColor, fontSize: 20.0); - final TextStyle itemStyle = TextStyle(color: UIColors.primaryColor); + TextStyle(color: UIColors.crusoeColor, fontSize: 20.0); + final TextStyle itemStyle = TextStyle(color: UIColors.crusoeColor); + final cardColor = UIColors.floralWhiteColor; return Scaffold( backgroundColor: UIColors.lightBackgroundColor, @@ -195,7 +195,7 @@ class _RuleSettingsPageState extends State { const SizedBox(height: 16), Text(S.of(context).rules, style: headerStyle), Card( - color: Color(Config.boardBackgroundColor), + color: cardColor, margin: const EdgeInsets.symmetric(vertical: 10), child: Column( children: [