Skip to content

F
feelver
Commit ebc14b30 by Mobile : Ball (Apprentice)
Options

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

# Conflicts:
#	lib/ui/payment/payment_detail.dart
#	lib/ui/payment/payment_page.dart
parents c79cd11e 703d01ea
Showing with 103 additions and 45 deletions
lib/ui/booking/bookingflow.dart
import 'package:feelverapp/ui/booking/bookingform.dart';
import 'package:feelverapp/util/SizeConfig.dart'; import 'package:feelverapp/util/SizeConfig.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
...@@ -50,7 +51,7 @@ class _BookingFlowState extends State<BookingFlow> { ...@@ -50,7 +51,7 @@ class _BookingFlowState extends State<BookingFlow> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => BookingFlow(), builder: (context) => BookingForm(),
), ),
); );
}, },
...@@ -236,8 +237,8 @@ class _BookingFlowState extends State<BookingFlow> { ...@@ -236,8 +237,8 @@ class _BookingFlowState extends State<BookingFlow> {
child: Image.network( child: Image.network(
'https://image.freepik.com/free-photo/girl-massage-spa-salon_110955-422.jpg', 'https://image.freepik.com/free-photo/girl-massage-spa-salon_110955-422.jpg',
fit: BoxFit.cover, fit: BoxFit.cover,
height: 100.0, height: SizeConfig.getHeight(100),
width: 100.0, width: SizeConfig.getWidth(100),
), ),
), ),
Column( Column(
...@@ -390,7 +391,7 @@ class _BookingFlowState extends State<BookingFlow> { ...@@ -390,7 +391,7 @@ class _BookingFlowState extends State<BookingFlow> {
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.getHeight(16), height: SizeConfig.getHeight(20),
), ),
], ],
), ),
...@@ -428,28 +429,81 @@ class _BookingFlowState extends State<BookingFlow> { ...@@ -428,28 +429,81 @@ class _BookingFlowState extends State<BookingFlow> {
fontWeight: FontWeight.w500), fontWeight: FontWeight.w500),
), ),
), ),
Container( Row(
alignment: Alignment.topLeft, children: <Widget>[
width: MediaQuery.of(context).size.width / 3, SizedBox(width: SizeConfig.getWidth(24),),
height: SizeConfig.getHeight(50), Container(
decoration: BoxDecoration( alignment: Alignment.topLeft,
borderRadius: BorderRadius.circular(24), width: MediaQuery.of(context).size.width / 4,
color: Color.fromRGBO(54, 148, 163, 1), height: SizeConfig.getHeight(50),
), decoration: BoxDecoration(
child: Container( borderRadius: BorderRadius.circular(24),
alignment: Alignment.topCenter, color: Color.fromRGBO(54, 148, 163, 1),
padding: EdgeInsets.only(top: SizeConfig.getPadding(10)), ),
child: Text( child: Container(
'ร้านแนะนำ', alignment: Alignment.topCenter,
textAlign: TextAlign.center, padding: EdgeInsets.only(top: SizeConfig.getPadding(10)),
style: TextStyle( child: Text(
color: Colors.white, '60 นาที',
fontSize: SizeConfig.getFontSize(14), textAlign: TextAlign.center,
fontFamily: "SF_Pro_Text", style: TextStyle(
fontWeight: FontWeight.w500), 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( SizedBox(
height: SizeConfig.getHeight(30), height: SizeConfig.getHeight(30),
), ),
......
lib/ui/home/home.dart
import 'package:feelverapp/ui/login/login.dart'; import 'package:feelverapp/ui/login/login.dart';
import 'package:feelverapp/ui/menu/menu.dart'; import 'package:feelverapp/ui/menu/menu.dart';
import 'package:feelverapp/ui/mycart/mycart_page.dart';
import 'package:feelverapp/ui/nearme/near_me_list.dart'; import 'package:feelverapp/ui/nearme/near_me_list.dart';
import 'package:feelverapp/ui/reserve/reserve_list.dart'; import 'package:feelverapp/ui/reserve/reserve_list.dart';
import 'package:feelverapp/ui/shop/shop_list.dart'; import 'package:feelverapp/ui/shop/shop_list.dart';
...@@ -96,10 +95,6 @@ class _HomePageState extends State<HomePage> { ...@@ -96,10 +95,6 @@ class _HomePageState extends State<HomePage> {
height: SizeConfig.getWidth(24), height: SizeConfig.getWidth(24),
), ),
onPressed: () { onPressed: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => MyCart()),
);
// Navigator.push( // Navigator.push(
// context, // context,
// MaterialPageRoute(builder: (context) => LoginPage()), // MaterialPageRoute(builder: (context) => LoginPage()),
......
lib/ui/nearme/near_me_detail.dart
...@@ -37,9 +37,9 @@ class _NearmeDetailState extends State<NearmeDetail> { ...@@ -37,9 +37,9 @@ class _NearmeDetailState extends State<NearmeDetail> {
Container( Container(
height: SizeConfig.getWidth(460), height: SizeConfig.getWidth(460),
child: Image.network( child: Image.network(
'https://wallup.net/wp-content/uploads/2017/03/27/380781-portrait_display-abstract-digital_art-geometry-triangle-lines-748x1330.jpg', 'https://res.klook.com/image/upload/fl_lossy.progressive,q_65,f_auto/c_fill,w_1160,h_652/v1522127734/activities/e8mqwlctlagkmzjr4ba1.webp',
width: double.maxFinite, width: double.maxFinite,
fit: BoxFit.fitWidth, fit: BoxFit.cover,
), ),
), ),
Positioned( Positioned(
......
lib/ui/reserve/reserve_date_time.dart
...@@ -93,6 +93,7 @@ class _ReserveDateTimeState extends State<ReserveDateTime> { ...@@ -93,6 +93,7 @@ class _ReserveDateTimeState extends State<ReserveDateTime> {
Image.network( Image.network(
'https://www.cancurreu.com/wp-content/uploads/can_curreu_hotel_ibiza_spa_tratamientos.jpg', 'https://www.cancurreu.com/wp-content/uploads/can_curreu_hotel_ibiza_spa_tratamientos.jpg',
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
height: SizeConfig.getHeight(450),
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
Positioned( Positioned(
......
lib/ui/reserve/reserve_list.dart
...@@ -95,6 +95,7 @@ class _ReserveListState extends State<ReserveList> { ...@@ -95,6 +95,7 @@ class _ReserveListState extends State<ReserveList> {
Image.network( Image.network(
'https://www.cancurreu.com/wp-content/uploads/can_curreu_hotel_ibiza_spa_tratamientos.jpg', 'https://www.cancurreu.com/wp-content/uploads/can_curreu_hotel_ibiza_spa_tratamientos.jpg',
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
height: SizeConfig.getHeight(450),
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
Positioned( Positioned(
......
pubspec.yaml
...@@ -56,18 +56,25 @@ flutter: ...@@ -56,18 +56,25 @@ flutter:
# in this "flutter" section. Each entry in this list should have a # in this "flutter" section. Each entry in this list should have a
# "family" key with the font family name, and a "fonts" key with a # "family" key with the font family name, and a "fonts" key with a
# list giving the asset and other descriptors for the font. For # list giving the asset and other descriptors for the font. For
# example: fonts:
# fonts: - family: SF_Pro_Text
# - family: Schyler fonts:
# fonts: - asset: assets/fonts/SF-Pro-Text-Regular.otf
# - asset: fonts/Schyler-Regular.ttf - asset: assets/fonts/SF-Pro-Text-Medium.otf
# - asset: fonts/Schyler-Italic.ttf weight: 500
# style: italic - asset: assets/fonts/SF-Pro-Text-Bold.otf
# - family: Trajan Pro weight: 700
# fonts: - family: sfproDisplay
# - asset: fonts/TrajanPro.ttf fonts:
# - asset: fonts/TrajanPro_Bold.ttf - asset: assets/fonts/SF-Pro-Display-Regular.otf
# weight: 700 - asset: assets/fonts/SF-Pro-Display-Medium.otf
# weight: 500
# For details regarding fonts from package dependencies, - asset: assets/fonts/SF-Pro-Display-Semibold.otf
weight: 600
- asset: assets/fonts/SF-Pro-Display-Bold.otf
weight: 700
# For details regarding fonts from package dependencies,
# see https://flutter.dev/custom-fonts/#from-packages # see https://flutter.dev/custom-fonts/#from-packages
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