Skip to content

F
feelver
Commit 99ad2318 by art
Options

up

parents 9aec92a7 04853921
Showing with 1230 additions and 554 deletions
lib/main.dart
import 'package:feelverapp/ui/account_setting/account_setting_page.dart';
import 'package:feelverapp/ui/my_order_status/my_order_status.dart';
import 'package:feelverapp/ui/my_reviews/my_reviews_page.dart';
import 'package:feelverapp/ui/my_service/my_service_tab.dart';
import 'package:feelverapp/ui/my_service/service_paid.dart';
import 'package:feelverapp/ui/my_service/service_success.dart';
import 'package:feelverapp/ui/my_service/service_ticket.dart';
import 'package:feelverapp/ui/notification/notification_page.dart';
import 'package:feelverapp/ui/other_menu/other_menu_page.dart';
import 'package:feelverapp/ui/payment/mycart.dart';
import 'package:feelverapp/ui/shop/shop_main.dart'; import 'package:feelverapp/ui/shop/shop_main.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'ui/splashscreen/splash_screen_page.dart'; import 'ui/splashscreen/splash_screen_page.dart';
...@@ -26,9 +17,10 @@ class MyApp extends StatelessWidget { ...@@ -26,9 +17,10 @@ class MyApp extends StatelessWidget {
// home: AccountSettingPage(), // home: AccountSettingPage(),
// home: OtherMenuPage(), // home: OtherMenuPage(),
home: MainShop(), //home: ShopNearbyPlacesPage(),
// home: service_tab(), // home: service_tab(),
// home: SplashScreenPage(),
home: SplashScreenPage(),
); );
} }
} }
lib/ui/favorite/favorite.dart
...@@ -20,12 +20,12 @@ class _FavoriteState extends State<Favorite> { ...@@ -20,12 +20,12 @@ 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(
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(
...@@ -87,7 +87,15 @@ class _FavoriteState extends State<Favorite> { ...@@ -87,7 +87,15 @@ 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(),
Divider(
color: Colors.black,
height: 40,
),
], ],
), ),
), ),
...@@ -98,35 +106,37 @@ class _FavoriteState extends State<Favorite> { ...@@ -98,35 +106,37 @@ class _FavoriteState extends State<Favorite> {
Widget list1() { Widget list1() {
return Container( return Container(
child: Column( // color: Colors.red,
children: <Widget>[ height: SizeConfig.getHeight(150),
Row( child: 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: Image.asset(
'assets/images/demo_img.png',
width: SizeConfig.getWidth(110),
height: SizeConfig.getHeight(150),
fit: BoxFit.fitWidth,
),
),
Expanded(
child: Container( child: Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(10),
right: SizeConfig.getPadding(5),
),
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 +149,28 @@ class _FavoriteState extends State<Favorite> { ...@@ -139,35 +149,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( SizedBox(
height: SizeConfig.getHeight(10), height: SizeConfig.getHeight(5),
), ),
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 +186,12 @@ class _FavoriteState extends State<Favorite> { ...@@ -183,16 +186,12 @@ class _FavoriteState extends State<Favorite> {
), ),
], ],
), ),
],
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(10), height: SizeConfig.getHeight(5),
), ),
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(
...@@ -209,14 +208,8 @@ class _FavoriteState extends State<Favorite> { ...@@ -209,14 +208,8 @@ 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('$a'),
child: Text(
'$a',
style: TextStyle(
fontSize: SizeConfig.getFontSize(12),
),
),
), ),
SizedBox( SizedBox(
width: SizeConfig.getPadding(20), width: SizeConfig.getPadding(20),
...@@ -231,13 +224,7 @@ class _FavoriteState extends State<Favorite> { ...@@ -231,13 +224,7 @@ class _FavoriteState extends State<Favorite> {
}, },
), ),
), ),
], Spacer(),
),
),
),
SizedBox(
width: SizeConfig.getWidth(85),
),
Text( Text(
'฿1,200.00', '฿1,200.00',
style: TextStyle( style: TextStyle(
...@@ -249,17 +236,10 @@ class _FavoriteState extends State<Favorite> { ...@@ -249,17 +236,10 @@ class _FavoriteState extends State<Favorite> {
), ),
], ],
), ),
],
),
),
), ),
], ],
), ),
Divider( ),
color: Colors.black,
height: 40,
indent: 8,
endIndent: 20,
), ),
], ],
), ),
...@@ -268,35 +248,37 @@ class _FavoriteState extends State<Favorite> { ...@@ -268,35 +248,37 @@ class _FavoriteState extends State<Favorite> {
Widget list2() { Widget list2() {
return Container( return Container(
child: Column( // color: Colors.red,
children: <Widget>[ height: SizeConfig.getHeight(150),
Row( child: 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: Image.asset(
'assets/images/demo_img.png',
width: SizeConfig.getWidth(110),
height: SizeConfig.getHeight(150),
fit: BoxFit.fitWidth,
),
),
Expanded(
child: Container( child: Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(10),
right: SizeConfig.getPadding(5),
),
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(
'Sunshine Spa & Massage', 'Ivory Relax and Spa',
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.bold,
color: Colors.black,
),
),
SizedBox(
width: SizeConfig.getWidth(20),
), ),
Spacer(),
Checkbox( Checkbox(
checkColor: Color(0xFFEEAFB7), checkColor: Color(0xFFEEAFB7),
activeColor: Colors.white, activeColor: Colors.white,
...@@ -309,35 +291,28 @@ class _FavoriteState extends State<Favorite> { ...@@ -309,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( SizedBox(
height: SizeConfig.getHeight(10), height: SizeConfig.getHeight(5),
), ),
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: 20, height: 20,
width: 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),
...@@ -353,16 +328,12 @@ class _FavoriteState extends State<Favorite> { ...@@ -353,16 +328,12 @@ class _FavoriteState extends State<Favorite> {
), ),
], ],
), ),
],
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(10), height: SizeConfig.getHeight(5),
), ),
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(
...@@ -379,8 +350,7 @@ class _FavoriteState extends State<Favorite> { ...@@ -379,8 +350,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('$b'), child: Text('$b'),
), ),
SizedBox( SizedBox(
...@@ -396,13 +366,7 @@ class _FavoriteState extends State<Favorite> { ...@@ -396,13 +366,7 @@ class _FavoriteState extends State<Favorite> {
}, },
), ),
), ),
], Spacer(),
),
),
),
SizedBox(
width: SizeConfig.getWidth(85),
),
Text( Text(
'฿1,200.00', '฿1,200.00',
style: TextStyle( style: TextStyle(
...@@ -414,17 +378,10 @@ class _FavoriteState extends State<Favorite> { ...@@ -414,17 +378,10 @@ class _FavoriteState extends State<Favorite> {
), ),
], ],
), ),
],
),
),
), ),
], ],
), ),
Divider( ),
color: Colors.black,
height: 40,
indent: 8,
endIndent: 20,
), ),
], ],
), ),
......
lib/ui/my_order_status/my_order_status.dart
import 'package:feelverapp/ui/home/home.dart'; import 'package:feelverapp/ui/home/home.dart';
import 'package:feelverapp/ui/menu/menu.dart'; import 'package:feelverapp/ui/menu/menu.dart';
import 'package:feelverapp/util/SizeConfig.dart'; import 'package:feelverapp/util/SizeConfig.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class MyOrderStatus extends StatefulWidget { class MyOrderStatus extends StatefulWidget {
...@@ -55,6 +56,7 @@ class _MyOrderStatusState extends State<MyOrderStatus> { ...@@ -55,6 +56,7 @@ class _MyOrderStatusState extends State<MyOrderStatus> {
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
// color: Colors.red,
height: SizeConfig.getHeight(280), height: SizeConfig.getHeight(280),
child: Stack( child: Stack(
children: <Widget>[ children: <Widget>[
...@@ -82,9 +84,11 @@ class _MyOrderStatusState extends State<MyOrderStatus> { ...@@ -82,9 +84,11 @@ class _MyOrderStatusState extends State<MyOrderStatus> {
height: SizeConfig.getWidth(50), height: SizeConfig.getWidth(50),
), ),
), ),
Positioned( Container(
left: SizeConfig.getPadding(75), margin: EdgeInsets.only(
top: SizeConfig.getPadding(190), top: SizeConfig.getPadding(188),
left: SizeConfig.getPadding(70)),
// color: Colors.orange,
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
...@@ -96,13 +100,18 @@ class _MyOrderStatusState extends State<MyOrderStatus> { ...@@ -96,13 +100,18 @@ class _MyOrderStatusState extends State<MyOrderStatus> {
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w700), fontWeight: FontWeight.w700),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(75), Container(
margin: EdgeInsets.only(
right: SizeConfig.getPadding(10),
), ),
// color: Colors.yellow,
child: Row(
children: <Widget>[
Image.asset( Image.asset(
'assets/images/ic_star_active.png', 'assets/images/ic_star_active.png',
width: 18, width: SizeConfig.getWidth(18),
height: 18, height: SizeConfig.getHeight(18),
), ),
Text('4.9'), Text('4.9'),
], ],
...@@ -111,12 +120,18 @@ class _MyOrderStatusState extends State<MyOrderStatus> { ...@@ -111,12 +120,18 @@ class _MyOrderStatusState extends State<MyOrderStatus> {
], ],
), ),
), ),
],
),
),
Container( Container(
// color: Colors.yellow,
alignment: Alignment.topLeft,
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: SizeConfig.getPadding(24), left: SizeConfig.getPadding(24),
right: SizeConfig.getPadding(24)), right: SizeConfig.getPadding(24),
alignment: Alignment.topLeft, ),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
'วันที่สั่งซื้อ : 23.02.2020 08:57', 'วันที่สั่งซื้อ : 23.02.2020 08:57',
...@@ -140,6 +155,7 @@ class _MyOrderStatusState extends State<MyOrderStatus> { ...@@ -140,6 +155,7 @@ class _MyOrderStatusState extends State<MyOrderStatus> {
), ),
), ),
Container( Container(
// color: Colors.green,
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: SizeConfig.getPadding(10), top: SizeConfig.getPadding(10),
left: SizeConfig.getPadding(24), left: SizeConfig.getPadding(24),
...@@ -156,18 +172,20 @@ class _MyOrderStatusState extends State<MyOrderStatus> { ...@@ -156,18 +172,20 @@ class _MyOrderStatusState extends State<MyOrderStatus> {
fontWeight: FontWeight.w700), fontWeight: FontWeight.w700),
), ),
), ),
Row( Container(
children: <Widget>[ // color: Colors.blue,
SizedBox( padding: EdgeInsets.only(
width: SizeConfig.getWidth(20), left: SizeConfig.getPadding(24),
), ),
child: Row(
children: <Widget>[
Image.asset( Image.asset(
'assets/images/clock.png', 'assets/images/clock.png',
width: SizeConfig.getWidth(20), width: SizeConfig.getWidth(20),
height: SizeConfig.getWidth(20), height: SizeConfig.getWidth(20),
), ),
SizedBox( SizedBox(
width: SizeConfig.getWidth(10), width: SizeConfig.getWidth(6),
), ),
Text( Text(
'90 นาที', '90 นาที',
...@@ -178,9 +196,7 @@ class _MyOrderStatusState extends State<MyOrderStatus> { ...@@ -178,9 +196,7 @@ class _MyOrderStatusState extends State<MyOrderStatus> {
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500), fontWeight: FontWeight.w500),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(30),
),
Image.asset( Image.asset(
'assets/images/sell.png', 'assets/images/sell.png',
width: SizeConfig.getWidth(20), width: SizeConfig.getWidth(20),
...@@ -213,6 +229,7 @@ class _MyOrderStatusState extends State<MyOrderStatus> { ...@@ -213,6 +229,7 @@ class _MyOrderStatusState extends State<MyOrderStatus> {
), ),
], ],
), ),
),
InkWell( InkWell(
onTap: () { onTap: () {
// Navigator.push( // Navigator.push(
...@@ -346,25 +363,40 @@ class _MyOrderStatusState extends State<MyOrderStatus> { ...@@ -346,25 +363,40 @@ class _MyOrderStatusState extends State<MyOrderStatus> {
), ),
), ),
), ),
Positioned( Container(
// color: Colors.red,
margin: EdgeInsets.only(
top: SizeConfig.getPadding(150), top: SizeConfig.getPadding(150),
),
child: Container( child: Container(
padding: EdgeInsets.only(left: 20), padding: EdgeInsets.only(
left: SizeConfig.getPadding(15),
right: SizeConfig.getPadding(15),
),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Column( Column(
children: <Widget>[ children: <Widget>[
Image.asset('assets/images/ic_NotInUse.png'), Image.asset(
Text('ยังไม่ได้ใช้งาน',style: TextStyle( 'assets/images/ic_NotInUse.png',
),
SizedBox(height: SizeConfig.getHeight(10),),
Text(
'ยังไม่ได้ใช้งาน',
style: TextStyle(
color: Color(0xFFEEAFB7), color: Color(0xFFEEAFB7),
fontSize: SizeConfig.getFontSize(12), fontSize: SizeConfig.getFontSize(12),
),), ),
),
], ],
), ),
SizedBox(width: SizeConfig.getWidth(45),), Spacer(),
Column( Column(
children: <Widget>[ children: <Widget>[
Image.asset('assets/images/ic_check.png',), Image.asset(
'assets/images/ic_check.png',
),
SizedBox(height: SizeConfig.getHeight(10),),
Text( Text(
'บริการที่พร้อมใช้', 'บริการที่พร้อมใช้',
style: TextStyle( style: TextStyle(
...@@ -374,14 +406,13 @@ class _MyOrderStatusState extends State<MyOrderStatus> { ...@@ -374,14 +406,13 @@ class _MyOrderStatusState extends State<MyOrderStatus> {
), ),
], ],
), ),
SizedBox(width: SizeConfig.getWidth(45),), Spacer(),
Column( Column(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/ic_like.png', 'assets/images/ic_like.png',
width: 25,
height: 25,
), ),
SizedBox(height: SizeConfig.getHeight(10),),
Text( Text(
'บริการที่เเล้วเสร็จ', 'บริการที่เเล้วเสร็จ',
style: TextStyle( style: TextStyle(
...@@ -399,5 +430,4 @@ class _MyOrderStatusState extends State<MyOrderStatus> { ...@@ -399,5 +430,4 @@ class _MyOrderStatusState extends State<MyOrderStatus> {
), ),
); );
} }
} }
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,9 @@ class _MyCartState extends State<MyCart> { ...@@ -42,8 +45,9 @@ class _MyCartState extends State<MyCart> {
), ),
), ),
Container( Container(
height: 40,
width: SizeConfig.getWidth(180), height: SizeConfig.getHeight(40),
width: SizeConfig.getWidth(200),
color: Colors.white, color: Colors.white,
child: TextField( child: TextField(
decoration: InputDecoration( decoration: InputDecoration(
...@@ -57,23 +61,23 @@ class _MyCartState extends State<MyCart> { ...@@ -57,23 +61,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,38 +92,36 @@ class _MyCartState extends State<MyCart> { ...@@ -88,38 +92,36 @@ 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(
padding: const EdgeInsets.only(left: 25),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Text( Text(
'รวมทั้งหมด', 'รวมทั้งหมด',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 16, fontSize: SizeConfig.getFontSize(16),
), ),
), ),
Text( Text(
'฿2,000', '฿2,000',
style: TextStyle( style: TextStyle(
color: Color(0xFFEEAFB7), color: Color(0xFFEEAFB7),
fontSize: 24, fontSize: SizeConfig.getFontSize(24),
), ),
), ),
], ],
), ),
), ),
), Spacer(),
Container( Container(
child: Padding(
padding: const EdgeInsets.only(left: 10),
child: RaisedButton( child: RaisedButton(
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(30.0),
), ),
onPressed: () { onPressed: () {
Navigator.push( Navigator.push(
...@@ -130,22 +132,21 @@ class _MyCartState extends State<MyCart> { ...@@ -130,22 +132,21 @@ class _MyCartState extends State<MyCart> {
); );
}, },
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 35, left: SizeConfig.getPadding(35),
right: 35, right: SizeConfig.getPadding(35),
top: 15, top: SizeConfig.getPadding(15),
bottom: 15, bottom: SizeConfig.getPadding(15),
), ),
color: Color(0xFFEEAFB7), color: Color(0xFFEEAFB7),
child: Text( child: Text(
'สั่งซื้อ', 'สั่งซื้อ',
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: SizeConfig.getPadding(16),
color: Colors.white, color: Colors.white,
), ),
), ),
), ),
), ),
),
], ],
), ),
), ),
...@@ -164,23 +165,20 @@ class _MyCartState extends State<MyCart> { ...@@ -164,23 +165,20 @@ 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( SizedBox(
height: SizeConfig.getHeight(15), height: SizeConfig.getHeight(15),
), ),
...@@ -188,69 +186,87 @@ class _MyCartState extends State<MyCart> { ...@@ -188,69 +186,87 @@ class _MyCartState extends State<MyCart> {
list2(), list2(),
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 40, height: SizeConfig.getHeight(40),
indent: 8,
endIndent: 20,
), ),
// list3(), // list3(),
], ],
), ),
), ),
), ),
),
); );
} }
Widget list1() { Widget list1() {
return Card(child: Container( return Card(
child: Column( elevation: 5,
children: <Widget>[ child: Container(
Row( 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>[ children: <Widget>[
Image.asset( 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( Expanded(
padding: const EdgeInsets.only(left: 8),
child: Container( child: Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(10),
right: SizeConfig.getPadding(5),
),
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( 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( SizedBox(
height: SizeConfig.getHeight(10), height: SizeConfig.getHeight(5),
), ),
Row( Container(
// color: Colors.yellow,
child: Row(
children: <Widget>[ children: <Widget>[
<<<<<<< HEAD
Row( Row(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
...@@ -281,17 +297,39 @@ class _MyCartState extends State<MyCart> { ...@@ -281,17 +297,39 @@ class _MyCartState extends State<MyCart> {
), ),
), ),
], ],
=======
Image.asset(
'assets/images/clock.png',
height: SizeConfig.getHeight(20),
width: SizeConfig.getWidth(20),
),
SizedBox(
width: SizeConfig.getWidth(5),
),
Text('90 นาที'),
Spacer(),
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),
),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
), ),
], ],
), ),
),
SizedBox( SizedBox(
height: SizeConfig.getHeight(10), height: SizeConfig.getHeight(5),
), ),
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(
...@@ -299,7 +337,9 @@ class _MyCartState extends State<MyCart> { ...@@ -299,7 +337,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: 0), padding: EdgeInsets.only(
right: SizeConfig.getPadding(0),
),
onPressed: () { onPressed: () {
setState(() { setState(() {
a = a - 1; a = a - 1;
...@@ -308,35 +348,29 @@ class _MyCartState extends State<MyCart> { ...@@ -308,35 +348,29 @@ class _MyCartState extends State<MyCart> {
), ),
), ),
Padding( Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(right: 8, left: 8),
right: 8, left: 8), child: Text('$a'),
child: Text(
'$a',
style: TextStyle(
fontSize: SizeConfig.getFontSize(12),
),
),
), ),
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: 0), padding: EdgeInsets.only(
right: SizeConfig.getPadding(0),
),
onPressed: () { onPressed: () {
setState(() { setState(() {
a = a + 1; a = a + 1;
}); });
}, },
), ),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
), ),
], Spacer(),
),
),
),
SizedBox(
width: SizeConfig.getWidth(60),
),
Text( Text(
'฿1,200.00', '฿1,200.00',
style: TextStyle( style: TextStyle(
...@@ -348,8 +382,6 @@ class _MyCartState extends State<MyCart> { ...@@ -348,8 +382,6 @@ class _MyCartState extends State<MyCart> {
), ),
], ],
), ),
SizedBox(
height: SizeConfig.getHeight(15),
), ),
], ],
), ),
...@@ -357,61 +389,80 @@ class _MyCartState extends State<MyCart> { ...@@ -357,61 +389,80 @@ class _MyCartState extends State<MyCart> {
), ),
], ],
), ),
],
), ),
),); );
} }
Widget list2() { Widget list2() {
return Card(child: Container( return Card(
child: Column( child: Container(
children: <Widget>[ // color: Colors.red,
Row( 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>[ children: <Widget>[
Image.asset( 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( Expanded(
padding: const EdgeInsets.only(left: 8),
child: Container( child: Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(10),
right: SizeConfig.getPadding(5),
),
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( 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( SizedBox(
height: SizeConfig.getHeight(10), height: SizeConfig.getHeight(5),
), ),
Row( Container(
// color: Colors.yellow,
child: Row(
children: <Widget>[ children: <Widget>[
<<<<<<< HEAD
Row( Row(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
...@@ -442,17 +493,39 @@ class _MyCartState extends State<MyCart> { ...@@ -442,17 +493,39 @@ class _MyCartState extends State<MyCart> {
), ),
), ),
], ],
=======
Image.asset(
'assets/images/clock.png',
height: SizeConfig.getHeight(20),
width: SizeConfig.getWidth(20),
),
SizedBox(
width: SizeConfig.getWidth(5),
),
Text('90 นาที'),
Spacer(),
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),
),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
), ),
], ],
), ),
),
SizedBox( SizedBox(
height: SizeConfig.getHeight(10), height: SizeConfig.getHeight(5),
), ),
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(
...@@ -460,46 +533,38 @@ class _MyCartState extends State<MyCart> { ...@@ -460,46 +533,38 @@ 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: 0), padding: EdgeInsets.only(right: SizeConfig.getPadding(0),),
onPressed: () { onPressed: () {
setState(() { setState(() {
b = b - 1; a = a - 1;
}); });
}, },
), ),
), ),
Padding( Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(right: 8, left: 8),
right: 8, left: 8), child: Text('$a'),
child: Text(
'$b',
style: TextStyle(
fontSize: SizeConfig.getFontSize(12),
),
),
), ),
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: 0), padding: EdgeInsets.only(right: SizeConfig.getPadding(0),),
onPressed: () { onPressed: () {
setState(() { setState(() {
b = b + 1; a = a + 1;
}); });
}, },
), ),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
), ),
], Spacer(),
),
),
),
SizedBox(
width: SizeConfig.getWidth(60),
),
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,8 +574,6 @@ class _MyCartState extends State<MyCart> { ...@@ -509,8 +574,6 @@ class _MyCartState extends State<MyCart> {
), ),
], ],
), ),
SizedBox(
height: SizeConfig.getHeight(15),
), ),
], ],
), ),
...@@ -518,13 +581,10 @@ class _MyCartState extends State<MyCart> { ...@@ -518,13 +581,10 @@ class _MyCartState extends State<MyCart> {
), ),
], ],
), ),
],
), ),
),); );
} }
Widget header() { Widget header() {
return Container( return Container(
child: Stack( child: Stack(
......
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,8 +54,6 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -55,8 +54,6 @@ 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(),
...@@ -64,7 +61,6 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -64,7 +61,6 @@ class _PaymentdetailState extends State<Paymentdetail> {
), ),
), ),
), ),
),
); );
} }
...@@ -82,9 +78,13 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -82,9 +78,13 @@ class _PaymentdetailState extends State<Paymentdetail> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
<<<<<<< HEAD
SizedBox( SizedBox(
width: SizeConfig.getWidth(45), width: SizeConfig.getWidth(45),
), ),
=======
Spacer(),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
Text( Text(
'23.02.2020 08:57', '23.02.2020 08:57',
style: TextStyle( style: TextStyle(
...@@ -100,14 +100,15 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -100,14 +100,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>[
...@@ -145,9 +146,7 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -145,9 +146,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(
...@@ -160,14 +159,12 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -160,14 +159,12 @@ class _PaymentdetailState extends State<Paymentdetail> {
], ],
), ),
), ),
) ),
], ],
), ),
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 40, height: 40,
indent: 10,
endIndent: 20,
), ),
], ],
), ),
...@@ -188,9 +185,13 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -188,9 +185,13 @@ class _PaymentdetailState extends State<Paymentdetail> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
<<<<<<< HEAD
SizedBox( SizedBox(
width: SizeConfig.getWidth(45), width: SizeConfig.getWidth(45),
), ),
=======
Spacer(),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
Text( Text(
'23.02.2020 08:57', '23.02.2020 08:57',
style: TextStyle( style: TextStyle(
...@@ -206,14 +207,15 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -206,14 +207,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 +253,7 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -251,9 +253,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 +266,19 @@ class _PaymentdetailState extends State<Paymentdetail> { ...@@ -266,20 +266,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,13 @@ class _PaymentState extends State<Payment> { ...@@ -40,8 +43,13 @@ class _PaymentState extends State<Payment> {
), ),
), ),
Container( Container(
<<<<<<< HEAD
height: 40, height: 40,
width: SizeConfig.getWidth(170), width: SizeConfig.getWidth(170),
=======
height: SizeConfig.getHeight(40),
width: SizeConfig.getWidth(200),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
color: Colors.white, color: Colors.white,
child: TextField( child: TextField(
decoration: InputDecoration( decoration: InputDecoration(
...@@ -55,46 +63,42 @@ class _PaymentState extends State<Payment> { ...@@ -55,46 +63,42 @@ 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(
padding: const EdgeInsets.only(left: 50),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
'ยอดชำระเงินทั้งหมด', 'ยอดชำระเงินทั้งหมด',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 16, fontSize: SizeConfig.getFontSize(14),
), ),
), ),
Text( Text(
'฿2,000', '฿2,000',
style: TextStyle( style: TextStyle(
color: Color(0xFFEEAFB7), color: Color(0xFFEEAFB7),
fontSize: 24, fontSize: SizeConfig.getFontSize(24),
), ),
), ),
], ],
), ),
), ),
), <<<<<<< HEAD
Container(width: SizeConfig.getWidth(100),height: SizeConfig.getHeight(45), Container(width: SizeConfig.getWidth(100),height: SizeConfig.getHeight(45),
child: Padding( child: Padding(
padding: const EdgeInsets.only(left:10), padding: const EdgeInsets.only(left:10),
...@@ -122,7 +126,37 @@ class _PaymentState extends State<Payment> { ...@@ -122,7 +126,37 @@ class _PaymentState extends State<Payment> {
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
color: Colors.white, color: Colors.white,
=======
Container(
padding: EdgeInsets.only(
right: SizeConfig.getPadding(10),
left: SizeConfig.getPadding(12),
), ),
child: RaisedButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(30.0),
),
onPressed: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => Paymentdetail(),
>>>>>>> 04853921d96720bb30f1d860c2eeda0a17fa7f23
),
);
},
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,14 +182,14 @@ class _PaymentState extends State<Payment> { ...@@ -148,14 +182,14 @@ 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,
...@@ -167,45 +201,44 @@ class _PaymentState extends State<Payment> { ...@@ -167,45 +201,44 @@ class _PaymentState extends State<Payment> {
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(), list2(),
Divider( Divider(
color: Colors.black, color: Colors.black,
height: 40, height: SizeConfig.getHeight(40),
indent: 8,
endIndent: 20,
), ),
list3(), 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 +252,7 @@ class _PaymentState extends State<Payment> { ...@@ -219,7 +252,7 @@ class _PaymentState extends State<Payment> {
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(12), height: SizeConfig.getHeight(10),
), ),
Text( Text(
'นวดแผนไทย', 'นวดแผนไทย',
...@@ -230,9 +263,11 @@ class _PaymentState extends State<Payment> { ...@@ -230,9 +263,11 @@ class _PaymentState extends State<Payment> {
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(15), height: SizeConfig.getHeight(12),
), ),
Row( Container(
// color: Colors.orangeAccent,
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'฿1,200.00', '฿1,200.00',
...@@ -243,9 +278,7 @@ class _PaymentState extends State<Payment> { ...@@ -243,9 +278,7 @@ class _PaymentState extends State<Payment> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(120),
),
Text( Text(
'X1', 'X1',
style: TextStyle( style: TextStyle(
...@@ -255,10 +288,11 @@ class _PaymentState extends State<Payment> { ...@@ -255,10 +288,11 @@ class _PaymentState extends State<Payment> {
), ),
], ],
), ),
),
], ],
), ),
), ),
) ),
], ],
), ),
); );
...@@ -266,17 +300,22 @@ class _PaymentState extends State<Payment> { ...@@ -266,17 +300,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 +329,7 @@ class _PaymentState extends State<Payment> { ...@@ -290,7 +329,7 @@ class _PaymentState extends State<Payment> {
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(12), height: SizeConfig.getHeight(10),
), ),
Text( Text(
'Footology', 'Footology',
...@@ -301,9 +340,11 @@ class _PaymentState extends State<Payment> { ...@@ -301,9 +340,11 @@ class _PaymentState extends State<Payment> {
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(15), height: SizeConfig.getHeight(12),
), ),
Row( Container(
// color: Colors.orangeAccent,
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'฿1,000.00', '฿1,000.00',
...@@ -314,9 +355,7 @@ class _PaymentState extends State<Payment> { ...@@ -314,9 +355,7 @@ class _PaymentState extends State<Payment> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(120),
),
Text( Text(
'X1', 'X1',
style: TextStyle( style: TextStyle(
...@@ -326,17 +365,19 @@ class _PaymentState extends State<Payment> { ...@@ -326,17 +365,19 @@ class _PaymentState extends State<Payment> {
), ),
], ],
), ),
),
], ],
), ),
), ),
) ),
], ],
), ),
); );
} }
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 +389,9 @@ class _PaymentState extends State<Payment> { ...@@ -348,6 +389,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 +399,9 @@ class _PaymentState extends State<Payment> { ...@@ -355,6 +399,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 +415,6 @@ class _PaymentState extends State<Payment> { ...@@ -368,8 +415,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 +423,9 @@ class _PaymentState extends State<Payment> { ...@@ -378,6 +423,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 +439,6 @@ class _PaymentState extends State<Payment> { ...@@ -391,8 +439,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 +447,9 @@ class _PaymentState extends State<Payment> { ...@@ -401,6 +447,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 +463,6 @@ class _PaymentState extends State<Payment> { ...@@ -414,8 +463,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.dart 0 → 100644
import 'package:feelverapp/ui/home/home.dart';
import 'package:feelverapp/ui/menu/menu.dart';
import 'package:feelverapp/util/SizeConfig.dart';
import 'package:flutter/material.dart';
class Shop extends StatefulWidget {
@override
_ShopState createState() => _ShopState();
}
class _ShopState extends State<Shop> {
@override
Widget build(BuildContext context) {
SizeConfig(context);
return ListView(padding: EdgeInsets.all(0), children: <Widget>[
_setupView(),
]);
}
_setupView() {
return Column(
children: <Widget>[
header(),
SizedBox(height: 20),
_listItem1(), bottom(),
SizedBox(height: 30),
Container(
padding: EdgeInsets.only(left: SizeConfig.getPadding(34)),
alignment: Alignment.topLeft,
child: Wrap(
alignment: WrapAlignment.start,
spacing: 10.0, // gap between adjacent chips
runSpacing: 5.0, // gap between lines
children: <Widget>[
FilterChip(
label: Text(
"ทั้งหมด (10)",
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(15),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
backgroundColor: Color.fromRGBO(106, 179, 170, 1),
shape: StadiumBorder(
side: BorderSide(color: Colors.white),
),
onSelected: (bool value) {
print("selected");
setState(() {});
},
),
FilterChip(
label: Text(
"ที่เที่ยว (5)",
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(15),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
backgroundColor: Color.fromRGBO(106, 179, 170, 1),
shape: StadiumBorder(
side: BorderSide(color: Colors.white),
),
onSelected: (bool value) {
print("selected");
},
),
FilterChip(
label: Text(
"ที่กิน (3)",
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(15),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
backgroundColor: Color.fromRGBO(106, 179, 170, 1),
shape: StadiumBorder(
side: BorderSide(color: Colors.white),
),
onSelected: (bool value) {
print("selected");
},
),
FilterChip(
label: Text(
"ที่พัก (1)",
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(15),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
backgroundColor: Color.fromRGBO(106, 179, 170, 1),
shape: StadiumBorder(
side: BorderSide(color: Colors.white),
),
onSelected: (bool value) {
print("selected");
},
),
FilterChip(
label: Text(
"กิจกรรม (1)",
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(15),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
backgroundColor: Color.fromRGBO(106, 179, 170, 1),
shape: StadiumBorder(
side: BorderSide(color: Colors.white),
),
onSelected: (bool value) {
print("selected");
},
),
],
),
),
SizedBox(height: 30),
// _getlist(),
],
);
}
_getlist() {
final List<String> entries = <String>[
'Ivory Relax and Spa',
'Sunshine Spa & Massage',
'Mandarin Ginger Spa'
];
return Expanded(
child: Container(
padding: EdgeInsets.only(
top: SizeConfig.getPadding(16),
left: SizeConfig.getPadding(16),
right: SizeConfig.getPadding(16),
bottom: SizeConfig.getPadding(10),
),
child: ListView.builder(
itemCount: entries.length,
itemBuilder: (context, i) {
return _listItem1();
},
),
),
);
}
_rating() {
return Container(
height: SizeConfig.getHeight(80),
child: Row(
children: <Widget>[
Text(
'5.0',
textAlign: TextAlign.right,
style: TextStyle(
color: Colors.black38,
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w700),
),SizedBox(width:5),
Image.asset(
'assets/images/ic_star_active.png',
width: SizeConfig.getWidth(16),
height: SizeConfig.getWidth(16),
),
Image.asset(
'assets/images/ic_star_active.png',
width: SizeConfig.getWidth(16),
height: SizeConfig.getWidth(16),
),
Image.asset(
'assets/images/ic_star_active.png',
width: SizeConfig.getWidth(16),
height: SizeConfig.getWidth(16),
),
Image.asset(
'assets/images/ic_star_active.png',
width: SizeConfig.getWidth(16),
height: SizeConfig.getWidth(16),
),
Image.asset(
'assets/images/ic_star_active.png',
width: SizeConfig.getWidth(16),
height: SizeConfig.getWidth(16),
),
],
),
);
}
Widget _listItem1() {
return Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(24), right: SizeConfig.getPadding(24)),
alignment: Alignment.center,
child: Column(
children: <Widget>[
Text(
"SPA Cenvaree @ Centara \nGrand CentralWorld Bangkok",
style: TextStyle(fontSize: 25.0, color: Colors.black),
),
_rating(),
Row(
children: <Widget>[
Text(
"Available Payment",
style: TextStyle(fontSize: 25.0, color: Colors.black),
)
],
),
Row(
children: <Widget>[
Image.asset(
'assets/images/mastercard_logo.png',
width: SizeConfig.getWidth(50),
height: SizeConfig.getWidth(50),
),
],
),
Text(
"A four hand massage performed by two therapists in unison, this experience coordinates a blend of Thai, Swedish, Shiatsu and Reflexology techniques using deep rhythmic movement to leave you feeling completely renewed. Top Tip: This is Khun Tara’s (our Group Spa Director) favourite massage. She loves it because having the sensation of two therapists working on you means your mind can’t concentrate on one area and it basically just gives up! This massage almost forces you to switch your mind off. Try it and see.",
style: TextStyle(fontSize: 18.0, color: Colors.black),
),
// Container(
// alignment: Alignment.topCenter,
// child: Image.network(
// 'https://image.freepik.com/free-photo/girl-massage-spa-salon_110955-422.jpg',
// height: SizeConfig.getHeight(300),
// width: MediaQuery.of(context).size.width,
// fit: BoxFit.cover,
// ),
// ),
],
));
}
Widget header() {
return Container(
child: Stack(
children: <Widget>[
Container(
color: Color.fromRGBO(69, 85, 79, 1),
height: SizeConfig.getHeight(270),
width: MediaQuery.of(context).size.width,
),
Positioned(
top: SizeConfig.getPadding(0),
child: Container(
alignment: Alignment.topCenter,
child: Image.network(
'https://image.freepik.com/free-photo/girl-massage-spa-salon_110955-422.jpg',
height: SizeConfig.getHeight(300),
width: MediaQuery.of(context).size.width,
fit: BoxFit.cover,
),
),
),Positioned(
top: SizeConfig.getPadding(0),
child: Container(
height: SizeConfig.getHeight(300),
width: MediaQuery.of(context).size.width,
alignment: Alignment.topCenter,
color: Colors.deepOrangeAccent.withOpacity(0.4)
),
),
Positioned(
top: SizeConfig.getPadding(150),
right: SizeConfig.getPadding(40),
child: Container(
child: Text(
"SPA Cenvaree @ Centara \nGrand CentralWorld Bangkok",
style: TextStyle(fontSize: 18.0, color: Colors.white),
),
),
),
Positioned(
top: SizeConfig.getPadding(150),
left: SizeConfig.getPadding(20),
child: InkWell(
// onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(builder: (context) => LoginPage()),
// );
// },
child: Container(
child: Image.asset(
'assets/images/ic_userimg.png',
height: SizeConfig.getWidth(80),
width: SizeConfig.getWidth(80),
fit: BoxFit.cover,
),
),
),
),
Positioned(
top: SizeConfig.getPadding(200),
left: SizeConfig.getPadding(100),
child: Container(
padding: EdgeInsets.only(left: 5),
child: Row(
children: <Widget>[
Column(
children: <Widget>[
SizedBox(
width: 90.0,
height: 30.0,
child: FlatButton(
color: Color.fromRGBO(106, 179, 170, 1),
textColor: Colors.white,
disabledColor: Colors.grey,
disabledTextColor: Colors.black,
padding: EdgeInsets.all(0.0),
splashColor: Colors.blueAccent,
onPressed: () {
/*...*/
},
shape: new RoundedRectangleBorder(
borderRadius: new BorderRadius.circular(20.0)),
child: Text(
"ถูกใจ",
style: TextStyle(fontSize: 12.0),
),
))
],
),
SizedBox(
width: SizeConfig.getWidth(5),
),
SizedBox(
width: 90.0,
height: 30.0,
child: FlatButton(
color: Color.fromRGBO(106, 179, 170, 1),
textColor: Colors.white,
disabledColor: Colors.grey,
disabledTextColor: Colors.black,
padding: EdgeInsets.all(0.0),
splashColor: Colors.blueAccent,
onPressed: () {
/*...*/
},
shape: new RoundedRectangleBorder(
borderRadius: new BorderRadius.circular(20.0)),
child: Text(
"ติดตาม",
style: TextStyle(fontSize: 12.0),
),
)),
SizedBox(
width: SizeConfig.getWidth(5),
),
SizedBox(
width: 90.0,
height: 30.0,
child: FlatButton(
color: Color.fromRGBO(106, 179, 170, 1),
textColor: Colors.white,
disabledColor: Colors.grey,
disabledTextColor: Colors.black,
padding: EdgeInsets.all(0.0),
splashColor: Colors.blueAccent,
onPressed: () {
/*...*/
},
shape: new RoundedRectangleBorder(
borderRadius: new BorderRadius.circular(20.0)),
child: Text(
"แชร์",
style: TextStyle(fontSize: 12.0),
),
))
],
),
),
),
],
),
);
}
Widget bottom() {
return Container(
child: Stack(
children: <Widget>[
Container(
color: Color.fromRGBO(106, 179, 170, 1),
height: SizeConfig.getHeight(470),
width: MediaQuery.of(context).size.width,
),
Positioned(
top: SizeConfig.getPadding(0),
child: Container(
alignment: Alignment.topCenter,
child: Image.network(
'https://image.freepik.com/free-photo/girl-massage-spa-salon_110955-422.jpg',
height: SizeConfig.getHeight(300),
width: MediaQuery.of(context).size.width,
fit: BoxFit.cover,
),
),
),
Positioned(
bottom: SizeConfig.getPadding(100),
left: SizeConfig.getPadding(40),
child: Container(
child: Text(
"เวลาทำการ",
style: TextStyle(fontSize: 18.0, color: Colors.white),
),
),
),
Positioned(
bottom: SizeConfig.getPadding(50),
left: SizeConfig.getPadding(40),
child: Container(
child: Text(
"จันทร์ - ศุกร์ 10:00 AM - 08:00 PM\nเสาร์ - อาทิตย์ 10:00 AM - 10:00 PM",
style: TextStyle(fontSize: 18.0, color: Colors.white),
),
),
),
],
),
);
}
}
lib/ui/shop/shop_Nearby_places.dart
...@@ -7,6 +7,7 @@ class ShopNearbyPlacesPage extends StatefulWidget { ...@@ -7,6 +7,7 @@ class ShopNearbyPlacesPage extends StatefulWidget {
@override @override
_ShopNearbyPlacesPageState createState() => _ShopNearbyPlacesPageState(); _ShopNearbyPlacesPageState createState() => _ShopNearbyPlacesPageState();
} }
final List<String> entries = <String>['A', 'B', 'C'];
class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage> { class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage> {
@override @override
...@@ -25,6 +26,7 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage> { ...@@ -25,6 +26,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 +38,7 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage> { ...@@ -36,9 +38,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(
......
lib/ui/shop/shop_list_detail.dart
...@@ -890,4 +890,5 @@ class _ShopListDetailState extends State<ShopListDetail> { ...@@ -890,4 +890,5 @@ class _ShopListDetailState extends State<ShopListDetail> {
], ],
), ),
); );
}} }
\ No newline at end of file }
lib/ui/shop/shop_main.dart
import 'package:feelverapp/ui/nearme/near_me_detail.dart'; import 'package:feelverapp/ui/shop/shop.dart';
import 'package:feelverapp/ui/shop/shop_Nearby_places.dart'; import 'package:feelverapp/ui/shop/shop_Nearby_places.dart';
import 'package:feelverapp/ui/shop/shop_reviews.dart'; import 'package:feelverapp/ui/shop/shop_reviews.dart';
import 'package:feelverapp/ui/shop/shop_service.dart'; import 'package:feelverapp/ui/shop/shop_service.dart';
import 'package:feelverapp/util/SizeConfig.dart'; import 'package:feelverapp/util/SizeConfig.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'dart:math';
class MainShop extends StatefulWidget { class MainShop extends StatefulWidget {
MainShop({Key key, this.title}) : super(key: key);
final String title;
@override @override
_MainShopState createState() => new _MainShopState(); _MainShopState createState() => _MainShopState();
} }
final List<String> entries = <String>['A', 'B', 'C']; class _MainShopState extends State<MainShop> with SingleTickerProviderStateMixin /*<-- This is for the controllers*/ {
TabController _controller; // To control switching tabs
ScrollController _scrollViewController; // To control scrolling
class _MainShopState extends State<MainShop> List<String> items = [];
with SingleTickerProviderStateMixin { List<Color> colors = [Colors.red, Colors.green, Colors.yellow, Colors.purple, Colors.blue, Colors.amber, Colors.cyan, Colors.pink];
TabController _controller; Random random = new Random();
Color getRandomColor() {
return colors.elementAt(random.nextInt(colors.length));
}
@override
void initState() { void initState() {
// TODO: implement initState
super.initState(); super.initState();
_controller = new TabController(length: 4, vsync: this); _controller = new TabController(length: 4, vsync: this);
_controller.addListener(_handleTabSelection); _controller.addListener(_handleTabSelection);
_scrollViewController =ScrollController();
}
void _handleTabSelection() {
setState(() {});
} }
@override @override
void dispose() { void dispose() {
// TODO: implement dispose
_controller.dispose();
super.dispose(); super.dispose();
_controller.dispose();
_scrollViewController.dispose();
} }
void _handleTabSelection() {
setState(() {
});
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
SizeConfig(context); SizeConfig(context);
return new Scaffold( // Init the items
appBar: new AppBar( for (var i = 0; i < 100; i++) {
items.add('Item $i');
}
return Scaffold(
// backgroundColor: Colors.transparent,
body: NestedScrollView(
controller: _scrollViewController,
headerSliverBuilder: (BuildContext context, bool boxIsScrolled) {
return <Widget>[
SliverAppBar(
backgroundColor: Color.fromRGBO(106, 179, 170, 1),
leading: IconButton( leading: IconButton(
icon: Icon(Icons.arrow_back_ios, color: Colors.white), icon: Icon(Icons.arrow_back_ios, color: Colors.white),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
), ),
backgroundColor: Color.fromRGBO(106, 179, 170, 1), title: Center(child:Text("Thai Body Balance",style:TextStyle(
title: new Text( color:Colors.white,
'Thai Body Balance', fontSize: 25)),),
style: TextStyle(color: Colors.white, fontSize: 25), floating: true,
), pinned: false,
elevation: 0, snap: true,
), bottom: new TabBar(
body: new ListView(
children: <Widget>[
// new Card(
// child: new ListTile(
// title: const Text('Some information'),
// ),
// ),
new Container( indicatorColor:Colors.transparent,
padding: const EdgeInsets.only(bottom: 25, top: 15),
decoration: new BoxDecoration(
color: Color.fromRGBO(106, 179, 170, 1),
),
child: new TabBar(
indicatorColor: Colors.transparent,
controller: _controller, controller: _controller,
tabs: [ tabs: [
new Tab( new Tab(
...@@ -133,16 +145,15 @@ class _MainShopState extends State<MainShop> ...@@ -133,16 +145,15 @@ class _MainShopState extends State<MainShop>
], ],
), ),
), ),
];
},
new Container( body: new Container(
height: double.maxFinite, height: double.maxFinite,
child: new TabBarView( child: new TabBarView(
controller: _controller, controller: _controller,
children: <Widget>[ children: <Widget>[
Container( Container(
color: Colors.deepPurpleAccent, child:Shop()
height: 50,
// child: getlist(), // child: getlist(),
//width: 20, //width: 20,
), ),
...@@ -245,11 +256,13 @@ class _MainShopState extends State<MainShop> ...@@ -245,11 +256,13 @@ class _MainShopState extends State<MainShop>
], ],
), ),
), ),
Container( Expanded(
// color: Colors.blue, child: Container(
height: double.maxFinite, // color: Colors.blue,
// height: double.maxFinite,
child: ShopServicePage(), child: ShopServicePage(),
), ),
),
], ],
), ),
// child: getlist(), // child: getlist(),
...@@ -271,8 +284,8 @@ class _MainShopState extends State<MainShop> ...@@ -271,8 +284,8 @@ class _MainShopState extends State<MainShop>
], ],
), ),
), ),
],
), ),
); );
} }
} }
\ No newline at end of file
lib/ui/shop/shop_reviews.dart
...@@ -32,8 +32,9 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -32,8 +32,9 @@ 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: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
...@@ -43,9 +44,7 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -43,9 +44,7 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
fontSize: SizeConfig.getFontSize(14), fontSize: SizeConfig.getFontSize(14),
), ),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(145),
),
Text( Text(
'ดูทั้งหมด', 'ดูทั้งหมด',
style: TextStyle( style: TextStyle(
...@@ -55,6 +54,7 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -55,6 +54,7 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
), ),
], ],
), ),
),
); );
} }
...@@ -66,12 +66,17 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -66,12 +66,17 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
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(
right: SizeConfig.getPadding(15),
left: SizeConfig.getPadding(15),
bottom: SizeConfig.getPadding(20),
top: SizeConfig.getPadding(20),
),
// color: Colors.blueGrey, // 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,10 +239,14 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -242,10 +239,14 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
SizedBox( SizedBox(
width: SizeConfig.getWidth(10), width: SizeConfig.getWidth(10),
), ),
Column( Expanded(
child: Container(
// color: Colors.green,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( SingleChildScrollView(
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'Rattaya Pratumkan', 'Rattaya Pratumkan',
...@@ -253,15 +254,21 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -253,15 +254,21 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
fontSize: SizeConfig.getFontSize(20), fontSize: SizeConfig.getFontSize(20),
color: Colors.black), color: Colors.black),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(60), Container(
), child: Icon(Icons.more_vert),
Icon(Icons.more_vert), )
], ],
), ),
),
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Container(
// color: Colors.blue,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate1, rate: rate1,
...@@ -275,6 +282,11 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -275,6 +282,11 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
), ),
], ],
), ),
),
],
),
),
),
], ],
), ),
), ),
...@@ -331,14 +343,20 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -331,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(
...@@ -368,33 +386,45 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -368,33 +386,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),
),
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') 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,
...@@ -403,10 +433,14 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -403,10 +433,14 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
SizedBox( SizedBox(
width: SizeConfig.getWidth(10), width: SizeConfig.getWidth(10),
), ),
Column( Expanded(
child: Container(
// color: Colors.green,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( SingleChildScrollView(
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'Rattaya Pratumkan', 'Rattaya Pratumkan',
...@@ -414,15 +448,21 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -414,15 +448,21 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
fontSize: SizeConfig.getFontSize(20), fontSize: SizeConfig.getFontSize(20),
color: Colors.black), color: Colors.black),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(60), Container(
), child: Icon(Icons.more_vert),
Icon(Icons.more_vert), )
], ],
), ),
),
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Container(
// color: Colors.blue,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate1, rate: rate1,
...@@ -436,6 +476,11 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -436,6 +476,11 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
), ),
], ],
), ),
),
],
),
),
),
], ],
), ),
), ),
...@@ -492,14 +537,20 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -492,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(
...@@ -529,33 +580,45 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -529,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),
),
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') 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,
...@@ -564,10 +627,14 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -564,10 +627,14 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
SizedBox( SizedBox(
width: SizeConfig.getWidth(10), width: SizeConfig.getWidth(10),
), ),
Column( Expanded(
child: Container(
// color: Colors.green,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( SingleChildScrollView(
child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
'Rattaya Pratumkan', 'Rattaya Pratumkan',
...@@ -575,15 +642,21 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -575,15 +642,21 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
fontSize: SizeConfig.getFontSize(20), fontSize: SizeConfig.getFontSize(20),
color: Colors.black), color: Colors.black),
), ),
SizedBox( Spacer(),
width: SizeConfig.getWidth(60), Container(
), child: Icon(Icons.more_vert),
Icon(Icons.more_vert), )
], ],
), ),
),
SizedBox( SizedBox(
height: SizeConfig.getHeight(5), height: SizeConfig.getHeight(5),
), ),
Container(
// color: Colors.blue,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate1, rate: rate1,
...@@ -597,6 +670,11 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -597,6 +670,11 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> {
), ),
], ],
), ),
),
],
),
),
),
], ],
), ),
), ),
...@@ -653,14 +731,20 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -653,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(
...@@ -690,18 +774,28 @@ class _ShopReviewsPageState extends State<ShopReviewsPage> { ...@@ -690,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),
),
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') Text(' 150Min')
],) ],
)
], ],
), ),
], ],
......
lib/ui/shop/shop_service.dart
...@@ -14,7 +14,6 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -14,7 +14,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
double rate4 = 0; double rate4 = 0;
double rate5 = 0; double rate5 = 0;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
SizeConfig(context); SizeConfig(context);
...@@ -36,7 +35,7 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -36,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),
...@@ -63,7 +62,6 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -63,7 +62,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
// color: Colors.yellow, // color: Colors.yellow,
height: SizeConfig.getHeight(250), height: SizeConfig.getHeight(250),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
...@@ -170,12 +168,18 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -170,12 +168,18 @@ class _ShopServicePageState extends State<ShopServicePage> {
), ),
], ],
), ),
SizedBox(height: SizeConfig.getHeight(5),), SizedBox(
height: SizeConfig.getHeight(5),
),
Container(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate1, rate: rate1,
starSize: 20, starSize: 20,
onChangeRate: (i){ onChangeRate: (i) {
setState(() { setState(() {
rate1 = i; rate1 = i;
print(i); print(i);
...@@ -185,7 +189,9 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -185,7 +189,9 @@ class _ShopServicePageState extends State<ShopServicePage> {
], ],
), ),
), ),
],
),
),
], ],
), ),
), ),
...@@ -197,12 +203,13 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -197,12 +203,13 @@ class _ShopServicePageState extends State<ShopServicePage> {
), ),
); );
} }
Widget Card2() { Widget Card2() {
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(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),
...@@ -229,7 +236,6 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -229,7 +236,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
// color: Colors.yellow, // color: Colors.yellow,
height: SizeConfig.getHeight(250), height: SizeConfig.getHeight(250),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
...@@ -336,12 +342,18 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -336,12 +342,18 @@ class _ShopServicePageState extends State<ShopServicePage> {
), ),
], ],
), ),
SizedBox(height: SizeConfig.getHeight(5),), SizedBox(
height: SizeConfig.getHeight(5),
),
Container(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate2, rate: rate2,
starSize: 20, starSize: 20,
onChangeRate: (i){ onChangeRate: (i) {
setState(() { setState(() {
rate2 = i; rate2 = i;
print(i); print(i);
...@@ -351,7 +363,9 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -351,7 +363,9 @@ class _ShopServicePageState extends State<ShopServicePage> {
], ],
), ),
), ),
],
),
),
], ],
), ),
), ),
...@@ -363,12 +377,13 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -363,12 +377,13 @@ class _ShopServicePageState extends State<ShopServicePage> {
), ),
); );
} }
Widget Card3() { Widget Card3() {
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(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),
...@@ -395,7 +410,6 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -395,7 +410,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
// color: Colors.yellow, // color: Colors.yellow,
height: SizeConfig.getHeight(250), height: SizeConfig.getHeight(250),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
...@@ -502,12 +516,18 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -502,12 +516,18 @@ class _ShopServicePageState extends State<ShopServicePage> {
), ),
], ],
), ),
SizedBox(height: SizeConfig.getHeight(5),), SizedBox(
height: SizeConfig.getHeight(5),
),
Container(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate3, rate: rate3,
starSize: 20, starSize: 20,
onChangeRate: (i){ onChangeRate: (i) {
setState(() { setState(() {
rate3 = i; rate3 = i;
print(i); print(i);
...@@ -517,7 +537,9 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -517,7 +537,9 @@ class _ShopServicePageState extends State<ShopServicePage> {
], ],
), ),
), ),
],
),
),
], ],
), ),
), ),
...@@ -529,12 +551,13 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -529,12 +551,13 @@ class _ShopServicePageState extends State<ShopServicePage> {
), ),
); );
} }
Widget Card4() { Widget Card4() {
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(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),
...@@ -561,7 +584,6 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -561,7 +584,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
// color: Colors.yellow, // color: Colors.yellow,
height: SizeConfig.getHeight(250), height: SizeConfig.getHeight(250),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
...@@ -668,12 +690,18 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -668,12 +690,18 @@ class _ShopServicePageState extends State<ShopServicePage> {
), ),
], ],
), ),
SizedBox(height: SizeConfig.getHeight(5),), SizedBox(
height: SizeConfig.getHeight(5),
),
Container(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate4, rate: rate4,
starSize: 20, starSize: 20,
onChangeRate: (i){ onChangeRate: (i) {
setState(() { setState(() {
rate4 = i; rate4 = i;
print(i); print(i);
...@@ -683,7 +711,9 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -683,7 +711,9 @@ class _ShopServicePageState extends State<ShopServicePage> {
], ],
), ),
), ),
],
),
),
], ],
), ),
), ),
...@@ -695,12 +725,13 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -695,12 +725,13 @@ class _ShopServicePageState extends State<ShopServicePage> {
), ),
); );
} }
Widget Card5() { Widget Card5() {
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(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),
...@@ -727,7 +758,6 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -727,7 +758,6 @@ class _ShopServicePageState extends State<ShopServicePage> {
// color: Colors.yellow, // color: Colors.yellow,
height: SizeConfig.getHeight(250), height: SizeConfig.getHeight(250),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
...@@ -834,12 +864,18 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -834,12 +864,18 @@ class _ShopServicePageState extends State<ShopServicePage> {
), ),
], ],
), ),
SizedBox(height: SizeConfig.getHeight(5),), SizedBox(
height: SizeConfig.getHeight(5),
),
Container(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingStar( RatingStar(
isRating: true, isRating: true,
rate: rate5, rate: rate5,
starSize: 20, starSize: 20,
onChangeRate: (i){ onChangeRate: (i) {
setState(() { setState(() {
rate5 = i; rate5 = i;
print(i); print(i);
...@@ -849,7 +885,9 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -849,7 +885,9 @@ class _ShopServicePageState extends State<ShopServicePage> {
], ],
), ),
), ),
],
),
),
], ],
), ),
), ),
...@@ -861,5 +899,4 @@ class _ShopServicePageState extends State<ShopServicePage> { ...@@ -861,5 +899,4 @@ class _ShopServicePageState extends State<ShopServicePage> {
), ),
); );
} }
} }
pubspec.lock
...@@ -7,42 +7,42 @@ packages: ...@@ -7,42 +7,42 @@ packages:
name: archive name: archive
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.13" version: "2.0.11"
args: args:
dependency: transitive dependency: transitive
description: description:
name: args name: args
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.6.0" version: "1.5.2"
async: async:
dependency: transitive dependency: transitive
description: description:
name: async name: async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.4.1" version: "2.4.0"
boolean_selector: boolean_selector:
dependency: transitive dependency: transitive
description: description:
name: boolean_selector name: boolean_selector
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.0" version: "1.0.5"
charcode: charcode:
dependency: transitive dependency: transitive
description: description:
name: charcode name: charcode
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.3" version: "1.1.2"
collection: collection:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.14.12" version: "1.14.11"
convert: convert:
dependency: transitive dependency: transitive
description: description:
...@@ -56,7 +56,7 @@ packages: ...@@ -56,7 +56,7 @@ packages:
name: crypto name: crypto
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.4" version: "2.1.3"
cupertino_icons: cupertino_icons:
dependency: "direct main" dependency: "direct main"
description: description:
...@@ -87,7 +87,7 @@ packages: ...@@ -87,7 +87,7 @@ packages:
name: image name: image
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.12" version: "2.1.4"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:
...@@ -109,6 +109,13 @@ packages: ...@@ -109,6 +109,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.6.4" version: "1.6.4"
pedantic:
dependency: transitive
description:
name: pedantic
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0+1"
petitparser: petitparser:
dependency: transitive dependency: transitive
description: description:
...@@ -122,7 +129,7 @@ packages: ...@@ -122,7 +129,7 @@ packages:
name: quiver name: quiver
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.3" version: "2.0.5"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
...@@ -134,7 +141,7 @@ packages: ...@@ -134,7 +141,7 @@ packages:
name: source_span name: source_span
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.7.0" version: "1.5.5"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
...@@ -169,7 +176,7 @@ packages: ...@@ -169,7 +176,7 @@ packages:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.15" version: "0.2.11"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
...@@ -190,6 +197,6 @@ packages: ...@@ -190,6 +197,6 @@ packages:
name: xml name: xml
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.6.1" version: "3.5.0"
sdks: sdks:
dart: ">=2.6.0 <3.0.0" dart: ">=2.6.0 <3.0.0"
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