Skip to content

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

no message

parent facc6447
Showing with 195 additions and 79 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,35 +102,31 @@ class _FavoriteState extends State<Favorite> { ...@@ -98,35 +102,31 @@ class _FavoriteState extends State<Favorite> {
Widget list1() { Widget list1() {
return Container( return Container(
child: Column( color: Colors.red,
children: <Widget>[ child: Row(
Row( mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Image.asset(
'assets/images/no-image.png',
height: SizeConfig.getHeight(80),
width: SizeConfig.getWidth(80),
),
Padding( Padding(
padding: const EdgeInsets.only(left: 8), padding: const EdgeInsets.only(left: 10),
child: Container( child: Image.asset(
'assets/images/demo_img.png',
width: SizeConfig.getWidth(110),
height: SizeConfig.getHeight(150),
fit: BoxFit.fitWidth,
),
),
Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( Container(
color: Colors.blue,
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'Ivory Relax and Spa', 'Ivory Relax and Spa',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
color: Colors.black,
),
),
SizedBox(
width: SizeConfig.getWidth(60),
), ),
Spacer(),
Checkbox( Checkbox(
checkColor: Color(0xFFEEAFB7), checkColor: Color(0xFFEEAFB7),
activeColor: Colors.white, activeColor: Colors.white,
...@@ -139,35 +139,25 @@ class _FavoriteState extends State<Favorite> { ...@@ -139,35 +139,25 @@ class _FavoriteState extends State<Favorite> {
}), }),
], ],
), ),
Text(
'นวดแผนไทย',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
color: Colors.black,
),
), ),
SizedBox( Container(
height: SizeConfig.getHeight(10), color: Colors.white,
child: Text('นวดเเผนไทย'),
), ),
Row( Container(
children: <Widget>[ color: Colors.yellow,
Row( child: Row(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/clock.png', 'assets/images/clock.png',
height: SizeConfig.getHeight(20), height: 20,
width: SizeConfig.getWidth(20), width: 20,
),
Text(
' 90 นาที',
style: TextStyle(
fontFamily: "SF_Pro_Text",
),
), ),
SizedBox( SizedBox(
width: SizeConfig.getWidth(95), width: SizeConfig.getWidth(5),
), ),
Text('90 นาที'),
Spacer(),
Icon( Icon(
Icons.local_offer, Icons.local_offer,
color: Color(0xFFEEAFB7), color: Color(0xFFEEAFB7),
...@@ -183,16 +173,9 @@ class _FavoriteState extends State<Favorite> { ...@@ -183,16 +173,9 @@ class _FavoriteState extends State<Favorite> {
), ),
], ],
), ),
],
), ),
SizedBox(
height: SizeConfig.getHeight(10),
),
Row(
children: <Widget>[
Container( Container(
child: Padding( color: Colors.orangeAccent,
padding: const EdgeInsets.only(left: 10),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
...@@ -203,7 +186,7 @@ class _FavoriteState extends State<Favorite> { ...@@ -203,7 +186,7 @@ class _FavoriteState extends State<Favorite> {
padding: EdgeInsets.only(right: 0), padding: EdgeInsets.only(right: 0),
onPressed: () { onPressed: () {
setState(() { setState(() {
a = a - 1; b = b - 1;
}); });
}, },
), ),
...@@ -211,12 +194,7 @@ class _FavoriteState extends State<Favorite> { ...@@ -211,12 +194,7 @@ class _FavoriteState extends State<Favorite> {
Padding( Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
right: 8, left: 8), right: 8, left: 8),
child: Text( child: Text('$b'),
'$a',
style: TextStyle(
fontSize: SizeConfig.getFontSize(12),
),
),
), ),
SizedBox( SizedBox(
width: SizeConfig.getPadding(20), width: SizeConfig.getPadding(20),
...@@ -226,18 +204,12 @@ class _FavoriteState extends State<Favorite> { ...@@ -226,18 +204,12 @@ class _FavoriteState extends State<Favorite> {
padding: EdgeInsets.only(right: 0), padding: EdgeInsets.only(right: 0),
onPressed: () { onPressed: () {
setState(() { setState(() {
a = a + 1; b = b + 1;
}); });
}, },
), ),
), ),
], Spacer(),
),
),
),
SizedBox(
width: SizeConfig.getWidth(85),
),
Text( Text(
'฿1,200.00', '฿1,200.00',
style: TextStyle( style: TextStyle(
...@@ -249,17 +221,9 @@ class _FavoriteState extends State<Favorite> { ...@@ -249,17 +221,9 @@ class _FavoriteState extends State<Favorite> {
), ),
], ],
), ),
],
),
),
), ),
], ],
), ),
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(
...@@ -399,7 +361,6 @@ class _FavoriteState extends State<Favorite> { ...@@ -399,7 +361,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