Skip to content

Commit 432413e

Browse files
Mugunthan-RamalingamMugunthan-Ramalingam
committed
FLUT-931209-[others]: updated calendar latest changes
1 parent 104a208 commit 432413e

File tree

9 files changed

+57
-53
lines changed

9 files changed

+57
-53
lines changed

‎packages/syncfusion_flutter_calendar/lib/src/calendar/appointment_layout/agenda_view_layout.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,7 @@ class _AgendaViewRenderObject extends CustomCalendarRenderObject {
13621362
rect.top < agendaViewNotifier.value!.hoveringOffset.dy &&
13631363
rect.bottom > agendaViewNotifier.value!.hoveringOffset.dy) {
13641364
if (isLargerScheduleUI) {
1365-
_rectPainter.color = Colors.grey.withOpacity(0.1);
1365+
_rectPainter.color = Colors.grey.withValues(alpha: 0.1);
13661366
const double viewPadding = 2;
13671367
canvas.drawRRect(
13681368
RRect.fromRectAndRadius(
@@ -1375,7 +1375,7 @@ class _AgendaViewRenderObject extends CustomCalendarRenderObject {
13751375
_rectPainter);
13761376
} else {
13771377
_rectPainter.color =
1378-
calendarTheme.selectionBorderColor!.withOpacity(0.4);
1378+
calendarTheme.selectionBorderColor!.withValues(alpha: 0.4);
13791379
_rectPainter.style = PaintingStyle.stroke;
13801380
_rectPainter.strokeWidth = 2;
13811381
if (childCount == 0) {

‎packages/syncfusion_flutter_calendar/lib/src/calendar/appointment_layout/allday_appointment_layout.dart‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1373,7 +1373,7 @@ class _AllDayAppointmentRenderObject extends CustomCalendarRenderObject {
13731373
_cellWidth;
13741374
final double leftPosition =
13751375
(rowIndex * _cellWidth) + (isRTL ? 0 : timeLabelWidth);
1376-
_rectPainter.color = Colors.grey.withOpacity(0.1);
1376+
_rectPainter.color = Colors.grey.withValues(alpha: 0.1);
13771377
canvas.drawRect(
13781378
Rect.fromLTWH(leftPosition, 0, _cellWidth, size.height), _rectPainter);
13791379
}
@@ -1395,8 +1395,8 @@ class _AllDayAppointmentRenderObject extends CustomCalendarRenderObject {
13951395
appointmentView.endIndex > index) {
13961396
selectionDecoration ??= BoxDecoration(
13971397
color: themeData.brightness == Brightness.light
1398-
? Colors.white.withOpacity(0.3)
1399-
: Colors.black.withOpacity(0.4),
1398+
? Colors.white.withValues(alpha: 0.3)
1399+
: Colors.black.withValues(alpha: 0.4),
14001400
border:
14011401
Border.all(color: calendarTheme.selectionBorderColor!, width: 2),
14021402
borderRadius: const BorderRadius.all(Radius.circular(2)),
@@ -1467,7 +1467,8 @@ class _AllDayAppointmentRenderObject extends CustomCalendarRenderObject {
14671467
rect.right > allDayHoverPosition.value!.dx &&
14681468
rect.top < allDayHoverPosition.value!.dy &&
14691469
rect.bottom > allDayHoverPosition.value!.dy) {
1470-
_rectPainter.color = calendarTheme.selectionBorderColor!.withOpacity(0.4);
1470+
_rectPainter.color =
1471+
calendarTheme.selectionBorderColor!.withValues(alpha: 0.4);
14711472
_rectPainter.strokeWidth = 2;
14721473
_rectPainter.style = PaintingStyle.stroke;
14731474
canvas.drawRRect(rect, _rectPainter);

‎packages/syncfusion_flutter_calendar/lib/src/calendar/appointment_layout/appointment_layout.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2151,7 +2151,7 @@ class _AppointmentRenderObject extends CustomCalendarRenderObject {
21512151
rect.top < hoverPosition.dy &&
21522152
rect.bottom > hoverPosition.dy) {
21532153
_appointmentPainter.color =
2154-
calendarTheme.selectionBorderColor!.withOpacity(0.4);
2154+
calendarTheme.selectionBorderColor!.withValues(alpha: 0.4);
21552155
_appointmentPainter.strokeWidth = 2;
21562156
_appointmentPainter.style = PaintingStyle.stroke;
21572157
canvas.drawRRect(rect, _appointmentPainter);

‎packages/syncfusion_flutter_calendar/lib/src/calendar/resource_view/resource_view.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ class _ResourceViewRenderObject extends CustomCalendarRenderObject {
449449
(themeData.brightness == Brightness.dark
450450
? Colors.white
451451
: Colors.black87)
452-
.withOpacity(0.04);
452+
.withValues(alpha: 0.04);
453453
_addHovering(context.canvas, size, yPosition, resourceHoveringColor);
454454
}
455455

@@ -480,7 +480,7 @@ class _ResourceViewRenderObject extends CustomCalendarRenderObject {
480480
final Color resourceHoveringColor = (themeData.brightness == Brightness.dark
481481
? Colors.white
482482
: Colors.black87)
483-
.withOpacity(0.04);
483+
.withValues(alpha: 0.04);
484484
final TextStyle displayNameTextStyle = calendarTheme.displayNameTextStyle!;
485485
_circlePainter.color = resourceCellBorderColor;
486486
_circlePainter.strokeWidth = 0.5;

‎packages/syncfusion_flutter_calendar/lib/src/calendar/sfcalendar.dart‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ class SfCalendar extends StatefulWidget {
645645
/// startTime: date,
646646
/// endTime: date.add(Duration(hours: 2)),
647647
/// enablePointerInteraction: false,
648-
/// color: Colors.grey.withOpacity(0.2),
648+
/// color: Colors.grey.withValues(alpha:0.2),
649649
/// text: 'Break'));
650650
///
651651
/// return regions;
@@ -1922,7 +1922,7 @@ class SfCalendar extends StatefulWidget {
19221922
/// startTime: DateTime.now(),
19231923
/// endTime: DateTime.now().add(Duration(hours: 1)),
19241924
/// enablePointerInteraction: false,
1925-
/// color: Colors.grey.withOpacity(0.2),
1925+
/// color: Colors.grey.withValues(alpha:0.2),
19261926
/// text: 'Break'));
19271927
///
19281928
/// return regions;
@@ -3879,15 +3879,15 @@ class _SfCalendarState extends State<SfCalendar>
38793879
?.merge(widget.blackoutDatesTextStyle),
38803880
trailingDatesTextStyle: themeData.textTheme.bodyMedium!
38813881
.copyWith(
3882-
color: colorScheme.onSurface.withOpacity(0.54),
3882+
color: colorScheme.onSurface.withValues(alpha: 0.54),
38833883
fontSize: isMaterial3 ? 14 : 13,
38843884
)
38853885
.merge(calendarThemeData.trailingDatesTextStyle)
38863886
.merge(
38873887
widget.monthViewSettings.monthCellStyle.trailingDatesTextStyle),
38883888
leadingDatesTextStyle: themeData.textTheme.bodyMedium!
38893889
.copyWith(
3890-
color: colorScheme.onSurface.withOpacity(0.54),
3890+
color: colorScheme.onSurface.withValues(alpha: 0.54),
38913891
fontSize: isMaterial3 ? 14 : 13,
38923892
)
38933893
.merge(calendarThemeData.leadingDatesTextStyle)
@@ -3902,37 +3902,37 @@ class _SfCalendarState extends State<SfCalendar>
39023902
.merge(widget.todayTextStyle),
39033903
headerTextStyle: themeData.textTheme.bodyLarge!
39043904
.copyWith(
3905-
color: colorScheme.onSurface.withOpacity(0.87),
3905+
color: colorScheme.onSurface.withValues(alpha: 0.87),
39063906
fontSize: isMaterial3 ? 16 : 18,
39073907
fontWeight: FontWeight.w400,
39083908
)
39093909
.merge(calendarThemeData.headerTextStyle)
39103910
.merge(widget.headerStyle.textStyle),
39113911
activeDatesTextStyle: themeData.textTheme.bodyMedium!
39123912
.copyWith(
3913-
color: colorScheme.onSurface.withOpacity(0.87),
3913+
color: colorScheme.onSurface.withValues(alpha: 0.87),
39143914
fontSize: 13,
39153915
)
39163916
.merge(calendarThemeData.activeDatesTextStyle)
39173917
.merge(widget.monthViewSettings.monthCellStyle.textStyle),
39183918
timeTextStyle: themeData.textTheme.bodySmall!
39193919
.copyWith(
3920-
color: colorScheme.onSurface.withOpacity(0.54),
3920+
color: colorScheme.onSurface.withValues(alpha: 0.54),
39213921
fontSize: isMaterial3 ? 12 : 10,
39223922
fontWeight: FontWeight.w500,
39233923
)
39243924
.merge(calendarThemeData.timeTextStyle)
39253925
.merge(widget.timeSlotViewSettings.timeTextStyle),
39263926
viewHeaderDateTextStyle: themeData.textTheme.bodyMedium!
39273927
.copyWith(
3928-
color: colorScheme.onSurface.withOpacity(0.87),
3928+
color: colorScheme.onSurface.withValues(alpha: 0.87),
39293929
fontSize: isMaterial3 ? 14 : 15,
39303930
)
39313931
.merge(calendarThemeData.viewHeaderDateTextStyle)
39323932
.merge(widget.viewHeaderStyle.dateTextStyle),
39333933
viewHeaderDayTextStyle: themeData.textTheme.bodySmall!
39343934
.copyWith(
3935-
color: colorScheme.onSurface.withOpacity(0.87),
3935+
color: colorScheme.onSurface.withValues(alpha: 0.87),
39363936
fontSize: isMaterial3 ? 12 : 11,
39373937
)
39383938
.merge(calendarThemeData.viewHeaderDayTextStyle)
@@ -3947,7 +3947,7 @@ class _SfCalendarState extends State<SfCalendar>
39473947
.merge(widget.resourceViewSettings.displayNameTextStyle),
39483948
weekNumberTextStyle: themeData.textTheme.bodyMedium!
39493949
.copyWith(
3950-
color: colorScheme.onSurface.withOpacity(0.87),
3950+
color: colorScheme.onSurface.withValues(alpha: 0.87),
39513951
fontSize: isMaterial3 ? 14 : 13,
39523952
)
39533953
.merge(calendarThemeData.weekNumberTextStyle)
@@ -5803,7 +5803,7 @@ class _SfCalendarState extends State<SfCalendar>
58035803
final double dividerHeight = _useMobilePlatformUI ? 0 : 1;
58045804
Color dividerColor =
58055805
widget.cellBorderColor ?? _calendarTheme.cellBorderColor!;
5806-
dividerColor = dividerColor.withOpacity(dividerColor.opacity * 0.5);
5806+
dividerColor = dividerColor.withValues(alpha: dividerColor.a * 0.5);
58075807
int numberOfEvents = 0;
58085808

58095809
double appointmentHeight = 0;
@@ -9523,7 +9523,7 @@ class _CalendarHeaderViewState extends State<_CalendarHeaderView> {
95239523
final Color headerBackgroundColor = widget.headerStyle.backgroundColor ??
95249524
widget.calendarTheme.headerBackgroundColor!;
95259525
final Color arrowColor =
9526-
headerTextColor.withOpacity(headerTextColor.opacity * 0.6);
9526+
headerTextColor.withValues(alpha: headerTextColor.a * 0.6);
95279527
Color prevArrowColor = arrowColor;
95289528
Color nextArrowColor = arrowColor;
95299529
final TextStyle style = TextStyle(color: arrowColor);
@@ -9761,7 +9761,7 @@ class _CalendarHeaderViewState extends State<_CalendarHeaderView> {
97619761
widget.maxDate,
97629762
dates,
97639763
widget.nonWorkingDays)) {
9764-
nextArrowColor = nextArrowColor.withOpacity(nextArrowColor.opacity * 0.5);
9764+
nextArrowColor = nextArrowColor.withValues(alpha: nextArrowColor.a * 0.5);
97659765
}
97669766

97679767
if (!DateTimeHelper.canMoveToPreviousView(
@@ -9771,7 +9771,7 @@ class _CalendarHeaderViewState extends State<_CalendarHeaderView> {
97719771
widget.maxDate,
97729772
dates,
97739773
widget.nonWorkingDays)) {
9774-
prevArrowColor = prevArrowColor.withOpacity(prevArrowColor.opacity * 0.5);
9774+
prevArrowColor = prevArrowColor.withValues(alpha: prevArrowColor.a * 0.5);
97759775
}
97769776

97779777
MainAxisAlignment getAlignmentFromTextAlign() {
@@ -9923,7 +9923,7 @@ class _CalendarHeaderViewState extends State<_CalendarHeaderView> {
99239923
decoration: BoxDecoration(
99249924
color:
99259925
widget.showDatePickerButton && widget.isPickerShown
9926-
? Colors.grey.withOpacity(0.3)
9926+
? Colors.grey.withValues(alpha: 0.3)
99279927
: headerBackgroundColor,
99289928
),
99299929

@@ -10330,7 +10330,7 @@ class _CalendarHeaderViewState extends State<_CalendarHeaderView> {
1033010330
padding: EdgeInsets.all(useMobilePlatformUI ? 2 : 4),
1033110331
child: Material(
1033210332
color: isHighlighted && (isNeedIcon || useMobilePlatformUI)
10333-
? Colors.grey.withOpacity(0.3)
10333+
? Colors.grey.withValues(alpha: 0.3)
1033410334
: headerBackgroundColor,
1033510335
child: InkWell(
1033610336
splashColor: calendarViewSplashColor,
@@ -10642,7 +10642,7 @@ class _ScheduleLabelPainter extends CustomPainter {
1064210642
final Rect rect = Rect.fromLTWH(
1064310643
0, padding, size.width - 2, size.height - (2 * padding));
1064410644
_backgroundPainter.color =
10645-
calendarTheme.selectionBorderColor!.withOpacity(0.4);
10645+
calendarTheme.selectionBorderColor!.withValues(alpha: 0.4);
1064610646
_backgroundPainter.style = PaintingStyle.stroke;
1064710647
_backgroundPainter.strokeWidth = 2;
1064810648
canvas.drawRect(rect, _backgroundPainter);
@@ -10654,7 +10654,7 @@ class _ScheduleLabelPainter extends CustomPainter {
1065410654
padding + viewPadding,
1065510655
size.width - (isRTL ? viewPadding : padding),
1065610656
size.height - (2 * (viewPadding + padding)));
10657-
_backgroundPainter.color = Colors.grey.withOpacity(0.1);
10657+
_backgroundPainter.color = Colors.grey.withValues(alpha: 0.1);
1065810658
canvas.drawRRect(
1065910659
RRect.fromRectAndRadius(rect, const Radius.circular(4)),
1066010660
_backgroundPainter);
@@ -11090,7 +11090,7 @@ class _CustomSplash extends InteractiveInkFeature {
1109011090
..addListener(controller.markNeedsPaint)
1109111091
..addStatusListener(_handleAlphaStatusChanged);
1109211092
_alpha = _alphaController!.drive(IntTween(
11093-
begin: color.alpha,
11093+
begin: (color.a * 255).toInt(),
1109411094
end: 0,
1109511095
));
1109611096

@@ -11260,7 +11260,7 @@ class _AgendaDateTimePainter extends CustomPainter {
1126011260
/// Holds the default agenda day text style from framework text theme.
1126111261
final TextStyle agendaDayThemeTextStyle =
1126211262
themeData.textTheme.bodySmall!.copyWith(
11263-
color: themeData.colorScheme.onSurface.withOpacity(0.54),
11263+
color: themeData.colorScheme.onSurface.withValues(alpha: 0.54),
1126411264
fontSize: 10,
1126511265
fontWeight: FontWeight.w500,
1126611266
);
@@ -11394,11 +11394,11 @@ class _AgendaDateTimePainter extends CustomPainter {
1139411394
yPosition + _textPainter.height >
1139511395
agendaDateNotifier.value!.hoveringOffset.dy) {
1139611396
_linePainter.color = isToday
11397-
? Colors.black.withOpacity(0.1)
11397+
? Colors.black.withValues(alpha: 0.1)
1139811398
: (themeData.brightness == Brightness.dark
1139911399
? Colors.white
1140011400
: Colors.black87)
11401-
.withOpacity(0.04);
11401+
.withValues(alpha: 0.04);
1140211402
_drawTodayCircle(canvas, xPosition, yPosition, padding);
1140311403
}
1140411404
}
@@ -11460,11 +11460,11 @@ class _AgendaDateTimePainter extends CustomPainter {
1146011460
(yPosition + _textPainter.height) >
1146111461
agendaDateNotifier.value!.hoveringOffset.dy) {
1146211462
_linePainter.color = isToday
11463-
? Colors.black.withOpacity(0.1)
11463+
? Colors.black.withValues(alpha: 0.1)
1146411464
: (themeData.brightness == Brightness.dark
1146511465
? Colors.white
1146611466
: Colors.black87)
11467-
.withOpacity(0.04);
11467+
.withValues(alpha: 0.04);
1146811468
_drawTodayCircle(canvas, dateTextStartPosition, yPosition, padding);
1146911469
}
1147011470
}

‎packages/syncfusion_flutter_calendar/lib/src/calendar/views/calendar_view.dart‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6479,7 +6479,7 @@ class _CalendarViewState extends State<_CalendarView>
64796479
final Widget shadowView = Divider(
64806480
height: 1,
64816481
thickness: 1,
6482-
color: borderColor.withOpacity(borderColor.opacity * 0.5),
6482+
color: borderColor.withValues(alpha: borderColor.a * 0.5),
64836483
);
64846484

64856485
final double timeLabelWidth = CalendarViewHelper.getTimeLabelWidth(
@@ -11641,13 +11641,13 @@ class _ViewHeaderViewPainter extends CustomPainter {
1164111641
if (!isDateWithInDateRange(minDate, maxDate, currentDate)) {
1164211642
dayTextStyle = dayTextStyle.copyWith(
1164311643
color: dayTextStyle.color != null
11644-
? dayTextStyle.color!.withOpacity(0.38)
11644+
? dayTextStyle.color!.withValues(alpha: 0.38)
1164511645
: themeData.brightness == Brightness.light
1164611646
? Colors.black26
1164711647
: Colors.white38);
1164811648
dateTextStyle = dateTextStyle.copyWith(
1164911649
color: dateTextStyle.color != null
11650-
? dateTextStyle.color!.withOpacity(0.38)
11650+
? dateTextStyle.color!.withValues(alpha: 0.38)
1165111651
: themeData.brightness == Brightness.light
1165211652
? Colors.black26
1165311653
: Colors.white38);
@@ -11789,7 +11789,7 @@ class _ViewHeaderViewPainter extends CustomPainter {
1178911789
hoveringColor: (themeData.brightness == Brightness.dark
1179011790
? Colors.white
1179111791
: Colors.black87)
11792-
.withOpacity(0.04));
11792+
.withValues(alpha: 0.04));
1179311793
}
1179411794
}
1179511795

@@ -11806,11 +11806,11 @@ class _ViewHeaderViewPainter extends CustomPainter {
1180611806
xPosition + dateXPosition + _dateTextPainter.width >=
1180711807
viewHeaderNotifier.value!.dx) {
1180811808
final Color hoveringColor = isToday
11809-
? Colors.black.withOpacity(0.12)
11809+
? Colors.black.withValues(alpha: 0.12)
1181011810
: (themeData.brightness == Brightness.dark
1181111811
? Colors.white
1181211812
: Colors.black87)
11813-
.withOpacity(0.04);
11813+
.withValues(alpha: 0.04);
1181411814
_drawTodayCircle(
1181511815
canvas,
1181611816
xPosition + dateXPosition,
@@ -14104,7 +14104,7 @@ class _DraggingAppointmentRenderObject extends RenderBox
1410414104
xPosition = dragDetails.position.value!.dx;
1410514105
yPosition = dragDetails.position.value!.dy;
1410614106
_shadowPainter.color =
14107-
dragDetails.appointmentView!.appointment!.color.withOpacity(0.5);
14107+
dragDetails.appointmentView!.appointment!.color.withValues(alpha: 0.5);
1410814108

1410914109
final RRect rect = RRect.fromRectAndRadius(
1411014110
Rect.fromLTWH(

‎packages/syncfusion_flutter_calendar/lib/src/calendar/views/day_view.dart‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ class _TimeSlotRenderObject extends CustomCalendarRenderObject {
754754
rect = Rect.fromLTRB(
755755
leftPosition, topPosition, rightPosition, bottomPosition);
756756
_linePainter.style = PaintingStyle.fill;
757-
_linePainter.color = Colors.grey.withOpacity(0.2);
757+
_linePainter.color = Colors.grey.withValues(alpha: 0.2);
758758
canvas.drawRect(rect, _linePainter);
759759
}
760760
}
@@ -798,7 +798,8 @@ class _TimeSlotRenderObject extends CustomCalendarRenderObject {
798798
timeIntervalHeight;
799799
_linePainter.style = PaintingStyle.stroke;
800800
_linePainter.strokeWidth = strokeWidth;
801-
_linePainter.color = calendarTheme.selectionBorderColor!.withOpacity(0.4);
801+
_linePainter.color =
802+
calendarTheme.selectionBorderColor!.withValues(alpha: 0.4);
802803
left += isRTL ? 0 : timeLabelWidth;
803804
double height = timeIntervalHeight;
804805
if (top == 0) {
@@ -836,7 +837,7 @@ class _TimeSlotRenderObject extends CustomCalendarRenderObject {
836837
for (int i = 0; i < count; i++) {
837838
final TimeRegionView view = specialRegionBounds[i];
838839
final CalendarTimeRegion region = view.region;
839-
_linePainter.color = region.color ?? Colors.grey.withOpacity(0.2);
840+
_linePainter.color = region.color ?? Colors.grey.withValues(alpha: 0.2);
840841

841842
final TextStyle textStyle = themeData.textTheme.bodyMedium!
842843
.copyWith(fontSize: 14)

‎packages/syncfusion_flutter_calendar/lib/src/calendar/views/month_view.dart‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ class _MonthViewRenderObject extends CustomCalendarRenderObject {
931931
final TextStyle? blackoutDatesStyle = calendarTheme.blackoutDatesTextStyle;
932932
final TextStyle disabledTextStyle = currentMonthTextStyle.copyWith(
933933
color: currentMonthTextStyle.color != null
934-
? currentMonthTextStyle.color!.withOpacity(0.38)
934+
? currentMonthTextStyle.color!.withValues(alpha: 0.38)
935935
: themeData.brightness == Brightness.light
936936
? Colors.black26
937937
: Colors.white38);
@@ -1126,7 +1126,8 @@ class _MonthViewRenderObject extends CustomCalendarRenderObject {
11261126
yPosition + cellHeight >= calendarCellNotifier.value!.dy) {
11271127
_linePainter.style = PaintingStyle.stroke;
11281128
_linePainter.strokeWidth = 2;
1129-
_linePainter.color = calendarTheme.selectionBorderColor!.withOpacity(0.4);
1129+
_linePainter.color =
1130+
calendarTheme.selectionBorderColor!.withValues(alpha: 0.4);
11301131
canvas.drawRect(
11311132
Rect.fromLTWH(
11321133
xPosition == 0 ? xPosition + linePadding : xPosition,

0 commit comments

Comments
 (0)