Skip to content

F
feelver
Commit 85b4b8fa by art
Options

update

parent 11909f6d
Showing with 568 additions and 35 deletions
lib/main.dart
import 'package:feelverapp/ui/nearme/near_me_list.dart';
import 'package:feelverapp/ui/shop/shop_main.dart';
import 'package:flutter/material.dart';
import 'ui/splashscreen/splash_screen_page.dart';
void main() => runApp(MyApp());
......@@ -14,13 +16,8 @@ class MyApp extends StatelessWidget {
theme: ThemeData(
primarySwatch: Colors.blue,
),
// home: AccountSettingPage(),
// home: OtherMenuPage(),
//home: ShopNearbyPlacesPage(),
// home: service_tab(),
home: SplashScreenPage(),
home: MainShop(),
// home: SplashScreenPage(),
);
}
}
lib/ui/booking/booking_detail.dart 0 → 100644
import 'package:feelverapp/ui/booking/bookingform.dart';
import 'package:feelverapp/util/SizeConfig.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
class BookingDetail extends StatefulWidget {
@override
_BookingDetailState createState() => _BookingDetailState();
}
class _BookingDetailState extends State<BookingDetail> {
@override
Widget build(BuildContext context) {
return Scaffold(
body: _setupView(),
bottomNavigationBar: Container(
height: SizeConfig.getHeight(100),
color: Color.fromRGBO(106, 179, 170, 1),
child: Stack(
children: <Widget>[
Positioned(
top: SizeConfig.getPadding(24),
left: SizeConfig.getPadding(20),
child: Container(
// color: Colors.red,
width: MediaQuery.of(context).size.width / 2.5,
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),
),
),
),
),
Positioned(
top: SizeConfig.getPadding(24),
right: SizeConfig.getPadding(20),
child: InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => BookingForm(),
),
);
},
child: Container(
// color: Colors.red,
width: MediaQuery.of(context).size.width / 2.5,
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),
),
),
),
),
),
],
),
),
);
}
_setupView() {
return SingleChildScrollView(
child: Column(
children: <Widget>[
Stack(
children: <Widget>[
Image.network(
'https://www.cancurreu.com/wp-content/uploads/can_curreu_hotel_ibiza_spa_tratamientos.jpg',
width: MediaQuery.of(context).size.width,
height: SizeConfig.getHeight(450),
fit: BoxFit.cover,
),
Positioned(
top: SizeConfig.getPadding(44),
left: SizeConfig.getPadding(16),
child: InkWell(
onTap: () {
Navigator.pop(context);
},
child: Image.asset(
'assets/images/ic_back.png',
width: SizeConfig.getWidth(20),
height: SizeConfig.getWidth(20),
),
),
),
],
),
Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(24),
top: SizeConfig.getPadding(16)),
alignment: Alignment.topLeft,
child: Text(
'4 ธ.ค. 2561 18:55 น.',
textAlign: TextAlign.left,
style: TextStyle(
color: Colors.black54,
fontSize: SizeConfig.getFontSize(11),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
),
Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(24),
top: SizeConfig.getPadding(3),
bottom: SizeConfig.getPadding(8)),
alignment: Alignment.topLeft,
child: Text(
'Thai Body',
textAlign: TextAlign.left,
style: TextStyle(
color: Colors.black,
fontSize: SizeConfig.getFontSize(26),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w700),
),
),
Row(
children: <Widget>[
SizedBox(
width: SizeConfig.getWidth(24),
),
ImageIcon(
AssetImage('assets/images/ic_fav_active.png'),
color: Colors.pink,
size: SizeConfig.getFontSize(24),
),
SizedBox(
width: SizeConfig.getWidth(8),
),
Container(
alignment: Alignment.topLeft,
child: Text(
'70',
textAlign: TextAlign.left,
style: TextStyle(
color: Colors.black54,
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
padding: EdgeInsets.only(
top: SizeConfig.getPadding(5),
left: SizeConfig.getPadding(0),
bottom: SizeConfig.getPadding(4)),
),
SizedBox(
width: SizeConfig.getWidth(20),
),
ImageIcon(
AssetImage('assets/images/ic_comment.png'),
color: Colors.grey,
size: SizeConfig.getFontSize(24),
),
SizedBox(
width: SizeConfig.getWidth(8),
),
Container(
alignment: Alignment.topLeft,
child: Text(
'70',
textAlign: TextAlign.left,
style: TextStyle(
color: Colors.black54,
fontSize: SizeConfig.getFontSize(16),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
padding: EdgeInsets.only(
top: SizeConfig.getPadding(5),
left: SizeConfig.getPadding(0),
bottom: SizeConfig.getPadding(4)),
),
SizedBox(
width: SizeConfig.getWidth(20),
),
ImageIcon(
AssetImage('assets/images/facebook-icon.png'),
color: Colors.grey,
size: SizeConfig.getFontSize(24),
),
SizedBox(
width: SizeConfig.getWidth(20),
),
ImageIcon(
AssetImage('assets/images/ic_twitter.png'),
color: Colors.grey,
size: SizeConfig.getFontSize(24),
),
],
),
SizedBox(
height: SizeConfig.getWidth(20),
),
Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(24),
right: SizeConfig.getPadding(24),
),
child: Card(
child: Column(
children: <Widget>[
Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
children: <Widget>[
ClipRRect(
borderRadius: BorderRadius.circular(11.0),
child: Image.network(
'https://image.freepik.com/free-photo/girl-massage-spa-salon_110955-422.jpg',
fit: BoxFit.cover,
height: SizeConfig.getHeight(100),
width: SizeConfig.getWidth(100),
),
),
Column(
children: <Widget>[
Container(
alignment: Alignment.topLeft,
child: Text(
'SPA By CLARINS',
textAlign: TextAlign.left,
style: TextStyle(
color: Colors.black,
fontSize: SizeConfig.getFontSize(12),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w700),
),
padding: EdgeInsets.only(
top: SizeConfig.getPadding(5),
left: SizeConfig.getPadding(0),
bottom: SizeConfig.getPadding(5)),
),
Row(
children: <Widget>[
SizedBox(
width: 16,
),
ImageIcon(
AssetImage('assets/images/pin_drop.png'),
color: Colors.black54,
size: SizeConfig.getFontSize(16),
),
SizedBox(
width: SizeConfig.getWidth(4),
),
Container(
alignment: Alignment.topLeft,
child: Text(
'พญาไท กรุงเทพ (3.8 km)',
textAlign: TextAlign.left,
style: TextStyle(
color: Colors.black87,
fontSize: SizeConfig.getFontSize(12),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
padding: EdgeInsets.only(
top: SizeConfig.getPadding(5),
left: SizeConfig.getPadding(0),
bottom: SizeConfig.getPadding(5)),
),
],
),
Row(
children: <Widget>[
SizedBox(
width: SizeConfig.getWidth(24),
),
Container(
alignment: Alignment.topLeft,
child: Text(
'4.4',
textAlign: TextAlign.left,
style: TextStyle(
color: Colors.black54,
fontSize: SizeConfig.getFontSize(12),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
padding: EdgeInsets.only(
top: SizeConfig.getPadding(5),
left: SizeConfig.getPadding(10),
bottom: SizeConfig.getPadding(5)),
),
SizedBox(
width: SizeConfig.getWidth(14),
),
ImageIcon(
AssetImage(
'assets/images/ic_star_active.png'),
color: Color.fromRGBO(255, 207, 7, 1),
size: SizeConfig.getFontSize(16),
),
SizedBox(
width: SizeConfig.getWidth(2),
),
ImageIcon(
AssetImage(
'assets/images/ic_star_active.png'),
color: Color.fromRGBO(255, 207, 7, 1),
size: SizeConfig.getFontSize(16),
),
SizedBox(
width: SizeConfig.getWidth(2),
),
ImageIcon(
AssetImage(
'assets/images/ic_star_active.png'),
color: Color.fromRGBO(255, 207, 7, 1),
size: SizeConfig.getFontSize(16),
),
SizedBox(
width: SizeConfig.getWidth(2),
),
ImageIcon(
AssetImage(
'assets/images/ic_star_active.png'),
color: Color.fromRGBO(255, 207, 7, 1),
size: SizeConfig.getFontSize(16),
),
SizedBox(
width: SizeConfig.getWidth(2),
),
ImageIcon(
AssetImage(
'assets/images/ic_star_unactive.png'),
color: Colors.grey,
size: SizeConfig.getFontSize(16),
),
SizedBox(
width: SizeConfig.getWidth(40),
height: SizeConfig.getWidth(30),
),
],
),
],
),
],
),
),
SizedBox(
height: SizeConfig.getHeight(8),
),
Container(
width: MediaQuery.of(context).size.width / 1.5,
height: SizeConfig.getHeight(40),
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),
),
),
),
SizedBox(
height: SizeConfig.getHeight(20),
),
],
),
),
),
Container(
alignment: Alignment.topLeft,
padding: EdgeInsets.only(
top: SizeConfig.getPadding(24),
left: SizeConfig.getPadding(24),
right: SizeConfig.getPadding(24)),
child: 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 Taras (our Group Spa Director) favourite massage. She loves it because having the sensation of two therapists working on you means your mind cant concentrate on one area and it basically just gives up! This massage almost forces you to switch your mind off. Try it and see.',
textAlign: TextAlign.left,
style: TextStyle(
color: Colors.black54,
fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
),
Container(
padding: EdgeInsets.only(
left: SizeConfig.getPadding(24),
top: SizeConfig.getPadding(3),
bottom: SizeConfig.getPadding(8)),
alignment: Alignment.topLeft,
child: Text(
'Thai Body Balance 60 นาที',
textAlign: TextAlign.left,
style: TextStyle(
color: Colors.black,
fontSize: SizeConfig.getFontSize(26),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
),
Row(
children: <Widget>[
SizedBox(width: SizeConfig.getWidth(24),),
Container(
alignment: Alignment.topLeft,
width: MediaQuery.of(context).size.width / 4,
height: SizeConfig.getHeight(50),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24),
color: Color.fromRGBO(54, 148, 163, 1),
),
child: Container(
alignment: Alignment.topCenter,
padding: EdgeInsets.only(top: SizeConfig.getPadding(10)),
child: Text(
'60 นาที',
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
),
),
SizedBox(width: SizeConfig.getWidth(16),),
Container(
alignment: Alignment.topLeft,
width: MediaQuery.of(context).size.width / 4,
height: SizeConfig.getHeight(50),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24),
color: Color.fromRGBO(54, 148, 163, 1),
),
child: Container(
alignment: Alignment.topCenter,
padding: EdgeInsets.only(top: SizeConfig.getPadding(10)),
child: Text(
'90 นาที',
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
),
), SizedBox(width: SizeConfig.getWidth(16),),
Container(
alignment: Alignment.topLeft,
width: MediaQuery.of(context).size.width / 4,
height: SizeConfig.getHeight(50),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24),
color: Color.fromRGBO(54, 148, 163, 1),
),
child: Container(
alignment: Alignment.topCenter,
padding: EdgeInsets.only(top: SizeConfig.getPadding(10)),
child: Text(
'90 นาที',
textAlign: TextAlign.center,
style: TextStyle(
color: Colors.white,
fontSize: SizeConfig.getFontSize(14),
fontFamily: "SF_Pro_Text",
fontWeight: FontWeight.w500),
),
),
),
],
),
SizedBox(
height: SizeConfig.getHeight(30),
),
],
),
);
}
}
lib/ui/login/login.dart
......@@ -45,7 +45,7 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
),
),
SizedBox(
height: SizeConfig.getWidth(24),
height: SizeConfig.getHeight(24),
),
TabBar(
indicatorColor: Color.fromRGBO(106, 179, 170, 1),
......@@ -65,12 +65,16 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
Tab(
child: Text(
'เบอร์โทร',
style: TextStyle(fontSize: SizeConfig.getFontSize(16)),
style: TextStyle(
fontSize: SizeConfig.getFontSize(16),
),
),
),
],
),
SizedBox(height: SizeConfig.getWidth(30)),
SizedBox(
height: SizeConfig.getHeight(30),
),
_formLogin(),
],
),
......@@ -84,7 +88,9 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
children: <Widget>[
Container(
alignment: Alignment.topLeft,
padding: EdgeInsets.only(left: SizeConfig.getPadding(30)),
padding: EdgeInsets.only(
left: SizeConfig.getPadding(30),
),
child: Text(
'อีเมล์',
style: TextStyle(
......@@ -125,7 +131,9 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
),
Container(
alignment: Alignment.topLeft,
padding: EdgeInsets.only(left: SizeConfig.getPadding(30)),
padding: EdgeInsets.only(
left: SizeConfig.getPadding(30),
),
child: Text(
'รหัสผ่าน',
style: TextStyle(
......@@ -141,8 +149,9 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
horizontal: SizeConfig.getPadding(24)),
child: Card(
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(SizeConfig.getPadding(50.0)),
borderRadius: BorderRadius.circular(
SizeConfig.getPadding(50.0),
),
),
child: TextFormField(
// controller: loginBloc.passCtrl,
......@@ -161,11 +170,13 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
),
),
SizedBox(
height: SizeConfig.getWidth(24),
height: SizeConfig.getHeight(24),
),
Container(
alignment: Alignment.topRight,
padding: EdgeInsets.only(right: SizeConfig.getPadding(30)),
padding: EdgeInsets.only(
right: SizeConfig.getPadding(30),
),
child: Text(
'ลืมรหัสผ่าน',
style: TextStyle(
......@@ -178,7 +189,7 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
_submitLoginButton(),
_policyText(),
SizedBox(
height: SizeConfig.getWidth(20),
height: SizeConfig.getHeight(20),
),
_facebookLoginButton(),
],
......@@ -193,15 +204,19 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
vertical: SizeConfig.getPadding(20.0),
horizontal: SizeConfig.getPadding(32)),
child: Container(
height: SizeConfig.getWidth(55),
height: SizeConfig.getHeight(55),
child: CupertinoButton(
color: Color.fromRGBO(106, 179, 170, 1),
padding: EdgeInsets.all(0),
borderRadius: BorderRadius.all(Radius.circular(50)),
borderRadius: BorderRadius.all(
Radius.circular(50),
),
onPressed: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => HomePage()),
MaterialPageRoute(
builder: (context) => HomePage(),
),
);
// if (loginBloc.formKey.currentState.validate()) {
// loginBloc.getLogin();
......@@ -222,13 +237,16 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
return Padding(
padding: EdgeInsets.symmetric(
vertical: SizeConfig.getPadding(16.0),
horizontal: SizeConfig.getPadding(32)),
horizontal: SizeConfig.getPadding(32),
),
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(SizeConfig.getPadding(50)),
borderRadius: BorderRadius.circular(
SizeConfig.getPadding(50),
),
color: Color(0xff3b5998),
),
height: SizeConfig.getWidth(55),
height: SizeConfig.getHeight(55),
child: CupertinoButton(
color: Color(0xff3b5998),
padding: EdgeInsets.all(0),
......@@ -239,7 +257,8 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
children: <Widget>[
Padding(
padding: EdgeInsets.symmetric(
horizontal: SizeConfig.getPadding(8.0)),
horizontal: SizeConfig.getPadding(8.0),
),
child: ImageIcon(
AssetImage('assets/images/facebook-icon.png'),
size: 20,
......@@ -247,7 +266,9 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
),
Text(
'Login with Facebook',
style: TextStyle(fontSize: SizeConfig.getFontSize(12)),
style: TextStyle(
fontSize: SizeConfig.getFontSize(12),
),
textAlign: TextAlign.center,
),
],
......
lib/ui/shop/shop.dart
......@@ -251,7 +251,7 @@ class _ShopState extends State<Shop> {
children: <Widget>[
Container(
color: Color.fromRGBO(69, 85, 79, 1),
height: SizeConfig.getHeight(270),
height: SizeConfig.getHeight(350),
width: MediaQuery.of(context).size.width,
),
......@@ -261,7 +261,7 @@ class _ShopState extends State<Shop> {
alignment: Alignment.topCenter,
child: Image.network(
'https://image.freepik.com/free-photo/girl-massage-spa-salon_110955-422.jpg',
height: SizeConfig.getHeight(300),
height: SizeConfig.getHeight(350),
width: MediaQuery.of(context).size.width,
fit: BoxFit.cover,
),
......@@ -269,14 +269,14 @@ class _ShopState extends State<Shop> {
),Positioned(
top: SizeConfig.getPadding(0),
child: Container(
height: SizeConfig.getHeight(300),
height: SizeConfig.getHeight(350),
width: MediaQuery.of(context).size.width,
alignment: Alignment.topCenter,
color: Colors.deepOrangeAccent.withOpacity(0.4)
),
),
Positioned(
top: SizeConfig.getPadding(150),
top: SizeConfig.getPadding(170),
right: SizeConfig.getPadding(40),
child: Container(
child: Text(
......@@ -286,8 +286,8 @@ class _ShopState extends State<Shop> {
),
),
Positioned(
top: SizeConfig.getPadding(150),
left: SizeConfig.getPadding(20),
top: SizeConfig.getPadding(172),
left: SizeConfig.getPadding(10),
child: InkWell(
// onTap: () {
// Navigator.push(
......@@ -306,8 +306,8 @@ class _ShopState extends State<Shop> {
),
),
Positioned(
top: SizeConfig.getPadding(200),
left: SizeConfig.getPadding(100),
top: SizeConfig.getPadding(220),
left: SizeConfig.getPadding(90),
child: Container(
padding: EdgeInsets.only(left: 5),
child: Row(
......@@ -316,7 +316,7 @@ class _ShopState extends State<Shop> {
children: <Widget>[
SizedBox(
width: 90.0,
height: 30.0,
height: 35.0,
child: FlatButton(
color: Color.fromRGBO(106, 179, 170, 1),
textColor: Colors.white,
......
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