From 2d4cb00716b4f1a063576272467fd800b95bdb69 Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Fri, 23 Apr 2021 19:14:29 +0300 Subject: [PATCH] fix design issue --- ios/Podfile.lock | 2 +- lib/config/config.dart | 4 +-- lib/screens/doctor/doctor_reply_screen.dart | 16 +++++------ .../profile/note/progress_note_screen.dart | 27 ++++++++++++------- lib/widgets/doctor/doctor_reply_widget.dart | 14 +++++----- 5 files changed, 36 insertions(+), 27 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 878a1850..2f4607e0 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -322,4 +322,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69 -COCOAPODS: 1.10.1 +COCOAPODS: 1.10.0.rc.1 diff --git a/lib/config/config.dart b/lib/config/config.dart index d350f66f..85e474eb 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -316,8 +316,8 @@ const PRIMARY_COLOR = 0xff515B5D; const TRANSACTION_NO = 0; const LANGUAGE_ID = 2; const STAMP = '2020-04-27T12:17:17.721Z'; -const IP_ADDRESS = '9.9.9.9'; -const VERSION_ID = 5.5; +const IP_ADDRESS = '11.11.11.11'; +const VERSION_ID = 5.6; const CHANNEL = 9; const SESSION_ID = 'BlUSkYymTt'; const IS_LOGIN_FOR_DOCTOR_APP = true; diff --git a/lib/screens/doctor/doctor_reply_screen.dart b/lib/screens/doctor/doctor_reply_screen.dart index 283ce7cd..f60f464c 100644 --- a/lib/screens/doctor/doctor_reply_screen.dart +++ b/lib/screens/doctor/doctor_reply_screen.dart @@ -51,14 +51,14 @@ class DoctorReplyScreen extends StatelessWidget { onTap: reply.status != 2 ? null : () { - Navigator.push( - context, - MaterialPageRoute( - builder: (BuildContext context) => - DoctorReplayChat( - reply: reply, - previousModel: model, - ))); + // Navigator.push( + // context, + // MaterialPageRoute( + // builder: (BuildContext context) => + // DoctorReplayChat( + // reply: reply, + // previousModel: model, + // ))); }, child: DoctorReplyWidget(reply: reply), ); diff --git a/lib/screens/patients/profile/note/progress_note_screen.dart b/lib/screens/patients/profile/note/progress_note_screen.dart index 5b806d4e..45e35079 100644 --- a/lib/screens/patients/profile/note/progress_note_screen.dart +++ b/lib/screens/patients/profile/note/progress_note_screen.dart @@ -9,6 +9,7 @@ import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/add-order/addNewOrder.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; +import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:flutter/material.dart'; @@ -171,6 +172,7 @@ class _ProgressNoteState extends State { onTap: () async { showMyDialog( context: context, + actionName: "cancel", confirmFun: () async { GifLoaderDialogUtils .showMyDialog( @@ -241,7 +243,7 @@ class _ProgressNoteState extends State { ), InkWell( onTap: () async { - showMyDialog(context: context, confirmFun: () async{ + showMyDialog(context: context, actionName: "verify",confirmFun: () async{ GifLoaderDialogUtils .showMyDialog(context); UpdateNoteReqModel reqModel = @@ -400,7 +402,7 @@ class _ProgressNoteState extends State { ); } - showMyDialog({BuildContext context, Function confirmFun, isCancel = true}) { + showMyDialog({BuildContext context, Function confirmFun, String actionName}) { showDialog( context: context, child: Center( @@ -412,7 +414,7 @@ class _ProgressNoteState extends State { height: MediaQuery .of(context) .size - .height * 0.5, + .height * 0.3, child: AppScaffold( isShowAppBar: false, body: Container( @@ -420,25 +422,32 @@ class _ProgressNoteState extends State { child: Center( child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center, children: [ // SizedBox(height: 20,), + SizedBox(height: 5,), + AppText( + "Confirm", fontWeight: FontWeight.w600, + color: Colors.black, + fontSize: 16,), + SizedBox(height: 5,), + DividerWithSpacesAround(), Container( padding: EdgeInsets.all(20), color: Colors.white, child: Expanded( child: AppText( - 'Are you sure you want to do this action?', + 'Are you sure you want $actionName this order?', fontSize: 15, textAlign: TextAlign.center, ), ), ), - SizedBox(height: MediaQuery - .of(context) - .size - .height * 0.2,), + + SizedBox(height: 30,), + DividerWithSpacesAround(), + // SizedBox(height: 30,), Row( mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/lib/widgets/doctor/doctor_reply_widget.dart b/lib/widgets/doctor/doctor_reply_widget.dart index 5e8fb8cf..b346a827 100644 --- a/lib/widgets/doctor/doctor_reply_widget.dart +++ b/lib/widgets/doctor/doctor_reply_widget.dart @@ -220,15 +220,15 @@ class _DoctorReplyWidgetState extends State { Container( width: MediaQuery.of(context).size.width * 0.5, child: RichText( - maxLines: 2, - overflow: TextOverflow.ellipsis, + // maxLines: 2, + // overflow: TextOverflow.ellipsis, text: new TextSpan( style: new TextStyle( fontSize: 2.0 * SizeConfig.textMultiplier, color: Colors.black), children: [ new TextSpan( - text: TranslationBase.of(context).doctorResponse + " : ", + text:"Patient Question :" ,//TranslationBase.of(context).doctorResponse + " : ", style: TextStyle(fontSize: 14, fontFamily: 'Poppins', color: Color(0xFF575757),fontWeight: FontWeight.bold)), new TextSpan( @@ -244,10 +244,10 @@ class _DoctorReplyWidgetState extends State { ],) ], ), - Container( - alignment: projectViewModel.isArabic?Alignment.centerLeft:Alignment.centerRight, - child: Icon(FontAwesomeIcons.arrowRight, - size: 20, color: Colors.black),) + // Container( + // alignment: projectViewModel.isArabic?Alignment.centerLeft:Alignment.centerRight, + // child: Icon(FontAwesomeIcons.arrowRight, + // size: 20, color: Colors.black),) ], ), // onTap: onTap,