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) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "317" 14 +def flutterVersionCode = "318"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '317' 16 + flutterVersionCode = '318'
17 } 17 }
18 18
19 -def flutterVersionName = "3.1.7" 19 +def flutterVersionName = "3.1.8"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '3.1.7' 21 + flutterVersionName = '3.1.8'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 2
3 class MyColours { 3 class MyColours {
4 - 4 + static const Color color_d7d7d7 = Color(0xffD7D7D7);
5 static const Color color_F4FAFF = Color(0xffF4FAFF); 5 static const Color color_F4FAFF = Color(0xffF4FAFF);
6 static const Color app_main = Color(0xFF24A4A8); 6 static const Color app_main = Color(0xFF24A4A8);
7 static const Color color_ffffff = Color(0xffffffff); 7 static const Color color_ffffff = Color(0xffffffff);
8 static const Color color_fefefe = Color(0xfffefefe); 8 static const Color color_fefefe = Color(0xfffefefe);
9 static const Color color_f5f5f5 = Color(0xfff5f5f5); 9 static const Color color_f5f5f5 = Color(0xfff5f5f5);
10 static const Color color_199095 = Color(0xff199095); 10 static const Color color_199095 = Color(0xff199095);
  11 + static const Color color_afbcc4 = Color(0xffAFBCC4);
11 static const Color color_999999 = Color(0xff999999); 12 static const Color color_999999 = Color(0xff999999);
12 static const Color color_353535 = Color(0xff353535); 13 static const Color color_353535 = Color(0xff353535);
13 static const Color color_d8d8d8 = Color(0xffD8D8D8); 14 static const Color color_d8d8d8 = Color(0xffD8D8D8);
@@ -121,7 +121,7 @@ class FTableItemState extends State<FTableItem> { @@ -121,7 +121,7 @@ class FTableItemState extends State<FTableItem> {
121 // margin: EdgeInsets.all(ScreenUtil().setWidth(9)), 121 // margin: EdgeInsets.all(ScreenUtil().setWidth(9)),
122 decoration: BoxDecoration( 122 decoration: BoxDecoration(
123 color: widget.need && signStr == '已预订' && !isSelf 123 color: widget.need && signStr == '已预订' && !isSelf
124 - ? Color.fromRGBO(154, 23, 45, 1) 124 + ? MyColours.color_afbcc4
125 : widget.canSelected && table.selected 125 : widget.canSelected && table.selected
126 ? MyColours.color_199095 126 ? MyColours.color_199095
127 : MyColours.color_ffffff, 127 : MyColours.color_ffffff,
@@ -152,13 +152,13 @@ class FTableItemState extends State<FTableItem> { @@ -152,13 +152,13 @@ class FTableItemState extends State<FTableItem> {
152 table.name, 152 table.name,
153 maxLines: 1, 153 maxLines: 1,
154 style: TextStyle( 154 style: TextStyle(
155 - color: (widget.need &&  
156 - signStr == '已预订' &&  
157 - !isSelf) ||  
158 - (widget.canSelected && table.selected)  
159 - ? MyColours.color_ffffff  
160 - : MyColours.color_333333,  
161 - fontSize: ScreenUtil().setSp(36), 155 + color:
  156 + (widget.need && signStr == '已预订' && !isSelf)
  157 + ? MyColours.color_333333
  158 + : (widget.canSelected && table.selected)
  159 + ? MyColours.color_ffffff
  160 + : MyColours.color_333333,
  161 + fontSize: ScreenUtil().setSp(34),
162 decoration: TextDecoration.none, 162 decoration: TextDecoration.none,
163 fontWeight: FontWeight.bold), 163 fontWeight: FontWeight.bold),
164 overflow: TextOverflow.ellipsis, 164 overflow: TextOverflow.ellipsis,
@@ -199,10 +199,11 @@ class FTableItemState extends State<FTableItem> { @@ -199,10 +199,11 @@ class FTableItemState extends State<FTableItem> {
199 : '') 199 : '')
200 : table.tableNum, 200 : table.tableNum,
201 style: TextStyle( 201 style: TextStyle(
202 - color: signStr == '已预订' && !isSelf ||  
203 - (widget.canSelected && table.selected)  
204 - ? MyColours.color_ffffff  
205 - : MyColours.color_353535, 202 + color: signStr == '已预订' && !isSelf
  203 + ? MyColours.color_353535
  204 + : (widget.canSelected && table.selected)
  205 + ? MyColours.color_ffffff
  206 + : MyColours.color_353535,
206 fontSize: ScreenUtil().setSp(22), 207 fontSize: ScreenUtil().setSp(22),
207 decoration: TextDecoration.none, 208 decoration: TextDecoration.none,
208 fontWeight: FontWeight.normal), 209 fontWeight: FontWeight.normal),
@@ -220,7 +221,7 @@ class FTableItemState extends State<FTableItem> { @@ -220,7 +221,7 @@ class FTableItemState extends State<FTableItem> {
220 ? '${table.nickName}订' 221 ? '${table.nickName}订'
221 : '', 222 : '',
222 style: TextStyle( 223 style: TextStyle(
223 - color: MyColours.color_ffffff, 224 + color: MyColours.color_353535,
224 fontSize: ScreenUtil().setSp(22), 225 fontSize: ScreenUtil().setSp(22),
225 decoration: TextDecoration.none, 226 decoration: TextDecoration.none,
226 fontWeight: FontWeight.normal), 227 fontWeight: FontWeight.normal),
@@ -237,12 +238,12 @@ class FTableItemState extends State<FTableItem> { @@ -237,12 +238,12 @@ class FTableItemState extends State<FTableItem> {
237 padding: EdgeInsets.symmetric( 238 padding: EdgeInsets.symmetric(
238 horizontal: ScreenUtil().setWidth(10)), 239 horizontal: ScreenUtil().setWidth(10)),
239 decoration: BoxDecoration( 240 decoration: BoxDecoration(
240 - color: Color.fromRGBO(232, 141, 164, 1), 241 + color: MyColours.color_d7d7d7,
241 ), 242 ),
242 child: Text( 243 child: Text(
243 '新客', 244 '新客',
244 style: TextStyle( 245 style: TextStyle(
245 - color: MyColours.color_ffffff, 246 + color: MyColours.color_353535,
246 fontSize: ScreenUtil().setSp(24), 247 fontSize: ScreenUtil().setSp(24),
247 decoration: TextDecoration.none, 248 decoration: TextDecoration.none,
248 fontWeight: FontWeight.normal), 249 fontWeight: FontWeight.normal),