Skip to content

F
feelver
Commit 2ab8682f by art
Options

update

parents 99ad2318 3a0ee540
Showing with 21 additions and 128 deletions
lib/ui/favorite/favorite.dart
...@@ -163,8 +163,8 @@ class _FavoriteState extends State<Favorite> { ...@@ -163,8 +163,8 @@ class _FavoriteState extends State<Favorite> {
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/clock.png', 'assets/images/clock.png',
height: 20, height: SizeConfig.getHeight(20),
width: 20, width: SizeConfig.getWidth(20),
), ),
SizedBox( SizedBox(
width: SizeConfig.getWidth(5), width: SizeConfig.getWidth(5),
...@@ -305,8 +305,8 @@ class _FavoriteState extends State<Favorite> { ...@@ -305,8 +305,8 @@ class _FavoriteState extends State<Favorite> {
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/clock.png', 'assets/images/clock.png',
height: 20, height: SizeConfig.getHeight(20),
width: 20, width: SizeConfig.getWidth(20),
), ),
SizedBox( SizedBox(
width: SizeConfig.getWidth(5), width: SizeConfig.getWidth(5),
......
lib/ui/payment/mycart.dart
...@@ -35,7 +35,10 @@ class _MyCartState extends State<MyCart> { ...@@ -35,7 +35,10 @@ class _MyCartState extends State<MyCart> {
color: Colors.white, color: Colors.white,
), ),
Padding( Padding(
padding: const EdgeInsets.only(left: 7, right: 12), padding: const EdgeInsets.only(
left: 7,
right: 12,
),
child: Text( child: Text(
'โค้ดส่วนลด', 'โค้ดส่วนลด',
style: TextStyle( style: TextStyle(
...@@ -266,38 +269,7 @@ class _MyCartState extends State<MyCart> { ...@@ -266,38 +269,7 @@ class _MyCartState extends State<MyCart> {
// color: Colors.yellow, // color: Colors.yellow,
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
<<<<<<< HEAD
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(60),
),
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),
),
),
],
=======
Image.asset( Image.asset(
'assets/images/clock.png', 'assets/images/clock.png',
height: SizeConfig.getHeight(20), height: SizeConfig.getHeight(20),
...@@ -320,7 +292,6 @@ class _MyCartState extends State<MyCart> { ...@@ -320,7 +292,6 @@ class _MyCartState extends State<MyCart> {
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
color: Color(0xFFEEAFB7), color: Color(0xFFEEAFB7),
), ),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
), ),
], ],
), ),
...@@ -352,9 +323,7 @@ class _MyCartState extends State<MyCart> { ...@@ -352,9 +323,7 @@ class _MyCartState extends State<MyCart> {
child: Text('$a'), child: Text('$a'),
), ),
SizedBox( SizedBox(
<<<<<<< HEAD
width: SizeConfig.getWidth(60),
=======
width: SizeConfig.getPadding(20), width: SizeConfig.getPadding(20),
height: SizeConfig.getPadding(20), height: SizeConfig.getPadding(20),
child: RaisedButton( child: RaisedButton(
...@@ -368,7 +337,6 @@ class _MyCartState extends State<MyCart> { ...@@ -368,7 +337,6 @@ class _MyCartState extends State<MyCart> {
}); });
}, },
), ),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
), ),
Spacer(), Spacer(),
Text( Text(
...@@ -462,38 +430,7 @@ class _MyCartState extends State<MyCart> { ...@@ -462,38 +430,7 @@ class _MyCartState extends State<MyCart> {
// color: Colors.yellow, // color: Colors.yellow,
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
<<<<<<< HEAD
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(60),
),
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),
),
),
],
=======
Image.asset( Image.asset(
'assets/images/clock.png', 'assets/images/clock.png',
height: SizeConfig.getHeight(20), height: SizeConfig.getHeight(20),
...@@ -516,7 +453,6 @@ class _MyCartState extends State<MyCart> { ...@@ -516,7 +453,6 @@ class _MyCartState extends State<MyCart> {
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
color: Color(0xFFEEAFB7), color: Color(0xFFEEAFB7),
), ),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
), ),
], ],
), ),
...@@ -533,7 +469,9 @@ class _MyCartState extends State<MyCart> { ...@@ -533,7 +469,9 @@ class _MyCartState extends State<MyCart> {
height: SizeConfig.getPadding(20), height: SizeConfig.getPadding(20),
child: RaisedButton( child: RaisedButton(
child: Text('-'), child: Text('-'),
padding: EdgeInsets.only(right: SizeConfig.getPadding(0),), padding: EdgeInsets.only(
right: SizeConfig.getPadding(0),
),
onPressed: () { onPressed: () {
setState(() { setState(() {
a = a - 1; a = a - 1;
...@@ -546,21 +484,19 @@ class _MyCartState extends State<MyCart> { ...@@ -546,21 +484,19 @@ class _MyCartState extends State<MyCart> {
child: Text('$a'), child: Text('$a'),
), ),
SizedBox( SizedBox(
<<<<<<< HEAD
width: SizeConfig.getWidth(60),
=======
width: SizeConfig.getPadding(20), width: SizeConfig.getPadding(20),
height: SizeConfig.getPadding(20), height: SizeConfig.getPadding(20),
child: RaisedButton( child: RaisedButton(
child: Text('+'), child: Text('+'),
padding: EdgeInsets.only(right: SizeConfig.getPadding(0),), padding: EdgeInsets.only(
right: SizeConfig.getPadding(0),
),
onPressed: () { onPressed: () {
setState(() { setState(() {
a = a + 1; a = a + 1;
}); });
}, },
), ),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
), ),
Spacer(), Spacer(),
Text( Text(
......
lib/ui/payment/payment_detail.dart
...@@ -78,13 +78,8 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -78,13 +78,8 @@ class _PaymentdetailState extends State<Paymentdetail> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
<<<<<<< HEAD
SizedBox(
width: SizeConfig.getWidth(45),
),
=======
Spacer(), Spacer(),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
Text( Text(
'23.02.2020 08:57', '23.02.2020 08:57',
style: TextStyle( style: TextStyle(
...@@ -185,13 +180,8 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -185,13 +180,8 @@ class _PaymentdetailState extends State<Paymentdetail> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
<<<<<<< HEAD
SizedBox(
width: SizeConfig.getWidth(45),
),
=======
Spacer(), Spacer(),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
Text( Text(
'23.02.2020 08:57', '23.02.2020 08:57',
style: TextStyle( style: TextStyle(
......
lib/ui/payment/payment_page.dart
...@@ -43,13 +43,9 @@ class _PaymentState extends State<Payment> { ...@@ -43,13 +43,9 @@ class _PaymentState extends State<Payment> {
), ),
), ),
Container( Container(
<<<<<<< HEAD
height: 40,
width: SizeConfig.getWidth(170),
=======
height: SizeConfig.getHeight(40), height: SizeConfig.getHeight(40),
width: SizeConfig.getWidth(200), width: SizeConfig.getWidth(200),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
color: Colors.white, color: Colors.white,
child: TextField( child: TextField(
decoration: InputDecoration( decoration: InputDecoration(
...@@ -98,35 +94,7 @@ class _PaymentState extends State<Payment> { ...@@ -98,35 +94,7 @@ class _PaymentState extends State<Payment> {
], ],
), ),
), ),
<<<<<<< HEAD
Container(width: SizeConfig.getWidth(100),height: SizeConfig.getHeight(45),
child: Padding(
padding: const EdgeInsets.only(left:10),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.0),
),
onPressed: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => Paymentdetail(),
),
);
},
padding: EdgeInsets.only(
left: 0,
right: 0,
top: 5,
bottom: 0,
),
color: Color(0xFFEEAFB7),
child: Text(
'ยืนยัน',
style: TextStyle(
fontSize: 16,
color: Colors.white,
=======
Container( Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(
right: SizeConfig.getPadding(10), right: SizeConfig.getPadding(10),
...@@ -141,7 +109,6 @@ class _PaymentState extends State<Payment> { ...@@ -141,7 +109,6 @@ class _PaymentState extends State<Payment> {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => Paymentdetail(), builder: (context) => Paymentdetail(),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
), ),
); );
}, },
......
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