diff --git a/lib/dashboard_latest/widgets/progress_fragment.dart b/lib/dashboard_latest/widgets/progress_fragment.dart index 5114b1d7..ba946d59 100644 --- a/lib/dashboard_latest/widgets/progress_fragment.dart +++ b/lib/dashboard_latest/widgets/progress_fragment.dart @@ -180,23 +180,23 @@ class ProgressFragment extends StatelessWidget { if (isCurrentUserIsNurse) { total = (snapshot.dashboardCount?.data?.countComplete ?? 0) + (snapshot.dashboardCount?.data?.countInprogress ?? 0) + (snapshot.dashboardCount?.data?.countOpen ?? 0); chartData = [ - ChartData('Open', snapshot.dashboardCount?.data?.countOpen?.toDouble() ?? 0.0, AppColor.openColor, "dashboard/open_icon"), - ChartData('In Progress', snapshot.dashboardCount?.data?.countInprogress?.toDouble() ?? 0.0, AppColor.inProgressColor, "dashboard/inprogress_icon"), - ChartData('Acknowledged', snapshot.dashboardCount?.data?.countComplete?.toDouble() ?? 0.0, AppColor.completeColor, "dashboard/completed_icon"), + ChartData('Open', snapshot.dashboardCount?.data?.countOpen?.toDouble() ?? 0.0, AppColor.openChartColor, "dashboard/open_icon"), + ChartData('In Progress', snapshot.dashboardCount?.data?.countInprogress?.toDouble() ?? 0.0, AppColor.inProgressChartColor, "dashboard/inprogress_icon"), + ChartData('Acknowledged', snapshot.dashboardCount?.data?.countComplete?.toDouble() ?? 0.0, AppColor.completeChartColor, "dashboard/completed_icon"), ]; } else if (_userProvider.isQualityUser) { total = (snapshot.dashboardCount?.data?.countComplete ?? 0) + (snapshot.dashboardCount?.data?.countInprogress ?? 0) + (snapshot.dashboardCount?.data?.countOpen ?? 0); chartData = [ - ChartData('Open', snapshot.dashboardCount?.data?.countOpen?.toDouble() ?? 0.0, AppColor.openColor, "dashboard/open_icon"), - ChartData('In Progress', snapshot.dashboardCount?.data?.countInprogress?.toDouble() ?? 0.0, AppColor.inProgressColor, "dashboard/inprogress_icon"), - ChartData('Closed', snapshot.dashboardCount?.data?.countComplete?.toDouble() ?? 0.0, AppColor.completeColor, "dashboard/completed_icon"), + ChartData('Open', snapshot.dashboardCount?.data?.countOpen?.toDouble() ?? 0.0, AppColor.openChartColor, "dashboard/open_icon"), + ChartData('In Progress', snapshot.dashboardCount?.data?.countInprogress?.toDouble() ?? 0.0, AppColor.inProgressChartColor, "dashboard/inprogress_icon"), + ChartData('Closed', snapshot.dashboardCount?.data?.countComplete?.toDouble() ?? 0.0, AppColor.completeChartColor, "dashboard/completed_icon"), ]; } else { total = (snapshot.dashboardCount?.data?.countComplete ?? 0) + (snapshot.dashboardCount?.data?.countInprogress ?? 0) + (snapshot.dashboardCount?.data?.countOpen ?? 0); chartData = [ - ChartData('Open', snapshot.dashboardCount?.data?.countOpen?.toDouble() ?? 0.0, AppColor.openColor, "dashboard/open_icon"), - ChartData('In Progress', snapshot.dashboardCount?.data?.countInprogress?.toDouble() ?? 0.0, AppColor.inProgressColor, "dashboard/inprogress_icon"), - ChartData('Completed', snapshot.dashboardCount?.data?.countComplete?.toDouble() ?? 0.0, AppColor.completeColor, "dashboard/completed_icon"), + ChartData('Open', snapshot.dashboardCount?.data?.countOpen?.toDouble() ?? 0.0, AppColor.openChartColor, "dashboard/open_icon"), + ChartData('In Progress', snapshot.dashboardCount?.data?.countInprogress?.toDouble() ?? 0.0, AppColor.inProgressChartColor, "dashboard/inprogress_icon"), + ChartData('Completed', snapshot.dashboardCount?.data?.countComplete?.toDouble() ?? 0.0, AppColor.completeChartColor, "dashboard/completed_icon"), ]; } diff --git a/lib/new_views/app_style/app_color.dart b/lib/new_views/app_style/app_color.dart index 50f5480b..4422e366 100644 --- a/lib/new_views/app_style/app_color.dart +++ b/lib/new_views/app_style/app_color.dart @@ -93,9 +93,13 @@ class AppColor { // new UI colors - static const Color openColor = Color(0xff226187); - static const Color inProgressColor = Color(0xff3DA5E5); - static const Color completeColor = Color(0xff92D9F8); + static const Color openChartColor = Color(0xff226187); + static const Color inProgressChartColor = Color(0xff3DA5E5); + static const Color completeChartColor = Color(0xff92D9F8); + static const Color inProgressColor = Color(0xffFDE19B); + static const Color overdueColor = Color(0xffFFC945); + static const Color highPriorityColor = red30; + static const Color unassignedColor = Color(0xff9F9FA8); // static Color greenStatus(BuildContext context) => context.isDark ? const Color(0xff1FA269) : green50; static Color greenStatus(BuildContext context) => context.isDark ? const Color(0xff54C166) : green70.withOpacity(.5); diff --git a/lib/new_views/common_widgets/app_drawer.dart b/lib/new_views/common_widgets/app_drawer.dart index c4041686..e8ee44eb 100644 --- a/lib/new_views/common_widgets/app_drawer.dart +++ b/lib/new_views/common_widgets/app_drawer.dart @@ -52,11 +52,7 @@ class AppDrawer extends StatelessWidget { ), ); }).onPress(() => Navigator.of(context).pushNamed(ProfilePage.id)), - Icon( - Icons.clear, - size: 32, - color: context.isDark ? AppColor.primary40 : Colors.white, - ).onPress(() => Navigator.of(context).pop()) + Icon(Icons.clear, size: 32, color: AppColor.icon2Color(context)).onPress(() => Navigator.of(context).pop()) ], ), 8.height, diff --git a/lib/new_views/pages/settings_page.dart b/lib/new_views/pages/settings_page.dart index 52c214c3..15bf5f98 100644 --- a/lib/new_views/pages/settings_page.dart +++ b/lib/new_views/pages/settings_page.dart @@ -100,6 +100,7 @@ class _SettingsPageState extends State { appBar: DefaultAppBar(title: context.translation.settings), body: Column( mainAxisSize: MainAxisSize.min, + spacing: 12, children: [ Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -120,9 +121,9 @@ class _SettingsPageState extends State { ), ], ), - 16.height, + // 16.height, const Divider().defaultStyle(context), - 16.height, + // 16.height, Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -139,9 +140,9 @@ class _SettingsPageState extends State { ), ], ), - 16.height, + // 16.height, const Divider().defaultStyle(context), - 16.height, + // 16.height, FutureBuilder( future: _settingProvider!.auth.isDeviceSupported(), builder: (cxt, snapshot) { @@ -165,7 +166,7 @@ class _SettingsPageState extends State { ); }), ], - ).toShadowContainer(context, borderRadius: 16).paddingAll(16), + ).toShadowContainer(context, borderRadius: 16, padding: 16).paddingAll(16), ); }