Skip to content

F
feelver
Commit 9125eb7e by Mobile : Ball (Apprentice)
Options

update

parent 2bec8595
Showing with 512 additions and 563 deletions
lib/ui/favorite/favorite.dart
...@@ -25,7 +25,7 @@ class _FavoriteState extends State<Favorite> { ...@@ -25,7 +25,7 @@ class _FavoriteState extends State<Favorite> {
children: <Widget>[ children: <Widget>[
Container( Container(
child: Padding( child: Padding(
padding: const EdgeInsets.only(top: 40), padding: const EdgeInsets.only(top: 20),
child: RaisedButton( child: RaisedButton(
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
...@@ -78,7 +78,7 @@ class _FavoriteState extends State<Favorite> { ...@@ -78,7 +78,7 @@ class _FavoriteState extends State<Favorite> {
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
left: 10, left: 10,
right: 10, right: 10,
top: 8, top: 16,
bottom: 8, bottom: 8,
), ),
child: Container( child: Container(
...@@ -92,6 +92,10 @@ class _FavoriteState extends State<Favorite> { ...@@ -92,6 +92,10 @@ class _FavoriteState extends State<Favorite> {
height: 40, height: 40,
), ),
list2(), list2(),
Divider(
color: Colors.black,
height: 40,
),
], ],
), ),
), ),
...@@ -102,7 +106,8 @@ class _FavoriteState extends State<Favorite> { ...@@ -102,7 +106,8 @@ class _FavoriteState extends State<Favorite> {
Widget list1() { Widget list1() {
return Container( return Container(
color: Colors.red, // color: Colors.red,
height: SizeConfig.getHeight(150),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
...@@ -116,11 +121,16 @@ class _FavoriteState extends State<Favorite> { ...@@ -116,11 +121,16 @@ class _FavoriteState extends State<Favorite> {
), ),
), ),
Expanded( Expanded(
child: Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(10),
right: SizeConfig.getPadding(5),
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Container( Container(
color: Colors.blue, // color: Colors.blue,
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
...@@ -141,11 +151,14 @@ class _FavoriteState extends State<Favorite> { ...@@ -141,11 +151,14 @@ class _FavoriteState extends State<Favorite> {
), ),
), ),
Container( Container(
color: Colors.white, // color: Colors.white,
child: Text('นวดเเผนไทย'), child: Text('นวดเเผนไทย'),
), ),
SizedBox(
height: SizeConfig.getHeight(5),
),
Container( Container(
color: Colors.yellow, // color: Colors.yellow,
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
...@@ -174,8 +187,11 @@ class _FavoriteState extends State<Favorite> { ...@@ -174,8 +187,11 @@ class _FavoriteState extends State<Favorite> {
], ],
), ),
), ),
SizedBox(
height: SizeConfig.getHeight(5),
),
Container( Container(
color: Colors.orangeAccent, // color: Colors.orangeAccent,
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
...@@ -186,15 +202,14 @@ class _FavoriteState extends State<Favorite> { ...@@ -186,15 +202,14 @@ class _FavoriteState extends State<Favorite> {
padding: EdgeInsets.only(right: 0), padding: EdgeInsets.only(right: 0),
onPressed: () { onPressed: () {
setState(() { setState(() {
b = b - 1; a = a - 1;
}); });
}, },
), ),
), ),
Padding( Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(right: 8, left: 8),
right: 8, left: 8), child: Text('$a'),
child: Text('$b'),
), ),
SizedBox( SizedBox(
width: SizeConfig.getPadding(20), width: SizeConfig.getPadding(20),
...@@ -204,7 +219,7 @@ class _FavoriteState extends State<Favorite> { ...@@ -204,7 +219,7 @@ class _FavoriteState extends State<Favorite> {
padding: EdgeInsets.only(right: 0), padding: EdgeInsets.only(right: 0),
onPressed: () { onPressed: () {
setState(() { setState(() {
b = b + 1; a = a + 1;
}); });
}, },
), ),
...@@ -225,6 +240,7 @@ class _FavoriteState extends State<Favorite> { ...@@ -225,6 +240,7 @@ class _FavoriteState extends State<Favorite> {
], ],
), ),
), ),
),
], ],
), ),
); );
...@@ -232,35 +248,37 @@ class _FavoriteState extends State<Favorite> { ...@@ -232,35 +248,37 @@ class _FavoriteState extends State<Favorite> {
Widget list2() { Widget list2() {
return Container( return Container(
child: Column( // color: Colors.red,
children: <Widget>[ height: SizeConfig.getHeight(150),
Row( child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Image.asset(
'assets/images/no-image.png',
height: SizeConfig.getHeight(80),
width: SizeConfig.getWidth(80),
),
Padding( Padding(
padding: const EdgeInsets.only(left: 8), padding: const EdgeInsets.only(left: 10),
child: Image.asset(
'assets/images/demo_img.png',
width: SizeConfig.getWidth(110),
height: SizeConfig.getHeight(150),
fit: BoxFit.fitWidth,
),
),
Expanded(
child: Container( child: Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(10),
right: SizeConfig.getPadding(5),
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( Container(
// color: Colors.blue,
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'Sunshine Spa & Massage', 'Ivory Relax and Spa',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
color: Colors.black,
),
),
SizedBox(
width: SizeConfig.getWidth(20),
), ),
Spacer(),
Checkbox( Checkbox(
checkColor: Color(0xFFEEAFB7), checkColor: Color(0xFFEEAFB7),
activeColor: Colors.white, activeColor: Colors.white,
...@@ -273,35 +291,28 @@ class _FavoriteState extends State<Favorite> { ...@@ -273,35 +291,28 @@ class _FavoriteState extends State<Favorite> {
}), }),
], ],
), ),
Text(
'นวดแผนไทย',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
color: Colors.black,
), ),
Container(
// color: Colors.white,
child: Text('นวดเเผนไทย'),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(10), height: SizeConfig.getHeight(5),
), ),
Row( Container(
children: <Widget>[ // color: Colors.yellow,
Row( child: Row(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/clock.png', 'assets/images/clock.png',
height: 20, height: 20,
width: 20, width: 20,
), ),
Text(
' 90 นาที',
style: TextStyle(
fontFamily: "SF_Pro_Text",
),
),
SizedBox( SizedBox(
width: SizeConfig.getWidth(95), width: SizeConfig.getWidth(5),
), ),
Text('90 นาที'),
Spacer(),
Icon( Icon(
Icons.local_offer, Icons.local_offer,
color: Color(0xFFEEAFB7), color: Color(0xFFEEAFB7),
...@@ -317,14 +328,12 @@ class _FavoriteState extends State<Favorite> { ...@@ -317,14 +328,12 @@ class _FavoriteState extends State<Favorite> {
), ),
], ],
), ),
],
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(10), height: SizeConfig.getHeight(5),
), ),
Row(
children: <Widget>[
Container( Container(
// color: Colors.orangeAccent,
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
...@@ -341,8 +350,7 @@ class _FavoriteState extends State<Favorite> { ...@@ -341,8 +350,7 @@ class _FavoriteState extends State<Favorite> {
), ),
), ),
Padding( Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(right: 8, left: 8),
right: 8, left: 8),
child: Text('$b'), child: Text('$b'),
), ),
SizedBox( SizedBox(
...@@ -358,12 +366,7 @@ class _FavoriteState extends State<Favorite> { ...@@ -358,12 +366,7 @@ class _FavoriteState extends State<Favorite> {
}, },
), ),
), ),
], Spacer(),
),
),
SizedBox(
width: SizeConfig.getWidth(85),
),
Text( Text(
'฿1,200.00', '฿1,200.00',
style: TextStyle( style: TextStyle(
...@@ -375,17 +378,10 @@ class _FavoriteState extends State<Favorite> { ...@@ -375,17 +378,10 @@ class _FavoriteState extends State<Favorite> {
), ),
], ],
), ),
],
),
),
), ),
], ],
), ),
Divider( ),
color: Colors.black,
height: 40,
indent: 8,
endIndent: 20,
), ),
], ],
), ),
...@@ -472,159 +468,3 @@ class _FavoriteState extends State<Favorite> { ...@@ -472,159 +468,3 @@ class _FavoriteState extends State<Favorite> {
); );
} }
} }
//Row(
//crossAxisAlignment: CrossAxisAlignment.start,
//children: <Widget>[
//Image.asset(
//'assets/images/demo_img.png',
//height: SizeConfig.getHeight(160),
//width: SizeConfig.getWidth(100),
//fit: BoxFit.cover,
//),
//Container(
//color: Colors.yellow,
//padding: EdgeInsets.only(
//left: SizeConfig.getPadding(7),
//right: SizeConfig.getPadding(10)
//),
//child: Column(
//children: <Widget>[
//Container(
//color: Colors.blue,
//child: Row(
//children: <Widget>[
//Text(
//'Ivory Relax and Spa',
//style: TextStyle(
//fontSize: SizeConfig.getFontSize(16),
//fontFamily: "SF_Pro_Text",
//fontWeight: FontWeight.bold,
//color: Colors.black,
//),
//),
//
//Checkbox(
//checkColor: Color(0xFFEEAFB7),
//activeColor: Colors.white,
//value: checkBoxValue,
//onChanged: (bool value) {
//setState(() {
//print(value);
//checkBoxValue = value;
//});
//}),
//],
//),
//),
//Text(
//'นวดแผนไทย',
//style: TextStyle(
//fontSize: SizeConfig.getFontSize(16),
//fontFamily: "SF_Pro_Text",
//color: Colors.black,
//),
//),
//SizedBox(
//height: SizeConfig.getHeight(10),
//),
//Row(
//children: <Widget>[
//Row(
//children: <Widget>[
//Image.asset(
//'assets/images/clock.png',
//height: SizeConfig.getHeight(20),
//width: SizeConfig.getWidth(20),
//),
//Text(
//' 90 นาที',
//style: TextStyle(
//fontFamily: "SF_Pro_Text",
//),
//),
//
//Icon(
//Icons.local_offer,
//color: Color(0xFFEEAFB7),
//),
//Text(
//'฿1,599.00',
//style: TextStyle(
//decoration: TextDecoration.lineThrough,
//fontSize: SizeConfig.getFontSize(16),
//fontFamily: "SF_Pro_Text",
//color: Color(0xFFEEAFB7),
//),
//),
//],
//),
//],
//),
//SizedBox(
//height: SizeConfig.getHeight(10),
//),
//Row(
//children: <Widget>[
//Container(
//child: Padding(
//padding: const EdgeInsets.only(left: 10),
//child: Row(
//children: <Widget>[
//SizedBox(
//width: SizeConfig.getPadding(20),
//height: SizeConfig.getPadding(20),
//child: RaisedButton(
//child: Text('-'),
//padding: EdgeInsets.only(right: 0),
//onPressed: () {
//setState(() {
//a = a - 1;
//});
//},
//),
//),
//Padding(
//padding:
//const EdgeInsets.only(right: 8, left: 8),
//child: Text(
//'$a',
//style: TextStyle(
//fontSize: SizeConfig.getFontSize(12),
//),
//),
//),
//SizedBox(
//width: SizeConfig.getPadding(20),
//height: SizeConfig.getPadding(20),
//child: RaisedButton(
//child: Text('+'),
//padding: EdgeInsets.only(right: 0),
//onPressed: () {
//setState(() {
//a = a + 1;
//});
//},
//),
//),
//],
//),
//),
//),
//
//Text(
//'฿1,200.00',
//style: TextStyle(
//fontSize: SizeConfig.getFontSize(20),
//color: Color(0xFFFD2956),
//fontFamily: "SF_Pro_Text",
//fontWeight: FontWeight.bold,
//),
//),
//],
//),
//],
//),
//),
//],
//),
lib/ui/payment/mycart.dart
...@@ -24,7 +24,10 @@ class _MyCartState extends State<MyCart> { ...@@ -24,7 +24,10 @@ class _MyCartState extends State<MyCart> {
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
margin: EdgeInsets.only(left: SizeConfig.getPadding(15), top: 17), margin: EdgeInsets.only(
left: SizeConfig.getPadding(15),
top: SizeConfig.getPadding(17),
),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Icon( Icon(
...@@ -42,8 +45,8 @@ class _MyCartState extends State<MyCart> { ...@@ -42,8 +45,8 @@ class _MyCartState extends State<MyCart> {
), ),
), ),
Container( Container(
height: 40, height: SizeConfig.getHeight(40),
width: 200, width: SizeConfig.getWidth(200),
color: Colors.white, color: Colors.white,
child: TextField( child: TextField(
decoration: InputDecoration( decoration: InputDecoration(
...@@ -57,23 +60,23 @@ class _MyCartState extends State<MyCart> { ...@@ -57,23 +60,23 @@ class _MyCartState extends State<MyCart> {
color: Colors.white, color: Colors.white,
size: 40, size: 40,
), ),
alignment: Alignment(0, 0),
onPressed: () {}), onPressed: () {}),
], ],
), ),
), ),
Divider( Divider(
color: Colors.white, color: Colors.white,
height: 35, height: SizeConfig.getHeight(35),
indent: 20, indent: 20,
endIndent: 20, endIndent: 20,
), ),
Container( Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(10),
right: SizeConfig.getPadding(15),
),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
SizedBox(
width: SizeConfig.getWidth(12),
),
Checkbox( Checkbox(
checkColor: Color(0xFFEEAFB7), checkColor: Color(0xFFEEAFB7),
activeColor: Colors.white, activeColor: Colors.white,
...@@ -88,38 +91,35 @@ class _MyCartState extends State<MyCart> { ...@@ -88,38 +91,35 @@ class _MyCartState extends State<MyCart> {
'เลือกทั้งหมด', 'เลือกทั้งหมด',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 16, fontSize: SizeConfig.getFontSize(16),
), ),
), ),
Spacer(),
Container( Container(
child: Padding(
padding: const EdgeInsets.only(left: 25),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Text( Text(
'รวมทั้งหมด', 'รวมทั้งหมด',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 16, fontSize: SizeConfig.getFontSize(16),
), ),
), ),
Text( Text(
'฿2,000', '฿2,000',
style: TextStyle( style: TextStyle(
color: Color(0xFFEEAFB7), color: Color(0xFFEEAFB7),
fontSize: 24, fontSize: SizeConfig.getFontSize(24),
), ),
), ),
], ],
), ),
), ),
), Spacer(),
Container( Container(
child: Padding(
padding: const EdgeInsets.only(left: 25),
child: RaisedButton( child: RaisedButton(
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(30.0),
), ),
onPressed: () { onPressed: () {
Navigator.push( Navigator.push(
...@@ -130,22 +130,21 @@ class _MyCartState extends State<MyCart> { ...@@ -130,22 +130,21 @@ class _MyCartState extends State<MyCart> {
); );
}, },
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 35, left: SizeConfig.getPadding(35),
right: 35, right: SizeConfig.getPadding(35),
top: 15, top: SizeConfig.getPadding(15),
bottom: 15, bottom: SizeConfig.getPadding(15),
), ),
color: Color(0xFFEEAFB7), color: Color(0xFFEEAFB7),
child: Text( child: Text(
'สั่งซื้อ', 'สั่งซื้อ',
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: SizeConfig.getPadding(16),
color: Colors.white, color: Colors.white,
), ),
), ),
), ),
), ),
),
], ],
), ),
), ),
...@@ -164,23 +163,20 @@ class _MyCartState extends State<MyCart> { ...@@ -164,23 +163,20 @@ class _MyCartState extends State<MyCart> {
); );
} }
Widget containt() { Widget containt() {
return Expanded( return Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Padding( padding: EdgeInsets.only(
padding: const EdgeInsets.only( left: SizeConfig.getPadding(10),
left: 10, right: SizeConfig.getPadding(10),
right: 10, top: SizeConfig.getPadding(8),
top: 8, bottom: SizeConfig.getPadding(8),
bottom: 8,
), ),
child: Container( child: Container(
alignment: FractionalOffset.topLeft, alignment: FractionalOffset.topLeft,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: SizeConfig.getHeight(15), height: SizeConfig.getHeight(15),
), ),
...@@ -188,85 +184,96 @@ class _MyCartState extends State<MyCart> { ...@@ -188,85 +184,96 @@ class _MyCartState extends State<MyCart> {
list2(), list2(),
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 40, height: SizeConfig.getHeight(40),
indent: 8,
endIndent: 20,
), ),
// list3(), // list3(),
], ],
), ),
), ),
), ),
),
); );
} }
Widget list1() { Widget list1() {
return Card(child: Container( return Card(
child: Column( elevation: 5,
children: <Widget>[ child: Container(
Row( padding: EdgeInsets.only(
left: SizeConfig.getPadding(12),
top: SizeConfig.getPadding(8),
right: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(8),
),
// color: Colors.red,
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/no-image.png', 'assets/images/demo_img.png',
height: SizeConfig.getHeight(80), width: SizeConfig.getWidth(110),
width: SizeConfig.getWidth(80), height: SizeConfig.getHeight(150),
fit: BoxFit.fitWidth,
), ),
Padding( Expanded(
padding: const EdgeInsets.only(left: 8),
child: Container( child: Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(10),
right: SizeConfig.getPadding(5),
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( Container(
// color: Colors.blue,
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'Ivory Relax and Spa', 'Ivory Relax and Spa',
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold,
fontSize: SizeConfig.getFontSize(16),
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(60), IconButton(
), icon: Icon(Icons.delete),
Icon(
Icons.delete,
color: Colors.black, color: Colors.black,
onPressed: () {
print('delete');
},
), ),
], ],
), ),
Text( ),
'นวดแผนไทย', Container(
// color: Colors.white,
child: Text(
'นวดเเผนไทย',
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold,
fontSize: SizeConfig.getFontSize(16),
),
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(10), height: SizeConfig.getHeight(5),
), ),
Row( Container(
children: <Widget>[ // color: Colors.yellow,
Row( child: Row(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/clock.png', 'assets/images/clock.png',
height: SizeConfig.getHeight(20), height: SizeConfig.getHeight(20),
width: SizeConfig.getWidth(20), width: SizeConfig.getWidth(20),
), ),
Text(
' 90 นาที',
style: TextStyle(
fontFamily: "SF_Pro_Text",
),
),
SizedBox( SizedBox(
width: SizeConfig.getWidth(90), width: SizeConfig.getWidth(5),
), ),
Text('90 นาที'),
Spacer(),
Icon( Icon(
Icons.local_offer, Icons.local_offer,
color: Color(0xFFEEAFB7), color: Color(0xFFEEAFB7),
...@@ -282,16 +289,12 @@ class _MyCartState extends State<MyCart> { ...@@ -282,16 +289,12 @@ class _MyCartState extends State<MyCart> {
), ),
], ],
), ),
],
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(10), height: SizeConfig.getHeight(5),
), ),
Row(
children: <Widget>[
Container( Container(
child: Padding( // color: Colors.orangeAccent,
padding: const EdgeInsets.only(left: 10),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
...@@ -299,7 +302,9 @@ class _MyCartState extends State<MyCart> { ...@@ -299,7 +302,9 @@ class _MyCartState extends State<MyCart> {
height: SizeConfig.getPadding(20), height: SizeConfig.getPadding(20),
child: RaisedButton( child: RaisedButton(
child: Text('-'), child: Text('-'),
padding: EdgeInsets.only(right: 0), padding: EdgeInsets.only(
right: SizeConfig.getPadding(0),
),
onPressed: () { onPressed: () {
setState(() { setState(() {
a = a - 1; a = a - 1;
...@@ -308,21 +313,17 @@ class _MyCartState extends State<MyCart> { ...@@ -308,21 +313,17 @@ class _MyCartState extends State<MyCart> {
), ),
), ),
Padding( Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(right: 8, left: 8),
right: 8, left: 8), child: Text('$a'),
child: Text(
'$a',
style: TextStyle(
fontSize: SizeConfig.getFontSize(12),
),
),
), ),
SizedBox( SizedBox(
width: SizeConfig.getPadding(20), width: SizeConfig.getPadding(20),
height: SizeConfig.getPadding(20), height: SizeConfig.getPadding(20),
child: RaisedButton( child: RaisedButton(
child: Text('+'), child: Text('+'),
padding: EdgeInsets.only(right: 0), padding: EdgeInsets.only(
right: SizeConfig.getPadding(0),
),
onPressed: () { onPressed: () {
setState(() { setState(() {
a = a + 1; a = a + 1;
...@@ -330,13 +331,7 @@ class _MyCartState extends State<MyCart> { ...@@ -330,13 +331,7 @@ class _MyCartState extends State<MyCart> {
}, },
), ),
), ),
], Spacer(),
),
),
),
SizedBox(
width: SizeConfig.getWidth(80),
),
Text( Text(
'฿1,200.00', '฿1,200.00',
style: TextStyle( style: TextStyle(
...@@ -348,8 +343,6 @@ class _MyCartState extends State<MyCart> { ...@@ -348,8 +343,6 @@ class _MyCartState extends State<MyCart> {
), ),
], ],
), ),
SizedBox(
height: SizeConfig.getHeight(15),
), ),
], ],
), ),
...@@ -357,77 +350,89 @@ class _MyCartState extends State<MyCart> { ...@@ -357,77 +350,89 @@ class _MyCartState extends State<MyCart> {
), ),
], ],
), ),
],
), ),
),); );
} }
Widget list2() { Widget list2() {
return Card(child: Container( return Card(
child: Column( child: Container(
children: <Widget>[ // color: Colors.red,
Row( padding: EdgeInsets.only(
left: SizeConfig.getPadding(12),
top: SizeConfig.getPadding(8),
right: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(8),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/no-image.png', 'assets/images/demo_img.png',
height: SizeConfig.getHeight(80), width: SizeConfig.getWidth(110),
width: SizeConfig.getWidth(80), height: SizeConfig.getHeight(150),
fit: BoxFit.fitWidth,
), ),
Padding( Expanded(
padding: const EdgeInsets.only(left: 8),
child: Container( child: Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(10),
right: SizeConfig.getPadding(5),
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( Container(
// color: Colors.blue,
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'Ivory Relax and Spa', 'Ivory Relax and Spa',
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold,
fontSize: SizeConfig.getFontSize(16),
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(60), IconButton(
), icon: Icon(Icons.delete),
Icon(
Icons.delete,
color: Colors.black, color: Colors.black,
onPressed: () {
print('delete');
},
), ),
], ],
), ),
Text( ),
'นวดแผนไทย', Container(
// color: Colors.white,
child: Text(
'นวดเเผนไทย',
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold,
fontSize: SizeConfig.getFontSize(16),
),
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(10), height: SizeConfig.getHeight(5),
), ),
Row( Container(
children: <Widget>[ // color: Colors.yellow,
Row( child: Row(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/clock.png', 'assets/images/clock.png',
height: SizeConfig.getHeight(20), height: SizeConfig.getHeight(20),
width: SizeConfig.getWidth(20), width: SizeConfig.getWidth(20),
), ),
Text(
' 90 นาที',
style: TextStyle(
fontFamily: "SF_Pro_Text",
),
),
SizedBox( SizedBox(
width: SizeConfig.getWidth(90), width: SizeConfig.getWidth(5),
), ),
Text('90 นาที'),
Spacer(),
Icon( Icon(
Icons.local_offer, Icons.local_offer,
color: Color(0xFFEEAFB7), color: Color(0xFFEEAFB7),
...@@ -443,16 +448,12 @@ class _MyCartState extends State<MyCart> { ...@@ -443,16 +448,12 @@ class _MyCartState extends State<MyCart> {
), ),
], ],
), ),
],
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(10), height: SizeConfig.getHeight(5),
), ),
Row(
children: <Widget>[
Container( Container(
child: Padding( // color: Colors.orangeAccent,
padding: const EdgeInsets.only(left: 10),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
...@@ -460,46 +461,34 @@ class _MyCartState extends State<MyCart> { ...@@ -460,46 +461,34 @@ class _MyCartState extends State<MyCart> {
height: SizeConfig.getPadding(20), height: SizeConfig.getPadding(20),
child: RaisedButton( child: RaisedButton(
child: Text('-'), child: Text('-'),
padding: EdgeInsets.only(right: 0), padding: EdgeInsets.only(right: SizeConfig.getPadding(0),),
onPressed: () { onPressed: () {
setState(() { setState(() {
b = b - 1; a = a - 1;
}); });
}, },
), ),
), ),
Padding( Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(right: 8, left: 8),
right: 8, left: 8), child: Text('$a'),
child: Text(
'$b',
style: TextStyle(
fontSize: SizeConfig.getFontSize(12),
),
),
), ),
SizedBox( SizedBox(
width: SizeConfig.getPadding(20), width: SizeConfig.getPadding(20),
height: SizeConfig.getPadding(20), height: SizeConfig.getPadding(20),
child: RaisedButton( child: RaisedButton(
child: Text('+'), child: Text('+'),
padding: EdgeInsets.only(right: 0), padding: EdgeInsets.only(right: SizeConfig.getPadding(0),),
onPressed: () { onPressed: () {
setState(() { setState(() {
b = b + 1; a = a + 1;
}); });
}, },
), ),
), ),
], Spacer(),
),
),
),
SizedBox(
width: SizeConfig.getWidth(80),
),
Text( Text(
'฿1,000.00', '฿1,200.00',
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(20), fontSize: SizeConfig.getFontSize(20),
color: Color(0xFFFD2956), color: Color(0xFFFD2956),
...@@ -509,8 +498,6 @@ class _MyCartState extends State<MyCart> { ...@@ -509,8 +498,6 @@ class _MyCartState extends State<MyCart> {
), ),
], ],
), ),
SizedBox(
height: SizeConfig.getHeight(15),
), ),
], ],
), ),
...@@ -518,13 +505,10 @@ class _MyCartState extends State<MyCart> { ...@@ -518,13 +505,10 @@ class _MyCartState extends State<MyCart> {
), ),
], ],
), ),
],
), ),
),); );
} }
Widget header() { Widget header() {
return Container( return Container(
child: Stack( child: Stack(
......
lib/ui/payment/payment_detail.dart
...@@ -28,12 +28,11 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -28,12 +28,11 @@ class _PaymentdetailState extends State<Paymentdetail> {
Widget containt() { Widget containt() {
return Expanded( return Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Padding( padding: EdgeInsets.only(
padding: const EdgeInsets.only( left: SizeConfig.getPadding(10),
left: 10, right: SizeConfig.getPadding(10),
right: 10, top: SizeConfig.getPadding(8),
top: 8, bottom: SizeConfig.getPadding(8),
bottom: 8,
), ),
child: Container( child: Container(
alignment: FractionalOffset.topLeft, alignment: FractionalOffset.topLeft,
...@@ -55,8 +54,6 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -55,8 +54,6 @@ class _PaymentdetailState extends State<Paymentdetail> {
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 40, height: 40,
indent: 10,
endIndent: 20,
), ),
list1(), list1(),
list2(), list2(),
...@@ -64,7 +61,6 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -64,7 +61,6 @@ class _PaymentdetailState extends State<Paymentdetail> {
), ),
), ),
), ),
),
); );
} }
...@@ -82,9 +78,7 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -82,9 +78,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(60),
),
Text( Text(
'23.02.2020 08:57', '23.02.2020 08:57',
style: TextStyle( style: TextStyle(
...@@ -100,14 +94,15 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -100,14 +94,15 @@ class _PaymentdetailState extends State<Paymentdetail> {
Row( Row(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/no-image.png', 'assets/images/demo_img.png',
height: SizeConfig.getPadding(80), height: SizeConfig.getPadding(90),
width: SizeConfig.getPadding(80), width: SizeConfig.getPadding(80),
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
Padding( Expanded(
padding: const EdgeInsets.only(left: 8),
child: Container( child: Container(
// color: Colors.green,
padding: EdgeInsets.only(left: SizeConfig.getPadding(8),),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
...@@ -145,9 +140,7 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -145,9 +140,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(120),
),
Text( Text(
'X1', 'X1',
style: TextStyle( style: TextStyle(
...@@ -160,14 +153,12 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -160,14 +153,12 @@ class _PaymentdetailState extends State<Paymentdetail> {
], ],
), ),
), ),
) ),
], ],
), ),
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 40, height: 40,
indent: 10,
endIndent: 20,
), ),
], ],
), ),
...@@ -188,9 +179,7 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -188,9 +179,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(60),
),
Text( Text(
'23.02.2020 08:57', '23.02.2020 08:57',
style: TextStyle( style: TextStyle(
...@@ -206,14 +195,15 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -206,14 +195,15 @@ class _PaymentdetailState extends State<Paymentdetail> {
Row( Row(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/no-image.png', 'assets/images/demo_img.png',
height: SizeConfig.getPadding(80), height: SizeConfig.getPadding(90),
width: SizeConfig.getPadding(80), width: SizeConfig.getPadding(80),
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
Padding( Expanded(
padding: const EdgeInsets.only(left: 8),
child: Container( child: Container(
// color: Colors.green,
padding: EdgeInsets.only(left: SizeConfig.getPadding(8),),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
...@@ -251,9 +241,7 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -251,9 +241,7 @@ class _PaymentdetailState extends State<Paymentdetail> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(120),
),
Text( Text(
'X1', 'X1',
style: TextStyle( style: TextStyle(
...@@ -266,20 +254,19 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -266,20 +254,19 @@ class _PaymentdetailState extends State<Paymentdetail> {
], ],
), ),
), ),
) ),
], ],
), ),
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 40, height: 40,
indent: 10,
endIndent: 20,
), ),
], ],
), ),
); );
} }
Widget header() { Widget header() {
return Container( return Container(
child: Stack( child: Stack(
......
lib/ui/payment/payment_page.dart
...@@ -22,7 +22,10 @@ class _PaymentState extends State<Payment> { ...@@ -22,7 +22,10 @@ class _PaymentState extends State<Payment> {
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
margin: EdgeInsets.only(left: SizeConfig.getPadding(15), top: 17), margin: EdgeInsets.only(
left: SizeConfig.getPadding(15),
top: SizeConfig.getPadding(17),
),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Icon( Icon(
...@@ -40,8 +43,8 @@ class _PaymentState extends State<Payment> { ...@@ -40,8 +43,8 @@ class _PaymentState extends State<Payment> {
), ),
), ),
Container( Container(
height: 40, height: SizeConfig.getHeight(40),
width: 200, width: SizeConfig.getWidth(200),
color: Colors.white, color: Colors.white,
child: TextField( child: TextField(
decoration: InputDecoration( decoration: InputDecoration(
...@@ -55,52 +58,49 @@ class _PaymentState extends State<Payment> { ...@@ -55,52 +58,49 @@ class _PaymentState extends State<Payment> {
color: Colors.white, color: Colors.white,
size: 40, size: 40,
), ),
alignment: Alignment(0, 0),
onPressed: () {}), onPressed: () {}),
], ],
), ),
), ),
Divider( Divider(
color: Colors.white, color: Colors.white,
height: 35, height: SizeConfig.getHeight(35),
indent: 20, indent: 20,
endIndent: 20, endIndent: 20,
), ),
Container( Container(
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
SizedBox( Spacer(),
width: SizeConfig.getWidth(75),
),
Container( Container(
child: Padding(
padding: const EdgeInsets.only(left: 50),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
'ยอดชำระเงินทั้งหมด', 'ยอดชำระเงินทั้งหมด',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 16, fontSize: SizeConfig.getFontSize(14),
), ),
), ),
Text( Text(
'฿2,000', '฿2,000',
style: TextStyle( style: TextStyle(
color: Color(0xFFEEAFB7), color: Color(0xFFEEAFB7),
fontSize: 24, fontSize: SizeConfig.getFontSize(24),
), ),
), ),
], ],
), ),
), ),
),
Container( Container(
child: Padding( padding: EdgeInsets.only(
padding: const EdgeInsets.only(left: 25), right: SizeConfig.getPadding(10),
left: SizeConfig.getPadding(12),
),
child: RaisedButton( child: RaisedButton(
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(30.0),
), ),
onPressed: () { onPressed: () {
Navigator.push( Navigator.push(
...@@ -111,22 +111,21 @@ class _PaymentState extends State<Payment> { ...@@ -111,22 +111,21 @@ class _PaymentState extends State<Payment> {
); );
}, },
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 35, left: SizeConfig.getPadding(35),
right: 35, right: SizeConfig.getPadding(35),
top: 15, top: SizeConfig.getPadding(15),
bottom: 15, bottom: SizeConfig.getPadding(15),
), ),
color: Color(0xFFEEAFB7), color: Color(0xFFEEAFB7),
child: Text( child: Text(
'ยืนยัน', 'ยืนยัน',
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: SizeConfig.getFontSize(16),
color: Colors.white, color: Colors.white,
), ),
), ),
), ),
), ),
),
], ],
), ),
), ),
...@@ -148,14 +147,14 @@ class _PaymentState extends State<Payment> { ...@@ -148,14 +147,14 @@ class _PaymentState extends State<Payment> {
Widget containt() { Widget containt() {
return Expanded( return Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Padding( padding: EdgeInsets.only(
padding: const EdgeInsets.only( left: SizeConfig.getPadding(10),
left: 10, right: SizeConfig.getPadding(10),
right: 10, top: SizeConfig.getPadding(8),
top: 8, bottom: SizeConfig.getPadding(8),
bottom: 8,
), ),
child: Container( child: Container(
// color: Colors.yellow,
alignment: FractionalOffset.topLeft, alignment: FractionalOffset.topLeft,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
...@@ -167,45 +166,44 @@ class _PaymentState extends State<Payment> { ...@@ -167,45 +166,44 @@ class _PaymentState extends State<Payment> {
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(15), height: SizeConfig.getHeight(20),
), ),
list1(), list1(),
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 40, height: SizeConfig.getHeight(40),
indent: 8,
endIndent: 20,
), ),
list2(), list2(),
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 40, height: SizeConfig.getHeight(40),
indent: 8,
endIndent: 20,
), ),
list3(), payment(),
], ],
), ),
), ),
), ),
),
); );
} }
Widget list1() { Widget list1() {
return Container( return Container(
// color: Colors.red,
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/no-image.png', 'assets/images/demo_img.png',
height: SizeConfig.getPadding(80), height: SizeConfig.getPadding(90),
width: SizeConfig.getPadding(80), width: SizeConfig.getPadding(80),
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
Padding( Expanded(
padding: const EdgeInsets.only(left: 8),
child: Container( child: Container(
// color: Colors.yellow,
padding: EdgeInsets.only(
left: SizeConfig.getPadding(8),
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
...@@ -219,7 +217,7 @@ class _PaymentState extends State<Payment> { ...@@ -219,7 +217,7 @@ class _PaymentState extends State<Payment> {
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(12), height: SizeConfig.getHeight(10),
), ),
Text( Text(
'นวดแผนไทย', 'นวดแผนไทย',
...@@ -230,9 +228,11 @@ class _PaymentState extends State<Payment> { ...@@ -230,9 +228,11 @@ class _PaymentState extends State<Payment> {
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(15), height: SizeConfig.getHeight(12),
), ),
Row( Container(
// color: Colors.orangeAccent,
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'฿1,200.00', '฿1,200.00',
...@@ -243,9 +243,7 @@ class _PaymentState extends State<Payment> { ...@@ -243,9 +243,7 @@ class _PaymentState extends State<Payment> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(120),
),
Text( Text(
'X1', 'X1',
style: TextStyle( style: TextStyle(
...@@ -255,10 +253,11 @@ class _PaymentState extends State<Payment> { ...@@ -255,10 +253,11 @@ class _PaymentState extends State<Payment> {
), ),
], ],
), ),
),
], ],
), ),
), ),
) ),
], ],
), ),
); );
...@@ -266,17 +265,22 @@ class _PaymentState extends State<Payment> { ...@@ -266,17 +265,22 @@ class _PaymentState extends State<Payment> {
Widget list2() { Widget list2() {
return Container( return Container(
// color: Colors.red,
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/no-image.png', 'assets/images/demo_img.png',
height: SizeConfig.getPadding(80), height: SizeConfig.getPadding(90),
width: SizeConfig.getPadding(80), width: SizeConfig.getPadding(80),
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
Padding( Expanded(
padding: const EdgeInsets.only(left: 8),
child: Container( child: Container(
// color: Colors.yellow,
padding: EdgeInsets.only(
left: SizeConfig.getPadding(8),
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
...@@ -290,7 +294,7 @@ class _PaymentState extends State<Payment> { ...@@ -290,7 +294,7 @@ class _PaymentState extends State<Payment> {
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(12), height: SizeConfig.getHeight(10),
), ),
Text( Text(
'Footology', 'Footology',
...@@ -301,9 +305,11 @@ class _PaymentState extends State<Payment> { ...@@ -301,9 +305,11 @@ class _PaymentState extends State<Payment> {
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(15), height: SizeConfig.getHeight(12),
), ),
Row( Container(
// color: Colors.orangeAccent,
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'฿1,000.00', '฿1,000.00',
...@@ -314,9 +320,7 @@ class _PaymentState extends State<Payment> { ...@@ -314,9 +320,7 @@ class _PaymentState extends State<Payment> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(120),
),
Text( Text(
'X1', 'X1',
style: TextStyle( style: TextStyle(
...@@ -326,17 +330,19 @@ class _PaymentState extends State<Payment> { ...@@ -326,17 +330,19 @@ class _PaymentState extends State<Payment> {
), ),
], ],
), ),
),
], ],
), ),
), ),
) ),
], ],
), ),
); );
} }
Widget list3() { Widget payment() {
return Container( return Container(
// color: Colors.green,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
...@@ -348,6 +354,9 @@ class _PaymentState extends State<Payment> { ...@@ -348,6 +354,9 @@ class _PaymentState extends State<Payment> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
SizedBox(
height: SizeConfig.getHeight(5),
),
Row( Row(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
...@@ -355,6 +364,9 @@ class _PaymentState extends State<Payment> { ...@@ -355,6 +364,9 @@ class _PaymentState extends State<Payment> {
height: SizeConfig.getPadding(50), height: SizeConfig.getPadding(50),
width: SizeConfig.getPadding(50), width: SizeConfig.getPadding(50),
), ),
SizedBox(
width: SizeConfig.getWidth(5),
),
Text( Text(
'บัตรเครดิต/บัตรเดบิต', 'บัตรเครดิต/บัตรเดบิต',
style: TextStyle( style: TextStyle(
...@@ -368,8 +380,6 @@ class _PaymentState extends State<Payment> { ...@@ -368,8 +380,6 @@ class _PaymentState extends State<Payment> {
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 10, height: 10,
indent: 8,
endIndent: 20,
), ),
Row( Row(
children: <Widget>[ children: <Widget>[
...@@ -378,6 +388,9 @@ class _PaymentState extends State<Payment> { ...@@ -378,6 +388,9 @@ class _PaymentState extends State<Payment> {
height: SizeConfig.getPadding(50), height: SizeConfig.getPadding(50),
width: SizeConfig.getPadding(50), width: SizeConfig.getPadding(50),
), ),
SizedBox(
width: SizeConfig.getWidth(5),
),
Text( Text(
'All Pay', 'All Pay',
style: TextStyle( style: TextStyle(
...@@ -391,8 +404,6 @@ class _PaymentState extends State<Payment> { ...@@ -391,8 +404,6 @@ class _PaymentState extends State<Payment> {
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 10, height: 10,
indent: 8,
endIndent: 20,
), ),
Row( Row(
children: <Widget>[ children: <Widget>[
...@@ -401,6 +412,9 @@ class _PaymentState extends State<Payment> { ...@@ -401,6 +412,9 @@ class _PaymentState extends State<Payment> {
height: SizeConfig.getPadding(50), height: SizeConfig.getPadding(50),
width: SizeConfig.getPadding(50), width: SizeConfig.getPadding(50),
), ),
SizedBox(
width: SizeConfig.getWidth(5),
),
Text( Text(
'QF Pay', 'QF Pay',
style: TextStyle( style: TextStyle(
...@@ -414,8 +428,6 @@ class _PaymentState extends State<Payment> { ...@@ -414,8 +428,6 @@ class _PaymentState extends State<Payment> {
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 10, height: 10,
indent: 8,
endIndent: 20,
), ),
], ],
), ),
......
lib/ui/shop/shop_reviews.dart
...@@ -16,12 +16,10 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -16,12 +16,10 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
return Container( return Container(
child: ListView( child: ListView(
children: <Widget>[ children: <Widget>[
Column( Column(
children: <Widget>[ children: <Widget>[
Texttop(), Texttop(),
Card1(), Card1(),
], ],
), ),
], ],
...@@ -34,9 +32,10 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -34,9 +32,10 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
margin: EdgeInsets.only( margin: EdgeInsets.only(
right: SizeConfig.getPadding(16), right: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16), left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(20), top: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(10)), bottom: SizeConfig.getPadding(10)),
child: SingleChildScrollView(child: Row( child: SingleChildScrollView(
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'รีวิว(จากผู้ใช้บริการจริง)', 'รีวิว(จากผู้ใช้บริการจริง)',
...@@ -54,7 +53,8 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -54,7 +53,8 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
), ),
), ),
], ],
),), ),
),
); );
} }
...@@ -66,12 +66,17 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -66,12 +66,17 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
top: SizeConfig.getPadding(20), top: SizeConfig.getPadding(20),
bottom: SizeConfig.getPadding(10)), bottom: SizeConfig.getPadding(10)),
child: Container( child: Container(
margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20), margin: EdgeInsets.only(
right: SizeConfig.getPadding(15),
left: SizeConfig.getPadding(15),
bottom: SizeConfig.getPadding(20),
top: SizeConfig.getPadding(20),
),
// color: Colors.blueGrey, // color: Colors.blueGrey,
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
// color: Colors.blueGrey, // color: Colors.green,
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Row( Row(
...@@ -120,9 +125,7 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -120,9 +125,7 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
fontSize: SizeConfig.getFontSize(16), fontSize: SizeConfig.getFontSize(16),
color: Colors.black), color: Colors.black),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(165),
),
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate1, rate: rate1,
...@@ -147,9 +150,7 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -147,9 +150,7 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
fontSize: SizeConfig.getFontSize(16), fontSize: SizeConfig.getFontSize(16),
color: Colors.black), color: Colors.black),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(120),
),
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate1, rate: rate1,
...@@ -174,9 +175,7 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -174,9 +175,7 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
fontSize: SizeConfig.getFontSize(16), fontSize: SizeConfig.getFontSize(16),
color: Colors.black), color: Colors.black),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(125),
),
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate1, rate: rate1,
...@@ -201,9 +200,7 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -201,9 +200,7 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
fontSize: SizeConfig.getFontSize(16), fontSize: SizeConfig.getFontSize(16),
color: Colors.black), color: Colors.black),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(160),
),
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate1, rate: rate1,
...@@ -232,8 +229,8 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -232,8 +229,8 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
children: <Widget>[ children: <Widget>[
ClipRRect( ClipRRect(
borderRadius: BorderRadius.circular(50), borderRadius: BorderRadius.circular(50),
child: Image.network( child: Image.asset(
'https://scontent.fbkk7-2.fna.fbcdn.net/v/t1.0-9/104204530_3370427592977187_6031309814586327212_o.jpg?_nc_cat=106&_nc_sid=110474&_nc_eui2=AeE2vpoR5NHZLbG8b3YABiSdSsMCoPYM3W1KwwKg9gzdbZuYqR1gPnkW3tGe-TS2Vtphdvn2OuvO2CdDLaCMVvcI&_nc_ohc=T5EK3sWOgtAAX994m4I&_nc_ht=scontent.fbkk7-2.fna&oh=0b3e434546b19e256c07ecd6a4d499fb&oe=5F098A94', 'assets/images/ic_userimg.png',
width: 55.0, width: 55.0,
height: 55.0, height: 55.0,
fit: BoxFit.cover, fit: BoxFit.cover,
...@@ -242,11 +239,14 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -242,11 +239,14 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
SizedBox( SizedBox(
width: SizeConfig.getWidth(10), width: SizeConfig.getWidth(10),
), ),
Column( Expanded(
child: Container(
// color: Colors.green,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
SingleChildScrollView(child: Row( SingleChildScrollView(
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'Rattaya Pratumkan', 'Rattaya Pratumkan',
...@@ -254,17 +254,21 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -254,17 +254,21 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
fontSize: SizeConfig.getFontSize(20), fontSize: SizeConfig.getFontSize(20),
color: Colors.black), color: Colors.black),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(35),
),
Container( Container(
child: Icon(Icons.more_vert),
child: Icon(Icons.more_vert),) )
], ],
),), ),
),
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Container(
// color: Colors.blue,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate1, rate: rate1,
...@@ -278,6 +282,11 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -278,6 +282,11 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
), ),
], ],
), ),
),
],
),
),
),
], ],
), ),
), ),
...@@ -334,14 +343,20 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -334,14 +343,20 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
), ),
], ],
), ),
SizedBox(height: SizeConfig.getHeight(10),), SizedBox(
height: SizeConfig.getHeight(10),
),
], ],
), ),
), ),
Container( Container(
color: Color(0xFFF2F2F2), color: Color(0xFFF2F2F2),
child: Padding( child: Padding(
padding: const EdgeInsets.only(left: 30,top: 20,bottom: 20,), padding: const EdgeInsets.only(
left: 30,
top: 20,
bottom: 20,
),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
ClipRRect( ClipRRect(
...@@ -371,33 +386,45 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -371,33 +386,45 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
fontSize: SizeConfig.getFontSize(14), fontSize: SizeConfig.getFontSize(14),
color: Colors.black), color: Colors.black),
), ),
SizedBox(height: SizeConfig.getHeight(5),), SizedBox(
height: SizeConfig.getHeight(5),
),
Text( Text(
"03/16/2019 12:49", "03/16/2019 12:49",
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(14), fontSize: SizeConfig.getFontSize(14),
color: Color(0xFF6AB3AA),), color: Color(0xFF6AB3AA),
),
),
SizedBox(
height: SizeConfig.getHeight(9),
),
Row(
children: <Widget>[
Icon(
Icons.access_time,
color: Color(0xFFEEAFB7),
), ),
SizedBox(height: SizeConfig.getHeight(9),),
Row(children: <Widget>[
Icon(Icons.access_time,color: Color(0xFFEEAFB7),),
Text(' 150Min') Text(' 150Min')
],) ],
)
], ],
), ),
], ],
), ),
), ),
), ),
SizedBox(height: SizeConfig.getHeight(30),), SizedBox(
height: SizeConfig.getHeight(30),
),
Container( Container(
// color: Colors.deepPurpleAccent, // color: Colors.deepPurpleAccent,
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
ClipRRect( ClipRRect(
borderRadius: BorderRadius.circular(50), borderRadius: BorderRadius.circular(50),
child: Image.network( child: Image.asset(
'https://scontent.fbkk7-2.fna.fbcdn.net/v/t1.0-9/104204530_3370427592977187_6031309814586327212_o.jpg?_nc_cat=106&_nc_sid=110474&_nc_eui2=AeE2vpoR5NHZLbG8b3YABiSdSsMCoPYM3W1KwwKg9gzdbZuYqR1gPnkW3tGe-TS2Vtphdvn2OuvO2CdDLaCMVvcI&_nc_ohc=T5EK3sWOgtAAX994m4I&_nc_ht=scontent.fbkk7-2.fna&oh=0b3e434546b19e256c07ecd6a4d499fb&oe=5F098A94', 'assets/images/ic_userimg.png',
width: 55.0, width: 55.0,
height: 55.0, height: 55.0,
fit: BoxFit.cover, fit: BoxFit.cover,
...@@ -406,10 +433,14 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -406,10 +433,14 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
SizedBox( SizedBox(
width: SizeConfig.getWidth(10), width: SizeConfig.getWidth(10),
), ),
Column( Expanded(
child: Container(
// color: Colors.green,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( SingleChildScrollView(
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'Rattaya Pratumkan', 'Rattaya Pratumkan',
...@@ -417,15 +448,21 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -417,15 +448,21 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
fontSize: SizeConfig.getFontSize(20), fontSize: SizeConfig.getFontSize(20),
color: Colors.black), color: Colors.black),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(35), Container(
), child: Icon(Icons.more_vert),
Icon(Icons.more_vert), )
], ],
), ),
),
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Container(
// color: Colors.blue,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate1, rate: rate1,
...@@ -439,6 +476,11 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -439,6 +476,11 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
), ),
], ],
), ),
),
],
),
),
),
], ],
), ),
), ),
...@@ -495,14 +537,20 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -495,14 +537,20 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
), ),
], ],
), ),
SizedBox(height: SizeConfig.getHeight(10),), SizedBox(
height: SizeConfig.getHeight(10),
),
], ],
), ),
), ),
Container( Container(
color: Color(0xFFF2F2F2), color: Color(0xFFF2F2F2),
child: Padding( child: Padding(
padding: const EdgeInsets.only(left: 30,top: 20,bottom: 20,), padding: const EdgeInsets.only(
left: 30,
top: 20,
bottom: 20,
),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
ClipRRect( ClipRRect(
...@@ -532,33 +580,45 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -532,33 +580,45 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
fontSize: SizeConfig.getFontSize(14), fontSize: SizeConfig.getFontSize(14),
color: Colors.black), color: Colors.black),
), ),
SizedBox(height: SizeConfig.getHeight(5),), SizedBox(
height: SizeConfig.getHeight(5),
),
Text( Text(
"03/16/2019 12:49", "03/16/2019 12:49",
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(14), fontSize: SizeConfig.getFontSize(14),
color: Color(0xFF6AB3AA),), color: Color(0xFF6AB3AA),
),
),
SizedBox(
height: SizeConfig.getHeight(9),
),
Row(
children: <Widget>[
Icon(
Icons.access_time,
color: Color(0xFFEEAFB7),
), ),
SizedBox(height: SizeConfig.getHeight(9),),
Row(children: <Widget>[
Icon(Icons.access_time,color: Color(0xFFEEAFB7),),
Text(' 150Min') Text(' 150Min')
],) ],
)
], ],
), ),
], ],
), ),
), ),
), ),
SizedBox(height: SizeConfig.getHeight(30),), SizedBox(
height: SizeConfig.getHeight(30),
),
Container( Container(
// color: Colors.deepPurpleAccent, // color: Colors.deepPurpleAccent,
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
ClipRRect( ClipRRect(
borderRadius: BorderRadius.circular(50), borderRadius: BorderRadius.circular(50),
child: Image.network( child: Image.asset(
'https://scontent.fbkk7-2.fna.fbcdn.net/v/t1.0-9/104204530_3370427592977187_6031309814586327212_o.jpg?_nc_cat=106&_nc_sid=110474&_nc_eui2=AeE2vpoR5NHZLbG8b3YABiSdSsMCoPYM3W1KwwKg9gzdbZuYqR1gPnkW3tGe-TS2Vtphdvn2OuvO2CdDLaCMVvcI&_nc_ohc=T5EK3sWOgtAAX994m4I&_nc_ht=scontent.fbkk7-2.fna&oh=0b3e434546b19e256c07ecd6a4d499fb&oe=5F098A94', 'assets/images/ic_userimg.png',
width: 55.0, width: 55.0,
height: 55.0, height: 55.0,
fit: BoxFit.cover, fit: BoxFit.cover,
...@@ -567,10 +627,14 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -567,10 +627,14 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
SizedBox( SizedBox(
width: SizeConfig.getWidth(10), width: SizeConfig.getWidth(10),
), ),
Column( Expanded(
child: Container(
// color: Colors.green,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( SingleChildScrollView(
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'Rattaya Pratumkan', 'Rattaya Pratumkan',
...@@ -578,15 +642,21 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -578,15 +642,21 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
fontSize: SizeConfig.getFontSize(20), fontSize: SizeConfig.getFontSize(20),
color: Colors.black), color: Colors.black),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(35), Container(
), child: Icon(Icons.more_vert),
Icon(Icons.more_vert), )
], ],
), ),
),
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Container(
// color: Colors.blue,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate1, rate: rate1,
...@@ -600,6 +670,11 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -600,6 +670,11 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
), ),
], ],
), ),
),
],
),
),
),
], ],
), ),
), ),
...@@ -656,14 +731,20 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -656,14 +731,20 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
), ),
], ],
), ),
SizedBox(height: SizeConfig.getHeight(10),), SizedBox(
height: SizeConfig.getHeight(10),
),
], ],
), ),
), ),
Container( Container(
color: Color(0xFFF2F2F2), color: Color(0xFFF2F2F2),
child: Padding( child: Padding(
padding: const EdgeInsets.only(left: 30,top: 20,bottom: 20,), padding: const EdgeInsets.only(
left: 30,
top: 20,
bottom: 20,
),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
ClipRRect( ClipRRect(
...@@ -693,18 +774,28 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -693,18 +774,28 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
fontSize: SizeConfig.getFontSize(14), fontSize: SizeConfig.getFontSize(14),
color: Colors.black), color: Colors.black),
), ),
SizedBox(height: SizeConfig.getHeight(5),), SizedBox(
height: SizeConfig.getHeight(5),
),
Text( Text(
"03/16/2019 12:49", "03/16/2019 12:49",
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(14), fontSize: SizeConfig.getFontSize(14),
color: Color(0xFF6AB3AA),), color: Color(0xFF6AB3AA),
),
),
SizedBox(
height: SizeConfig.getHeight(9),
),
Row(
children: <Widget>[
Icon(
Icons.access_time,
color: Color(0xFFEEAFB7),
), ),
SizedBox(height: SizeConfig.getHeight(9),),
Row(children: <Widget>[
Icon(Icons.access_time,color: Color(0xFFEEAFB7),),
Text(' 150Min') Text(' 150Min')
],) ],
)
], ],
), ),
], ],
......
lib/ui/shop/shop_service.dart
...@@ -35,7 +35,7 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -35,7 +35,7 @@ class _ShopServicePageState extends State<ShopServicePage> {
margin: EdgeInsets.only( margin: EdgeInsets.only(
right: SizeConfig.getPadding(16), right: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16), left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(20), top: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(10)), bottom: SizeConfig.getPadding(10)),
child: Container( child: Container(
margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20), margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20),
...@@ -171,6 +171,10 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -171,6 +171,10 @@ class _ShopServicePageState extends State<ShopServicePage> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Container(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate1, rate: rate1,
...@@ -188,6 +192,9 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -188,6 +192,9 @@ class _ShopServicePageState extends State<ShopServicePage> {
], ],
), ),
), ),
],
),
),
), ),
], ],
), ),
...@@ -202,7 +209,7 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -202,7 +209,7 @@ class _ShopServicePageState extends State<ShopServicePage> {
margin: EdgeInsets.only( margin: EdgeInsets.only(
right: SizeConfig.getPadding(16), right: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16), left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(20), top: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(10)), bottom: SizeConfig.getPadding(10)),
child: Container( child: Container(
margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20), margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20),
...@@ -338,6 +345,10 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -338,6 +345,10 @@ class _ShopServicePageState extends State<ShopServicePage> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Container(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate2, rate: rate2,
...@@ -355,6 +366,9 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -355,6 +366,9 @@ class _ShopServicePageState extends State<ShopServicePage> {
], ],
), ),
), ),
],
),
),
), ),
], ],
), ),
...@@ -369,7 +383,7 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -369,7 +383,7 @@ class _ShopServicePageState extends State<ShopServicePage> {
margin: EdgeInsets.only( margin: EdgeInsets.only(
right: SizeConfig.getPadding(16), right: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16), left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(20), top: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(10)), bottom: SizeConfig.getPadding(10)),
child: Container( child: Container(
margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20), margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20),
...@@ -505,6 +519,10 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -505,6 +519,10 @@ class _ShopServicePageState extends State<ShopServicePage> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Container(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate3, rate: rate3,
...@@ -522,6 +540,9 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -522,6 +540,9 @@ class _ShopServicePageState extends State<ShopServicePage> {
], ],
), ),
), ),
],
),
),
), ),
], ],
), ),
...@@ -536,7 +557,7 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -536,7 +557,7 @@ class _ShopServicePageState extends State<ShopServicePage> {
margin: EdgeInsets.only( margin: EdgeInsets.only(
right: SizeConfig.getPadding(16), right: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16), left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(20), top: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(10)), bottom: SizeConfig.getPadding(10)),
child: Container( child: Container(
margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20), margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20),
...@@ -672,6 +693,10 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -672,6 +693,10 @@ class _ShopServicePageState extends State<ShopServicePage> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Container(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate4, rate: rate4,
...@@ -689,6 +714,9 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -689,6 +714,9 @@ class _ShopServicePageState extends State<ShopServicePage> {
], ],
), ),
), ),
],
),
),
), ),
], ],
), ),
...@@ -703,7 +731,7 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -703,7 +731,7 @@ class _ShopServicePageState extends State<ShopServicePage> {
margin: EdgeInsets.only( margin: EdgeInsets.only(
right: SizeConfig.getPadding(16), right: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16), left: SizeConfig.getPadding(16),
top: SizeConfig.getPadding(20), top: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(10)), bottom: SizeConfig.getPadding(10)),
child: Container( child: Container(
margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20), margin: EdgeInsets.only(right: 15, left: 15, bottom: 20, top: 20),
...@@ -839,6 +867,10 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -839,6 +867,10 @@ class _ShopServicePageState extends State<ShopServicePage> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Container(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate5, rate: rate5,
...@@ -856,6 +888,9 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -856,6 +888,9 @@ class _ShopServicePageState extends State<ShopServicePage> {
], ],
), ),
), ),
],
),
),
), ),
], ],
), ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment