Skip to content

F
feelver
Commit 6f0cd9b4 by Mobile : Ball (Apprentice)
Options

no message

parent facc6447
Showing with 267 additions and 151 deletions
lib/ui/favorite/favorite.dart
...@@ -20,7 +20,7 @@ class _FavoriteState extends State<Favorite> { ...@@ -20,7 +20,7 @@ class _FavoriteState extends State<Favorite> {
body: _setupView(), body: _setupView(),
bottomNavigationBar: Container( bottomNavigationBar: Container(
color: Color.fromRGBO(69, 85, 79, 1), color: Color.fromRGBO(69, 85, 79, 1),
height: SizeConfig.getWidth(120), height: SizeConfig.getHeight(120),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
...@@ -87,6 +87,10 @@ class _FavoriteState extends State<Favorite> { ...@@ -87,6 +87,10 @@ class _FavoriteState extends State<Favorite> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
list1(), list1(),
Divider(
color: Colors.black,
height: 40,
),
list2(), list2(),
], ],
), ),
...@@ -98,168 +102,128 @@ class _FavoriteState extends State<Favorite> { ...@@ -98,168 +102,128 @@ class _FavoriteState extends State<Favorite> {
Widget list1() { Widget list1() {
return Container( return Container(
child: Column( color: Colors.red,
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,
Padding( ),
padding: const EdgeInsets.only(left: 8), ),
child: Container( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
color: Colors.blue,
child: Row(
children: <Widget>[ children: <Widget>[
Row( Text(
children: <Widget>[ 'Ivory Relax and Spa',
Text( ),
'Ivory Relax and Spa', Spacer(),
style: TextStyle( Checkbox(
fontSize: SizeConfig.getFontSize(16), checkColor: Color(0xFFEEAFB7),
fontFamily: "SF_Pro_Text", activeColor: Colors.white,
fontWeight: FontWeight.bold, value: checkBoxValue,
color: Colors.black, onChanged: (bool value) {
), setState(() {
), print(value);
SizedBox( checkBoxValue = value;
width: SizeConfig.getWidth(60), });
), }),
Checkbox( ],
checkColor: Color(0xFFEEAFB7), ),
activeColor: Colors.white, ),
value: checkBoxValue, Container(
onChanged: (bool value) { color: Colors.white,
setState(() { child: Text('นวดเเผนไทย'),
print(value); ),
checkBoxValue = value; Container(
}); color: Colors.yellow,
}), child: Row(
], children: <Widget>[
Image.asset(
'assets/images/clock.png',
height: 20,
width: 20,
),
SizedBox(
width: SizeConfig.getWidth(5),
),
Text('90 นาที'),
Spacer(),
Icon(
Icons.local_offer,
color: Color(0xFFEEAFB7),
), ),
Text( Text(
'นวดแผนไทย', '฿1,599.00',
style: TextStyle( style: TextStyle(
decoration: TextDecoration.lineThrough,
fontSize: SizeConfig.getFontSize(16), fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
color: Colors.black, color: Color(0xFFEEAFB7),
), ),
), ),
],
),
),
Container(
color: Colors.orangeAccent,
child: Row(
children: <Widget>[
SizedBox( SizedBox(
height: SizeConfig.getHeight(10), width: SizeConfig.getPadding(20),
height: SizeConfig.getPadding(20),
child: RaisedButton(
child: Text('-'),
padding: EdgeInsets.only(right: 0),
onPressed: () {
setState(() {
b = b - 1;
});
},
),
), ),
Row( Padding(
children: <Widget>[ padding: const EdgeInsets.only(
Row( right: 8, left: 8),
children: <Widget>[ child: Text('$b'),
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(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( SizedBox(
height: SizeConfig.getHeight(10), width: SizeConfig.getPadding(20),
height: SizeConfig.getPadding(20),
child: RaisedButton(
child: Text('+'),
padding: EdgeInsets.only(right: 0),
onPressed: () {
setState(() {
b = b + 1;
});
},
),
), ),
Row( Spacer(),
children: <Widget>[ Text(
Container( '฿1,200.00',
child: Padding( style: TextStyle(
padding: const EdgeInsets.only(left: 10), fontSize: SizeConfig.getFontSize(20),
child: Row( color: Color(0xFFFD2956),
children: <Widget>[ fontFamily: "SF_Pro_Text",
SizedBox( fontWeight: FontWeight.bold,
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;
});
},
),
),
],
),
),
),
SizedBox(
width: SizeConfig.getWidth(85),
),
Text(
'฿1,200.00',
style: TextStyle(
fontSize: SizeConfig.getFontSize(20),
color: Color(0xFFFD2956),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
),
),
],
), ),
], ],
), ),
), ),
), ],
], ),
),
Divider(
color: Colors.black,
height: 40,
indent: 8,
endIndent: 20,
), ),
], ],
), ),
...@@ -361,8 +325,6 @@ class _FavoriteState extends State<Favorite> { ...@@ -361,8 +325,6 @@ class _FavoriteState extends State<Favorite> {
Row( Row(
children: <Widget>[ children: <Widget>[
Container( Container(
child: Padding(
padding: const EdgeInsets.only(left: 10),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
...@@ -398,7 +360,6 @@ class _FavoriteState extends State<Favorite> { ...@@ -398,7 +360,6 @@ class _FavoriteState extends State<Favorite> {
), ),
], ],
), ),
),
), ),
SizedBox( SizedBox(
width: SizeConfig.getWidth(85), width: SizeConfig.getWidth(85),
...@@ -511,3 +472,159 @@ class _FavoriteState extends State<Favorite> { ...@@ -511,3 +472,159 @@ 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/shop/shop_Nearby_places.dart
...@@ -25,6 +25,7 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage> { ...@@ -25,6 +25,7 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage> {
top: SizeConfig.getPadding(15), top: SizeConfig.getPadding(15),
bottom: SizeConfig.getPadding(10), bottom: SizeConfig.getPadding(10),
left: SizeConfig.getPadding(24), left: SizeConfig.getPadding(24),
right: SizeConfig.getPadding(24)
), ),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
...@@ -36,9 +37,7 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage> { ...@@ -36,9 +37,7 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage> {
fontSize: SizeConfig.getFontSize(14), fontSize: SizeConfig.getFontSize(14),
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(175),
),
Text( Text(
'ดูทั้งหมด', 'ดูทั้งหมด',
style: TextStyle( style: TextStyle(
......
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