Skip to content

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

update

parent 2bec8595
Showing with 1127 additions and 1178 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,113 +121,124 @@ class _FavoriteState extends State<Favorite> { ...@@ -116,113 +121,124 @@ class _FavoriteState extends State<Favorite> {
), ),
), ),
Expanded( Expanded(
child: Column( child: Container(
crossAxisAlignment: CrossAxisAlignment.start, padding: EdgeInsets.only(
children: <Widget>[ left: SizeConfig.getPadding(10),
Container( right: SizeConfig.getPadding(5),
color: Colors.blue, ),
child: Row( child: Column(
children: <Widget>[ crossAxisAlignment: CrossAxisAlignment.start,
Text( children: <Widget>[
'Ivory Relax and Spa', Container(
), // color: Colors.blue,
Spacer(), child: Row(
Checkbox( children: <Widget>[
checkColor: Color(0xFFEEAFB7), Text(
activeColor: Colors.white, 'Ivory Relax and Spa',
value: checkBoxValue, ),
onChanged: (bool value) { Spacer(),
setState(() { Checkbox(
print(value); checkColor: Color(0xFFEEAFB7),
checkBoxValue = value; activeColor: Colors.white,
}); value: checkBoxValue,
}), onChanged: (bool value) {
], setState(() {
print(value);
checkBoxValue = value;
});
}),
],
),
), ),
), Container(
Container( // color: Colors.white,
color: Colors.white, child: Text('นวดเเผนไทย'),
child: Text('นวดเเผนไทย'), ),
), SizedBox(
Container( height: SizeConfig.getHeight(5),
color: Colors.yellow, ),
child: Row( Container(
children: <Widget>[ // color: Colors.yellow,
Image.asset( child: Row(
'assets/images/clock.png', children: <Widget>[
height: 20, Image.asset(
width: 20, 'assets/images/clock.png',
), height: 20,
SizedBox( width: 20,
width: SizeConfig.getWidth(5), ),
), SizedBox(
Text('90 นาที'), width: SizeConfig.getWidth(5),
Spacer(), ),
Icon( Text('90 นาที'),
Icons.local_offer, Spacer(),
color: Color(0xFFEEAFB7), Icon(
), Icons.local_offer,
Text(
'฿1,599.00',
style: TextStyle(
decoration: TextDecoration.lineThrough,
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
color: Color(0xFFEEAFB7), color: Color(0xFFEEAFB7),
), ),
), Text(
], '฿1,599.00',
style: TextStyle(
decoration: TextDecoration.lineThrough,
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
color: Color(0xFFEEAFB7),
),
),
],
),
), ),
), SizedBox(
Container( height: SizeConfig.getHeight(5),
color: Colors.orangeAccent, ),
child: Row( Container(
children: <Widget>[ // color: Colors.orangeAccent,
SizedBox( child: Row(
width: SizeConfig.getPadding(20), children: <Widget>[
height: SizeConfig.getPadding(20), SizedBox(
child: RaisedButton( width: SizeConfig.getPadding(20),
child: Text('-'), height: SizeConfig.getPadding(20),
padding: EdgeInsets.only(right: 0), child: RaisedButton(
onPressed: () { child: Text('-'),
setState(() { padding: EdgeInsets.only(right: 0),
b = b - 1; onPressed: () {
}); setState(() {
}, a = a - 1;
});
},
),
), ),
), Padding(
Padding( padding: const EdgeInsets.only(right: 8, left: 8),
padding: const EdgeInsets.only( child: Text('$a'),
right: 8, left: 8), ),
child: Text('$b'), SizedBox(
), width: SizeConfig.getPadding(20),
SizedBox( height: SizeConfig.getPadding(20),
width: SizeConfig.getPadding(20), child: RaisedButton(
height: SizeConfig.getPadding(20), child: Text('+'),
child: RaisedButton( padding: EdgeInsets.only(right: 0),
child: Text('+'), onPressed: () {
padding: EdgeInsets.only(right: 0), setState(() {
onPressed: () { a = a + 1;
setState(() { });
b = b + 1; },
}); ),
},
), ),
), Spacer(),
Spacer(), Text(
Text( '฿1,200.00',
'฿1,200.00', style: TextStyle(
style: TextStyle( fontSize: SizeConfig.getFontSize(20),
fontSize: SizeConfig.getFontSize(20), color: Color(0xFFFD2956),
color: Color(0xFFFD2956), fontFamily: "SF_Pro_Text",
fontFamily: "SF_Pro_Text", fontWeight: FontWeight.bold,
fontWeight: FontWeight.bold, ),
), ),
), ],
], ),
), ),
), ],
], ),
), ),
), ),
], ],
...@@ -232,160 +248,140 @@ class _FavoriteState extends State<Favorite> { ...@@ -232,160 +248,140 @@ class _FavoriteState extends State<Favorite> {
Widget list2() { Widget list2() {
return Container( return Container(
child: Column( // color: Colors.red,
height: SizeConfig.getHeight(150),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( Padding(
children: <Widget>[ padding: const EdgeInsets.only(left: 10),
Image.asset( child: 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,
),
),
Expanded(
child: Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(10),
right: SizeConfig.getPadding(5),
), ),
Padding( child: Column(
padding: const EdgeInsets.only(left: 8), crossAxisAlignment: CrossAxisAlignment.start,
child: Container( children: <Widget>[
child: Column( Container(
crossAxisAlignment: CrossAxisAlignment.start, // color: Colors.blue,
children: <Widget>[ child: Row(
Row( children: <Widget>[
children: <Widget>[ Text(
Text( 'Ivory Relax and Spa',
'Sunshine Spa & Massage', ),
style: TextStyle( Spacer(),
fontSize: SizeConfig.getFontSize(16), Checkbox(
fontFamily: "SF_Pro_Text", checkColor: Color(0xFFEEAFB7),
fontWeight: FontWeight.bold, activeColor: Colors.white,
color: Colors.black, value: checkBoxValue,
), onChanged: (bool value) {
), setState(() {
SizedBox( print(value);
width: SizeConfig.getWidth(20), checkBoxValue = value;
), });
Checkbox( }),
checkColor: Color(0xFFEEAFB7), ],
activeColor: Colors.white, ),
value: checkBoxValue, ),
onChanged: (bool value) { Container(
setState(() { // color: Colors.white,
print(value); child: Text('นวดเเผนไทย'),
checkBoxValue = value; ),
}); SizedBox(
}), height: SizeConfig.getHeight(5),
], ),
), Container(
Text( // color: Colors.yellow,
'นวดแผนไทย', child: Row(
style: TextStyle( children: <Widget>[
fontSize: SizeConfig.getFontSize(16), Image.asset(
fontFamily: "SF_Pro_Text", 'assets/images/clock.png',
color: Colors.black, height: 20,
width: 20,
), ),
), SizedBox(
SizedBox( width: SizeConfig.getWidth(5),
height: SizeConfig.getHeight(10), ),
), Text('90 นาที'),
Row( Spacer(),
children: <Widget>[ Icon(
Row( Icons.local_offer,
children: <Widget>[ color: Color(0xFFEEAFB7),
Image.asset( ),
'assets/images/clock.png', Text(
height: 20, '฿1,599.00',
width: 20, style: TextStyle(
), decoration: TextDecoration.lineThrough,
Text( fontSize: SizeConfig.getFontSize(16),
' 90 นาที', fontFamily: "SF_Pro_Text",
style: TextStyle( color: Color(0xFFEEAFB7),
fontFamily: "SF_Pro_Text",
),
),
SizedBox(
width: SizeConfig.getWidth(95),
),
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), ),
), SizedBox(
Row( height: SizeConfig.getHeight(5),
children: <Widget>[ ),
Container( Container(
child: Row( // color: Colors.orangeAccent,
children: <Widget>[ child: Row(
SizedBox( children: <Widget>[
width: SizeConfig.getPadding(20), SizedBox(
height: SizeConfig.getPadding(20), width: SizeConfig.getPadding(20),
child: RaisedButton( height: SizeConfig.getPadding(20),
child: Text('-'), child: RaisedButton(
padding: EdgeInsets.only(right: 0), child: Text('-'),
onPressed: () { padding: EdgeInsets.only(right: 0),
setState(() { onPressed: () {
b = b - 1; setState(() {
}); b = b - 1;
}, });
), },
),
Padding(
padding: const EdgeInsets.only(
right: 8, left: 8),
child: Text('$b'),
),
SizedBox(
width: SizeConfig.getPadding(20),
height: SizeConfig.getPadding(20),
child: RaisedButton(
child: Text('+'),
padding: EdgeInsets.only(right: 0),
onPressed: () {
setState(() {
b = b + 1;
});
},
),
),
],
),
), ),
SizedBox( ),
width: SizeConfig.getWidth(85), Padding(
padding: const EdgeInsets.only(right: 8, left: 8),
child: Text('$b'),
),
SizedBox(
width: SizeConfig.getPadding(20),
height: SizeConfig.getPadding(20),
child: RaisedButton(
child: Text('+'),
padding: EdgeInsets.only(right: 0),
onPressed: () {
setState(() {
b = b + 1;
});
},
), ),
Text( ),
'฿1,200.00', Spacer(),
style: TextStyle( Text(
fontSize: SizeConfig.getFontSize(20), '฿1,200.00',
color: Color(0xFFFD2956), style: TextStyle(
fontFamily: "SF_Pro_Text", fontSize: SizeConfig.getFontSize(20),
fontWeight: FontWeight.bold, color: Color(0xFFFD2956),
), fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
), ),
], ),
), ],
], ),
), ),
), ],
), ),
], ),
),
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,60 +91,56 @@ class _MyCartState extends State<MyCart> { ...@@ -88,60 +91,56 @@ 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( child: Column(
padding: const EdgeInsets.only(left: 25), children: <Widget>[
child: Column( Text(
children: <Widget>[ 'รวมทั้งหมด',
Text( style: TextStyle(
'รวมทั้งหมด', color: Colors.white,
style: TextStyle( fontSize: SizeConfig.getFontSize(16),
color: Colors.white,
fontSize: 16,
),
), ),
Text( ),
'฿2,000', Text(
style: TextStyle( '฿2,000',
color: Color(0xFFEEAFB7), style: TextStyle(
fontSize: 24, color: Color(0xFFEEAFB7),
), fontSize: SizeConfig.getFontSize(24),
), ),
], ),
), ],
), ),
), ),
Spacer(),
Container( Container(
child: Padding( child: RaisedButton(
padding: const EdgeInsets.only(left: 25), shape: RoundedRectangleBorder(
child: RaisedButton( borderRadius: BorderRadius.circular(30.0),
shape: RoundedRectangleBorder( ),
borderRadius: BorderRadius.circular(25.0), onPressed: () {
), Navigator.push(
onPressed: () { context,
Navigator.push( MaterialPageRoute(
context, builder: (context) => Payment(),
MaterialPageRoute(
builder: (context) => Payment(),
),
);
},
padding: EdgeInsets.only(
left: 35,
right: 35,
top: 15,
bottom: 15,
),
color: Color(0xFFEEAFB7),
child: Text(
'สั่งซื้อ',
style: TextStyle(
fontSize: 16,
color: Colors.white,
), ),
);
},
padding: EdgeInsets.only(
left: SizeConfig.getPadding(35),
right: SizeConfig.getPadding(35),
top: SizeConfig.getPadding(15),
bottom: SizeConfig.getPadding(15),
),
color: Color(0xFFEEAFB7),
child: Text(
'สั่งซื้อ',
style: TextStyle(
fontSize: SizeConfig.getPadding(16),
color: Colors.white,
), ),
), ),
), ),
...@@ -164,37 +163,31 @@ class _MyCartState extends State<MyCart> { ...@@ -164,37 +163,31 @@ 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(
height: SizeConfig.getHeight(15),
SizedBox( ),
height: SizeConfig.getHeight(15), list1(),
), list2(),
list1(), Divider(
list2(), color: Colors.black,
Divider( height: SizeConfig.getHeight(40),
color: Colors.black, ),
height: 40,
indent: 8,
endIndent: 20,
),
// list3(), // list3(),
], ],
),
), ),
), ),
), ),
...@@ -202,141 +195,143 @@ class _MyCartState extends State<MyCart> { ...@@ -202,141 +195,143 @@ class _MyCartState extends State<MyCart> {
} }
Widget list1() { Widget list1() {
return Card(child: Container( return Card(
child: Column( elevation: 5,
children: <Widget>[ child: Container(
Row( padding: EdgeInsets.only(
children: <Widget>[ left: SizeConfig.getPadding(12),
Image.asset( top: SizeConfig.getPadding(8),
'assets/images/no-image.png', right: SizeConfig.getPadding(10),
height: SizeConfig.getHeight(80), bottom: SizeConfig.getPadding(8),
width: SizeConfig.getWidth(80), ),
), // color: Colors.red,
Padding( child: Row(
padding: const EdgeInsets.only(left: 8), mainAxisAlignment: MainAxisAlignment.start,
child: Container( children: <Widget>[
child: Column( Image.asset(
crossAxisAlignment: CrossAxisAlignment.start, 'assets/images/demo_img.png',
children: <Widget>[ width: SizeConfig.getWidth(110),
Row( height: SizeConfig.getHeight(150),
fit: BoxFit.fitWidth,
),
Expanded(
child: Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(10),
right: SizeConfig.getPadding(5),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
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( ),
height: SizeConfig.getHeight(10), SizedBox(
), height: SizeConfig.getHeight(5),
Row( ),
Container(
// color: Colors.yellow,
child: Row(
children: <Widget>[ children: <Widget>[
Row( Image.asset(
children: <Widget>[ 'assets/images/clock.png',
Image.asset( height: SizeConfig.getHeight(20),
'assets/images/clock.png', width: SizeConfig.getWidth(20),
height: SizeConfig.getHeight(20), ),
width: SizeConfig.getWidth(20), SizedBox(
), width: SizeConfig.getWidth(5),
Text( ),
' 90 นาที', Text('90 นาที'),
style: TextStyle( Spacer(),
fontFamily: "SF_Pro_Text", Icon(
), Icons.local_offer,
), color: Color(0xFFEEAFB7),
SizedBox( ),
width: SizeConfig.getWidth(90), Text(
), '฿1,599.00',
Icon( style: TextStyle(
Icons.local_offer, decoration: TextDecoration.lineThrough,
color: Color(0xFFEEAFB7), fontSize: SizeConfig.getFontSize(16),
), fontFamily: "SF_Pro_Text",
Text( color: Color(0xFFEEAFB7),
'฿1,599.00', ),
style: TextStyle(
decoration: TextDecoration.lineThrough,
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
color: Color(0xFFEEAFB7),
),
),
],
), ),
], ],
), ),
SizedBox( ),
height: SizeConfig.getHeight(10), SizedBox(
), height: SizeConfig.getHeight(5),
Row( ),
Container(
// color: Colors.orangeAccent,
child: Row(
children: <Widget>[ children: <Widget>[
Container( SizedBox(
child: Padding( width: SizeConfig.getPadding(20),
padding: const EdgeInsets.only(left: 10), height: SizeConfig.getPadding(20),
child: Row( child: RaisedButton(
children: <Widget>[ child: Text('-'),
SizedBox( padding: EdgeInsets.only(
width: SizeConfig.getPadding(20), right: SizeConfig.getPadding(0),
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;
});
},
),
),
],
), ),
onPressed: () {
setState(() {
a = a - 1;
});
},
), ),
), ),
Padding(
padding: const EdgeInsets.only(right: 8, left: 8),
child: Text('$a'),
),
SizedBox( SizedBox(
width: SizeConfig.getWidth(80), width: SizeConfig.getPadding(20),
height: SizeConfig.getPadding(20),
child: RaisedButton(
child: Text('+'),
padding: EdgeInsets.only(
right: SizeConfig.getPadding(0),
),
onPressed: () {
setState(() {
a = a + 1;
});
},
),
), ),
Spacer(),
Text( Text(
'฿1,200.00', '฿1,200.00',
style: TextStyle( style: TextStyle(
...@@ -348,158 +343,152 @@ class _MyCartState extends State<MyCart> { ...@@ -348,158 +343,152 @@ class _MyCartState extends State<MyCart> {
), ),
], ],
), ),
SizedBox( ),
height: SizeConfig.getHeight(15), ],
),
],
),
), ),
), ),
], ),
), ],
], ),
), ),
),); );
} }
Widget list2() { Widget list2() {
return Card(child: Container( return Card(
child: Column( child: Container(
children: <Widget>[ // color: Colors.red,
Row( padding: EdgeInsets.only(
children: <Widget>[ left: SizeConfig.getPadding(12),
Image.asset( top: SizeConfig.getPadding(8),
'assets/images/no-image.png', right: SizeConfig.getPadding(10),
height: SizeConfig.getHeight(80), bottom: SizeConfig.getPadding(8),
width: SizeConfig.getWidth(80), ),
), child: Row(
Padding( mainAxisAlignment: MainAxisAlignment.start,
padding: const EdgeInsets.only(left: 8), children: <Widget>[
child: Container( Image.asset(
child: Column( 'assets/images/demo_img.png',
crossAxisAlignment: CrossAxisAlignment.start, width: SizeConfig.getWidth(110),
children: <Widget>[ height: SizeConfig.getHeight(150),
Row( fit: BoxFit.fitWidth,
),
Expanded(
child: Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(10),
right: SizeConfig.getPadding(5),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
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( ),
height: SizeConfig.getHeight(10), SizedBox(
), height: SizeConfig.getHeight(5),
Row( ),
Container(
// color: Colors.yellow,
child: Row(
children: <Widget>[ children: <Widget>[
Row( Image.asset(
children: <Widget>[ 'assets/images/clock.png',
Image.asset( height: SizeConfig.getHeight(20),
'assets/images/clock.png', width: SizeConfig.getWidth(20),
height: SizeConfig.getHeight(20), ),
width: SizeConfig.getWidth(20), SizedBox(
), width: SizeConfig.getWidth(5),
Text( ),
' 90 นาที', Text('90 นาที'),
style: TextStyle( Spacer(),
fontFamily: "SF_Pro_Text", Icon(
), Icons.local_offer,
), color: Color(0xFFEEAFB7),
SizedBox( ),
width: SizeConfig.getWidth(90), Text(
), '฿1,599.00',
Icon( style: TextStyle(
Icons.local_offer, decoration: TextDecoration.lineThrough,
color: Color(0xFFEEAFB7), fontSize: SizeConfig.getFontSize(16),
), fontFamily: "SF_Pro_Text",
Text( color: Color(0xFFEEAFB7),
'฿1,599.00', ),
style: TextStyle(
decoration: TextDecoration.lineThrough,
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
color: Color(0xFFEEAFB7),
),
),
],
), ),
], ],
), ),
SizedBox( ),
height: SizeConfig.getHeight(10), SizedBox(
), height: SizeConfig.getHeight(5),
Row( ),
Container(
// color: Colors.orangeAccent,
child: Row(
children: <Widget>[ children: <Widget>[
Container( SizedBox(
child: Padding( width: SizeConfig.getPadding(20),
padding: const EdgeInsets.only(left: 10), height: SizeConfig.getPadding(20),
child: Row( child: RaisedButton(
children: <Widget>[ child: Text('-'),
SizedBox( padding: EdgeInsets.only(right: SizeConfig.getPadding(0),),
width: SizeConfig.getPadding(20), onPressed: () {
height: SizeConfig.getPadding(20), setState(() {
child: RaisedButton( a = a - 1;
child: Text('-'), });
padding: EdgeInsets.only(right: 0), },
onPressed: () {
setState(() {
b = b - 1;
});
},
),
),
Padding(
padding: const EdgeInsets.only(
right: 8, left: 8),
child: Text(
'$b',
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(() {
b = b + 1;
});
},
),
),
],
),
), ),
), ),
Padding(
padding: const EdgeInsets.only(right: 8, left: 8),
child: Text('$a'),
),
SizedBox( SizedBox(
width: SizeConfig.getWidth(80), width: SizeConfig.getPadding(20),
height: SizeConfig.getPadding(20),
child: RaisedButton(
child: Text('+'),
padding: EdgeInsets.only(right: SizeConfig.getPadding(0),),
onPressed: () {
setState(() {
a = a + 1;
});
},
),
), ),
Spacer(),
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,22 +498,17 @@ class _MyCartState extends State<MyCart> { ...@@ -509,22 +498,17 @@ class _MyCartState extends State<MyCart> {
), ),
], ],
), ),
SizedBox( ),
height: SizeConfig.getHeight(15), ],
),
],
),
), ),
), ),
], ),
), ],
], ),
), ),
),); );
} }
Widget header() { Widget header() {
return Container( return Container(
child: Stack( child: Stack(
...@@ -537,7 +521,7 @@ class _MyCartState extends State<MyCart> { ...@@ -537,7 +521,7 @@ class _MyCartState extends State<MyCart> {
Positioned( Positioned(
top: SizeConfig.getPadding(50), top: SizeConfig.getPadding(50),
left: left:
SizeConfig.getPadding(MediaQuery.of(context).size.width / 3.5), SizeConfig.getPadding(MediaQuery.of(context).size.width / 3.5),
child: Container( child: Container(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: Image.asset( child: Image.asset(
......
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,15 +54,12 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -55,15 +54,12 @@ 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(),
], ],
), ),
), ),
),
), ),
); );
} }
...@@ -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,74 +94,71 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -100,74 +94,71 @@ 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(
child: Column( // color: Colors.green,
crossAxisAlignment: CrossAxisAlignment.start, padding: EdgeInsets.only(left: SizeConfig.getPadding(8),),
children: <Widget>[ child: Column(
Text( crossAxisAlignment: CrossAxisAlignment.start,
'Ivory Relax and Spa', children: <Widget>[
style: TextStyle( Text(
fontSize: SizeConfig.getFontSize(16), 'Ivory Relax and Spa',
fontFamily: "SF_Pro_Text", style: TextStyle(
fontWeight: FontWeight.bold, fontSize: SizeConfig.getFontSize(16),
color: Colors.black, fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
color: Colors.black,
),
), ),
), SizedBox(
SizedBox( height: SizeConfig.getHeight(12),
height: SizeConfig.getHeight(12),
),
Text(
'นวดแผนไทย',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
color: Colors.black,
), ),
), Text(
SizedBox( 'นวดแผนไทย',
height: SizeConfig.getHeight(15), style: TextStyle(
), fontSize: SizeConfig.getFontSize(16),
Row( fontFamily: "SF_Pro_Text",
children: <Widget>[ color: Colors.black,
Text(
'฿1,200.00',
style: TextStyle(
fontSize: SizeConfig.getFontSize(20),
color: Color(0xFFFD2956),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
),
),
SizedBox(
width: SizeConfig.getWidth(120),
), ),
Text( ),
'X1', SizedBox(
style: TextStyle( height: SizeConfig.getHeight(15),
color: Color(0xFF9D9D9D), ),
fontSize: SizeConfig.getFontSize(20), Row(
children: <Widget>[
Text(
'฿1,200.00',
style: TextStyle(
fontSize: SizeConfig.getFontSize(20),
color: Color(0xFFFD2956),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
),
), ),
), Spacer(),
], Text(
), 'X1',
], style: TextStyle(
color: Color(0xFF9D9D9D),
fontSize: SizeConfig.getFontSize(20),
),
),
],
),
],
),
), ),
), ),
)
], ],
), ),
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,74 +58,70 @@ class _PaymentState extends State<Payment> { ...@@ -55,74 +58,70 @@ 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( child: Column(
padding: const EdgeInsets.only(left: 50), crossAxisAlignment: CrossAxisAlignment.start,
child: Column( children: <Widget>[
children: <Widget>[ Text(
Text( 'ยอดชำระเงินทั้งหมด',
'ยอดชำระเงินทั้งหมด', style: TextStyle(
style: TextStyle( color: Colors.white,
color: Colors.white, fontSize: SizeConfig.getFontSize(14),
fontSize: 16,
),
), ),
Text( ),
'฿2,000', Text(
style: TextStyle( '฿2,000',
color: Color(0xFFEEAFB7), style: TextStyle(
fontSize: 24, color: Color(0xFFEEAFB7),
), fontSize: SizeConfig.getFontSize(24),
), ),
], ),
), ],
), ),
), ),
Container( Container(
child: Padding( padding: EdgeInsets.only(
padding: const EdgeInsets.only(left: 25), right: SizeConfig.getPadding(10),
child: RaisedButton( left: SizeConfig.getPadding(12),
shape: RoundedRectangleBorder( ),
borderRadius: BorderRadius.circular(25.0), child: RaisedButton(
), shape: RoundedRectangleBorder(
onPressed: () { borderRadius: BorderRadius.circular(30.0),
Navigator.push( ),
context, onPressed: () {
MaterialPageRoute( Navigator.push(
builder: (context) => Paymentdetail(), context,
), MaterialPageRoute(
); builder: (context) => Paymentdetail(),
},
padding: EdgeInsets.only(
left: 35,
right: 35,
top: 15,
bottom: 15,
),
color: Color(0xFFEEAFB7),
child: Text(
'ยืนยัน',
style: TextStyle(
fontSize: 16,
color: Colors.white,
), ),
);
},
padding: EdgeInsets.only(
left: SizeConfig.getPadding(35),
right: SizeConfig.getPadding(35),
top: SizeConfig.getPadding(15),
bottom: SizeConfig.getPadding(15),
),
color: Color(0xFFEEAFB7),
child: Text(
'ยืนยัน',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
color: Colors.white,
), ),
), ),
), ),
...@@ -148,44 +147,39 @@ class _PaymentState extends State<Payment> { ...@@ -148,44 +147,39 @@ 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,
children: <Widget>[ children: <Widget>[
Text( Text(
'เเพ็คเกจที่คุณเลือก', 'เเพ็คเกจที่คุณเลือก',
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(18), fontSize: SizeConfig.getFontSize(18),
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(),
), Divider(
list2(), color: Colors.black,
Divider( height: SizeConfig.getHeight(40),
color: Colors.black, ),
height: 40, payment(),
indent: 8, ],
endIndent: 20,
),
list3(),
],
),
), ),
), ),
), ),
...@@ -194,18 +188,22 @@ class _PaymentState extends State<Payment> { ...@@ -194,18 +188,22 @@ class _PaymentState extends State<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,35 +228,36 @@ class _PaymentState extends State<Payment> { ...@@ -230,35 +228,36 @@ class _PaymentState extends State<Payment> {
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(15), height: SizeConfig.getHeight(12),
), ),
Row( Container(
children: <Widget>[ // color: Colors.orangeAccent,
Text( child: Row(
'฿1,200.00', children: <Widget>[
style: TextStyle( Text(
fontSize: SizeConfig.getFontSize(20), '฿1,200.00',
color: Color(0xFFFD2956), style: TextStyle(
fontFamily: "SF_Pro_Text", fontSize: SizeConfig.getFontSize(20),
fontWeight: FontWeight.bold, color: Color(0xFFFD2956),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
),
), ),
), Spacer(),
SizedBox( Text(
width: SizeConfig.getWidth(120), 'X1',
), style: TextStyle(
Text( color: Color(0xFF9D9D9D),
'X1', fontSize: SizeConfig.getFontSize(20),
style: TextStyle( ),
color: Color(0xFF9D9D9D),
fontSize: SizeConfig.getFontSize(20),
), ),
), ],
], ),
), ),
], ],
), ),
), ),
) ),
], ],
), ),
); );
...@@ -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,42 +305,44 @@ class _PaymentState extends State<Payment> { ...@@ -301,42 +305,44 @@ class _PaymentState extends State<Payment> {
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(15), height: SizeConfig.getHeight(12),
), ),
Row( Container(
children: <Widget>[ // color: Colors.orangeAccent,
Text( child: Row(
'฿1,000.00', children: <Widget>[
style: TextStyle( Text(
fontSize: SizeConfig.getFontSize(20), '฿1,000.00',
color: Color(0xFFFD2956), style: TextStyle(
fontFamily: "SF_Pro_Text", fontSize: SizeConfig.getFontSize(20),
fontWeight: FontWeight.bold, color: Color(0xFFFD2956),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
),
), ),
), Spacer(),
SizedBox( Text(
width: SizeConfig.getWidth(120), 'X1',
), style: TextStyle(
Text( color: Color(0xFF9D9D9D),
'X1', fontSize: SizeConfig.getFontSize(20),
style: TextStyle( ),
color: Color(0xFF9D9D9D),
fontSize: SizeConfig.getFontSize(20),
), ),
), ],
], ),
), ),
], ],
), ),
), ),
) ),
], ],
), ),
); );
} }
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
...@@ -14,14 +14,12 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -14,14 +14,12 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
SizeConfig(context); SizeConfig(context);
return Container( return Container(
child: ListView( child: ListView(
children: <Widget>[ children: <Widget>[
Column( Column(
children: <Widget>[ children: <Widget>[
Texttop(), Texttop(),
Card1(), Card1(),
], ],
), ),
], ],
...@@ -34,44 +32,51 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -34,44 +32,51 @@ 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(
children: <Widget>[ child: Row(
Text( children: <Widget>[
'รีวิว(จากผู้ใช้บริการจริง)', Text(
style: TextStyle( 'รีวิว(จากผู้ใช้บริการจริง)',
color: Color(0xFF6AB3AA), style: TextStyle(
fontSize: SizeConfig.getFontSize(14), color: Color(0xFF6AB3AA),
fontSize: SizeConfig.getFontSize(14),
),
), ),
), Spacer(),
Spacer(), Text(
Text( 'ดูทั้งหมด',
'ดูทั้งหมด', style: TextStyle(
style: TextStyle( color: Colors.black,
color: Colors.black, fontSize: SizeConfig.getFontSize(14),
fontSize: SizeConfig.getFontSize(14), ),
), ),
), ],
], ),
),), ),
); );
} }
Widget Card1() { Widget Card1() {
return Card( return Card(
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(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(
// color: Colors.blueGrey, right: SizeConfig.getPadding(15),
left: SizeConfig.getPadding(15),
bottom: SizeConfig.getPadding(20),
top: SizeConfig.getPadding(20),
),
// 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,41 +239,53 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -242,41 +239,53 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
SizedBox( SizedBox(
width: SizeConfig.getWidth(10), width: SizeConfig.getWidth(10),
), ),
Column( Expanded(
crossAxisAlignment: CrossAxisAlignment.start, child: Container(
children: <Widget>[ // color: Colors.green,
SingleChildScrollView(child: Row( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( SingleChildScrollView(
'Rattaya Pratumkan', child: Row(
style: TextStyle( children: <Widget>[
fontSize: SizeConfig.getFontSize(20), Text(
color: Colors.black), 'Rattaya Pratumkan',
style: TextStyle(
fontSize: SizeConfig.getFontSize(20),
color: Colors.black),
),
Spacer(),
Container(
child: Icon(Icons.more_vert),
)
],
),
),
SizedBox(
height: SizeConfig.getHeight(5),
),
Container(
// color: Colors.blue,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar(
isRating: true,
rate: rate1,
starSize: 20,
onChangeRate: (i) {
setState(() {
rate1 = i;
print(i);
});
},
),
],
),
), ),
SizedBox(
width: SizeConfig.getWidth(35),
),
Container(
child: Icon(Icons.more_vert),)
], ],
),),
SizedBox(
height: SizeConfig.getHeight(5),
), ),
RatingStar( ),
isRating: true,
rate: rate1,
starSize: 20,
onChangeRate: (i) {
setState(() {
rate1 = i;
print(i);
});
},
),
],
), ),
], ],
), ),
...@@ -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(
...@@ -359,45 +374,57 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -359,45 +374,57 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
'service : Spa Cenvaree', 'service : Spa Cenvaree',
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.getFontSize(14), fontSize: SizeConfig.getFontSize(14),
color: Colors.black), color: Colors.black),
), ),
Text( Text(
"Ladies' Day", "Ladies' Day",
style: TextStyle( style: TextStyle(
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),
), ),
SizedBox(height: SizeConfig.getHeight(9),), Row(
Row(children: <Widget>[ children: <Widget>[
Icon(Icons.access_time,color: Color(0xFFEEAFB7),), Icon(
Text(' 150Min') Icons.access_time,
],) color: Color(0xFFEEAFB7),
),
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,38 +433,53 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -406,38 +433,53 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
SizedBox( SizedBox(
width: SizeConfig.getWidth(10), width: SizeConfig.getWidth(10),
), ),
Column( Expanded(
crossAxisAlignment: CrossAxisAlignment.start, child: Container(
children: <Widget>[ // color: Colors.green,
Row( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( SingleChildScrollView(
'Rattaya Pratumkan', child: Row(
style: TextStyle( children: <Widget>[
fontSize: SizeConfig.getFontSize(20), Text(
color: Colors.black), 'Rattaya Pratumkan',
style: TextStyle(
fontSize: SizeConfig.getFontSize(20),
color: Colors.black),
),
Spacer(),
Container(
child: Icon(Icons.more_vert),
)
],
),
), ),
SizedBox( SizedBox(
width: SizeConfig.getWidth(35), height: SizeConfig.getHeight(5),
),
Container(
// color: Colors.blue,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar(
isRating: true,
rate: rate1,
starSize: 20,
onChangeRate: (i) {
setState(() {
rate1 = i;
print(i);
});
},
),
],
),
), ),
Icon(Icons.more_vert),
], ],
), ),
SizedBox( ),
height: SizeConfig.getHeight(5),
),
RatingStar(
isRating: true,
rate: rate1,
starSize: 20,
onChangeRate: (i) {
setState(() {
rate1 = i;
print(i);
});
},
),
],
), ),
], ],
), ),
...@@ -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),
), ),
SizedBox(height: SizeConfig.getHeight(9),), Row(
Row(children: <Widget>[ children: <Widget>[
Icon(Icons.access_time,color: Color(0xFFEEAFB7),), Icon(
Text(' 150Min') Icons.access_time,
],) color: Color(0xFFEEAFB7),
),
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,38 +627,53 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -567,38 +627,53 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
SizedBox( SizedBox(
width: SizeConfig.getWidth(10), width: SizeConfig.getWidth(10),
), ),
Column( Expanded(
crossAxisAlignment: CrossAxisAlignment.start, child: Container(
children: <Widget>[ // color: Colors.green,
Row( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( SingleChildScrollView(
'Rattaya Pratumkan', child: Row(
style: TextStyle( children: <Widget>[
fontSize: SizeConfig.getFontSize(20), Text(
color: Colors.black), 'Rattaya Pratumkan',
style: TextStyle(
fontSize: SizeConfig.getFontSize(20),
color: Colors.black),
),
Spacer(),
Container(
child: Icon(Icons.more_vert),
)
],
),
), ),
SizedBox( SizedBox(
width: SizeConfig.getWidth(35), height: SizeConfig.getHeight(5),
),
Container(
// color: Colors.blue,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar(
isRating: true,
rate: rate1,
starSize: 20,
onChangeRate: (i) {
setState(() {
rate1 = i;
print(i);
});
},
),
],
),
), ),
Icon(Icons.more_vert),
], ],
), ),
SizedBox( ),
height: SizeConfig.getHeight(5),
),
RatingStar(
isRating: true,
rate: rate1,
starSize: 20,
onChangeRate: (i) {
setState(() {
rate1 = i;
print(i);
});
},
),
],
), ),
], ],
), ),
...@@ -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),
), ),
SizedBox(height: SizeConfig.getHeight(9),), Row(
Row(children: <Widget>[ children: <Widget>[
Icon(Icons.access_time,color: Color(0xFFEEAFB7),), Icon(
Text(' 150Min') Icons.access_time,
],) color: Color(0xFFEEAFB7),
),
Text(' 150Min')
],
)
], ],
), ),
], ],
......
lib/ui/shop/shop_service.dart
...@@ -17,8 +17,8 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -17,8 +17,8 @@ class _ShopServicePageState extends State<ShopServicePage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
SizeConfig(context); SizeConfig(context);
return Container( return Container(
child: ListView( child: ListView(
children: <Widget>[ children: <Widget>[
Card1(), Card1(),
Card2(), Card2(),
...@@ -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,16 +171,23 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -171,16 +171,23 @@ class _ShopServicePageState extends State<ShopServicePage> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
RatingStar( Container(
isRating: true, child: Row(
rate: rate1, crossAxisAlignment: CrossAxisAlignment.start,
starSize: 20, children: <Widget>[
onChangeRate: (i) { RatingStar(
setState(() { isRating: true,
rate1 = i; rate: rate1,
print(i); starSize: 20,
}); onChangeRate: (i) {
}, setState(() {
rate1 = i;
print(i);
});
},
),
],
),
), ),
], ],
), ),
...@@ -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,16 +345,23 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -338,16 +345,23 @@ class _ShopServicePageState extends State<ShopServicePage> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
RatingStar( Container(
isRating: true, child: Row(
rate: rate2, crossAxisAlignment: CrossAxisAlignment.start,
starSize: 20, children: <Widget>[
onChangeRate: (i) { RatingStar(
setState(() { isRating: true,
rate2 = i; rate: rate2,
print(i); starSize: 20,
}); onChangeRate: (i) {
}, setState(() {
rate2 = i;
print(i);
});
},
),
],
),
), ),
], ],
), ),
...@@ -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,16 +519,23 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -505,16 +519,23 @@ class _ShopServicePageState extends State<ShopServicePage> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
RatingStar( Container(
isRating: true, child: Row(
rate: rate3, crossAxisAlignment: CrossAxisAlignment.start,
starSize: 20, children: <Widget>[
onChangeRate: (i) { RatingStar(
setState(() { isRating: true,
rate3 = i; rate: rate3,
print(i); starSize: 20,
}); onChangeRate: (i) {
}, setState(() {
rate3 = i;
print(i);
});
},
),
],
),
), ),
], ],
), ),
...@@ -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,16 +693,23 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -672,16 +693,23 @@ class _ShopServicePageState extends State<ShopServicePage> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
RatingStar( Container(
isRating: true, child: Row(
rate: rate4, crossAxisAlignment: CrossAxisAlignment.start,
starSize: 20, children: <Widget>[
onChangeRate: (i) { RatingStar(
setState(() { isRating: true,
rate4 = i; rate: rate4,
print(i); starSize: 20,
}); onChangeRate: (i) {
}, setState(() {
rate4 = i;
print(i);
});
},
),
],
),
), ),
], ],
), ),
...@@ -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,16 +867,23 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -839,16 +867,23 @@ class _ShopServicePageState extends State<ShopServicePage> {
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
RatingStar( Container(
isRating: true, child: Row(
rate: rate5, crossAxisAlignment: CrossAxisAlignment.start,
starSize: 20, children: <Widget>[
onChangeRate: (i) { RatingStar(
setState(() { isRating: true,
rate5 = i; rate: rate5,
print(i); starSize: 20,
}); onChangeRate: (i) {
}, setState(() {
rate5 = i;
print(i);
});
},
),
],
),
), ),
], ],
), ),
......
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