diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index ad8a5590..4178805a 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -13,6 +13,7 @@ import 'package:hmg_patient_app/models/Authentication/authenticated_user.dart'; import 'package:hmg_patient_app/models/Authentication/check_paitent_authentication_req.dart'; import 'package:hmg_patient_app/models/Authentication/select_device_imei_res.dart'; import 'package:hmg_patient_app/models/LiveCare/IncomingCallData.dart'; +import 'package:hmg_patient_app/new_ui/new_ext.dart'; import 'package:hmg_patient_app/pages/BookAppointment/Search.dart'; import 'package:hmg_patient_app/pages/DrawerPages/family/my-family.dart'; import 'package:hmg_patient_app/pages/ToDoList/ToDo.dart'; @@ -51,6 +52,7 @@ import 'package:local_auth/local_auth.dart'; import 'package:provider/provider.dart'; import '../../locator.dart'; +import '../../new_ui/exception_widget/ExceptionBottomSheet.dart'; import '../../routes.dart'; class LandingPage extends StatefulWidget { @@ -778,7 +780,16 @@ class _LandingPageState extends State with WidgetsBindingObserver { ); } on PlatformException catch (e) { GifLoaderDialogUtils.hideDialog(context); - AppToast.showErrorToast(message: 'Please enable your Touch or Face ID'); + context.showBottomSheet( + child: ExceptionBottomSheet( + message: "Please enable your Touch or Face ID", + onOkPressed: () { + Navigator.of(context).pop(); + // Don't resume timer here, let it continue naturally when user tries again + }, + ), + ); + // AppToast.showErrorToast(message: 'Please enable your Touch or Face ID'); } if (authenticated == true) { Navigator.of(context).pop(); diff --git a/lib/pages/login/saved_login.dart b/lib/pages/login/saved_login.dart index b685c6f5..72223bea 100644 --- a/lib/pages/login/saved_login.dart +++ b/lib/pages/login/saved_login.dart @@ -215,23 +215,40 @@ class _SavedLogin extends State { const SizedBox(height: 24), // OTP login button widget.savedLoginData.logInType != null && widget.savedLoginData.logInType != 1 - ? CustomButton( - text: TranslationBase.of(context).loginByOTP, - onPressed: () { - if (widget.savedLoginData.logInType! == 2 || widget.savedLoginData.logInType! == 3) { - loginWithFingerPrintFace(widget.savedLoginData.logInType!, widget.savedLoginData.iMEI!); - } else { - widget.savedLoginData.logInType = 1; - int? val = widget.savedLoginData.logInType!; - checkUserAuthentication(val); - } - }, - backgroundColor: Colors.white, - borderColor: Color(0xFF2E3039), - textColor: Color(0xFF2E3039), - borderWidth: 2, - padding: EdgeInsets.fromLTRB(0, 14, 0, 14), - icon: "assets/images/svg/password-validation.svg", + ? Column( + children: [ + CustomButton( + text: TranslationBase.of(context).loginByOTP, + onPressed: () { + widget.savedLoginData.logInType = 1; + int? val = widget.savedLoginData.logInType!; + checkUserAuthentication(val); + }, + backgroundColor: Colors.white, + borderColor: Color(0xFF2E3039), + textColor: Color(0xFF2E3039), + borderWidth: 2, + padding: EdgeInsets.fromLTRB(0, 14, 0, 14), + icon: "assets/images/svg/password-validation.svg", + ), + SizedBox( + height: 20, + ), + CustomButton( + text: "${TranslationBase.of(context).loginBy} ${getType(4, context)}", + onPressed: () { + widget.savedLoginData.logInType = 4; + int? val = widget.savedLoginData.logInType!; + checkUserAuthentication(val); + }, + backgroundColor: Colors.white, + borderColor: Color(0xFF2E3039), + textColor: Color(0xFF2E3039), + borderWidth: 2, + padding: EdgeInsets.fromLTRB(0, 14, 0, 14), + icon: "assets/images/svg/whatsapp.svg", + ), + ], ) : CustomButton( text: "${TranslationBase.of(context).loginBy} ${getType(4, context)}",