From 587210ee581dad7d48c3c11bf42ba3a47ffa96c3 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 10 Oct 2021 18:02:12 +0300 Subject: [PATCH] UI fixes --- .../components/DocAvailableAppointments.dart | 2 +- lib/pages/Covid-DriveThru/Covid-TimeSlots.dart | 2 +- lib/uitl/utils_new.dart | 12 ++++++++++++ lib/widgets/drawer/app_drawer_widget.dart | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart index af4c4f88..25f8cb9c 100644 --- a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart +++ b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart @@ -178,7 +178,7 @@ class _DocAvailableAppointmentsState extends State wit viewHeaderStyle: ViewHeaderStyle(dayTextStyle: TextStyle(fontSize: 12.0, fontWeight: FontWeight.w600, letterSpacing: -0.46, color: CustomColors.black)), view: CalendarView.month, todayHighlightColor: CustomColors.green, - selectionDecoration: containerColorRadiusBorderWidth(Colors.transparent, 4, CustomColors.green, 2.5), + selectionDecoration: containerColorRadiusBorderWidthCircular(Colors.transparent, 4, CustomColors.green, 2.5), cellBorderColor: Colors.white, dataSource: MeetingDataSource(_getDataSource()), monthViewSettings: const MonthViewSettings(appointmentDisplayMode: MonthAppointmentDisplayMode.indicator, showTrailingAndLeadingDates: false, appointmentDisplayCount: 1), diff --git a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart index 2d3ffbfe..834d7a0a 100644 --- a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart +++ b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart @@ -248,7 +248,7 @@ class _CovidTimeSlotsState extends State with TickerProviderStat viewHeaderStyle: ViewHeaderStyle(dayTextStyle: TextStyle(fontSize: 12.0, fontWeight: FontWeight.w600, letterSpacing: -0.46, color: CustomColors.black)), view: CalendarView.month, todayHighlightColor: CustomColors.green, - selectionDecoration: containerColorRadiusBorderWidth(Colors.transparent, 4, CustomColors.green, 2.5), + selectionDecoration: containerColorRadiusBorderWidthCircular(Colors.transparent, 4, CustomColors.green, 2.5), cellBorderColor: Colors.white, dataSource: MeetingDataSource(_getDataSource()), monthViewSettings: const MonthViewSettings(appointmentDisplayMode: MonthAppointmentDisplayMode.indicator, showTrailingAndLeadingDates: false, appointmentDisplayCount: 1), diff --git a/lib/uitl/utils_new.dart b/lib/uitl/utils_new.dart index 124b3b45..0bbad901 100644 --- a/lib/uitl/utils_new.dart +++ b/lib/uitl/utils_new.dart @@ -310,6 +310,18 @@ Decoration containerColorRadiusBorderWidth(Color background, double radius, Colo ); } +Decoration containerColorRadiusBorderWidthCircular(Color background, double radius, Color color, double w) { + return BoxDecoration( + color: background, + border: Border.all( + width: w, // + color: color // <--- border width here + ), + // borderRadius: BorderRadius.circular(radius), + shape: BoxShape.circle, + ); +} + Decoration containerColorRadiusRight(Color background, double radius) { return BoxDecoration( color: background, diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index 3f90ad48..83e70064 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -357,7 +357,7 @@ class _AppDrawerState extends State { ), onTap: () { //NotificationsPage - Navigator.of(context).pop(); + // Navigator.of(context).pop(); Navigator.push(context, FadePage(page: NotificationsPage())); }, ),