From 2ab012d5038f6c96d28672549e6c9757124aef80 Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Sun, 4 Apr 2021 10:57:59 +0300 Subject: [PATCH 1/2] fix drawer issue --- lib/widgets/shared/app_drawer_widget.dart | 4 ++-- lib/widgets/shared/drawer_item_widget.dart | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/widgets/shared/app_drawer_widget.dart b/lib/widgets/shared/app_drawer_widget.dart index 100e8c1d..43106db1 100644 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -76,7 +76,7 @@ class _AppDrawerState extends State { fontWeight: FontWeight.bold, color: Color(0xFF2E303A), fontFamily: 'Poppins', - fontSize: SizeConfig.textMultiplier * 2.5, + fontSize: 17, ), ), Padding( @@ -85,7 +85,7 @@ class _AppDrawerState extends State { authProvider.doctorProfile?.clinicDescription, fontWeight: FontWeight.w600, color: Color(0xFF2E303A), - fontSize: SizeConfig.textMultiplier * 2, + fontSize: 15, fontFamily: 'Poppins', )) ], diff --git a/lib/widgets/shared/drawer_item_widget.dart b/lib/widgets/shared/drawer_item_widget.dart index 84691f7f..fefea780 100644 --- a/lib/widgets/shared/drawer_item_widget.dart +++ b/lib/widgets/shared/drawer_item_widget.dart @@ -47,7 +47,7 @@ class _DrawerItemState extends State { marginLeft: 5, marginRight: 5, color:widget.color ??Color(0xFF2E303A), - fontSize: SizeConfig.textMultiplier * 2.0, + fontSize: 14, fontFamily: 'Poppins', fontWeight: FontWeight.bold, ), From 3f342d8ce14c6a6e4b516f123704c8e4e66077e8 Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Sun, 4 Apr 2021 11:26:47 +0300 Subject: [PATCH 2/2] fix doctor replay --- lib/widgets/doctor/doctor_reply_widget.dart | 292 ++++---------------- 1 file changed, 49 insertions(+), 243 deletions(-) diff --git a/lib/widgets/doctor/doctor_reply_widget.dart b/lib/widgets/doctor/doctor_reply_widget.dart index d0d8c3ca..d056f816 100644 --- a/lib/widgets/doctor/doctor_reply_widget.dart +++ b/lib/widgets/doctor/doctor_reply_widget.dart @@ -1,4 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; import 'package:doctor_app_flutter/util/date-utils.dart'; @@ -8,6 +9,8 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; class DoctorReplyWidget extends StatefulWidget { final ListGtMyPatientsQuestions reply; @@ -22,6 +25,8 @@ class DoctorReplyWidget extends StatefulWidget { class _DoctorReplyWidgetState extends State { @override Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); + return Container( child: CardWithBgWidget( bgColor: @@ -57,26 +62,44 @@ class _DoctorReplyWidgetState extends State { ], ), ), - AppText( - DateUtils.getDateTimeFromServerFormat( - widget.reply.createdOn) - .day - .toString() + - " " + - DateUtils.getMonth( - DateUtils.getDateTimeFromServerFormat( - widget.reply.createdOn) - .month) - .toString() - .substring(0, 3) + - ' ' + + Column( + children: [ + AppText( + DateUtils.getDateTimeFromServerFormat( + widget.reply.createdOn) + .day + .toString() + + " " + + DateUtils.getMonth( + DateUtils.getDateTimeFromServerFormat( + widget.reply.createdOn) + .month) + .toString() + .substring(0, 3) + + ' ' + + DateUtils.getDateTimeFromServerFormat( + widget.reply.createdOn) + .year + .toString(), + fontFamily: 'Poppins', + fontWeight: FontWeight.w600, + ), + AppText( DateUtils.getDateTimeFromServerFormat( + widget.reply.createdOn) + .hour + .toString() + + ":"+ + DateUtils.getDateTimeFromServerFormat( widget.reply.createdOn) - .year - .toString(), - fontFamily: 'Poppins', - fontWeight: FontWeight.w600, - ) + .minute + .toString(), + fontFamily: 'Poppins', + fontWeight: FontWeight.w600, + ) + + ], + ), ], ), Row( @@ -197,6 +220,8 @@ class _DoctorReplyWidgetState extends State { Container( width: MediaQuery.of(context).size.width * 0.5, child: RichText( + maxLines: 2, + overflow: TextOverflow.ellipsis, text: new TextSpan( style: new TextStyle( fontSize: 2.0 * SizeConfig.textMultiplier, @@ -207,11 +232,11 @@ class _DoctorReplyWidgetState extends State { style: TextStyle(fontSize: 14, fontFamily: 'Poppins', color: Color(0xFF575757),fontWeight: FontWeight.bold)), new TextSpan( - text: widget.reply.remarks, + text: widget.reply.remarks.trim(), style: TextStyle( fontFamily: 'Poppins', color: Color(0xFF575757), - fontSize: 15)), + fontSize: 12)), ], ), ), @@ -219,234 +244,15 @@ class _DoctorReplyWidgetState extends State { ],) ], ), - - SizedBox( - height: 20, - ), + Container( + alignment: projectViewModel.isArabic?Alignment.centerLeft:Alignment.centerRight, + child: Icon(FontAwesomeIcons.arrowRight, + size: 20, color: Colors.black),) ], ), // onTap: onTap, )), ), ); - // Stack( - // children: [ - // Container( - // margin: EdgeInsets.symmetric(vertical: 10.0), - // width: double.infinity, - // decoration: BoxDecoration( - // color: HexColor('#FFFFFF'), - // borderRadius: BorderRadius.all( - // Radius.circular(20.0), - // ), - // ), - // child: Container( - // margin: EdgeInsets.all(5), - // child: Column( - // children: [ - // SizedBox(height: 18,), - // Container( - // margin: EdgeInsets.only(right: 15), - // child: Row( - // children: [ - // SizedBox(width: 5,), - // //LargeAvatar(icon: widget.reply.gender == 0 ? DoctorApp.male : DoctorApp.femaleicon ,), - // Container( - // decoration: BoxDecoration( - // gradient: LinearGradient( - // begin: Alignment(-1, -1), - // end: Alignment(1, 1), - // colors: [ - // Colors.grey[100], - // Colors.grey[200], - // ]), - // boxShadow: [ - // BoxShadow( - // color: Color.fromRGBO(0, 0, 0, 0.08), - // offset: Offset(0.0, 5.0), - // blurRadius: 16.0) - // ], - // borderRadius: BorderRadius.all(Radius.circular(50.0)), - // ), - // width: 80, - // height: 80, - // child: Icon(widget.reply.gender == 1 ? DoctorApp.male : DoctorApp.female_icon,size: 80,)), - // - // SizedBox(width: 15,), - // Expanded( - // child: Container( - // child: Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // AppText( - // widget.reply.patientName, - // fontSize: 1.5 * SizeConfig.textMultiplier, - // fontWeight: FontWeight.bold, - // ), - // SizedBox( - // height: 5, - // ), - // - // Row( - // children: [ - // AppText( - // TranslationBase.of(context).fileNo, - // fontSize: 1.7 * SizeConfig.textMultiplier, - // fontWeight: FontWeight.bold, - // ), - // Container( - // margin: EdgeInsets.only(left: 5), - // child: AppText( - // '${widget.reply.patientID}', - // fontSize: 1.7 * SizeConfig.textMultiplier, - // fontWeight: FontWeight.bold, - // ), - // ), - // ], - // ), - // SizedBox( - // height: 5, - // ), - // Row( - // children: [ - // AppText( - // TranslationBase.of(context).mobileNo, - // fontSize: 1.7 * SizeConfig.textMultiplier, - // fontWeight: FontWeight.bold, - // ), - // Container( - // margin: EdgeInsets.only(left: 5), - // child: AppText( - // widget.reply.mobileNumber, - // fontSize: 1.7 * SizeConfig.textMultiplier, - // fontWeight: FontWeight.bold, - // ), - // ), - // ], - // ), - // SizedBox( - // height: 5, - // ), - // Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // Container( - // width: 70, - // height: 20, - // decoration: BoxDecoration( - // borderRadius: BorderRadius.all(Radius.circular(60.0)), - // color: Colors.green[600] - // ), - // child: Center( - // child: AppText( - // widget.reply.requestTime, - // fontSize: 1.5 * SizeConfig.textMultiplier, - // color: Colors.white, - // ), - // ), - // ), - // Container( - // - // child: AppText( - // '${Helpers.getDate(widget.reply.requestDate)}', - // fontSize: 1.7 * SizeConfig.textMultiplier, - // fontWeight: FontWeight.bold, - // color: Colors.black, - // ), - // ), - // ], - // ), - // - // ], - // ), - // ), - // ) - // - // ], - // ), - // ), - // - // !widget.isShowMore ? SizedBox(height: 18,) : - // AnimatedContainer( - // duration: Duration(milliseconds: 200), - // child: Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // Divider(color: Colors.grey), - // SizedBox(height: 5,), - // Row( - // mainAxisAlignment: MainAxisAlignment.start, - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // AppText( - // TranslationBase.of(context).remarks + " : ", - // fontSize: 2.5 * SizeConfig.textMultiplier, - // //fontWeight: FontWeight.bold, - // ),Expanded( - // child: AppText( - // widget.reply.remarks, - // fontSize: 2.5 * SizeConfig.textMultiplier, - // //fontWeight: FontWeight.bold, - // ), - // ), - // ], - // ), - // SizedBox(height: 10,), - // Row( - // mainAxisAlignment: MainAxisAlignment.start, - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // AppText( - // TranslationBase.of(context).doctorResponse + " : ", - // fontSize: 2.5 * SizeConfig.textMultiplier, - // //fontWeight: FontWeight.bold, - // ),Expanded( - // child: AppText( - // widget.reply.doctorResponse, - // fontSize: 2.5 * SizeConfig.textMultiplier, - // //fontWeight: FontWeight.bold, - // ), - // ), - // ], - // ),SizedBox(height: 10,), - // Row( - // mainAxisAlignment: MainAxisAlignment.start, - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // AppText( - // TranslationBase.of(context).infoStatus + " : ", - // fontSize: 2.5 * SizeConfig.textMultiplier, - // //fontWeight: FontWeight.bold, - // ),Expanded( - // child: AppText( - // widget.reply.infoStatus, - // fontSize: 2.5 * SizeConfig.textMultiplier, - // //fontWeight: FontWeight.bold, - // ), - // ), - // ], - // ) - // ], - // ), - // ), - // - // ], - // ), - // ), - // ), - // Positioned( - // right: 5, - // top: 20, - // child: InkWell( - // onTap: (){ - // setState(() { - // widget.isShowMore = !widget.isShowMore; - // }); - // }, - // child: Icon(widget.isShowMore? Icons.keyboard_arrow_up : Icons.keyboard_arrow_down)), - // ) - // ], - // - // ); } }