fix design issue

merge-requests/560/head
Elham Rababah 5 years ago
parent fceb351b6c
commit 2d4cb00716

@ -322,4 +322,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69 PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69
COCOAPODS: 1.10.1 COCOAPODS: 1.10.0.rc.1

@ -316,8 +316,8 @@ const PRIMARY_COLOR = 0xff515B5D;
const TRANSACTION_NO = 0; const TRANSACTION_NO = 0;
const LANGUAGE_ID = 2; const LANGUAGE_ID = 2;
const STAMP = '2020-04-27T12:17:17.721Z'; const STAMP = '2020-04-27T12:17:17.721Z';
const IP_ADDRESS = '9.9.9.9'; const IP_ADDRESS = '11.11.11.11';
const VERSION_ID = 5.5; const VERSION_ID = 5.6;
const CHANNEL = 9; const CHANNEL = 9;
const SESSION_ID = 'BlUSkYymTt'; const SESSION_ID = 'BlUSkYymTt';
const IS_LOGIN_FOR_DOCTOR_APP = true; const IS_LOGIN_FOR_DOCTOR_APP = true;

@ -51,14 +51,14 @@ class DoctorReplyScreen extends StatelessWidget {
onTap: reply.status != 2 onTap: reply.status != 2
? null ? null
: () { : () {
Navigator.push( // Navigator.push(
context, // context,
MaterialPageRoute( // MaterialPageRoute(
builder: (BuildContext context) => // builder: (BuildContext context) =>
DoctorReplayChat( // DoctorReplayChat(
reply: reply, // reply: reply,
previousModel: model, // previousModel: model,
))); // )));
}, },
child: DoctorReplyWidget(reply: reply), child: DoctorReplyWidget(reply: reply),
); );

@ -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/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/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/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/errors/dr_app_embedded_error.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -171,6 +172,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
onTap: () async { onTap: () async {
showMyDialog( showMyDialog(
context: context, context: context,
actionName: "cancel",
confirmFun: () async { confirmFun: () async {
GifLoaderDialogUtils GifLoaderDialogUtils
.showMyDialog( .showMyDialog(
@ -241,7 +243,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
), ),
InkWell( InkWell(
onTap: () async { onTap: () async {
showMyDialog(context: context, confirmFun: () async{ showMyDialog(context: context, actionName: "verify",confirmFun: () async{
GifLoaderDialogUtils GifLoaderDialogUtils
.showMyDialog(context); .showMyDialog(context);
UpdateNoteReqModel reqModel = UpdateNoteReqModel reqModel =
@ -400,7 +402,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
); );
} }
showMyDialog({BuildContext context, Function confirmFun, isCancel = true}) { showMyDialog({BuildContext context, Function confirmFun, String actionName}) {
showDialog( showDialog(
context: context, context: context,
child: Center( child: Center(
@ -412,7 +414,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
height: MediaQuery height: MediaQuery
.of(context) .of(context)
.size .size
.height * 0.5, .height * 0.3,
child: AppScaffold( child: AppScaffold(
isShowAppBar: false, isShowAppBar: false,
body: Container( body: Container(
@ -420,25 +422,32 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
child: Center( child: Center(
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
// SizedBox(height: 20,), // SizedBox(height: 20,),
SizedBox(height: 5,),
AppText(
"Confirm", fontWeight: FontWeight.w600,
color: Colors.black,
fontSize: 16,),
SizedBox(height: 5,),
DividerWithSpacesAround(),
Container( Container(
padding: EdgeInsets.all(20), padding: EdgeInsets.all(20),
color: Colors.white, color: Colors.white,
child: Expanded( child: Expanded(
child: AppText( child: AppText(
'Are you sure you want to do this action?', 'Are you sure you want $actionName this order?',
fontSize: 15, fontSize: 15,
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
), ),
), ),
SizedBox(height: MediaQuery
.of(context) SizedBox(height: 30,),
.size DividerWithSpacesAround(),
.height * 0.2,), // SizedBox(height: 30,),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [

@ -220,15 +220,15 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
Container( Container(
width: MediaQuery.of(context).size.width * 0.5, width: MediaQuery.of(context).size.width * 0.5,
child: RichText( child: RichText(
maxLines: 2, // maxLines: 2,
overflow: TextOverflow.ellipsis, // overflow: TextOverflow.ellipsis,
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
fontSize: 2.0 * SizeConfig.textMultiplier, fontSize: 2.0 * SizeConfig.textMultiplier,
color: Colors.black), color: Colors.black),
children: <TextSpan>[ children: <TextSpan>[
new TextSpan( new TextSpan(
text: TranslationBase.of(context).doctorResponse + " : ", text:"Patient Question :" ,//TranslationBase.of(context).doctorResponse + " : ",
style: style:
TextStyle(fontSize: 14, fontFamily: 'Poppins', color: Color(0xFF575757),fontWeight: FontWeight.bold)), TextStyle(fontSize: 14, fontFamily: 'Poppins', color: Color(0xFF575757),fontWeight: FontWeight.bold)),
new TextSpan( new TextSpan(
@ -244,10 +244,10 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
],) ],)
], ],
), ),
Container( // Container(
alignment: projectViewModel.isArabic?Alignment.centerLeft:Alignment.centerRight, // alignment: projectViewModel.isArabic?Alignment.centerLeft:Alignment.centerRight,
child: Icon(FontAwesomeIcons.arrowRight, // child: Icon(FontAwesomeIcons.arrowRight,
size: 20, color: Colors.black),) // size: 20, color: Colors.black),)
], ],
), ),
// onTap: onTap, // onTap: onTap,

Loading…
Cancel
Save