From 4564b4201892109b40a767564af37c3f5830efc7 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 27 Apr 2025 14:56:43 +0300 Subject: [PATCH] updates & fixes --- lib/pages/login/confirm-login.dart | 8 +- .../login/user-login-agreement-page.dart | 484 +++++++++++++++++- lib/widgets/in_app_browser/InAppBrowser.dart | 4 +- 3 files changed, 481 insertions(+), 15 deletions(-) diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index 5dfa3c49..9b76efbd 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -711,9 +711,9 @@ class _ConfirmLogin extends State { checkIfUserAgreedBefore(CheckActivationCode result) { if (projectViewModel.havePrivilege(109)) { this.authService.checkIfUserAgreed().then((result) { - // if (result['IsPatientAlreadyAgreed']) { - // goToHome(); - // } else { + if (result['IsPatientAlreadyAgreed']) { + goToHome(); + } else { this.authService.getUserAgreementContent().then((result) { GifLoaderDialogUtils.hideDialog(AppGlobal.context); Navigator.pushAndRemoveUntil( @@ -732,7 +732,7 @@ class _ConfirmLogin extends State { GifLoaderDialogUtils.hideDialog(context); print(err); }); - // } + } }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); print(err); diff --git a/lib/pages/login/user-login-agreement-page.dart b/lib/pages/login/user-login-agreement-page.dart index cdf72035..72f46e74 100644 --- a/lib/pages/login/user-login-agreement-page.dart +++ b/lib/pages/login/user-login-agreement-page.dart @@ -46,6 +46,8 @@ class _UserLoginAgreementPageState extends State { late final WebViewController _controller; bool isPageLoaded = false; + bool isTermsAndConditionsPage = true; + @override void initState() { super.initState(); @@ -87,15 +89,17 @@ class _UserLoginAgreementPageState extends State { showNewAppBar: true, isShowDecPage: false, appBarTitle: TranslationBase.of(context).userAgreement, - body: isPageLoaded - ? WebViewWidget(controller: _controller) - : Container( - child: Center( - child: GifLoaderContainer( - barrierDismissible: false, + body: isTermsAndConditionsPage + ? getTermsAndConditionsContent() + : isPageLoaded + ? WebViewWidget(controller: _controller) + : Container( + child: Center( + child: GifLoaderContainer( + barrierDismissible: false, + ), + ), ), - ), - ), // Padding( // padding: const EdgeInsets.all(8.0), // child: SingleChildScrollView(child: WebViewWidget(controller: _controller) @@ -150,7 +154,13 @@ class _UserLoginAgreementPageState extends State { elevation: 0, onPressed: isPageLoaded ? () { - addUsageAgreement(); + if (isTermsAndConditionsPage) { + setState(() { + isTermsAndConditionsPage = false; + }); + } else { + addUsageAgreement(); + } } : null, child: Text(TranslationBase.of(context).acceptLbl.toUpperCase(), @@ -195,6 +205,462 @@ class _UserLoginAgreementPageState extends State { ); } + Widget getTermsAndConditionsContent() { + return SingleChildScrollView( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + TranslationBase.of(context).termsHeading, + style: + TextStyle(fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions1, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions2, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions3, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions4, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions5, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsHeading2, + style: + TextStyle(fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions6, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsHeading3, + style: + TextStyle(fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions7, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions8, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions9, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions10, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions11, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions12, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions12a, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions12b, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions12c, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions13, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions14, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions14a, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions14b, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsHeading4, + style: + TextStyle(fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions15, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions16, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions16a, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions16b, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions17, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions18, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions19, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions19a, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions19b, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsHeading5, + style: + TextStyle(fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions20, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions21, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsHeading6, + style: + TextStyle(fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions21, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions22, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions23, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions24, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsHeading7, + style: + TextStyle(fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions25, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions25a, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions25b, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions25c, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions26, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions27, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions28, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions29, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions30, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions31, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions32, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsHeading8, + style: + TextStyle(fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions33, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions33a, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions33b, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions34, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions34a, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions34b, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions34c, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions34d, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions34e, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions35, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions35a, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions35b, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions35c, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions35d, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions35e, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions36, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions37, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions38, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions39, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions39a, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions39b, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions39c, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions39d, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsHeading9, + style: + TextStyle(fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions40, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions41, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsHeading10, + style: + TextStyle(fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions42, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions43, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsHeading11, + style: + TextStyle(fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions44, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsHeading12, + style: + TextStyle(fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(12.0), + Text( + TranslationBase.of(context).termsConditions45, + style: TextStyle(fontSize: 16, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + ), + mHeight(24.0), + mHeight(150.0), + ], + ), + ), + ); + } + addUsageAgreement() { GifLoaderDialogUtils.showMyDialog(context); this.authService.addUserAgreementContent().then((result) { diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart index 6f61ac8a..ee68f743 100644 --- a/lib/widgets/in_app_browser/InAppBrowser.dart +++ b/lib/widgets/in_app_browser/InAppBrowser.dart @@ -38,9 +38,9 @@ class MyInAppBrowser extends InAppBrowser { static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE // static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT - static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT + // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT - // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE + static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE // static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS