Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0

# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
merge-update-with-lab-changes
Mirza.Shafique 5 years ago
commit b2bba050e8

@ -861,7 +861,7 @@ class Utils {
SizedBox(height: 12), SizedBox(height: 12),
Text( Text(
text.toLowerCase().capitalizeFirstofEach, text.toLowerCase().capitalizeFirstofEach,
style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, color: Color(0xff575757), letterSpacing: -0.4, height: 16 / 10), style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff575757), letterSpacing: -0.4, height: 16 / 10),
), ),
SizedBox(height: 12), SizedBox(height: 12),
if (!isLast) if (!isLast)

@ -130,7 +130,7 @@ class DoctorCard extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
myRichText(isSortByClinic ? TranslationBase.of(context).hospital : TranslationBase.of(context).clinic + ":", subName), myRichText(isSortByClinic ? TranslationBase.of(context).hospital : TranslationBase.of(context).clinic + ":", subName),
myRichText(TranslationBase.of(context).billNo, billNo ?? ""), myRichText(TranslationBase.of(context).invoiceNo, billNo ?? ""),
//if (rat != null) StarRating(totalAverage: rat, forceStars: true), //if (rat != null) StarRating(totalAverage: rat, forceStars: true),
], ],
), ),

Loading…
Cancel
Save