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