diff --git a/assets/fonts/ar/Cairo-Regular/Cairo-Regular.ttf b/assets/fonts/ar/Cairo-Regular/Cairo-Regular.ttf new file mode 100644 index 00000000..3eb09f86 Binary files /dev/null and b/assets/fonts/ar/Cairo-Regular/Cairo-Regular.ttf differ diff --git a/lib/config/config.dart b/lib/config/config.dart index be94c94c..4311ef6d 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -697,10 +697,10 @@ var GET_PATIENT_OCCUPATION_LIST = 'Services/Authentication.svc/REST/GetPatientOc //PAYFORT var getPayFortProjectDetails = "Services/PayFort_Serv.svc/REST/GetPayFortProjectDetails"; var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse"; -// var payFortEnvironment = FortEnvironment.production; -// var applePayMerchantId = "merchant.com.hmgwebservices"; -var payFortEnvironment = FortEnvironment.test; -var applePayMerchantId = "merchant.com.hmgwebservices.uat"; +var payFortEnvironment = FortEnvironment.production; +var applePayMerchantId = "merchant.com.hmgwebservices"; +// var payFortEnvironment = FortEnvironment.test; +// var applePayMerchantId = "merchant.com.hmgwebservices.uat"; class AppGlobal { static var context; diff --git a/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart b/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart index 2109c92e..898eaf2e 100644 --- a/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart +++ b/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart @@ -98,9 +98,10 @@ class _EROnlineCheckInHomePageState extends State with style: TextStyle( fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), ), + mHeight(12), Text( TranslationBase.of(context).EROnlineCheckInDesc1, - style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), + style: TextStyle(fontSize: 13, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), ), mHeight(16), // Text( @@ -179,7 +180,7 @@ class _EROnlineCheckInHomePageState extends State with padding: const EdgeInsets.only(left: 50, right: 50), child: Text( TranslationBase.of(context).EROnlineCheckInTapOnCheckIn, - style: TextStyle(fontSize: 14, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), + style: TextStyle(fontSize: 13, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), ), ), mHeight(16), @@ -225,7 +226,7 @@ class _EROnlineCheckInHomePageState extends State with padding: const EdgeInsets.only(left: 50, right: 50), child: Text( TranslationBase.of(context).EROnlineCheckInHoldPhoneInstruction, - style: TextStyle(fontSize: 14, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), + style: TextStyle(fontSize: 13, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), ), ), mHeight(16), @@ -271,7 +272,7 @@ class _EROnlineCheckInHomePageState extends State with padding: const EdgeInsets.only(left: 50, right: 50), child: Text( TranslationBase.of(context).EROnlineCheckInWaitTurnInstruction, - style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), letterSpacing: -1.44, height: 35 / 24), + style: TextStyle(fontSize: 13, color: CustomColors.textDarkColor, fontWeight: FontWeight.w700, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), letterSpacing: -1.44, height: 35 / 24), ), ), ], diff --git a/pubspec.yaml b/pubspec.yaml index 7b43a711..26b406e4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -257,6 +257,12 @@ flutter: - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.woff weight: 300 +# - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.eot +# - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.otf + - asset: assets/fonts/ar/Cairo-Regular/Cairo-Regular.ttf +# - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.woff + weight: 400 + - asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.eot - asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.otf - asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.ttf