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 84 additions and 26 deletions
lib/ui/booking/bookingflow.dart
import 'package:feelverapp/ui/booking/bookingform.dart';
import 'package:feelverapp/util/SizeConfig.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
......@@ -50,7 +51,7 @@ class _BookingFlowState extends State<BookingFlow> {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => BookingFlow(),
builder: (context) => BookingForm(),
),
);
},
......@@ -236,8 +237,8 @@ class _BookingFlowState extends State<BookingFlow> {
child: Image.network(
'https://image.freepik.com/free-photo/girl-massage-spa-salon_110955-422.jpg',
fit: BoxFit.cover,
height: 100.0,
width: 100.0,
height: SizeConfig.getHeight(100),
width: SizeConfig.getWidth(100),
),
),
Column(
......@@ -390,7 +391,7 @@ class _BookingFlowState extends State<BookingFlow> {
),
),
SizedBox(
height: SizeConfig.getHeight(16),
height: SizeConfig.getHeight(20),
),
],
),
......@@ -428,9 +429,12 @@ class _BookingFlowState extends State<BookingFlow> {
fontWeight: FontWeight.w500),
),
),
Row(
children: <Widget>[
SizedBox(width: SizeConfig.getWidth(24),),
Container(
alignment: Alignment.topLeft,
width: MediaQuery.of(context).size.width / 3,
width: MediaQuery.of(context).size.width / 4,
height: SizeConfig.getHeight(50),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24),
......@@ -440,7 +444,54 @@ class _BookingFlowState extends State<BookingFlow> {
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,
......@@ -450,6 +501,9 @@ class _BookingFlowState extends State<BookingFlow> {
),
),
),
],
),
SizedBox(
height: SizeConfig.getHeight(30),
),
......
lib/ui/home/home.dart
import 'package:feelverapp/ui/login/login.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/reserve/reserve_list.dart';
import 'package:feelverapp/ui/shop/shop_list.dart';
......@@ -96,10 +95,6 @@ class _HomePageState extends State<HomePage> {
height: SizeConfig.getWidth(24),
),
onPressed: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => MyCart()),
);
// Navigator.push(
// context,
// MaterialPageRoute(builder: (context) => LoginPage()),
......
lib/ui/nearme/near_me_detail.dart
......@@ -37,9 +37,9 @@ class _NearmeDetailState extends State<NearmeDetail> {
Container(
height: SizeConfig.getWidth(460),
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,
fit: BoxFit.fitWidth,
fit: BoxFit.cover,
),
),
Positioned(
......
lib/ui/reserve/reserve_date_time.dart
......@@ -93,6 +93,7 @@ class _ReserveDateTimeState extends State<ReserveDateTime> {
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(
......
lib/ui/reserve/reserve_list.dart
......@@ -95,6 +95,7 @@ class _ReserveListState extends State<ReserveList> {
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(
......
pubspec.yaml
......@@ -56,18 +56,25 @@ flutter:
# 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
# list giving the asset and other descriptors for the font. For
# example:
# fonts:
# - family: Schyler
# fonts:
# - asset: fonts/Schyler-Regular.ttf
# - asset: fonts/Schyler-Italic.ttf
# style: italic
# - family: Trajan Pro
# fonts:
# - asset: fonts/TrajanPro.ttf
# - asset: fonts/TrajanPro_Bold.ttf
# weight: 700
#
fonts:
- family: SF_Pro_Text
fonts:
- asset: assets/fonts/SF-Pro-Text-Regular.otf
- asset: assets/fonts/SF-Pro-Text-Medium.otf
weight: 500
- asset: assets/fonts/SF-Pro-Text-Bold.otf
weight: 700
- family: sfproDisplay
fonts:
- asset: assets/fonts/SF-Pro-Display-Regular.otf
- asset: assets/fonts/SF-Pro-Display-Medium.otf
weight: 500
- 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
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