merge-requests/429/head
haroon amjad 3 years ago
parent a819660536
commit 587210ee58

@ -178,7 +178,7 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
viewHeaderStyle: ViewHeaderStyle(dayTextStyle: TextStyle(fontSize: 12.0, fontWeight: FontWeight.w600, letterSpacing: -0.46, color: CustomColors.black)), viewHeaderStyle: ViewHeaderStyle(dayTextStyle: TextStyle(fontSize: 12.0, fontWeight: FontWeight.w600, letterSpacing: -0.46, color: CustomColors.black)),
view: CalendarView.month, view: CalendarView.month,
todayHighlightColor: CustomColors.green, todayHighlightColor: CustomColors.green,
selectionDecoration: containerColorRadiusBorderWidth(Colors.transparent, 4, CustomColors.green, 2.5), selectionDecoration: containerColorRadiusBorderWidthCircular(Colors.transparent, 4, CustomColors.green, 2.5),
cellBorderColor: Colors.white, cellBorderColor: Colors.white,
dataSource: MeetingDataSource(_getDataSource()), dataSource: MeetingDataSource(_getDataSource()),
monthViewSettings: const MonthViewSettings(appointmentDisplayMode: MonthAppointmentDisplayMode.indicator, showTrailingAndLeadingDates: false, appointmentDisplayCount: 1), monthViewSettings: const MonthViewSettings(appointmentDisplayMode: MonthAppointmentDisplayMode.indicator, showTrailingAndLeadingDates: false, appointmentDisplayCount: 1),

@ -248,7 +248,7 @@ class _CovidTimeSlotsState extends State<CovidTimeSlots> with TickerProviderStat
viewHeaderStyle: ViewHeaderStyle(dayTextStyle: TextStyle(fontSize: 12.0, fontWeight: FontWeight.w600, letterSpacing: -0.46, color: CustomColors.black)), viewHeaderStyle: ViewHeaderStyle(dayTextStyle: TextStyle(fontSize: 12.0, fontWeight: FontWeight.w600, letterSpacing: -0.46, color: CustomColors.black)),
view: CalendarView.month, view: CalendarView.month,
todayHighlightColor: CustomColors.green, todayHighlightColor: CustomColors.green,
selectionDecoration: containerColorRadiusBorderWidth(Colors.transparent, 4, CustomColors.green, 2.5), selectionDecoration: containerColorRadiusBorderWidthCircular(Colors.transparent, 4, CustomColors.green, 2.5),
cellBorderColor: Colors.white, cellBorderColor: Colors.white,
dataSource: MeetingDataSource(_getDataSource()), dataSource: MeetingDataSource(_getDataSource()),
monthViewSettings: const MonthViewSettings(appointmentDisplayMode: MonthAppointmentDisplayMode.indicator, showTrailingAndLeadingDates: false, appointmentDisplayCount: 1), monthViewSettings: const MonthViewSettings(appointmentDisplayMode: MonthAppointmentDisplayMode.indicator, showTrailingAndLeadingDates: false, appointmentDisplayCount: 1),

@ -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) { Decoration containerColorRadiusRight(Color background, double radius) {
return BoxDecoration( return BoxDecoration(
color: background, color: background,

@ -357,7 +357,7 @@ class _AppDrawerState extends State<AppDrawer> {
), ),
onTap: () { onTap: () {
//NotificationsPage //NotificationsPage
Navigator.of(context).pop(); // Navigator.of(context).pop();
Navigator.push(context, FadePage(page: NotificationsPage())); Navigator.push(context, FadePage(page: NotificationsPage()));
}, },
), ),

Loading…
Cancel
Save