update

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.lock

@@ -7,42 +7,42 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.13"
+    version: "2.0.11"
   args:
     dependency: transitive
     description:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.0"
+    version: "1.5.2"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "1.0.5"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.3"
+    version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.12"
+    version: "1.14.11"
   convert:
     dependency: transitive
     description:
@@ -56,7 +56,7 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.3"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -87,7 +87,7 @@ packages:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.12"
+    version: "2.1.4"
   matcher:
     dependency: transitive
     description:
@@ -109,6 +109,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.6.4"
+  pedantic:
+    dependency: transitive
+    description:
+      name: pedantic
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.8.0+1"
   petitparser:
     dependency: transitive
     description:
@@ -122,7 +129,7 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
+    version: "2.0.5"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -134,7 +141,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.5.5"
   stack_trace:
     dependency: transitive
     description:
@@ -169,7 +176,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.15"
+    version: "0.2.11"
   typed_data:
     dependency: transitive
     description:
@@ -190,6 +197,6 @@ packages:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.6.1"
+    version: "3.5.0"
 sdks:
   dart: ">=2.6.0 <3.0.0"

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