Merge remote-tracking branch 'origin/master' into changes

# Conflicts:
#	assets/langs/en-US.json
pull/255/head
tahaalam 7 hours ago
commit ee8257054e

@ -1767,5 +1767,7 @@
"selectCriteria": "اختيار المعيار",
"locationServicesDisabled": "حالة الطقس غير متوفرة لتعطيل خدمات الموقع. يرجى تفعيل خدمات الموقع لتتمكن من رؤية معلومات الطقس.",
"selectDateTimeKey": "اختيار",
"medicalKey": "الطبية"
"medicalKey": "الطبية",
"convertBloodcholesterolInfo":"حول قيمة كوليسترول الدم بين ملجم/ديسيلتر و مليمول/لتر"
}

@ -1755,10 +1755,10 @@
"selectSearchCriteria": "Select the Search Criteria",
"selectCriteria": "Select Criteria",
"locationServicesDisabled": "Weather is unavailable because location services are disabled. Please enable location services to see the weather information.",
"selectDateTimeKey": "Select",
"medicalKey": "Medical"
,
"convertBloodcholesterolInfo": "Convert blood cholesterol values between mg/dL and mmol/L. "
}

@ -1,4 +1,6 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
import 'package:provider/provider.dart';
import 'package:hmg_patient_app_new/core/app_assets.dart';
import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
@ -121,7 +123,7 @@ class _BloodCholesterolWidgetState extends State<BloodCholesterolWidget> {
Utils.buildSvgWithAssets(icon: AppAssets.globe, width: 18.w, height: 18.w),
SizedBox(width: 12.w),
Expanded(
child: "Convert blood cholesterol values between mg/dL and mmol/L. ".toText12(isBold: true, color: AppColors.inputLabelTextColor),
child:LocaleKeys.convertBloodcholesterolInfo.tr(context: context).toText12(isBold: true, color: AppColors.inputLabelTextColor),
),
],
).paddingSymmetrical(0.w, 16.w),

Loading…
Cancel
Save