Merge branch 'development_new_design_2.0' into haroon-new-design

# Conflicts:
#	lib/config/localized_values.dart
merge-update-with-lab-changes
haroon amjad 4 years ago
commit 5287260b85

@ -1581,4 +1581,5 @@ const Map localizedValues = {
"syncHealthData": { "en": "Sync Health Data", "ar": "مزامنة البيانات الصحية" },
"steps": { "en": "Steps", "ar": "الخطوات" },
"avgSteps": { "en": "Average Steps", "ar": "متوسط الخطوات" },
"enterDetails": {"en": "Enter Details", "ar": "أدخل التفاصيل"},
};

@ -69,7 +69,7 @@ class _RegisterNew extends State<RegisterNew> {
children: [
Expanded(
child: showProgress(
title: TranslationBase.of(context).RequesterInfo,
title: TranslationBase.of(context).enterDetails,
status: _currentIndex == 0
? TranslationBase.of(context).inPrgress
: _currentIndex > 0

@ -2484,7 +2484,7 @@ class TranslationBase {
String get mostViewed => localizedValues["mostViewed"][locale.languageCode];
String get newProducts => localizedValues["newProducts"][locale.languageCode];
String get enterDetails => localizedValues["enterDetails"][locale.languageCode];
String get paymentSelected => localizedValues["paymentSelected"][locale.languageCode];
String get moreNotifications => localizedValues["moreNotifications"][locale.languageCode];

Loading…
Cancel
Save