Skip to content

F
feelver
Commit 820b71a3 by Mobile : Jetrin Phuekkaew (N'new)
Options

Merge branch 'develop' of https://gitlab.2fellows.com/art/feelver into develop 

# Conflicts:
#	lib/main.dart
parents 13c213f6 c2e95add
Showing with 203 additions and 22 deletions
lib/main.dart
import 'package:feelverapp/ui/booking/booking_detail.dart';
import 'package:feelverapp/ui/login/login.dart'; import 'package:feelverapp/ui/login/login.dart';
import 'package:feelverapp/ui/my_reviews/my_reviews_page.dart';
import 'package:feelverapp/ui/shop/shop_main.dart'; import 'package:feelverapp/ui/shop/shop_main.dart';
import 'package:feelverapp/ui/splashscreen/splash_screen_page.dart'; import 'package:feelverapp/ui/splashscreen/splash_screen_page.dart';
...@@ -18,8 +20,9 @@ class MyApp extends StatelessWidget { ...@@ -18,8 +20,9 @@ class MyApp extends StatelessWidget {
theme: ThemeData( theme: ThemeData(
primarySwatch: Colors.blue, primarySwatch: Colors.blue,
), ),
// home: MainShop(),
home: SplashScreenPage(), home: SplashScreenPage(),
); );
} }
} }
lib/ui/booking/booking_detail.dart
...@@ -414,6 +414,170 @@ class _BookingDetailState extends State<BookingDetail> { ...@@ -414,6 +414,170 @@ class _BookingDetailState extends State<BookingDetail> {
), ),
), ),
Container( Container(
alignment: Alignment.topLeft,
padding: EdgeInsets.only(
top: SizeConfig.getPadding(24),
left: SizeConfig.getPadding(24),
right: SizeConfig.getPadding(24)),
child: Text(
'Thai Body Balance 60 นาที',
textAlign: TextAlign.left,
style: TextStyle(
color: Colors.black87,
fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
),
SizedBox(
height: SizeConfig.getHeight(16),
),
Row(
children: <Widget>[
SizedBox(
width: SizeConfig.getWidth(24),
),
Image.asset(
'assets/images/clock.png',
width: SizeConfig.getWidth(20),
height: SizeConfig.getWidth(20),
),
SizedBox(
width: SizeConfig.getWidth(10),
),
Text(
'150 นาที',
textAlign: TextAlign.left,
style: TextStyle(
color: Colors.black87,
fontSize: SizeConfig.getFontSize(12),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
],
),
Stack(
children: <Widget>[
Container(
width: SizeConfig.getWidth(50),
height: SizeConfig.getHeight(65),
color: Color.fromRGBO(255, 0, 0, 1),
margin: EdgeInsets.only(
left: SizeConfig.getPadding(24),
// right: SizeConfig.getPadding(20),
top: SizeConfig.getPadding(30),
bottom: SizeConfig.getPadding(20),
),
),
Container(
alignment: Alignment.topLeft,
child: Text(
'Sale\n50%',
textAlign: TextAlign.left,
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w700),
),
padding: EdgeInsets.only(
left: SizeConfig.getPadding(35),
// right: SizeConfig.getPadding(20),
top: SizeConfig.getPadding(40),
bottom: SizeConfig.getPadding(20),
),
),
Container(
alignment: Alignment.topLeft,
child: Text(
'฿199.00',
textAlign: TextAlign.left,
style: TextStyle(
color: Color.fromRGBO(255, 0, 0, 1),
fontSize: SizeConfig.getFontSize(26),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
padding: EdgeInsets.only(
left: SizeConfig.getPadding(90),
// right: SizeConfig.getPadding(20),
top: SizeConfig.getPadding(30),
bottom: SizeConfig.getPadding(20),
),
),
Container(
alignment: Alignment.topLeft,
padding: EdgeInsets.only(
left: SizeConfig.getPadding(90),
// right: SizeConfig.getPadding(20),
top: SizeConfig.getPadding(60),
bottom: SizeConfig.getPadding(20),
),
child: Text(
'฿599.00 ',
textAlign: TextAlign.left,
style: TextStyle(
color: Colors.black45,
fontSize: SizeConfig.getFontSize(20),
decoration: TextDecoration.lineThrough,
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
),
Container(
margin: EdgeInsets.only(
top: SizeConfig.getPadding(10),
left: SizeConfig.getPadding(250)),
// color: Colors.red,
width: SizeConfig.getWidth(100),
height: SizeConfig.getHeight(45),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24),
color: Color.fromRGBO(54, 148, 163, 1),
),
child: Container(
padding: EdgeInsets.only(top: SizeConfig.getPadding(6)),
child: Text(
'หยิบใส่รถเข็น',
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
),
),
Container(
margin: EdgeInsets.only(
top: SizeConfig.getPadding(55),
left: SizeConfig.getPadding(250)),
// color: Colors.red,
width: SizeConfig.getWidth(100),
height: SizeConfig.getHeight(45),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24),
color: Color.fromRGBO(232, 166, 180, 1),
),
child: Container(
padding: EdgeInsets.only(top: SizeConfig.getPadding(6)),
child: Text(
'จองเลย',
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
),
)
,
],
),
Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: SizeConfig.getPadding(24), left: SizeConfig.getPadding(24),
top: SizeConfig.getPadding(3), top: SizeConfig.getPadding(3),
...@@ -460,9 +624,12 @@ class _BookingDetailState extends State<BookingDetail> { ...@@ -460,9 +624,12 @@ class _BookingDetailState extends State<BookingDetail> {
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
width: MediaQuery.of(context).size.width / 4, width: MediaQuery.of(context).size.width / 4,
height: SizeConfig.getHeight(50), height: SizeConfig.getHeight(50),
decoration: BoxDecoration( decoration: BoxDecoration(border: Border.all(
color: Colors.grey,
width: 1,
),
borderRadius: BorderRadius.circular(24), borderRadius: BorderRadius.circular(24),
color: Color.fromRGBO(54, 148, 163, 1), color: Colors.transparent,
), ),
child: Container( child: Container(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
...@@ -471,7 +638,7 @@ class _BookingDetailState extends State<BookingDetail> { ...@@ -471,7 +638,7 @@ class _BookingDetailState extends State<BookingDetail> {
'90 นาที', '90 นาที',
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.grey,
fontSize: SizeConfig.getFontSize(14), fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500), fontWeight: FontWeight.w500),
...@@ -483,18 +650,21 @@ class _BookingDetailState extends State<BookingDetail> { ...@@ -483,18 +650,21 @@ class _BookingDetailState extends State<BookingDetail> {
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
width: MediaQuery.of(context).size.width / 4, width: MediaQuery.of(context).size.width / 4,
height: SizeConfig.getHeight(50), height: SizeConfig.getHeight(50),
decoration: BoxDecoration( decoration: BoxDecoration(border: Border.all(
color: Colors.grey,
width: 1,
),
borderRadius: BorderRadius.circular(24), borderRadius: BorderRadius.circular(24),
color: Color.fromRGBO(54, 148, 163, 1), color: Colors.transparent,
), ),
child: Container( child: Container(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
padding: EdgeInsets.only(top: SizeConfig.getPadding(10)), padding: EdgeInsets.only(top: SizeConfig.getPadding(10)),
child: Text( child: Text(
'90 นาที', '120 นาที',
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.grey,
fontSize: SizeConfig.getFontSize(14), fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500), fontWeight: FontWeight.w500),
...@@ -512,4 +682,3 @@ class _BookingDetailState extends State<BookingDetail> { ...@@ -512,4 +682,3 @@ class _BookingDetailState extends State<BookingDetail> {
); );
} }
} }
lib/ui/booking/bookingflow.dart
...@@ -456,13 +456,17 @@ class _BookingFlowState extends State<BookingFlow> { ...@@ -456,13 +456,17 @@ class _BookingFlowState extends State<BookingFlow> {
), ),
SizedBox(width: SizeConfig.getWidth(16),), SizedBox(width: SizeConfig.getWidth(16),),
Container( Container(
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
width: MediaQuery.of(context).size.width / 4, width: MediaQuery.of(context).size.width / 4,
height: SizeConfig.getHeight(50), height: SizeConfig.getHeight(50),
decoration: BoxDecoration( decoration: BoxDecoration(border: Border.all(
color: Colors.grey,
width: 1,
),
borderRadius: BorderRadius.circular(24), borderRadius: BorderRadius.circular(24),
color: Color.fromRGBO(54, 148, 163, 1), color: Colors.transparent,
), ),
child: Container( child: Container(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
...@@ -471,30 +475,35 @@ class _BookingFlowState extends State<BookingFlow> { ...@@ -471,30 +475,35 @@ class _BookingFlowState extends State<BookingFlow> {
'90 นาที', '90 นาที',
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.grey,
fontSize: SizeConfig.getFontSize(14), fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500), fontWeight: FontWeight.w500),
), ),
), ),
), SizedBox(width: SizeConfig.getWidth(16),), ),
SizedBox(width: SizeConfig.getWidth(16),),
Container( Container(
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
width: MediaQuery.of(context).size.width / 4, width: MediaQuery.of(context).size.width / 4,
height: SizeConfig.getHeight(50), height: SizeConfig.getHeight(50),
decoration: BoxDecoration( decoration: BoxDecoration(border: Border.all(
color: Colors.grey,
width: 1,
),
borderRadius: BorderRadius.circular(24), borderRadius: BorderRadius.circular(24),
color: Color.fromRGBO(54, 148, 163, 1), color: Colors.transparent,
), ),
child: Container( child: Container(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
padding: EdgeInsets.only(top: SizeConfig.getPadding(10)), padding: EdgeInsets.only(top: SizeConfig.getPadding(10)),
child: Text( child: Text(
'90 นาที', '120 นาที',
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.grey,
fontSize: SizeConfig.getFontSize(14), fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text", fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500), fontWeight: FontWeight.w500),
......
lib/ui/shop/shop.dart
...@@ -277,7 +277,7 @@ class _ShopState extends State<Shop> { ...@@ -277,7 +277,7 @@ class _ShopState extends State<Shop> {
), ),
Positioned( Positioned(
top: SizeConfig.getPadding(170), top: SizeConfig.getPadding(170),
right: SizeConfig.getPadding(40), right: SizeConfig.getPadding(30),
child: Container( child: Container(
child: Text( child: Text(
"SPA Cenvaree @ Centara \nGrand CentralWorld Bangkok", "SPA Cenvaree @ Centara \nGrand CentralWorld Bangkok",
...@@ -307,7 +307,7 @@ class _ShopState extends State<Shop> { ...@@ -307,7 +307,7 @@ class _ShopState extends State<Shop> {
), ),
Positioned( Positioned(
top: SizeConfig.getPadding(220), top: SizeConfig.getPadding(220),
left: SizeConfig.getPadding(90), left: SizeConfig.getPadding(100),
child: Container( child: Container(
padding: EdgeInsets.only(left: 5), padding: EdgeInsets.only(left: 5),
child: Row( child: Row(
...@@ -315,7 +315,7 @@ class _ShopState extends State<Shop> { ...@@ -315,7 +315,7 @@ class _ShopState extends State<Shop> {
Column( Column(
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
width: 90.0, width: 70.0,
height: 35.0, height: 35.0,
child: FlatButton( child: FlatButton(
color: Color.fromRGBO(106, 179, 170, 1), color: Color.fromRGBO(106, 179, 170, 1),
...@@ -340,7 +340,7 @@ class _ShopState extends State<Shop> { ...@@ -340,7 +340,7 @@ class _ShopState extends State<Shop> {
width: SizeConfig.getWidth(5), width: SizeConfig.getWidth(5),
), ),
SizedBox( SizedBox(
width: 90.0, width: 70.0,
height: 30.0, height: 30.0,
child: FlatButton( child: FlatButton(
color: Color.fromRGBO(106, 179, 170, 1), color: Color.fromRGBO(106, 179, 170, 1),
...@@ -363,7 +363,7 @@ class _ShopState extends State<Shop> { ...@@ -363,7 +363,7 @@ class _ShopState extends State<Shop> {
width: SizeConfig.getWidth(5), width: SizeConfig.getWidth(5),
), ),
SizedBox( SizedBox(
width: 90.0, width: 70.0,
height: 30.0, height: 30.0,
child: FlatButton( child: FlatButton(
color: Color.fromRGBO(106, 179, 170, 1), color: Color.fromRGBO(106, 179, 170, 1),
......
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