From bd08e0056788b745cec52a23d7c2efc6610d9a9d Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Wed, 14 Apr 2021 12:40:25 +0300 Subject: [PATCH] fix issue on expandable_SOAP_widget --- lib/config/localized_values.dart | 4 +-- .../soap_update/expandable_SOAP_widget.dart | 35 ++++++++++--------- .../subjective/bottom_sheet_title.dart | 2 +- .../subjective/{ => history}/PriorityBar.dart | 2 ++ .../history/add_history_dialog.dart | 2 +- .../history/update_history_widget.dart | 2 +- 6 files changed, 25 insertions(+), 22 deletions(-) rename lib/widgets/patients/profile/soap_update/subjective/{ => history}/PriorityBar.dart (98%) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 20cb9ef7..abccd0cf 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -848,8 +848,8 @@ const Map> localizedValues = { "ar": "هذه الخانة مطلوبه" }, "applyOrRescheduleLeave": { - "en": "Apply Or Reschedule Leave", - "ar": "التقدم بطلب أو إعادة جدولة الإجازة" + "en": "Apply Reschedule Leave", + "ar": "التقدم بطلب إعادة جدولة الإجازة" },"myQRCode": { "en": "My QR Code", "ar": "My QR Code" diff --git a/lib/widgets/patients/profile/soap_update/expandable_SOAP_widget.dart b/lib/widgets/patients/profile/soap_update/expandable_SOAP_widget.dart index 81bdf613..796a6c37 100644 --- a/lib/widgets/patients/profile/soap_update/expandable_SOAP_widget.dart +++ b/lib/widgets/patients/profile/soap_update/expandable_SOAP_widget.dart @@ -34,24 +34,25 @@ class ExpandableSOAPWidget extends StatelessWidget { headerWidget: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Row( - children: [ - Texts(headerTitle, - variant: isExpanded ? "bodyText" : '', - // bold: isExpanded ? true : false, - fontSize: 15, - color: Colors.black), - if(isRequired) - Icon( - FontAwesomeIcons.asterisk, - size: 12, - ) - ], - ), InkWell( - onTap: onTap, - child: Icon( - isExpanded ? EvaIcons.arrowIosUpwardOutline: EvaIcons.arrowIosDownwardOutline)) + onTap: onTap, + child: Row( + children: [ + Texts(headerTitle, + variant: isExpanded ? "bodyText" : '', + // bold: isExpanded ? true : false, + fontSize: 15, + color: Colors.black), + if(isRequired) + Icon( + FontAwesomeIcons.asterisk, + size: 12, + ) + ], + ), + ), + Icon( + isExpanded ? EvaIcons.arrowIosUpwardOutline: EvaIcons.arrowIosDownwardOutline) ], ), bodyWidget: child, diff --git a/lib/widgets/patients/profile/soap_update/subjective/bottom_sheet_title.dart b/lib/widgets/patients/profile/soap_update/subjective/bottom_sheet_title.dart index a6c59c86..ba893520 100644 --- a/lib/widgets/patients/profile/soap_update/subjective/bottom_sheet_title.dart +++ b/lib/widgets/patients/profile/soap_update/subjective/bottom_sheet_title.dart @@ -40,7 +40,7 @@ class BottomSheetTitle extends StatelessWidget { color: Color(0xFF2B353E), fontWeight: FontWeight.bold, fontFamily: 'Poppins', - fontSize: 20)), + fontSize: 22)), ], ), ), diff --git a/lib/widgets/patients/profile/soap_update/subjective/PriorityBar.dart b/lib/widgets/patients/profile/soap_update/subjective/history/PriorityBar.dart similarity index 98% rename from lib/widgets/patients/profile/soap_update/subjective/PriorityBar.dart rename to lib/widgets/patients/profile/soap_update/subjective/history/PriorityBar.dart index 0bc1080a..693ab59e 100644 --- a/lib/widgets/patients/profile/soap_update/subjective/PriorityBar.dart +++ b/lib/widgets/patients/profile/soap_update/subjective/history/PriorityBar.dart @@ -65,8 +65,10 @@ class _PriorityBarState extends State { (projectViewModel.isArabic) ? _prioritiesAr[index] : item, + textAlign: TextAlign.center, style: TextStyle( fontSize: 14, + color: Colors.black, //Colors.black, fontWeight: FontWeight.bold, ), diff --git a/lib/widgets/patients/profile/soap_update/subjective/history/add_history_dialog.dart b/lib/widgets/patients/profile/soap_update/subjective/history/add_history_dialog.dart index d66f35fb..86b5b31d 100644 --- a/lib/widgets/patients/profile/soap_update/subjective/history/add_history_dialog.dart +++ b/lib/widgets/patients/profile/soap_update/subjective/history/add_history_dialog.dart @@ -9,7 +9,7 @@ import 'package:doctor_app_flutter/widgets/shared/master_key_checkbox_search_wid import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:flutter/material.dart'; -import '../PriorityBar.dart'; +import 'PriorityBar.dart'; import '../bottom_sheet_title.dart'; class AddHistoryDialog extends StatefulWidget { diff --git a/lib/widgets/patients/profile/soap_update/subjective/history/update_history_widget.dart b/lib/widgets/patients/profile/soap_update/subjective/history/update_history_widget.dart index 873c01d2..4cd29fca 100644 --- a/lib/widgets/patients/profile/soap_update/subjective/history/update_history_widget.dart +++ b/lib/widgets/patients/profile/soap_update/subjective/history/update_history_widget.dart @@ -18,7 +18,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; -import '../PriorityBar.dart'; +import 'PriorityBar.dart'; import '../bottom_sheet_title.dart'; import 'add_history_dialog.dart';