updated new flutter version

lib/constants.dart

@@ -1,6 +1,7 @@
 
 class Constants {
 
+  static const bool DEBUG = false;
   static const bool ENABLE_NATIVE_PAY = false;
 
   static const bool isPreview = false;
@@ -20,10 +21,9 @@ class Constants {
   static const int FONT_WISETRONIC = 0xe812;
   static const int FONT_TOPTONS = 0xe813;
 
-  static const bool DEBUG = false;
   static const int BUSINESS_ID = 310; //310, 680, 357(notjust), 651(kiosk);
   static const String APP_TITLE = 'MiniPOS Ponit of Sale System';
-  static const String BASE_API_URL = 'https://api.minipos.us/'; //'https://sandbox.minipos.us/', 'https://api.minipos.us/'
+  static const String BASE_API_URL = DEBUG ? 'https://sandbox.minipos.us/' : 'https://api.minipos.us/'; //'https://sandbox.minipos.us/', 'https://api.minipos.us/'
   static const String TUTORIAL_URL = 'https://archive.wisetronic.com/wisetronic-products-documentation/';
   static const String API_SECRET = 'pei326sami1223HellowWorldabcdEd';
   static const KEY_USER_ID = 'user_id';

lib/dialog/logout_dialog.dart

@@ -19,7 +19,7 @@ AlertDialog logoutDialog(BuildContext context) {
         .of(context)
         .are_you_sure_to_logout),
     actions: <Widget>[
-      FlatButton(
+      TextButton(
         child: Text(S
             .of(context)
             .cancel),
@@ -27,7 +27,7 @@ AlertDialog logoutDialog(BuildContext context) {
           Navigator.of(context).pop();
         },
       ),
-      FlatButton(
+      TextButton(
         child: Text(S
             .of(context)
             .yes_i_am_sure),

lib/utils/utils.dart

@@ -525,7 +525,7 @@ class Utils {
             content: Text(message),
             actions: actions == null
                 ? <Widget>[
-                    FlatButton(
+                    TextButton(
                       child: Text(S.of(context).ok),
                       onPressed: onOk == null
                           ? () {
@@ -740,13 +740,13 @@ class Utils {
               title: Text(S.of(context).warning),
               content: Text(S.of(context).are_you_sure_to_empty_basket),
               actions: <Widget>[
-                FlatButton(
+                TextButton(
                   child: Text(S.of(context).cancel),
                   onPressed: () {
                     Navigator.of(context).pop();
                   },
                 ),
-                FlatButton(
+                TextButton(
                   child: Text(S.of(context).yes_i_am_sure),
                   onPressed: () {
                     store.dispatch(new UpdateCartInfo(

lib/widgets/desktop/desktop_change_mobile_or_email.dart

@@ -4,7 +4,6 @@ import 'package:countdown/countdown.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_wisetronic/widgets/general/breadcrumbs.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 
 import '../../generated/l10n.dart';
@@ -216,8 +215,10 @@ class DesktopChangeMobileOrEmailState extends State<DesktopChangeMobileOrEmail>
           margin: EdgeInsets.only(top: 0.0, right: 16.0),
           child: Align(
             alignment: Alignment.centerRight,
-            child: RaisedButton(
+            child: ElevatedButton(
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               child: Text(
                 S.of(context).submit_to_change,
                 style: TextStyle(

lib/widgets/desktop/desktop_change_password.dart

@@ -280,8 +280,10 @@ class DesktopChangePasswordState extends State<DesktopChangePassword> {
                           padding: EdgeInsets.only(right: 16.0, top: 16.0),
                           child: Align(
                             alignment: Alignment.centerRight,
-                            child: RaisedButton(
+                            child: ElevatedButton(
-                              color: Theme.of(context).primaryColor,
+                              style: ElevatedButton.styleFrom(
+                                primary: Theme.of(context).primaryColor,
+                              ),
                               child: Text(
                                 S.of(context).submit,
                                 style: TextStyle(
@@ -319,7 +321,7 @@ class DesktopChangePasswordState extends State<DesktopChangePassword> {
               title: Text(S.of(context).success),
               content: Text(S.of(context).password_has_been_changed),
               actions: <Widget>[
-                FlatButton(
+                TextButton(
                   child: Text(S.of(context).ok),
                   onPressed: () {
                     Navigator.of(context).pop();

lib/widgets/desktop/desktop_checkout.dart

@@ -125,8 +125,10 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
                 Text(
                   S.of(context).no_delivery_method,
                 ),
-                RaisedButton(
+                ElevatedButton(
-                  color: Theme.of(context).primaryColor,
+                  style: ElevatedButton.styleFrom(
+                    primary: Theme.of(context).primaryColor,
+                  ),
                   child: Text(
                     S.of(context).ok,
                     style: TextStyle(
@@ -1215,7 +1217,7 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
               ),
               Container(
                 padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-                child: FlatButton(
+                child: TextButton(
                   child: Text(S.of(context).cancel),
                   onPressed: () {
                     panelController.close();
@@ -1280,7 +1282,7 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
               ),
               Container(
                 padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-                child: FlatButton(
+                child: TextButton(
                   child: Text(S.of(context).cancel),
                   onPressed: () {
                     panelController.close();
@@ -1385,7 +1387,7 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
               ),
               Container(
                 padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-                child: FlatButton(
+                child: TextButton(
                   child: Text(S.of(context).close),
                   onPressed: () {
                     panelController.close();
@@ -1431,7 +1433,7 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
             ),
             Container(
               padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-              child: FlatButton(
+              child: TextButton(
                 child: Text(S.of(context).cancel),
                 onPressed: () {
                   panelController.close();
@@ -1605,7 +1607,7 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
             ),
             Container(
               padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-              child: FlatButton(
+              child: TextButton(
                 child: Text(S.of(context).cancel),
                 onPressed: () {
                   panelController.close();
@@ -1657,7 +1659,7 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
             ),
             Container(
               margin: EdgeInsets.only(left: 5.0),
-              child: RaisedButton(
+              child: ElevatedButton(
                 child: Text(
                   S.of(context).get_coupon,
                 ),
@@ -1951,7 +1953,7 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
       ));
       for (int i = 0; i < cartInfo.businessInfo.quickInputs.length; i++) {
         String qi = cartInfo.businessInfo.quickInputs[i].value;
-        w.children.add(FlatButton(
+        w.children.add(TextButton(
           child: Text(
             qi,
             style: TextStyle(
@@ -1993,7 +1995,7 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
             ),
             Container(
               padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-              child: FlatButton(
+              child: TextButton(
                 child: Text(S.of(context).cancel),
                 onPressed: () {
                   panelController.close();
@@ -2002,7 +2004,7 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
             ),
             Container(
               padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-              child: FlatButton(
+              child: TextButton(
                 child: Text(S.of(context).save),
                 onPressed: () {
                   if (mounted) {
@@ -2069,7 +2071,7 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
             ),
             Container(
               padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-              child: FlatButton(
+              child: TextButton(
                 child: Text(S.of(context).cancel),
                 onPressed: () {
                   panelController.close();

lib/widgets/desktop/desktop_coupons.dart

@@ -269,17 +269,19 @@ class DesktopCouponsState extends State<DesktopCoupons> {
             ),
           ),
           Container(
-            child: RaisedButton(
+            child: ElevatedButton(
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(20.0),
+                ),
+              ),
               child: Text(
                 S.of(context).redeem_coupon,
                 style: TextStyle(
                   color: Colors.white,
                 ),
               ),
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(20.0),
-              ),
               onPressed: () {
                 if (coupon.store != null) {
                   Routes.router.navigateTo(context, '/shop/${coupon.store.id}/na/na/na');

lib/widgets/desktop/desktop_edit_address.dart

@@ -434,7 +434,7 @@ class DesktopEditAddressState extends State<DesktopEditAddress> {
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: <Widget>[
-            FlatButton(
+            TextButton(
               child: Text(
                 S
                     .of(context)
@@ -452,7 +452,7 @@ class DesktopEditAddressState extends State<DesktopEditAddress> {
                             .of(context)
                             .are_you_sure_to_delete_the_address),
                         actions: <Widget>[
-                          FlatButton(
+                          TextButton(
                             child: Text(S
                                 .of(context)
                                 .cancel),
@@ -460,7 +460,7 @@ class DesktopEditAddressState extends State<DesktopEditAddress> {
                               Navigator.of(context).pop();
                             },
                           ),
-                          FlatButton(
+                          TextButton(
                             child: Text(S
                                 .of(context)
                                 .yes_i_am_sure),
@@ -475,7 +475,7 @@ class DesktopEditAddressState extends State<DesktopEditAddress> {
                 );
               },
             ),
-            FlatButton(
+            TextButton(
               child: Text(
                   S
                       .of(context)

lib/widgets/desktop/desktop_forgot_password.dart

@@ -197,8 +197,10 @@ class DesktopForgotPasswordState extends State<DesktopForgotPassword> {
           margin: EdgeInsets.only(top: 0.0, right: 16.0),
           child: Align(
             alignment: Alignment.centerRight,
-            child: RaisedButton(
+            child: ElevatedButton(
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               child: Text(
                 S.of(context).verify,
                 style: TextStyle(

lib/widgets/desktop/desktop_login.dart

@@ -211,7 +211,7 @@ class DesktopLoginState extends State<DesktopLogin> {
                           mainAxisAlignment: MainAxisAlignment.start,
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: <Widget>[
-                            FlatButton(
+                            TextButton(
                               child: Text(
                                 S.of(context).new_user_question,
                                 style: TextStyle(
@@ -226,7 +226,7 @@ class DesktopLoginState extends State<DesktopLogin> {
                               child: Text(''),
                             ),
                             Container(
-                              child: FlatButton(
+                              child: TextButton(
                                 child: Text(
                                   S.of(context).forgot_password_question,
                                   style: TextStyle(
@@ -246,8 +246,10 @@ class DesktopLoginState extends State<DesktopLogin> {
                         child: Container(
                           padding: EdgeInsets.only(
                               top: 20.0, left: 16.0, right: 16.0, bottom: 20.0),
-                          child: RaisedButton(
+                          child: ElevatedButton(
-                            color: Theme.of(context).primaryColor,
+                            style: ElevatedButton.styleFrom(
+                              primary: Theme.of(context).primaryColor,
+                            ),
                             child: Text(
                               S.of(context).login,
                               style: TextStyle(

lib/widgets/desktop/desktop_my_cards.dart

@@ -139,14 +139,16 @@ class MyCardsState extends State<DesktopMyCards> {
                       S.of(context).are_you_sure_to_remove_the_card,
                     ),
                     actions: <Widget>[
-                      FlatButton(
+                      TextButton(
                         child: Text(S.of(context).cancel),
-                        color: Theme.of(context).primaryColor,
                         onPressed: () {
                           Navigator.of(context).pop();
                         },
+                        style: TextButton.styleFrom(
+                          primary: Theme.of(context).primaryColor,
+                        ),
                       ),
-                      FlatButton(
+                      TextButton(
                         child: Text(S.of(context).yes_i_am_sure),
                         onPressed: () {
                           Navigator.of(context).pop();

lib/widgets/desktop/desktop_new_address.dart

@@ -358,7 +358,7 @@ class DesktopNewAddressState extends State<DesktopNewAddress> {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: <Widget>[
             SizedBox(),
-            FlatButton(
+            TextButton(
               child: Text(
                   S.of(context).save
               ),

lib/widgets/desktop/desktop_new_comment.dart

@@ -167,14 +167,16 @@ class DesktopNewCommentState extends State<DesktopNewComment> {
                 child: SizedBox(
                   width: 150.0,
                   height: 36.0,
-                  child: RaisedButton(
+                  child: ElevatedButton(
                     child: Text(
                       S.of(context).submit,
                       style: TextStyle(
                         color: Colors.white,
                       ),
                     ),
-                    color: Theme.of(context).primaryColor,
+                    style: ElevatedButton.styleFrom(
+                      primary: Theme.of(context).primaryColor,
+                    ),
                     onPressed: () {
                       _submit();
                     },
@@ -238,14 +240,16 @@ class DesktopNewCommentState extends State<DesktopNewComment> {
                         title: Text(S.of(context).warning),
                         content: Text(S.of(context).are_you_sure_to_remove_the_picture),
                         actions: <Widget>[
-                          FlatButton(
+                          TextButton(
                             child: Text(S.of(context).cancel),
                             onPressed: () {
                               Navigator.of(context).pop();
                             },
-                            color: Theme.of(context).primaryColor,
+                            style: TextButton.styleFrom(
+                              primary: Theme.of(context).primaryColor,
+                            ),
                           ),
-                          FlatButton(
+                          TextButton(
                             child: Text(S.of(context).yes_i_am_sure),
                             onPressed: () {
                               Navigator.of(context).pop();

lib/widgets/desktop/desktop_new_ticket.dart

@@ -208,8 +208,10 @@ class DesktopNewTicketState extends State<DesktopNewTicket> {
                       alignment: Alignment.centerRight,
                       child: Container(
                         padding: EdgeInsets.only(top: 20.0, left: 16.0, right: 16.0, bottom: 20.0),
-                        child: RaisedButton(
+                        child: ElevatedButton(
-                          color: Theme.of(context).primaryColor,
+                          style: ElevatedButton.styleFrom(
+                            primary: Theme.of(context).primaryColor,
+                          ),
                           child: Text(
                             S.of(context).login,
                             style: TextStyle(
@@ -389,15 +391,17 @@ class DesktopNewTicketState extends State<DesktopNewTicket> {
           title: Text(S.of(context).warning),
           content: Text(S.of(context).are_you_sure_to_remove_the_picture),
           actions: [
-            FlatButton(
+            TextButton(
               child: Text(S.of(context).cancel),
               onPressed: () {
                 Navigator.of(context).pop();
               },
             ),
-            RaisedButton(
+            ElevatedButton(
               child: Text(S.of(context).yes_i_am_sure),
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               onPressed: () {
                 Navigator.of(context).pop();
                 setState(() {
@@ -439,7 +443,7 @@ class DesktopNewTicketState extends State<DesktopNewTicket> {
                     title: Text(S.of(context).success),
                     content: Text(S.of(context).ticket_created_success),
                     actions: <Widget>[
-                      FlatButton(
+                      TextButton(
                         child: Text(S.of(context).ok),
                         onPressed: () {
                           Routes.router.navigateTo(context, '/my-support/${widget.businessId}', replace: true);

lib/widgets/desktop/desktop_new_user.dart

@@ -2,7 +2,6 @@
 import 'package:countdown/countdown.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:flutter_wisetronic/widgets/general/breadcrumbs.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 
 import '../../constants.dart';
@@ -195,8 +194,10 @@ class DesktopNewUserState extends State<DesktopNewUser> {
           margin: EdgeInsets.only(top: 0.0, right: 16.0),
           child: Align(
             alignment: Alignment.centerRight,
-            child: RaisedButton(
+            child: ElevatedButton(
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               child: Text(
                 S.of(context).register,
                 style: TextStyle(

lib/widgets/desktop/desktop_order_detail.dart

@@ -1001,7 +1001,7 @@ class DesktopOrderDetailState extends State<DesktopOrderDetail> {
                 Container(
                   padding: EdgeInsets.only(right: 10.0),
                   child: order.status == Constants.STATUS_PENDING && order.paymentStatus == Constants.PAYMENT_STATUS_UNPAID ?
-                  FlatButton(
+                  TextButton(
                     child: Text(
                       S.of(context).cancel_order,
                       style: TextStyle(
@@ -1015,7 +1015,7 @@ class DesktopOrderDetailState extends State<DesktopOrderDetail> {
                   ) : SizedBox.shrink(),
                 ),
                 Container(
-                  child: order.status == Constants.STATUS_COMPLETE && !order.hasComment ? RaisedButton(
+                  child: order.status == Constants.STATUS_COMPLETE && !order.hasComment ? ElevatedButton(
                     child: Text(
                       S.of(context).comment,
                       style: TextStyle(
@@ -1033,7 +1033,7 @@ class DesktopOrderDetailState extends State<DesktopOrderDetail> {
               child: order.paymentStatus != Constants.PAYMENT_STATUS_PAID
                   && order.status != Constants.STATUS_CANCELLED
                   && order.status != Constants.STATUS_COMPLETE ?
-              FlatButton(
+              TextButton(
                 child: Text(
                   S.of(context).pay_now,
                   style: TextStyle(
@@ -1044,7 +1044,7 @@ class DesktopOrderDetailState extends State<DesktopOrderDetail> {
                 onPressed: () {
                   Routes.router.navigateTo(context, '/paynow/${order.id}');
                 },
-              ) : FlatButton(
+              ) : TextButton(
                 child: Text(
                   S.of(context).order_again,
                   style: TextStyle(
@@ -1172,16 +1172,18 @@ class DesktopOrderDetailState extends State<DesktopOrderDetail> {
           title: Text(S.of(context).warning),
           content: Text(S.of(context).are_you_sure_to_cancel_the_order),
           actions: <Widget>[
-            FlatButton(
+            TextButton(
               child: Text(
                 S.of(context).no,
               ),
-              color: Theme.of(context).primaryColor,
+              style: TextButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               onPressed: () {
                 Navigator.of(context).pop();
               },
             ),
-            FlatButton(
+            TextButton(
               child: Text(
                 S.of(context).yes_i_am_sure,
               ),

lib/widgets/desktop/desktop_orders.dart

@@ -216,7 +216,7 @@ class DesktopOrdersState extends State<DesktopOrders> with SingleTickerProviderS
         Row row3 = Row(
           mainAxisAlignment: MainAxisAlignment.start,
           children: <Widget>[
-            RaisedButton(
+            ElevatedButton(
               child: Text(
                 S.of(context).detail,
               ),
@@ -232,7 +232,7 @@ class DesktopOrdersState extends State<DesktopOrders> with SingleTickerProviderS
           row3.children.add(
             Padding(
               padding: EdgeInsets.only(left: 10.0),
-              child: RaisedButton(
+              child: ElevatedButton(
                 child: Text(
                   S.of(context).comment,
                 ),
@@ -254,7 +254,7 @@ class DesktopOrdersState extends State<DesktopOrders> with SingleTickerProviderS
           if (order.paymentStatus != Constants.PAYMENT_STATUS_PAID
               && order.status != Constants.STATUS_CANCELLED
               && order.status != Constants.STATUS_COMPLETE) {
-            row2.children.add(RaisedButton(
+            row2.children.add(ElevatedButton(
               child: Text(
                 S.of(context)
                     .pay_now,
@@ -262,20 +262,24 @@ class DesktopOrdersState extends State<DesktopOrders> with SingleTickerProviderS
                   color: Colors.white,
                 ),
               ),
-              color: Colors.redAccent,
+              style: ElevatedButton.styleFrom(
+                primary: Colors.redAccent,
+              ),
               onPressed: () {
                 Routes.router.navigateTo(context, '/paynow/${order.id}');
               },
             ));
           } else {
-            row2.children.add(RaisedButton(
+            row2.children.add(ElevatedButton(
               child: Text(
                 S.of(context).order_again,
                 style: TextStyle(
                   color: Colors.white,
                 ),
               ),
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               onPressed: () {
                 Utils.orderAgain(context, order.cartInfo);
               },
@@ -283,14 +287,16 @@ class DesktopOrdersState extends State<DesktopOrders> with SingleTickerProviderS
           }
         } else {
           row2.children.add(row3);
-          row2.children.add(RaisedButton(
+          row2.children.add(ElevatedButton(
             child: Text(
               S.of(context).order_again,
               style: TextStyle(
                 color: Colors.white,
               ),
             ),
-            color: Theme.of(context).primaryColor,
+            style: ElevatedButton.styleFrom(
+              primary: Theme.of(context).primaryColor,
+            ),
             onPressed: () {
               Utils.orderAgain(context, order.cartInfo);
             },

lib/widgets/desktop/desktop_reset_password.dart

@@ -177,8 +177,10 @@ class DesktopResetPasswordState extends State<DesktopResetPassword> {
               padding: EdgeInsets.only(right: 0.0, top: 16.0),
               child: Align(
                 alignment: Alignment.centerRight,
-                child: RaisedButton(
+                child: ElevatedButton(
-                  color: Theme.of(context).primaryColor,
+                  style: ElevatedButton.styleFrom(
+                    primary: Theme.of(context).primaryColor,
+                  ),
                   child: Text(
                     S.of(context).submit,
                     style: TextStyle(
@@ -276,7 +278,7 @@ class DesktopResetPasswordState extends State<DesktopResetPassword> {
               title: Text(S.of(context).success),
               content: Text(S.of(context).reset_password_success),
               actions: <Widget>[
-                FlatButton(
+                TextButton(
                   child: Text(S.of(context).ok),
                   onPressed: () {
                     Routes.router.navigateTo(context, '/login', replace: true, clearStack: false);

lib/widgets/desktop/desktop_set_password.dart

@@ -177,8 +177,10 @@ class DesktopSetPasswordState extends State<DesktopSetPassword> {
               padding: EdgeInsets.only(right: 16.0, top: 16.0),
               child: Align(
                 alignment: Alignment.centerRight,
-                child: RaisedButton(
+                child: ElevatedButton(
-                  color: Theme.of(context).primaryColor,
+                  style: ElevatedButton.styleFrom(
+                    primary: Theme.of(context).primaryColor,
+                  ),
                   child: Text(
                     S.of(context).submit,
                     style: TextStyle(
@@ -276,7 +278,7 @@ class DesktopSetPasswordState extends State<DesktopSetPassword> {
               title: Text(S.of(context).success),
               content: Text(S.of(context).reset_password_success),
               actions: <Widget>[
-                FlatButton(
+                TextButton(
                   child: Text(S.of(context).ok),
                   onPressed: () {
                     Routes.router.navigateTo(context, '/login', replace: true, clearStack: false);

lib/widgets/desktop/desktop_user_profile.dart

@@ -13,7 +13,6 @@ import '../../store/store.dart';
 import '../../utils/http_util.dart';
 import '../../utils/util_web.dart' if (dart.library.io) '../../utils/util_io.dart';
 import '../../utils/utils.dart';
-import '../../widgets/general/breadcrumbs.dart';
 
 class DesktopUserProfile extends StatefulWidget {
   final Key key;
@@ -435,7 +434,7 @@ class DesktopUserProfileState extends State<DesktopUserProfile> {
               ),
             ),
             actions: <Widget>[
-              FlatButton(
+              TextButton(
                 child: Text(
                     S.of(context).cancel
                 ),
@@ -443,7 +442,7 @@ class DesktopUserProfileState extends State<DesktopUserProfile> {
                   Navigator.of(context).pop();
                 },
               ),
-              FlatButton(
+              TextButton(
                 child: Text(
                   S.of(context).submit_to_change,
                 ),

lib/widgets/desktop/desktop_view_ticket.dart

@@ -192,8 +192,10 @@ class DesktopViewTicketState extends State<DesktopViewTicket> {
       alignment: Alignment.centerRight,
       child: Container(
         padding: EdgeInsets.only(top: 20.0, left: 16.0, right: 16.0, bottom: 20.0),
-        child: RaisedButton(
+        child: ElevatedButton(
-          color: Theme.of(context).primaryColor,
+          style: ElevatedButton.styleFrom(
+            primary: Theme.of(context).primaryColor,
+          ),
           child: Text(
             S.of(context).reply,
             style: TextStyle(
@@ -633,15 +635,17 @@ class DesktopViewTicketState extends State<DesktopViewTicket> {
           title: Text(S.of(context).warning),
           content: Text(S.of(context).are_you_sure_to_remove_the_picture),
           actions: [
-            FlatButton(
+            TextButton(
               child: Text(S.of(context).cancel),
               onPressed: () {
                 Navigator.of(context).pop();
               },
             ),
-            RaisedButton(
+            ElevatedButton(
               child: Text(S.of(context).yes_i_am_sure),
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               onPressed: () {
                 Navigator.of(context).pop();
                 setState(() {
@@ -685,7 +689,7 @@ class DesktopViewTicketState extends State<DesktopViewTicket> {
                     title: Text(S.of(context).success),
                     content: Text(S.of(context).ticket_created_success),
                     actions: <Widget>[
-                      FlatButton(
+                      TextButton(
                         child: Text(S.of(context).ok),
                         onPressed: () {
                           Routes.router.navigateTo(context,

lib/widgets/general/add_remove_button.dart

@@ -22,6 +22,7 @@ class AddRemoveButton extends StatefulWidget {
   final bool addOnly;
   final int cartLineItemIndex;
   final bool addToBasket;
+  final bool onHovor;
 
   AddRemoveButton({
     this.product,
@@ -29,6 +30,7 @@ class AddRemoveButton extends StatefulWidget {
     this.addOnly = false,
     this.cartLineItemIndex = -1,
     this.addToBasket = false,
+    this.onHovor = false,
   });
 
   @override
@@ -72,7 +74,7 @@ class AddRemoveButtonState extends State<AddRemoveButton> {
       return Container(
         padding: EdgeInsets.only(top: 5.0, bottom: 5.0, left: 32.0, right: 32.0),
         child: Text(
-          'x$_qty'
+            'x$_qty'
         ),
       );
     }
@@ -121,13 +123,16 @@ class AddRemoveButtonState extends State<AddRemoveButton> {
           padding: EdgeInsets.all(10),
           position: BadgePosition.topEnd(top: -15, end: -10),
           badgeColor: Colors.lightBlueAccent,
-          child: RaisedButton.icon(
+          child: ElevatedButton.icon(
-            padding: EdgeInsets.only(left: 32, right: 32, top: 20, bottom: 20),
+            style: ElevatedButton.styleFrom(
-            elevation: 2.0,
+              primary: Colors.redAccent,
-            shape: new RoundedRectangleBorder(
+              onPrimary: Colors.white,
-              borderRadius: new BorderRadius.circular(10.0),
+              padding: EdgeInsets.only(left: 32, right: 32, top: 20, bottom: 20),
+              elevation: 2.0,
+              shape: new RoundedRectangleBorder(
+                borderRadius: new BorderRadius.circular(10.0),
+              ),
             ),
-            color: Colors.redAccent,
             icon: Icon(
               Icons.shopping_basket_outlined,
               size: 32.0,
@@ -147,13 +152,15 @@ class AddRemoveButtonState extends State<AddRemoveButton> {
           ),
         );
       } else {
-        return RaisedButton.icon(
+        return ElevatedButton.icon(
-          padding: EdgeInsets.only(left: 32, right: 32, top: 20, bottom: 20),
+          style: ElevatedButton.styleFrom(
-          elevation: 2.0,
+            primary: Colors.redAccent,
-          shape: new RoundedRectangleBorder(
+            padding: EdgeInsets.only(left: 32, right: 32, top: 20, bottom: 20),
-            borderRadius: new BorderRadius.circular(10.0),
+            elevation: 2.0,
+            shape: new RoundedRectangleBorder(
+              borderRadius: new BorderRadius.circular(10.0),
+            ),
           ),
-          color: Colors.redAccent,
           icon: Icon(
             Icons.shopping_basket_outlined,
             size: 32.0,
@@ -172,7 +179,7 @@ class AddRemoveButtonState extends State<AddRemoveButton> {
           },
         );
       }
-    }else if (widget.addOnly) {
+    } else if (widget.addOnly) {
       return Container(
         key: startKey,
         padding: EdgeInsets.all(0.0),
@@ -235,6 +242,9 @@ class AddRemoveButtonState extends State<AddRemoveButton> {
           ],
         );
       } else {
+        if (!widget.onHovor && _qty == 0) {
+          return SizedBox.shrink();
+        }
         return new Row(
           key: startKey,
           crossAxisAlignment: CrossAxisAlignment.end,
@@ -337,28 +347,28 @@ class AddRemoveButtonState extends State<AddRemoveButton> {
     if (widget.cartLineItemIndex != -1) {
       if (cartInfo.productList[widget.cartLineItemIndex].quantity <= 1) {
         showDialog(
-          context: context,
+            context: context,
-          builder: (BuildContext context) {
+            builder: (BuildContext context) {
-            return AlertDialog(
+              return AlertDialog(
-              title: Text(S.of(context).warning),
+                title: Text(S.of(context).warning),
-              content: Text(S.of(context).are_you_sure_to_remove_the_item),
+                content: Text(S.of(context).are_you_sure_to_remove_the_item),
-              actions: <Widget>[
+                actions: <Widget>[
-                FlatButton(
+                  TextButton(
-                  child: Text(S.of(context).cancel),
+                    child: Text(S.of(context).cancel),
-                  onPressed: () {
+                    onPressed: () {
-                    Navigator.of(context).pop();
+                      Navigator.of(context).maybePop();
-                  },
+                    },
-                ),
+                  ),
-                FlatButton(
+                  TextButton(
-                  child: Text(S.of(context).yes_i_am_sure),
+                    child: Text(S.of(context).yes_i_am_sure),
-                  onPressed: () {
+                    onPressed: () {
-                    _removeCartLineItem();
+                      _removeCartLineItem();
-                    Navigator.of(context).pop();
+                      Navigator.of(context).maybePop();
-                  },
+                    },
-                ),
+                  ),
-              ],
+                ],
-            );
+              );
-          }
+            }
         );
       } else {
         _removeCartLineItem();

lib/widgets/general/download_item.dart

@@ -1,14 +1,13 @@
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import '../../widgets/general/text_link.dart';
 import 'package:url_launcher/url_launcher.dart';
-import '../../generated/l10n.dart';
+
-import '../../utils/utils.dart';
-import '../../utils/extensions.dart';
-import 'package:universal_io/io.dart';
 import '../../constants.dart';
+import '../../generated/l10n.dart';
+import '../../utils/extensions.dart';
 import '../../utils/util_web.dart' if (dart.library.io) '../../utils/util_io.dart';
+import '../../utils/utils.dart';
 
 class DownloadItem extends StatefulWidget {
   final dynamic desc;
@@ -242,9 +241,11 @@ class DownloadItemState extends State<DownloadItem> {
         ),
       );
     } else if (downloadUrl != null && downloadUrl.isNotEmpty) {
-      return RaisedButton(
+      return ElevatedButton(
-        color: Theme.of(context).primaryColor,
+        style: ElevatedButton.styleFrom(
-        padding: EdgeInsets.all(8.0),
+          primary: Theme.of(context).primaryColor,
+          padding: EdgeInsets.all(8)
+        ),
         child: Row(
           crossAxisAlignment: CrossAxisAlignment.center,
           mainAxisAlignment: MainAxisAlignment.center,

lib/widgets/general/payment_verification_code_dialog.dart

@@ -95,7 +95,7 @@ class PaymentVerificationCodeDialogState extends State<PaymentVerificationCodeDi
                           title: Text(S.of(context).error),
                           content: Text(S.of(context).wrong_payment_verification_code),
                           actions: [
-                            FlatButton(
+                            TextButton(
                               child: Text(S.of(context).ok),
                               onPressed: () {
                                 _pinPutController.clear();
@@ -124,7 +124,7 @@ class PaymentVerificationCodeDialogState extends State<PaymentVerificationCodeDi
         ],
       ),
       actions: [
-        FlatButton(
+        TextButton(
           child: Text(S.of(context).close),
           onPressed: () {
             Navigator.of(context).pop();

lib/widgets/general/sliding_up_panel.dart

@@ -215,7 +215,7 @@ class _SlidingUpPanelState extends State<SlidingUpPanel> with SingleTickerProvid
 
   ScrollController _sc;
   bool _scrollingEnabled = false;
-  VelocityTracker _vt = new VelocityTracker();
+  VelocityTracker _vt = VelocityTracker.withKind(PointerDeviceKind.touch);
 
   bool _isPanelVisible = true;
 
@@ -312,7 +312,7 @@ class _SlidingUpPanelState extends State<SlidingUpPanel> with SingleTickerProvid
               );
             },
             child: Stack(
-              overflow: Overflow.visible,
+              clipBehavior: Clip.none,
               children: <Widget>[
 
                 //open panel

lib/widgets/mobile/mobile_attribute_selection.dart

@@ -35,8 +35,8 @@ class MobileAttributeSelection extends StatefulWidget {
 class MobileAttributeSelectionState extends State<MobileAttributeSelection> {
   Product product;
   int index;
-  FlatButton previousButton;
+  TextButton previousButton;
-  FlatButton nextButton;
+  TextButton nextButton;
   bool previousButtonEnable;
   bool nextButtonEnable;
 
@@ -159,12 +159,12 @@ class MobileAttributeSelectionState extends State<MobileAttributeSelection> {
   }
 
   Widget _getProductContent() {
-    previousButton = new FlatButton(
+    previousButton = TextButton(
       onPressed: previousButtonEnable ? _goPrevious : null,
       child: new Text(S.of(context).previous),
     );
 
-    nextButton = new FlatButton(
+    nextButton = TextButton(
       onPressed: nextButtonEnable ? _goNext : null,
       child: new Text(
           product.productAttributes.length > index + 1 ? nextText : finishText

lib/widgets/mobile/mobile_change_mobile_or_email.dart

@@ -221,8 +221,10 @@ class MobileChangeMobileOrEmailState extends State<MobileChangeMobileOrEmail> {
           margin: EdgeInsets.only(top: 0.0, right: 16.0),
           child: Align(
             alignment: Alignment.centerRight,
-            child: RaisedButton(
+            child: ElevatedButton(
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               child: Text(
                 S.of(context).submit_to_change,
                 style: TextStyle(

lib/widgets/mobile/mobile_change_password.dart

@@ -230,8 +230,10 @@ class MobileChangePasswordState extends State<MobileChangePassword> {
           padding: EdgeInsets.only(right: 16.0, top: 16.0, bottom: 20.0),
           child: Align(
             alignment: Alignment.centerRight,
-            child: RaisedButton(
+            child: ElevatedButton(
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               child: Text(
                 S.of(context).submit,
                 style: TextStyle(
@@ -257,7 +259,7 @@ class MobileChangePasswordState extends State<MobileChangePassword> {
               title: Text(S.of(context).success),
               content: Text(S.of(context).password_has_been_changed),
               actions: <Widget>[
-                FlatButton(
+                TextButton(
                   child: Text(S.of(context).ok),
                   onPressed: () {
                     Navigator.of(context).pop();

lib/widgets/mobile/mobile_checkout.dart

@@ -112,8 +112,10 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
                 Text(
                   S.of(context).no_delivery_method,
                 ),
-                RaisedButton(
+                ElevatedButton(
-                  color: Theme.of(context).primaryColor,
+                  style: ElevatedButton.styleFrom(
+                    primary: Theme.of(context).primaryColor,
+                  ),
                   child: Text(
                     S.of(context).ok,
                     style: TextStyle(
@@ -1195,7 +1197,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
               ),
               Container(
                 padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-                child: FlatButton(
+                child: TextButton(
                   child: Text(S.of(context).cancel),
                   onPressed: () {
                     panelController.close();
@@ -1260,7 +1262,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
               ),
               Container(
                 padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-                child: FlatButton(
+                child: TextButton(
                   child: Text(S.of(context).cancel),
                   onPressed: () {
                     panelController.close();
@@ -1365,7 +1367,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
               ),
               Container(
                 padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-                child: FlatButton(
+                child: TextButton(
                   child: Text(S.of(context).close),
                   onPressed: () {
                     panelController.close();
@@ -1411,7 +1413,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
             ),
             Container(
               padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-              child: FlatButton(
+              child: TextButton(
                 child: Text(S.of(context).cancel),
                 onPressed: () {
                   panelController.close();
@@ -1585,7 +1587,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
             ),
             Container(
               padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-              child: FlatButton(
+              child: TextButton(
                 child: Text(S.of(context).cancel),
                 onPressed: () {
                   panelController.close();
@@ -1637,7 +1639,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
             ),
             Container(
               margin: EdgeInsets.only(left: 5.0),
-              child: RaisedButton(
+              child: ElevatedButton(
                 child: Text(
                   S.of(context).get_coupon,
                 ),
@@ -1931,7 +1933,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
       ));
       for (int i = 0; i < cartInfo.businessInfo.quickInputs.length; i++) {
         String qi = cartInfo.businessInfo.quickInputs[i].value;
-        w.children.add(FlatButton(
+        w.children.add(TextButton(
           child: Text(
             qi,
             style: TextStyle(
@@ -1973,7 +1975,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
             ),
             Container(
               padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-              child: FlatButton(
+              child: TextButton(
                 child: Text(S.of(context).cancel),
                 onPressed: () {
                   panelController.close();
@@ -1982,7 +1984,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
             ),
             Container(
               padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-              child: FlatButton(
+              child: TextButton(
                 child: Text(S.of(context).save),
                 onPressed: () {
                   if (mounted) {
@@ -2049,7 +2051,7 @@ class MobileCheckoutState extends State<MobileCheckout> with SingleTickerProvide
             ),
             Container(
               padding: EdgeInsets.only(top: 16.0, bottom: 16.0, right: 16.0),
-              child: FlatButton(
+              child: TextButton(
                 child: Text(S.of(context).cancel),
                 onPressed: () {
                   panelController.close();

lib/widgets/mobile/mobile_coupons.dart

@@ -246,17 +246,19 @@ class MobileCouponsState extends State<MobileCoupons> {
             ),
           ),
           Container(
-            child: RaisedButton(
+            child: ElevatedButton(
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(20),
+                ),
+              ),
               child: Text(
                 S.of(context).redeem_coupon,
                 style: TextStyle(
                   color: Colors.white,
                 ),
               ),
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(20.0),
-              ),
               onPressed: () {
                 if (coupon.store != null) {
                   Routes.router.navigateTo(context, '/shop/${coupon.store.id}/na/na/na');

lib/widgets/mobile/mobile_edit_address.dart

@@ -410,7 +410,7 @@ class MobileEditAddressState extends State<MobileEditAddress> {
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: <Widget>[
-            FlatButton(
+            TextButton(
               child: Text(
                 S
                     .of(context)
@@ -428,7 +428,7 @@ class MobileEditAddressState extends State<MobileEditAddress> {
                             .of(context)
                             .are_you_sure_to_delete_the_address),
                         actions: <Widget>[
-                          FlatButton(
+                          TextButton(
                             child: Text(S
                                 .of(context)
                                 .cancel),
@@ -436,7 +436,7 @@ class MobileEditAddressState extends State<MobileEditAddress> {
                               Navigator.of(context).pop();
                             },
                           ),
-                          FlatButton(
+                          TextButton(
                             child: Text(S
                                 .of(context)
                                 .yes_i_am_sure),
@@ -451,7 +451,7 @@ class MobileEditAddressState extends State<MobileEditAddress> {
                 );
               },
             ),
-            FlatButton(
+            TextButton(
               child: Text(
                   S
                       .of(context)

lib/widgets/mobile/mobile_forgot_password.dart

@@ -204,8 +204,10 @@ class MobileForgotPasswordState extends State<MobileForgotPassword> {
           margin: EdgeInsets.only(top: 0.0, right: 16.0),
           child: Align(
             alignment: Alignment.centerRight,
-            child: RaisedButton(
+            child: ElevatedButton(
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               child: Text(
                 S.of(context).verify,
                 style: TextStyle(

lib/widgets/mobile/mobile_login.dart

@@ -160,7 +160,7 @@ class MobileLoginState extends State<MobileLogin> {
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: <Widget>[
-              FlatButton(
+              TextButton(
                 child: Text(
                   S.of(context).new_user_question,
                   style: TextStyle(
@@ -175,7 +175,7 @@ class MobileLoginState extends State<MobileLogin> {
                 child: Text(''),
               ),
               Container(
-                child: FlatButton(
+                child: TextButton(
                   child: Text(
                     S.of(context).forgot_password_question,
                     style: TextStyle(
@@ -194,8 +194,10 @@ class MobileLoginState extends State<MobileLogin> {
           alignment: Alignment.centerRight,
           child: Container(
             padding: EdgeInsets.only(top: 20.0, left: 16.0, right: 16.0, bottom: 20.0),
-            child: RaisedButton(
+            child: ElevatedButton(
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               child: Text(
                 S.of(context).login,
                 style: TextStyle(

lib/widgets/mobile/mobile_me.dart

@@ -405,7 +405,7 @@ class MobileMeState extends State<MobileMe> {
                                       S.of(context).feature_not_available_web,
                                     ),
                                     actions: [
-                                      FlatButton(
+                                      TextButton(
                                           onPressed: () {
                                             Routes.router.pop(context);
                                           },
@@ -679,15 +679,19 @@ class MobileMeState extends State<MobileMe> {
                                     title: Text(S.of(context).warning),
                                     content: Text(S.of(context).email_needed),
                                     actions: <Widget>[
-                                      FlatButton(
+                                      TextButton(
                                         child: Text(S.of(context).cancel),
                                         onPressed: () {
                                           Navigator.of(context).pop();
                                         },
                                       ),
-                                      RaisedButton(
+                                      ElevatedButton(
-                                        color: Theme.of(context).primaryColor,
+                                        style: ElevatedButton.styleFrom(
-                                        textColor: Colors.white,
+                                          primary: Theme.of(context).primaryColor,
+                                          textStyle: TextStyle(
+                                            color: Colors.white,
+                                          ),
+                                        ),
                                         child: Text(S.of(context).ok),
                                         onPressed: () {
                                           Navigator.of(context).pop();

lib/widgets/mobile/mobile_my_cards.dart

@@ -113,14 +113,16 @@ class MyCardsState extends State<MobileMyCards> {
                       S.of(context).are_you_sure_to_remove_the_card,
                     ),
                     actions: <Widget>[
-                      FlatButton(
+                      TextButton(
                         child: Text(S.of(context).cancel),
-                        color: Theme.of(context).primaryColor,
+                        style: TextButton.styleFrom(
+                          primary: Theme.of(context).primaryColor,
+                        ),
                         onPressed: () {
                           Navigator.of(context).pop();
                         },
                       ),
-                      FlatButton(
+                      TextButton(
                         child: Text(S.of(context).yes_i_am_sure),
                         onPressed: () {
                           Navigator.of(context).pop();

lib/widgets/mobile/mobile_new_address.dart

@@ -329,7 +329,7 @@ class MobileNewAddressState extends State<MobileNewAddress> {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: <Widget>[
             SizedBox(),
-            FlatButton(
+            TextButton(
               child: Text(
                   S.of(context).save
               ),

lib/widgets/mobile/mobile_new_comment.dart

@@ -204,14 +204,16 @@ class MobileNewCommentState extends State<MobileNewComment> {
                         title: Text(S.of(context).warning),
                         content: Text(S.of(context).are_you_sure_to_remove_the_picture),
                         actions: <Widget>[
-                          FlatButton(
+                          TextButton(
                             child: Text(S.of(context).cancel),
                             onPressed: () {
                               Navigator.of(context).pop();
                             },
-                            color: Theme.of(context).primaryColor,
+                            style: TextButton.styleFrom(
+                              primary: Theme.of(context).primaryColor,
+                            ),
                           ),
-                          FlatButton(
+                          TextButton(
                             child: Text(S.of(context).yes_i_am_sure),
                             onPressed: () {
                               Navigator.of(context).pop();

lib/widgets/mobile/mobile_new_ticket.dart

@@ -160,8 +160,10 @@ class MobileNewTicketState extends State<MobileNewTicket> {
           alignment: Alignment.centerRight,
           child: Container(
             padding: EdgeInsets.only(top: 20.0, left: 16.0, right: 16.0, bottom: 20.0),
-            child: RaisedButton(
+            child: ElevatedButton(
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               child: Text(
                 S.of(context).submit,
                 style: TextStyle(
@@ -233,7 +235,7 @@ class MobileNewTicketState extends State<MobileNewTicket> {
             title: Text(S.of(context).success),
             content: Text(S.of(context).ticket_created_success),
             actions: <Widget>[
-              FlatButton(
+              TextButton(
                 child: Text(S.of(context).ok),
                 onPressed: () {
                   Routes.router.navigateTo(context, '/my-support/${widget.businessId}', replace: true);
@@ -363,15 +365,17 @@ class MobileNewTicketState extends State<MobileNewTicket> {
           title: Text(S.of(context).warning),
           content: Text(S.of(context).are_you_sure_to_remove_the_picture),
           actions: [
-            FlatButton(
+            TextButton(
               child: Text(S.of(context).cancel),
               onPressed: () {
                 Navigator.of(context).pop();
               },
             ),
-            RaisedButton(
+            ElevatedButton(
               child: Text(S.of(context).yes_i_am_sure),
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               onPressed: () {
                 Navigator.of(context).pop();
                 setState(() {

lib/widgets/mobile/mobile_new_user.dart

@@ -201,8 +201,10 @@ class MobileNewUserState extends State<MobileNewUser> {
           margin: EdgeInsets.only(top: 0.0, right: 16.0),
           child: Align(
             alignment: Alignment.centerRight,
-            child: RaisedButton(
+            child: ElevatedButton(
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               child: Text(
                 S.of(context).register,
                 style: TextStyle(

lib/widgets/mobile/mobile_order_detail.dart

@@ -984,7 +984,7 @@ class MobileOrderDetailState extends State<MobileOrderDetail> {
                 Container(
                   padding: EdgeInsets.only(right: 10.0),
                   child: order.status == Constants.STATUS_PENDING && order.paymentStatus == Constants.PAYMENT_STATUS_UNPAID ?
-                  FlatButton(
+                  TextButton(
                     child: Text(
                       S.of(context).cancel_order,
                     ),
@@ -994,7 +994,7 @@ class MobileOrderDetailState extends State<MobileOrderDetail> {
                   ) : SizedBox.shrink(),
                 ),
                 Container(
-                  child: order.status == Constants.STATUS_COMPLETE && !order.hasComment ? RaisedButton(
+                  child: order.status == Constants.STATUS_COMPLETE && !order.hasComment ? ElevatedButton(
                     child: Text(
                       S.of(context).comment,
                     ),
@@ -1009,14 +1009,14 @@ class MobileOrderDetailState extends State<MobileOrderDetail> {
               child: order.paymentStatus != Constants.PAYMENT_STATUS_PAID
                   && order.status != Constants.STATUS_CANCELLED
                   && order.status != Constants.STATUS_COMPLETE ?
-              FlatButton(
+              TextButton(
                 child: Text(
                   S.of(context).pay_now,
                 ),
                 onPressed: () {
                   Routes.router.navigateTo(context, '/paynow/${order.id}');
                 },
-              ) : FlatButton(
+              ) : TextButton(
                 child: Text(
                   S.of(context).order_again,
                 ),
@@ -1140,16 +1140,18 @@ class MobileOrderDetailState extends State<MobileOrderDetail> {
           title: Text(S.of(context).warning),
           content: Text(S.of(context).are_you_sure_to_cancel_the_order),
           actions: <Widget>[
-            FlatButton(
+            TextButton(
               child: Text(
                 S.of(context).no,
               ),
-              color: Theme.of(context).primaryColor,
+              style: TextButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               onPressed: () {
                 Navigator.of(context).pop();
               },
             ),
-            FlatButton(
+            TextButton(
               child: Text(
                 S.of(context).yes_i_am_sure,
               ),

lib/widgets/mobile/mobile_orders.dart

@@ -187,7 +187,7 @@ class MobileOrdersState extends State<MobileOrders> with SingleTickerProviderSta
         Row row3 = Row(
           mainAxisAlignment: MainAxisAlignment.start,
           children: <Widget>[
-            RaisedButton(
+            ElevatedButton(
               child: Text(
                 S.of(context).detail,
               ),
@@ -203,7 +203,7 @@ class MobileOrdersState extends State<MobileOrders> with SingleTickerProviderSta
           row3.children.add(
             Padding(
               padding: EdgeInsets.only(left: 10.0),
-              child: RaisedButton(
+              child: ElevatedButton(
                 child: Text(
                   S.of(context).comment,
                 ),
@@ -225,7 +225,7 @@ class MobileOrdersState extends State<MobileOrders> with SingleTickerProviderSta
           if (order.paymentStatus != Constants.PAYMENT_STATUS_PAID
               && order.status != Constants.STATUS_CANCELLED
               && order.status != Constants.STATUS_COMPLETE) {
-            row2.children.add(RaisedButton(
+            row2.children.add(ElevatedButton(
               child: Text(
                 S.of(context)
                     .pay_now,
@@ -233,20 +233,24 @@ class MobileOrdersState extends State<MobileOrders> with SingleTickerProviderSta
                   color: Colors.white,
                 ),
               ),
-              color: Colors.redAccent,
+              style: ElevatedButton.styleFrom(
+                primary: Colors.redAccent,
+              ),
               onPressed: () {
                 Routes.router.navigateTo(context, '/paynow/${order.id}');
               },
             ));
           } else {
-            row2.children.add(RaisedButton(
+            row2.children.add(ElevatedButton(
               child: Text(
                 S.of(context).order_again,
                 style: TextStyle(
                   color: Colors.white,
                 ),
               ),
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               onPressed: () {
                 Utils.orderAgain(context, order.cartInfo);
               },
@@ -254,14 +258,16 @@ class MobileOrdersState extends State<MobileOrders> with SingleTickerProviderSta
           }
         } else {
           row2.children.add(row3);
-          row2.children.add(RaisedButton(
+          row2.children.add(ElevatedButton(
             child: Text(
               S.of(context).order_again,
               style: TextStyle(
                 color: Colors.white,
               ),
             ),
-            color: Theme.of(context).primaryColor,
+            style: ElevatedButton.styleFrom(
+              primary: Theme.of(context).primaryColor,
+            ),
             onPressed: () {
               Utils.orderAgain(context, order.cartInfo);
             },

lib/widgets/mobile/mobile_reset_password.dart

@@ -193,8 +193,10 @@ class MobileResetPasswordState extends State<MobileResetPassword> {
           padding: EdgeInsets.only(right: 16.0, top: 16.0),
           child: Align(
             alignment: Alignment.centerRight,
-            child: RaisedButton(
+            child: ElevatedButton(
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               child: Text(
                 S.of(context).submit,
                 style: TextStyle(
@@ -220,7 +222,7 @@ class MobileResetPasswordState extends State<MobileResetPassword> {
               title: Text(S.of(context).success),
               content: Text(S.of(context).reset_password_success),
               actions: <Widget>[
-                FlatButton(
+                TextButton(
                   child: Text(S.of(context).ok),
                   onPressed: () {
                     Routes.router.navigateTo(context, '/login', replace: true, clearStack: false);

lib/widgets/mobile/mobile_set_password.dart

@@ -194,8 +194,10 @@ class MobileSetPasswordState extends State<MobileSetPassword> {
           padding: EdgeInsets.only(right: 16.0, top: 16.0),
           child: Align(
             alignment: Alignment.centerRight,
-            child: RaisedButton(
+            child: ElevatedButton(
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               child: Text(
                 S.of(context).submit,
                 style: TextStyle(
@@ -221,7 +223,7 @@ class MobileSetPasswordState extends State<MobileSetPassword> {
               title: Text(S.of(context).success),
               content: Text(S.of(context).user_account_created_success),
               actions: <Widget>[
-                FlatButton(
+                TextButton(
                   child: Text(S.of(context).ok),
                   onPressed: () {
                     Routes.router.navigateTo(context, '/login', replace: true, clearStack: false);

lib/widgets/mobile/mobile_user_profile.dart

@@ -402,7 +402,7 @@ class MobileUserProfileState extends State<MobileUserProfile> {
               ),
             ),
             actions: <Widget>[
-              FlatButton(
+              TextButton(
                 child: Text(
                     S.of(context).cancel
                 ),
@@ -410,7 +410,7 @@ class MobileUserProfileState extends State<MobileUserProfile> {
                   Navigator.of(context).pop();
                 },
               ),
-              FlatButton(
+              TextButton(
                 child: Text(
                   S.of(context).submit_to_change,
                 ),

lib/widgets/mobile/mobile_view_ticket.dart

@@ -337,8 +337,10 @@ class MobileViewTicketState extends State<MobileViewTicket> {
       alignment: Alignment.centerRight,
       child: Container(
         padding: EdgeInsets.only(top: 20.0, left: 16.0, right: 16.0, bottom: 20.0),
-        child: RaisedButton(
+        child: ElevatedButton(
-          color: Theme.of(context).primaryColor,
+          style: ElevatedButton.styleFrom(
+            primary: Theme.of(context).primaryColor,
+          ),
           child: Text(
             S.of(context).reply,
             style: TextStyle(
@@ -631,15 +633,17 @@ class MobileViewTicketState extends State<MobileViewTicket> {
           title: Text(S.of(context).warning),
           content: Text(S.of(context).are_you_sure_to_remove_the_picture),
           actions: [
-            FlatButton(
+            TextButton(
               child: Text(S.of(context).cancel),
               onPressed: () {
                 Navigator.of(context).pop();
               },
             ),
-            RaisedButton(
+            ElevatedButton(
               child: Text(S.of(context).yes_i_am_sure),
-              color: Theme.of(context).primaryColor,
+              style: ElevatedButton.styleFrom(
+                primary: Theme.of(context).primaryColor,
+              ),
               onPressed: () {
                 Navigator.of(context).pop();
                 setState(() {
@@ -683,7 +687,7 @@ class MobileViewTicketState extends State<MobileViewTicket> {
                   title: Text(S.of(context).success),
                   content: Text(S.of(context).ticket_created_success),
                   actions: <Widget>[
-                    FlatButton(
+                    TextButton(
                       child: Text(S.of(context).ok),
                       onPressed: () {
                         Routes.router.navigateTo(context,

lib/widgets/mobile/shop.dart

@@ -534,7 +534,7 @@ class ShopState extends State<Shop>
       action: SnackBarAction(
         label: S.of(context).close,
         onPressed: () {
-          _scaffoldKey.currentState.hideCurrentSnackBar();
+          ScaffoldMessenger.of(context).hideCurrentSnackBar();
         },
       ),
       content: Container(

linux/flutter/generated_plugins.cmake

@@ -7,6 +7,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
   url_launcher_linux
 )
 
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
 set(PLUGIN_BUNDLED_LIBRARIES)
 
 foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -15,3 +18,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
   list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
   list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
 endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)

pubspec.lock

@@ -36,13 +36,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
   cached_network_image:
     dependency: "direct main"
     description:
@@ -84,7 +77,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   charcode:
     dependency: transitive
     description:
@@ -119,7 +112,7 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   countdown:
     dependency: "direct main"
     description:
@@ -232,13 +225,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
   ffi:
     dependency: "direct main"
     description:
@@ -403,11 +389,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.22.0"
-  flutter_test:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
   flutter_web_plugins:
     dependency: "direct main"
     description: flutter
@@ -566,7 +547,7 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.3"
+    version: "0.6.4"
   logging:
     dependency: transitive
     description:
@@ -602,13 +583,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.5"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   mime:
     dependency: transitive
     description:
@@ -692,7 +680,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.2"
   path_drawing:
     dependency: transitive
     description:
@@ -929,13 +917,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.10.0"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
   stream_transform:
     dependency: transitive
     description:
@@ -994,13 +975,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.4.3"
   timezone:
     dependency: transitive
     description:
@@ -1119,28 +1093,42 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   video_player:
     dependency: transitive
     description:
       name: video_player
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.12"
+    version: "2.2.19"
+  video_player_android:
+    dependency: transitive
+    description:
+      name: video_player_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.3.4"
+  video_player_avfoundation:
+    dependency: transitive
+    description:
+      name: video_player_avfoundation
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.3.5"
   video_player_platform_interface:
     dependency: transitive
     description:
       name: video_player_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.0"
+    version: "5.0.0"
   video_player_web:
     dependency: transitive
     description:
       name: video_player_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.10"
   wakelock:
     dependency: transitive
     description:
@@ -1219,5 +1207,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.14.0 <3.0.0"
+  dart: ">=2.17.0-0 <3.0.0"
-  flutter: ">=2.2.0"
+  flutter: ">=2.8.0"

windows/flutter/generated_plugins.cmake

@@ -7,6 +7,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
   url_launcher_windows
 )
 
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
 set(PLUGIN_BUNDLED_LIBRARIES)
 
 foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -15,3 +18,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
   list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
   list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
 endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)