xt / Flutter-ReserveApp · Commits

Go to a project

Commit e72e0e929c6713275822dd209135c2e91fe11799

Authored by wdn127929
1 parent e90c7662
build: skipped

已预订item颜色调整

Inline Side-by-side
Showing 3 changed files with 22 additions and 20 deletions
... ... @@ -11,14 +11,14 @@ if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}
def flutterVersionCode = "317"
def flutterVersionCode = "318"
if (flutterVersionCode == null) {
flutterVersionCode = '317'
flutterVersionCode = '318'
}
def flutterVersionName = "3.1.7"
def flutterVersionName = "3.1.8"
if (flutterVersionName == null) {
flutterVersionName = '3.1.7'
flutterVersionName = '3.1.8'
}
apply plugin: 'com.android.application'
... ...
import 'package:flutter/material.dart';
class MyColours {
static const Color color_d7d7d7 = Color(0xffD7D7D7);
static const Color color_F4FAFF = Color(0xffF4FAFF);
static const Color app_main = Color(0xFF24A4A8);
static const Color color_ffffff = Color(0xffffffff);
static const Color color_fefefe = Color(0xfffefefe);
static const Color color_f5f5f5 = Color(0xfff5f5f5);
static const Color color_199095 = Color(0xff199095);
static const Color color_afbcc4 = Color(0xffAFBCC4);
static const Color color_999999 = Color(0xff999999);
static const Color color_353535 = Color(0xff353535);
static const Color color_d8d8d8 = Color(0xffD8D8D8);
... ...
... ... @@ -121,7 +121,7 @@ class FTableItemState extends State<FTableItem> {
// margin: EdgeInsets.all(ScreenUtil().setWidth(9)),
decoration: BoxDecoration(
color: widget.need && signStr == '已预订' && !isSelf
? Color.fromRGBO(154, 23, 45, 1)
? MyColours.color_afbcc4
: widget.canSelected && table.selected
? MyColours.color_199095
: MyColours.color_ffffff,
... ... @@ -152,13 +152,13 @@ class FTableItemState extends State<FTableItem> {
table.name,
maxLines: 1,
style: TextStyle(
color: (widget.need &&
signStr == '已预订' &&
!isSelf) ||
(widget.canSelected && table.selected)
? MyColours.color_ffffff
: MyColours.color_333333,
fontSize: ScreenUtil().setSp(36),
color:
(widget.need && signStr == '已预订' && !isSelf)
? MyColours.color_333333
: (widget.canSelected && table.selected)
? MyColours.color_ffffff
: MyColours.color_333333,
fontSize: ScreenUtil().setSp(34),
decoration: TextDecoration.none,
fontWeight: FontWeight.bold),
overflow: TextOverflow.ellipsis,
... ... @@ -199,10 +199,11 @@ class FTableItemState extends State<FTableItem> {
: '')
: table.tableNum,
style: TextStyle(
color: signStr == '已预订' && !isSelf ||
(widget.canSelected && table.selected)
? MyColours.color_ffffff
: MyColours.color_353535,
color: signStr == '已预订' && !isSelf
? MyColours.color_353535
: (widget.canSelected && table.selected)
? MyColours.color_ffffff
: MyColours.color_353535,
fontSize: ScreenUtil().setSp(22),
decoration: TextDecoration.none,
fontWeight: FontWeight.normal),
... ... @@ -220,7 +221,7 @@ class FTableItemState extends State<FTableItem> {
? '${table.nickName}订'
: '',
style: TextStyle(
color: MyColours.color_ffffff,
color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(22),
decoration: TextDecoration.none,
fontWeight: FontWeight.normal),
... ... @@ -237,12 +238,12 @@ class FTableItemState extends State<FTableItem> {
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(10)),
decoration: BoxDecoration(
color: Color.fromRGBO(232, 141, 164, 1),
color: MyColours.color_d7d7d7,
),
child: Text(
'新客',
style: TextStyle(
color: MyColours.color_ffffff,
color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(24),
decoration: TextDecoration.none,
fontWeight: FontWeight.normal),
... ...