diff --git a/lib/widgets/doctor/doctor_reply_widget.dart b/lib/widgets/doctor/doctor_reply_widget.dart index f75f43d0..599e4e37 100644 --- a/lib/widgets/doctor/doctor_reply_widget.dart +++ b/lib/widgets/doctor/doctor_reply_widget.dart @@ -49,7 +49,6 @@ class _DoctorReplyWidgetState extends State { color: Colors.black), children: [ new TextSpan( - //TODO Elham* add translation text: widget.reply.status == 2 ? TranslationBase.of(context).active : widget.reply.status == 1 @@ -190,47 +189,6 @@ class _DoctorReplyWidgetState extends State { value: "${AppDateUtils.getAgeByBirthday(widget.reply.dateofBirth, context)}", ), - // CustomRow( - // label:TranslationBase.of(context).requestType+ - // ": ", - // value: "${widget.reply.requestTypeDescription}", - // ), - - Container( - width: MediaQuery.of(context).size.width * 0.5, - child: RichText( - maxLines: 3, - overflow: TextOverflow.ellipsis, - text: new TextSpan( - style: new TextStyle( - fontSize: - 1.3 * SizeConfig.textMultiplier, - color: Color(0xFF575757)), - children: [ - new TextSpan( - text: TranslationBase.of(context) - .requestType + - ": ", - style: TextStyle( - fontSize: SizeConfig - .getTextMultiplierBasedOnWidth() * - 2.8, - color: Color(0xFF575757), - //TranslationBase.of(context).doctorResponse + " : ", - )), - new TextSpan( - text: - "${widget.reply.requestTypeDescription}", - style: TextStyle( - fontFamily: 'Poppins', - fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, - color: Color(0xFF2E303A), - fontWeight: FontWeight.w700, - )), - ], - ), - ), - ), CustomRow( width: MediaQuery.of(context).size.width * .3, label: TranslationBase.of(context).infoStatus + @@ -269,17 +227,29 @@ class _DoctorReplyWidgetState extends State { overflow: TextOverflow.ellipsis, text: new TextSpan( style: new TextStyle( - fontSize: 1.3 * SizeConfig.textMultiplier, + fontSize: + 1.3 * SizeConfig.textMultiplier, color: Color(0xFF575757)), children: [ new TextSpan( - text: - "Patient Question: ", //TranslationBase.of(context).doctorResponse + " : ", - ), + text: TranslationBase.of(context) + .requestType + + ": ", + style: TextStyle( + fontSize: SizeConfig + .getTextMultiplierBasedOnWidth() * + 2.8, + color: Color(0xFF575757), + //TranslationBase.of(context).doctorResponse + " : ", + )), new TextSpan( - text: widget.reply?.remarks?.trim() ?? '', + text: + "${widget.reply.requestTypeDescription}", style: TextStyle( fontFamily: 'Poppins', + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, + color: Color(0xFF2E303A), + fontWeight: FontWeight.w700, )), ], ), diff --git a/lib/widgets/shared/card_with_bg_widget.dart b/lib/widgets/shared/card_with_bg_widget.dart index deeff358..d414f557 100644 --- a/lib/widgets/shared/card_with_bg_widget.dart +++ b/lib/widgets/shared/card_with_bg_widget.dart @@ -40,8 +40,8 @@ class CardWithBgWidget extends StatelessWidget { color: bgColor ?? HexColor('#58434F'), borderRadius: BorderRadius.only( - topLeft: Radius.circular(10), - bottomLeft: Radius.circular(10),),), + topRight: Radius.circular(10), + bottomRight: Radius.circular(10),),), width: 10, ), bottom: 1,