diff --git a/lib/checkout/view/checkout_view.dart b/lib/checkout/view/checkout_view.dart index c308708..4b5db4b 100644 --- a/lib/checkout/view/checkout_view.dart +++ b/lib/checkout/view/checkout_view.dart @@ -345,6 +345,7 @@ class CheckoutView extends StatelessWidget { CustomFilledButton( onTap: () { showModalBottomSheet( + backgroundColor: Colors.white, context: context, isScrollControlled: true, shape: RoundedRectangleBorder( diff --git a/lib/checkout/widget/all_coupons_bottomsheet.dart b/lib/checkout/widget/all_coupons_bottomsheet.dart index bb54b92..43ed068 100644 --- a/lib/checkout/widget/all_coupons_bottomsheet.dart +++ b/lib/checkout/widget/all_coupons_bottomsheet.dart @@ -71,7 +71,9 @@ class AllCouponsBottomsheet extends StatelessWidget { GestureDetector( onTap: (){ Navigator.pop(context); - showModalBottomSheet(context: context, + showModalBottomSheet( + backgroundColor: Colors.white, + context: context, isScrollControlled: true, shape: RoundedRectangleBorder( borderRadius: BorderRadius.vertical( diff --git a/lib/checkout/widget/login_email_bottomsheet.dart b/lib/checkout/widget/login_email_bottomsheet.dart index 18af4db..a330960 100644 --- a/lib/checkout/widget/login_email_bottomsheet.dart +++ b/lib/checkout/widget/login_email_bottomsheet.dart @@ -62,6 +62,7 @@ class LoginEmailBottomsheet extends StatelessWidget { Navigator.pop(context); showModalBottomSheet( context: context, + backgroundColor: Colors.white, isScrollControlled: true, shape: RoundedRectangleBorder( borderRadius: BorderRadius.vertical( diff --git a/lib/checkout/widget/purchase_details_bottomsheet.dart b/lib/checkout/widget/purchase_details_bottomsheet.dart index 0fa7376..9665816 100644 --- a/lib/checkout/widget/purchase_details_bottomsheet.dart +++ b/lib/checkout/widget/purchase_details_bottomsheet.dart @@ -200,7 +200,9 @@ class PurchaseDetailsBottomsheet extends StatelessWidget { // --- Proceed Button --- CustomFilledButton( - onTap: () {}, + onTap: () { + Navigator.pop(context); + }, label: "Proceed", width: double.infinity, ), diff --git a/lib/checkout/widget/verify_otp_bottomsheet.dart b/lib/checkout/widget/verify_otp_bottomsheet.dart index 792a3b7..74fb695 100644 --- a/lib/checkout/widget/verify_otp_bottomsheet.dart +++ b/lib/checkout/widget/verify_otp_bottomsheet.dart @@ -76,7 +76,9 @@ class VerifyOtpBottomsheet extends StatelessWidget { SizedBox(height: 42.h), CustomFilledButton( - onTap: () {}, + onTap: () { + Navigator.pop(context); + }, label: "Continue", width: double.infinity, ), diff --git a/lib/main.dart b/lib/main.dart index 216c347..68b805f 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,5 @@ import 'package:citycards_customer/cart/blocs/postcard_bloc.dart'; +import 'package:citycards_customer/core/route_constants.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; @@ -39,6 +40,7 @@ class MyApp extends StatelessWidget { ], child: MaterialApp( onGenerateRoute: _appRouter.onGenerateRoute, + initialRoute: RouteConstants.buyPass, debugShowCheckedModeBanner: false, title: 'City Cards', theme: ThemeData(