organ
/
Sanmill
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

flutter: Settings color is fixed

This commit is contained in:
Calcitem 2021-02-27 01:14:44 +08:00
parent 943ef77087
commit 26e89124fb
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ui/flutter_app/lib/style/colors.dart
View File

@ -19,17 +19,20 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class UIColors { class UIColors {
static const floralWhiteColor = Color(0xFFFFFAF0);
static const crusoeColor = Color(0xFF165B31); static const crusoeColor = Color(0xFF165B31);
static const burlyWoodColor = Color(0xFFDEB887); 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 turmericColor = Color.fromARGB(0xFF, 186, 202, 68);
static const logoColor = Color(0xFF6D000D); static const logoColor = Color(0xFF6D000D);
static const primaryColor = Color(0xFF461220); static const primaryColor = Colors.green;
static const secondaryColor = Color(0x99461220); static const secondaryColor = Color(0x99461220);
static var darkBackgroundColor = crusoeColor; static var darkBackgroundColor = crusoeColor;
static const lightBackgroundColor = Color(0xFFEEE0CB); static const lightBackgroundColor = papayaWhipColor;
static var boardBackgroundColor = burlyWoodColor; static var boardBackgroundColor = burlyWoodColor;

21
src/ui/flutter_app/lib/widgets/game_settings_page.dart
View File

@ -289,14 +289,17 @@ class _GameSettingsPageState extends State<GameSettingsPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
//
final TextStyle headerStyle = final TextStyle headerStyle =
TextStyle(color: UIColors.secondaryColor, fontSize: 20.0); TextStyle(color: UIColors.crusoeColor, fontSize: 20.0);
final TextStyle itemStyle = TextStyle(color: UIColors.primaryColor); final TextStyle itemStyle = TextStyle(color: UIColors.crusoeColor);
final cardColor = UIColors.floralWhiteColor;
return Scaffold( return Scaffold(
backgroundColor: UIColors.lightBackgroundColor, 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( body: SingleChildScrollView(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: Column( child: Column(
@ -306,7 +309,7 @@ class _GameSettingsPageState extends State<GameSettingsPage> {
Text(S.of(context).skillLevel, style: headerStyle), Text(S.of(context).skillLevel, style: headerStyle),
const SizedBox(height: 10.0), const SizedBox(height: 10.0),
Card( Card(
color: Color(Config.boardBackgroundColor), color: cardColor,
elevation: 0.5, elevation: 0.5,
margin: const EdgeInsets.symmetric(vertical: 4.0, horizontal: 0), margin: const EdgeInsets.symmetric(vertical: 4.0, horizontal: 0),
child: Column( child: Column(
@ -331,7 +334,7 @@ class _GameSettingsPageState extends State<GameSettingsPage> {
const SizedBox(height: 16), const SizedBox(height: 16),
Text(S.of(context).sound, style: headerStyle), Text(S.of(context).sound, style: headerStyle),
Card( Card(
color: Color(Config.boardBackgroundColor), color: cardColor,
margin: const EdgeInsets.symmetric(vertical: 10), margin: const EdgeInsets.symmetric(vertical: 10),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
@ -354,7 +357,7 @@ class _GameSettingsPageState extends State<GameSettingsPage> {
const SizedBox(height: 16), const SizedBox(height: 16),
Text(S.of(context).whoMovesFirst, style: headerStyle), Text(S.of(context).whoMovesFirst, style: headerStyle),
Card( Card(
color: Color(Config.boardBackgroundColor), color: cardColor,
margin: const EdgeInsets.symmetric(vertical: 10), margin: const EdgeInsets.symmetric(vertical: 10),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
@ -374,7 +377,7 @@ class _GameSettingsPageState extends State<GameSettingsPage> {
const SizedBox(height: 16), const SizedBox(height: 16),
Text(S.of(context).misc, style: headerStyle), Text(S.of(context).misc, style: headerStyle),
Card( Card(
color: Color(Config.boardBackgroundColor), color: cardColor,
margin: const EdgeInsets.symmetric(vertical: 10), margin: const EdgeInsets.symmetric(vertical: 10),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
@ -398,7 +401,7 @@ class _GameSettingsPageState extends State<GameSettingsPage> {
const SizedBox(height: 16), const SizedBox(height: 16),
Text(S.of(context).color, style: headerStyle), Text(S.of(context).color, style: headerStyle),
Card( Card(
color: Color(Config.boardBackgroundColor), color: cardColor,
margin: const EdgeInsets.symmetric(vertical: 10), margin: const EdgeInsets.symmetric(vertical: 10),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[

8
src/ui/flutter_app/lib/widgets/rule_settings_page.dart
View File

@ -178,10 +178,10 @@ class _RuleSettingsPageState extends State<RuleSettingsPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
//
final TextStyle headerStyle = final TextStyle headerStyle =
TextStyle(color: UIColors.secondaryColor, fontSize: 20.0); TextStyle(color: UIColors.crusoeColor, fontSize: 20.0);
final TextStyle itemStyle = TextStyle(color: UIColors.primaryColor); final TextStyle itemStyle = TextStyle(color: UIColors.crusoeColor);
final cardColor = UIColors.floralWhiteColor;
return Scaffold( return Scaffold(
backgroundColor: UIColors.lightBackgroundColor, backgroundColor: UIColors.lightBackgroundColor,
@ -195,7 +195,7 @@ class _RuleSettingsPageState extends State<RuleSettingsPage> {
const SizedBox(height: 16), const SizedBox(height: 16),
Text(S.of(context).rules, style: headerStyle), Text(S.of(context).rules, style: headerStyle),
Card( Card(
color: Color(Config.boardBackgroundColor), color: cardColor,
margin: const EdgeInsets.symmetric(vertical: 10), margin: const EdgeInsets.symmetric(vertical: 10),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[