Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

color name changed and the item size changed

Browse Source
main
taha.alam@cloudsolutions.com.sa 2 months ago
parent 3de009d2dd
commit 1b40b65515
31 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File

2
lib/config/config.dart
Unescape Escape View File

@ -430,7 +430,7 @@ const TIMER_MIN = 10;
class AppGlobal { class AppGlobal {
static var CONTEX; static var CONTEX;
static Color appRedColor = Color(0xFF1E8CC8); static Color appColor = Color(0xFF1E8CC8);
static Color appGreenColor = Color(0xFF1E8CC8); static Color appGreenColor = Color(0xFF1E8CC8);
static Color appTextColor = Color(0xFF2B353E); static Color appTextColor = Color(0xFF2B353E);
static Color scheduleTextColor = Color(0xFF2E303A); static Color scheduleTextColor = Color(0xFF2E303A);

2
lib/screens/auth/login_screen.dart
Unescape Escape View File

@ -167,7 +167,7 @@ class _LoginScreenState extends State<LoginScreen> {
children: <Widget>[ children: <Widget>[
AppButton( AppButton(
title: TranslationBase.of(context).login, title: TranslationBase.of(context).login,
color: AppGlobal.appRedColor, color: AppGlobal.appColor,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
disabled: authenticationViewModel.userInfo.userID == null || authenticationViewModel.userInfo.password == null, disabled: authenticationViewModel.userInfo.userID == null || authenticationViewModel.userInfo.password == null,
onPressed: () { onPressed: () {

2
lib/screens/auth/verification_methods_screen.dart
Unescape Escape View File

@ -343,7 +343,7 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
children: <Widget>[ children: <Widget>[
AppButton( AppButton(
title: TranslationBase.of(context).useAnotherAccount ?? '', title: TranslationBase.of(context).useAnotherAccount ?? '',
color: Color(0xFFD02127), color: AppGlobal.appColor,
//fontWeight: FontWeight.w700, //fontWeight: FontWeight.w700,
onPressed: () { onPressed: () {
authenticationViewModel.deleteUser(); authenticationViewModel.deleteUser();

4
lib/screens/home/home_screen.dart
Unescape Escape View File

@ -172,7 +172,7 @@ class _HomeScreenState extends State<HomeScreen> {
padding: EdgeInsets.all(0), padding: EdgeInsets.all(0),
margin: EdgeInsets.all(2), margin: EdgeInsets.all(2),
decoration: new BoxDecoration( decoration: new BoxDecoration(
color: AppGlobal.appRedColor, color: AppGlobal.appColor,
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
), ),
constraints: BoxConstraints( constraints: BoxConstraints(
@ -349,7 +349,7 @@ class _HomeScreenState extends State<HomeScreen> {
List<LinearGradient> backgroundColors = []; List<LinearGradient> backgroundColors = [];
backgroundColors.add(LinearGradient(begin: Alignment(-1.0, -2.0), end: Alignment(1.0, 2.0), colors: [ backgroundColors.add(LinearGradient(begin: Alignment(-1.0, -2.0), end: Alignment(1.0, 2.0), colors: [
AppGlobal.appRedColor, AppGlobal.appColor,
Color(0xFFAD3B3B), Color(0xFFAD3B3B),
])); //AppGlobal.appRedColor; ])); //AppGlobal.appRedColor;
backgroundColors.add(LinearGradient(begin: Alignment.center, end: Alignment.center, colors: [ backgroundColors.add(LinearGradient(begin: Alignment.center, end: Alignment.center, colors: [

2
lib/screens/medicine/medicine_search_screen.dart
Unescape Escape View File

@ -178,7 +178,7 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
onPressed: () async { onPressed: () async {
await searchMedicine(context, model); await searchMedicine(context, model);
}, },
color: AppGlobal.appRedColor, color: AppGlobal.appColor,
), ),
), ),
), ),

2
lib/screens/patients/In_patient/filter_date_page.dart
Unescape Escape View File

@ -188,7 +188,7 @@ class _FilterDatePageState extends State<FilterDatePage> {
child: AppButton( child: AppButton(
title: TranslationBase.of(context).reset, title: TranslationBase.of(context).reset,
padding: 10, padding: 10,
color: AppGlobal.appRedColor, color: AppGlobal.appColor,
onPressed: () async { onPressed: () async {
this.widget.patientSearchViewModel.selectedToDate = null; this.widget.patientSearchViewModel.selectedToDate = null;
this.widget.patientSearchViewModel.selectedFromDate = null; this.widget.patientSearchViewModel.selectedFromDate = null;

2
lib/screens/patients/In_patient/in_patient_list_page.dart
Unescape Escape View File

@ -180,7 +180,7 @@ class _InPatientListPageState extends State<InPatientListPage> {
height: 25, height: 25,
width: 25, width: 25,
child: CircularProgressIndicator( child: CircularProgressIndicator(
color: AppGlobal.appRedColor, color: AppGlobal.appColor,
), ),
), ),
), ),

2
lib/screens/patients/In_patient/in_patient_screen.dart
Unescape Escape View File

@ -153,7 +153,7 @@ class _InPatientScreenState extends State<InPatientScreen> with SingleTickerProv
child: TabBar( child: TabBar(
isScrollable: false, isScrollable: false,
controller: _tabController, controller: _tabController,
indicatorColor: AppGlobal.appRedColor, indicatorColor: AppGlobal.appColor,
indicatorWeight: 0.001, indicatorWeight: 0.001,
indicator: BoxDecoration(), indicator: BoxDecoration(),
// indicatorSize: TabBarIndicatorSize.tab, // indicatorSize: TabBarIndicatorSize.tab,

2
lib/screens/patients/patient_search/patient_search_screen.dart
Unescape Escape View File

@ -109,7 +109,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
onPressed: () { onPressed: () {
onSubmitSearch(); onSubmitSearch();
}, },
color: AppGlobal.appRedColor, color: AppGlobal.appColor,
), ),
), ),
), ),

2
lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart
Unescape Escape View File

@ -173,7 +173,7 @@ class _UCAFPagerScreenState extends State<UCAFPagerScreen> with TickerProviderSt
vPadding: 8, vPadding: 8,
hPadding: 8, hPadding: 8,
borderColor: Color(0xFFB8382B), borderColor: Color(0xFFB8382B),
color: AppGlobal.appRedColor, color: AppGlobal.appColor,
fontColor: Colors.white, fontColor: Colors.white,
onPressed: () { onPressed: () {
model.saveUCAFOnTap!(); model.saveUCAFOnTap!();

4
lib/screens/patients/profile/UCAF/widgets/pocedures_widget.dart
Unescape Escape View File

@ -62,7 +62,7 @@ class ProceduresWidget extends StatelessWidget {
labelSize: SizeConfig.textMultiplier! * 1.6, labelSize: SizeConfig.textMultiplier! * 1.6,
valueColor: procedure.isCovered! valueColor: procedure.isCovered!
? AppGlobal.appGreenColor ? AppGlobal.appGreenColor
: AppGlobal.appRedColor, : AppGlobal.appColor,
), ),
CustomRow( CustomRow(
label: "${TranslationBase.of(context).approvalRequired}: ", label: "${TranslationBase.of(context).approvalRequired}: ",
@ -87,7 +87,7 @@ class ProceduresWidget extends StatelessWidget {
labelSize: SizeConfig.textMultiplier! * 1.6, labelSize: SizeConfig.textMultiplier! * 1.6,
valueColor: procedure.isCovered! valueColor: procedure.isCovered!
? AppGlobal.appGreenColor ? AppGlobal.appGreenColor
: AppGlobal.appRedColor, : AppGlobal.appColor,
), ),
SizedBox( SizedBox(
height: 16, height: 16,

2
lib/screens/patients/profile/admission_request/admission_request_second_screen.dart
Unescape Escape View File

@ -454,7 +454,7 @@ class _AdmissionRequestSecondScreenState extends State<AdmissionRequestSecondScr
width: MediaQuery.of(context).size.width * 0.4, width: MediaQuery.of(context).size.width * 0.4,
child: AppButton( child: AppButton(
title: TranslationBase.of(context).next, title: TranslationBase.of(context).next,
color: AppGlobal.appRedColor, color: AppGlobal.appColor,
fontColor: Colors.white, fontColor: Colors.white,
onPressed: () async { onPressed: () async {
await locator<AnalyticsService>().logEvent( await locator<AnalyticsService>().logEvent(

2
lib/screens/patients/profile/pharmacy-intervention/intervention_medication_history_screen.dart
Unescape Escape View File

@ -253,7 +253,7 @@ class _InterventionMedicationHistoryScreenState extends State<InterventionMedica
}, },
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppGlobal.appRedColor, color: AppGlobal.appColor,
borderRadius: borderRadius:
BorderRadius.circular(10), BorderRadius.circular(10),
), ),

12
lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
Unescape Escape View File

@ -250,10 +250,10 @@ String noteValidation ="";
disabled: model.state == ViewState.BusyLocal, disabled: model.state == ViewState.BusyLocal,
title: "${TranslationBase.of(context).createNew}\n${TranslationBase.of(context).episode}", title: "${TranslationBase.of(context).createNew}\n${TranslationBase.of(context).episode}",
color: isFromLiveCare || isInpatient color: isFromLiveCare || isInpatient
? AppGlobal.appRedColor ? AppGlobal.appColor
: patient.patientStatusType == 43 : patient.patientStatusType == 43
? AppGlobal.appRedColor ? AppGlobal.appColor
: AppGlobal.appRedColor, : AppGlobal.appColor,
fontColor: Colors.white, fontColor: Colors.white,
// vPadding: 8, // vPadding: 8,
height: SizeConfig.heightMultiplier! * (SizeConfig.isHeightVeryShort ? 9 : 6), height: SizeConfig.heightMultiplier! * (SizeConfig.isHeightVeryShort ? 9 : 6),
@ -285,10 +285,10 @@ String noteValidation ="";
// disabled: model.state == ViewState.BusyLocal || isSigned, // disabled: model.state == ViewState.BusyLocal || isSigned,
title: "${TranslationBase.of(context).update}\n${TranslationBase.of(context).episode}", title: "${TranslationBase.of(context).update}\n${TranslationBase.of(context).episode}",
color: ((isInpatient) || isFromLiveCare) && model.state != ViewState.BusyLocal color: ((isInpatient) || isFromLiveCare) && model.state != ViewState.BusyLocal
? AppGlobal.appRedColor ? AppGlobal.appColor
: patient.patientStatusType == 43 : patient.patientStatusType == 43
? AppGlobal.appRedColor ? AppGlobal.appColor
: AppGlobal.appRedColor, : AppGlobal.appColor,
fontColor: Colors.white, fontColor: Colors.white,
// vPadding: 8, // vPadding: 8,
height: SizeConfig.heightMultiplier! * (SizeConfig.isHeightVeryShort ? 9 : 6), height: SizeConfig.heightMultiplier! * (SizeConfig.isHeightVeryShort ? 9 : 6),

2
lib/screens/patients/profile/referral/referral_details/my-referral-detail-screen.dart
Unescape Escape View File

@ -330,7 +330,7 @@ class MyReferralDetailScreen extends StatelessWidget {
Expanded( Expanded(
child: AppButton( child: AppButton(
title: TranslationBase.of(context).reject, title: TranslationBase.of(context).reject,
color: AppGlobal.appRedColor, color: AppGlobal.appColor,
fontColor: Colors.white, fontColor: Colors.white,
hPadding: 8, hPadding: 8,
vPadding: 12, vPadding: 12,

2
lib/screens/patients/profile/soap_update/subjective/history/priority_bar.dart
Unescape Escape View File

@ -74,7 +74,7 @@ class _PriorityBarState extends State<PriorityBar> {
Container( Container(
width: 120, width: 120,
height: 4, height: 4,
color: AppGlobal.appRedColor, color: AppGlobal.appColor,
) )
], ],
), ),

2
lib/screens/patients/register_patient/RegisterPatientPage.dart
Unescape Escape View File

@ -200,7 +200,7 @@ class _RegisterPatientPageState extends State<RegisterPatientPage>
vPadding: 12, vPadding: 12,
hPadding: 8, hPadding: 8,
borderColor: Color(0xFFB8382B), borderColor: Color(0xFFB8382B),
color: AppGlobal.appRedColor, color: AppGlobal.appColor,
fontColor: Colors.white, fontColor: Colors.white,
onPressed: () { onPressed: () {
changePageViewIndex(_currentIndex + 1); changePageViewIndex(_currentIndex + 1);

2
lib/screens/patients/register_patient/RegisterSearchPatientPage.dart
Unescape Escape View File

@ -342,7 +342,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
title: TranslationBase.of(context).next, title: TranslationBase.of(context).next,
hasBorder: true, hasBorder: true,
borderColor: Color(0xFFB8382B), borderColor: Color(0xFFB8382B),
color: AppGlobal.appRedColor, color: AppGlobal.appColor,
fontColor: Colors.white, fontColor: Colors.white,
onPressed: () async { onPressed: () async {
setState(() { setState(() {

6
lib/screens/pharmacy_intervention/widgets/PharmacyInterventionDialog.dart
Unescape Escape View File

@ -148,7 +148,7 @@ class _PharmacyInterventionDialogState
.search, .search,
hasBorder: true, hasBorder: true,
borderColor: Color(0xFFB8382B), borderColor: Color(0xFFB8382B),
color: AppGlobal.appRedColor, color: AppGlobal.appColor,
fontColor: Colors.white, fontColor: Colors.white,
onPressed: () async { onPressed: () async {
//(dateFrom, dateTo, admissionNumber, patientId, nursingStation) //(dateFrom, dateTo, admissionNumber, patientId, nursingStation)
@ -209,7 +209,7 @@ class _PharmacyInterventionDialogState
data: ThemeData.light().copyWith( data: ThemeData.light().copyWith(
colorScheme: ColorScheme.fromSwatch( colorScheme: ColorScheme.fromSwatch(
primarySwatch: Colors.red, primarySwatch: Colors.red,
accentColor: AppGlobal.appRedColor, accentColor: AppGlobal.appColor,
), ),
dialogBackgroundColor: Colors.white, dialogBackgroundColor: Colors.white,
), ),
@ -295,7 +295,7 @@ class _PharmacyInterventionDialogState
) )
) )
), ),
dropdownButtonProps: DropdownButtonProps(color: AppGlobal.appRedColor,), dropdownButtonProps: DropdownButtonProps(color: AppGlobal.appColor,),
dropdownDecoratorProps: DropDownDecoratorProps( dropdownDecoratorProps: DropDownDecoratorProps(
textAlignVertical: TextAlignVertical.center, textAlignVertical: TextAlignVertical.center,
dropdownSearchDecoration: InputDecoration( dropdownSearchDecoration: InputDecoration(

2
lib/screens/pharmacy_intervention/widgets/intervention_history_item.dart
Unescape Escape View File

@ -84,7 +84,7 @@ class InterventionHistoryItem extends StatelessWidget {
.reject, .reject,
hasBorder: true, hasBorder: true,
borderColor: Color(0xFFB8382B), borderColor: Color(0xFFB8382B),
color: AppGlobal.appRedColor, color: AppGlobal.appColor,
fontColor: Colors.white, fontColor: Colors.white,
onPressed: () async { onPressed: () async {
if(remarksController.text.isEmpty == true) { if(remarksController.text.isEmpty == true) {

2
lib/screens/prescription/prescription_checkout_screen.dart
Unescape Escape View File

@ -316,7 +316,7 @@ class _PrescriptionCheckOutScreenState extends State<PrescriptionCheckOutScreen>
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
Radio( Radio(
activeColor: AppGlobal.appRedColor, activeColor: AppGlobal.appColor,
value: 1, value: 1,
groupValue: selectedType, groupValue: selectedType,
onChanged: (value) { onChanged: (value) {

2
lib/screens/procedures/entity_list_checkbox_search_widget.dart
Unescape Escape View File

@ -294,7 +294,7 @@ class _EntityListCheckboxSearchWidgetState extends State<EntityListCheckboxSearc
Center( Center(
child: Padding( child: Padding(
padding: const EdgeInsets.all(20.0), padding: const EdgeInsets.all(20.0),
child: AppText("Sorry, No Match", color: AppGlobal.appRedColor), child: AppText("Sorry, No Match", color: AppGlobal.appColor),
), ),
) )
else if (items.isEmpty && procedureName.text.length > 0 && procedureName.text.length < 3) else if (items.isEmpty && procedureName.text.length > 0 && procedureName.text.length < 3)

2
lib/screens/procedures/favorite_procedure/entity_list_fav_procedure.dart
Unescape Escape View File

@ -123,7 +123,7 @@ class _EntityListCheckboxSearchFavProceduresWidgetState extends State<EntityList
) )
: Center( : Center(
child: Container( child: Container(
child: AppText(TranslationBase.of(context).sorryNoMatch, color: AppGlobal.appRedColor), child: AppText(TranslationBase.of(context).sorryNoMatch, color: AppGlobal.appColor),
), ),
) )
], ],

2
lib/screens/procedures/procedure_card.dart
Unescape Escape View File

@ -77,7 +77,7 @@ class ProcedureCard extends StatelessWidget {
children: [ children: [
AppText( AppText(
entityList!.orderType == 0 ? 'Routine' : 'Urgent', entityList!.orderType == 0 ? 'Routine' : 'Urgent',
color: entityList!.orderType == 0 ? Colors.black : AppGlobal.appRedColor, color: entityList!.orderType == 0 ? Colors.black : AppGlobal.appColor,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
SizedBox( SizedBox(

4
lib/screens/procedures/update_procedure.dart
Unescape Escape View File

@ -111,7 +111,7 @@ class _UpdateProcedureWidgetState extends State<UpdateProcedureWidget> {
children: [ children: [
AppText(TranslationBase.of(context).orderType), AppText(TranslationBase.of(context).orderType),
Radio( Radio(
activeColor: AppGlobal.appRedColor, activeColor: AppGlobal.appColor,
value: 0, value: 0,
groupValue: widget.selectedType, groupValue: widget.selectedType,
onChanged: (value) { onChanged: (value) {
@ -120,7 +120,7 @@ class _UpdateProcedureWidgetState extends State<UpdateProcedureWidget> {
), ),
Text('routine'), Text('routine'),
Radio( Radio(
activeColor: AppGlobal.appRedColor, activeColor: AppGlobal.appColor,
groupValue: widget.selectedType, groupValue: widget.selectedType,
value: 1, value: 1,
onChanged: (value) { onChanged: (value) {

6
lib/utils/tab_utils.dart
Unescape Escape View File

@ -14,7 +14,7 @@ class TabUtils {
double radius = 6.0, double radius = 6.0,
required ProjectViewModel projectViewModel}) { required ProjectViewModel projectViewModel}) {
return BoxDecoration( return BoxDecoration(
color: isActive ? AppGlobal.appRedColor : Color(0xFFEAEAEA), color: isActive ? AppGlobal.appColor : Color(0xFFEAEAEA),
shape: BoxShape.rectangle, shape: BoxShape.rectangle,
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
topRight: projectViewModel.isArabic topRight: projectViewModel.isArabic
@ -92,7 +92,7 @@ class TabUtils {
width: 15, width: 15,
height: 15, height: 15,
decoration: BoxDecoration( decoration: BoxDecoration(
color: isActive ? Colors.white : AppGlobal.appRedColor, color: isActive ? Colors.white : AppGlobal.appColor,
shape: BoxShape.circle, shape: BoxShape.circle,
), ),
child: Center( child: Center(
@ -100,7 +100,7 @@ class TabUtils {
child: AppText( child: AppText(
"$counter", "$counter",
fontSize: SizeConfig.textMultiplier! * 1.5, fontSize: SizeConfig.textMultiplier! * 1.5,
color: !isActive ? Colors.white : AppGlobal.appRedColor, color: !isActive ? Colors.white : AppGlobal.appColor,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
), ),

2
lib/widgets/patients/profile/prescription_in_patinets_widget.dart
Unescape Escape View File

@ -30,7 +30,7 @@ class PrescriptionInPatientWidget extends StatelessWidget {
padding: EdgeInsets.all(40), padding: EdgeInsets.all(40),
decoration: BoxDecoration( decoration: BoxDecoration(
border: border:
Border.all(color: AppGlobal.appRedColor, width: 4), Border.all(color: AppGlobal.appColor, width: 4),
borderRadius: BorderRadius.all(Radius.circular(100))), borderRadius: BorderRadius.all(Radius.circular(100))),
child: IconButton( child: IconButton(
icon: Icon( icon: Icon(

2
lib/widgets/shared/app_drawer_widget.dart
Unescape Escape View File

@ -49,7 +49,7 @@ class _AppDrawerState extends State<AppDrawer> {
Container( Container(
child: Image.asset( child: Image.asset(
'assets/images/dr_app_logo.png', 'assets/images/dr_app_logo.png',
width: MediaQuery.of(context).size.width * 0.16, width: MediaQuery.of(context).size.width * 0.3,
height: MediaQuery.of(context).size.height * 0.16, height: MediaQuery.of(context).size.height * 0.16,
), ),
margin: EdgeInsets.only(top: 10, bottom: 10), margin: EdgeInsets.only(top: 10, bottom: 10),

2
lib/widgets/shared/bottom_navigation_item.dart
Unescape Escape View File

@ -46,7 +46,7 @@ class BottomNavigationItem extends StatelessWidget {
Positioned( Positioned(
top: 0, top: 0,
child: Container( child: Container(
color: AppGlobal.appRedColor, color: AppGlobal.appColor,
width: 100, width: 100,
height: 3, height: 3,
)), )),

2
lib/widgets/shared/dialogs/dailog-list-select.dart
Unescape Escape View File

@ -97,7 +97,7 @@ class _ListSelectDialogState extends State<ListSelectDialog> {
title: Text(Utils.convertToTitleCase(item[widget.attributeName].toString())), title: Text(Utils.convertToTitleCase(item[widget.attributeName].toString())),
groupValue: widget.selectedValue[widget.attributeValueId].toString().toLowerCase(), groupValue: widget.selectedValue[widget.attributeValueId].toString().toLowerCase(),
value: item[widget.attributeValueId].toString().toLowerCase(), value: item[widget.attributeValueId].toString().toLowerCase(),
activeColor: AppGlobal.appRedColor, activeColor: AppGlobal.appColor,
selected: item[widget.attributeValueId].toString() == widget.selectedValue[widget.attributeValueId].toString(), selected: item[widget.attributeValueId].toString() == widget.selectedValue[widget.attributeValueId].toString(),
onChanged: (val) { onChanged: (val) {
setState(() { setState(() {

4
lib/widgets/shared/loader/gif_loader_container.dart
Unescape Escape View File

@ -33,7 +33,9 @@ class _GifLoaderContainerState extends State<GifLoaderContainer> with TickerProv
// margin: EdgeInsets.only(bottom: 40), // margin: EdgeInsets.only(bottom: 40),
child: Gif( child: Gif(
controller: controller1, controller: controller1,
image: AssetImage("assets/images/progress-loading-red.gif"), //NetworkImage("http://img.mp.itc.cn/upload/20161107/5cad975eee9e4b45ae9d3c1238ccf91e.jpg"), width: 72,
height: 72,
image: AssetImage("assets/images/progress-loading-red.gif", ), //NetworkImage("http://img.mp.itc.cn/upload/20161107/5cad975eee9e4b45ae9d3c1238ccf91e.jpg"),
), ),
)); ));
} }

Write Preview
Loading…
Cancel
Save