Skip to content

Commit 73d2f82

Browse files
author
LavanyaA
authored
Merge pull request #1584 from Yuvaraj-Gajaraj/master
Move Volume 4 main release source to master branch
2 parents 286835a + c54a990 commit 73d2f82

777 files changed

Lines changed: 94884 additions & 106927 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/syncfusion_flutter_barcodes/example/lib/main.dart‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ class MyApp extends StatelessWidget {
1010
@override
1111
Widget build(BuildContext context) {
1212
return MaterialApp(
13+
theme: ThemeData(
14+
useMaterial3: false,
15+
),
1316
home: Scaffold(
1417
appBar: AppBar(
1518
title: const Text('Barcode Generator Demo'),

‎packages/syncfusion_flutter_barcodes/pubspec.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: syncfusion_flutter_barcodes
22
description: Flutter Barcodes generator library is used to generate and display data in the machine-readable, industry-standard 1D and 2D barcodes.
3-
version: 23.1.36
3+
version: 24.1.41
44
homepage: https://github.com/syncfusion/flutter-widgets/tree/master/packages/syncfusion_flutter_barcodes
55

66
environment:
@@ -9,8 +9,8 @@ environment:
99
dependencies:
1010
flutter:
1111
sdk: flutter
12-
syncfusion_flutter_core: ^23.1.36
13-
12+
syncfusion_flutter_core:
13+
path: ../syncfusion_flutter_core
1414

1515
dev_dependencies:
1616
flutter_test:

‎packages/syncfusion_flutter_calendar/example/lib/main.dart‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ void main() {
99
class CalendarApp extends StatelessWidget {
1010
@override
1111
Widget build(BuildContext context) {
12-
return const MaterialApp(title: 'Calendar Demo', home: MyHomePage());
12+
return MaterialApp(
13+
title: 'Calendar Demo',
14+
theme: ThemeData(useMaterial3: false),
15+
home: const MyHomePage(),
16+
);
1317
}
1418
}
1519

‎packages/syncfusion_flutter_calendar/lib/src/calendar/appointment_engine/appointment_helper.dart‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class AppointmentHelper {
158158
/// hence to rectify this tha value 1.5 used, and tested with multiple
159159
/// device.
160160
final int iconStartPosition = (textPainter.height -
161-
(icon.style!.fontSize! * textPainter.textScaleFactor)) ~/
161+
(textPainter.textScaler.scale(icon.style!.fontSize!))) ~/
162162
1.5;
163163
return rect.top -
164164
((textPainter.height - rect.height) / 2) -
@@ -609,7 +609,8 @@ class AppointmentHelper {
609609
if (isTimelineMonth) {
610610
return isSameDate(
611611
currentApp.actualStartTime, appointment.actualStartTime) ||
612-
isSameDate(currentApp.actualEndTime, appointment.actualEndTime);
612+
isSameDate(currentApp.actualStartTime, appointment.actualEndTime) ||
613+
isSameDate(currentApp.actualEndTime, appointment.actualStartTime);
613614
}
614615

615616
if (CalendarViewHelper.isSameTimeSlot(

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,7 @@ class _AgendaViewRenderObject extends CustomCalendarRenderObject {
10781078
bool isAllDay,
10791079
double spanIconWidth) {
10801080
_textPainter.text = icon;
1081-
_textPainter.textScaleFactor = textScaleFactor;
1081+
_textPainter.textScaler = TextScaler.linear(textScaleFactor);
10821082
_textPainter.layout(maxWidth: size.width - (2 * padding) - padding);
10831083
final double iconSize = textSize + 8;
10841084
if (!isLargerScheduleUI) {
@@ -1156,7 +1156,7 @@ class _AgendaViewRenderObject extends CustomCalendarRenderObject {
11561156
List<String> appointmentFormatString,
11571157
List<String> sameDateAppointmentFormatString,
11581158
List<String> diffDateAppointmentFormatString) {
1159-
_textPainter.textScaleFactor = textScaleFactor;
1159+
_textPainter.textScaler = TextScaler.linear(textScaleFactor);
11601160
final double lineHeight = _updatePainterLinesCount(appointmentHeight);
11611161
final double iconSize = isRecurrence ? recurrenceTextSize + 10 : 0;
11621162
_textPainter.layout(
@@ -1273,7 +1273,7 @@ class _AgendaViewRenderObject extends CustomCalendarRenderObject {
12731273
CalendarViewHelper.getTextDirectionBasedOnLocale(locale);
12741274
_textPainter.textAlign = TextAlign.left;
12751275
_textPainter.textWidthBasis = TextWidthBasis.longestLine;
1276-
_textPainter.textScaleFactor = textScaleFactor;
1276+
_textPainter.textScaler = TextScaler.linear(textScaleFactor);
12771277
}
12781278

12791279
double _addScheduleViewForWeb(
@@ -1292,7 +1292,7 @@ class _AgendaViewRenderObject extends CustomCalendarRenderObject {
12921292
List<String> appointmentFormatString,
12931293
List<String> sameDateAppointmentFormatString,
12941294
Offset offset) {
1295-
_textPainter.textScaleFactor = textScaleFactor;
1295+
_textPainter.textScaler = TextScaler.linear(textScaleFactor);
12961296
final double centerYPosition = appointmentHeight / 2;
12971297
final double circleRadius =
12981298
centerYPosition > padding ? padding : centerYPosition - 2;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ class _AllDayAppointmentRenderObject extends CustomCalendarRenderObject {
976976

977977
@override
978978
void paint(PaintingContext context, Offset offset) {
979-
_textPainter.textScaleFactor = _textScaleFactor;
979+
_textPainter.textScaler = TextScaler.linear(textScaleFactor);
980980
double leftPosition = 0, rightPosition = size.width;
981981
if (CalendarViewHelper.isDayView(
982982
view,
@@ -1196,7 +1196,7 @@ class _AllDayAppointmentRenderObject extends CustomCalendarRenderObject {
11961196
AppointmentHelper.getAppointmentTextStyle(
11971197
calendar.appointmentTextStyle, view, themeData);
11981198
final double iconTextSize = _getTextSize(
1199-
rect, appointmentTextStyle.fontSize! * _textPainter.textScaleFactor);
1199+
rect, _textPainter.textScaler.scale(appointmentTextStyle.fontSize!));
12001200
const double iconPadding = 2;
12011201
//// Padding 4 is left and right 2 padding.
12021202
final double iconSize = iconTextSize + (2 * iconPadding);
@@ -1348,7 +1348,7 @@ class _AllDayAppointmentRenderObject extends CustomCalendarRenderObject {
13481348
: kAllDayAppointmentHeight + 5,
13491349
fontFamily: 'MaterialIcons',
13501350
));
1351-
_expanderTextPainter.textScaleFactor = textScaleFactor;
1351+
_expanderTextPainter.textScaler = TextScaler.linear(textScaleFactor);
13521352
_expanderTextPainter.text = icon;
13531353
_expanderTextPainter.layout(maxWidth: timeLabelWidth);
13541354
_expanderTextPainter.paint(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1836,7 +1836,7 @@ class _AppointmentRenderObject extends CustomCalendarRenderObject {
18361836
appointment.recurrenceRule != null &&
18371837
appointment.recurrenceRule!.isNotEmpty;
18381838
final double iconTextSize = _getTextSize(
1839-
appointmentRect, textSize * _textPainter.textScaleFactor);
1839+
appointmentRect, _textPainter.textScaler.scale(textSize));
18401840
const double iconPadding = 2;
18411841
//// Padding 4 is left and right 2 padding.
18421842
final double iconSize = iconTextSize + (2 * iconPadding);
@@ -2688,6 +2688,6 @@ TextPainter _updateTextPainter(TextSpan span, TextPainter textPainter,
26882688
textPainter.textDirection = TextDirection.ltr;
26892689
textPainter.textAlign = isRTL ? TextAlign.right : TextAlign.left;
26902690
textPainter.textWidthBasis = TextWidthBasis.longestLine;
2691-
textPainter.textScaleFactor = textScaleFactor;
2691+
textPainter.textScaler = TextScaler.linear(textScaleFactor);
26922692
return textPainter;
26932693
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ class _ResourceViewRenderObject extends CustomCalendarRenderObject {
555555
_namePainter.textDirection = TextDirection.ltr;
556556
_namePainter.maxLines = 1;
557557
_namePainter.textWidthBasis = TextWidthBasis.longestLine;
558-
_namePainter.textScaleFactor = textScaleFactor;
558+
_namePainter.textScaler = TextScaler.linear(textScaleFactor);
559559
}
560560

561561
/// Draws the outer circle border for the resource view.

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2754,6 +2754,7 @@ class _SfCalendarState extends State<SfCalendar>
27542754

27552755
@override
27562756
void initState() {
2757+
_textScaleFactor = 1;
27572758
_timeZoneLoaded = false;
27582759
_showHeader = false;
27592760
_calendarViewWidth = 0;
@@ -2814,7 +2815,7 @@ class _SfCalendarState extends State<SfCalendar>
28142815

28152816
@override
28162817
void didChangeDependencies() {
2817-
_textScaleFactor = MediaQuery.of(context).textScaleFactor;
2818+
_textScaleFactor = MediaQuery.textScalerOf(context).scale(_textScaleFactor);
28182819
// default width value will be device width when the widget placed inside a
28192820
// infinity width widget
28202821
_minWidth = MediaQuery.of(context).size.width;
@@ -9992,7 +9993,7 @@ class _CalendarHeaderViewState extends State<_CalendarHeaderView> {
99929993
child: Text(
99939994
widget.localizations.weeknumberLabel,
99949995
textAlign: TextAlign.center,
9995-
textScaleFactor: widget.textScaleFactor,
9996+
textScaler: TextScaler.linear(widget.textScaleFactor),
99969997
style: weekNumberTextStyle,
99979998
overflow: TextOverflow.ellipsis,
99989999
maxLines: 1,
@@ -10002,7 +10003,7 @@ class _CalendarHeaderViewState extends State<_CalendarHeaderView> {
1000210003
' $weekNumberString',
1000310004
textAlign: TextAlign.center,
1000410005
style: weekNumberTextStyle,
10005-
textScaleFactor: widget.textScaleFactor,
10006+
textScaler: TextScaler.linear(widget.textScaleFactor),
1000610007
maxLines: 1,
1000710008
))
1000810009
],
@@ -10782,7 +10783,7 @@ class _ScheduleLabelPainter extends CustomPainter {
1078210783
_textPainter.maxLines = 1;
1078310784
_textPainter.textDirection = TextDirection.ltr;
1078410785
_textPainter.textWidthBasis = TextWidthBasis.longestLine;
10785-
_textPainter.textScaleFactor = textScaleFactor;
10786+
_textPainter.textScaler = TextScaler.linear(textScaleFactor);
1078610787
}
1078710788

1078810789
@override
@@ -11284,17 +11285,13 @@ class _AgendaDateTimePainter extends CustomPainter {
1128411285
dayTextStyle = agendaDayThemeTextStyle.merge(
1128511286
scheduleViewSettings!.dayHeaderSettings.dayTextStyle ??
1128611287
TextStyle(
11287-
color: calendarTheme.agendaDayTextStyle != null
11288-
? calendarTheme.agendaDayTextStyle!.color
11289-
: null,
11288+
color: calendarTheme.agendaDayTextStyle?.color,
1129011289
fontSize: 9,
1129111290
fontWeight: FontWeight.w500));
1129211291
dateTextStyle = agendaDateThemeTextStyle.merge(
1129311292
scheduleViewSettings!.dayHeaderSettings.dateTextStyle ??
1129411293
TextStyle(
11295-
color: calendarTheme.agendaDateTextStyle != null
11296-
? calendarTheme.agendaDateTextStyle!.color
11297-
: null,
11294+
color: calendarTheme.agendaDateTextStyle?.color,
1129811295
fontSize: 18,
1129911296
fontWeight: FontWeight.normal));
1130011297
}
@@ -11331,7 +11328,7 @@ class _AgendaDateTimePainter extends CustomPainter {
1133111328
_textPainter.textDirection = TextDirection.ltr;
1133211329
_textPainter.textAlign = TextAlign.left;
1133311330
_textPainter.textWidthBasis = TextWidthBasis.parent;
11334-
_textPainter.textScaleFactor = textScaleFactor;
11331+
_textPainter.textScaler = TextScaler.linear(textScaleFactor);
1133511332
}
1133611333

1133711334
void _addDayLabelForMobile(

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5916,8 +5916,10 @@ class _CalendarViewState extends State<_CalendarView>
59165916
return;
59175917
}
59185918

5919-
if (widget.resourcePanelScrollController!.offset !=
5920-
_timelineViewVerticalScrollController!.offset) {
5919+
if (_timelineViewVerticalScrollController != null &&
5920+
_timelineViewVerticalScrollController!.hasClients &&
5921+
widget.resourcePanelScrollController!.offset !=
5922+
_timelineViewVerticalScrollController!.offset) {
59215923
_timelineViewVerticalScrollController!
59225924
.jumpTo(widget.resourcePanelScrollController!.offset);
59235925
}
@@ -11609,7 +11611,7 @@ class _ViewHeaderViewPainter extends CustomPainter {
1160911611
_dateTextPainter.textDirection = TextDirection.ltr;
1161011612
_dateTextPainter.textAlign = TextAlign.left;
1161111613
_dateTextPainter.textWidthBasis = TextWidthBasis.longestLine;
11612-
_dateTextPainter.textScaleFactor = textScaleFactor;
11614+
_dateTextPainter.textScaler = TextScaler.linear(textScaleFactor);
1161311615

1161411616
_dateTextPainter.layout(maxWidth: width);
1161511617

@@ -11670,7 +11672,7 @@ class _ViewHeaderViewPainter extends CustomPainter {
1167011672
_dateTextPainter.textDirection = TextDirection.ltr;
1167111673
_dateTextPainter.textAlign = TextAlign.left;
1167211674
_dateTextPainter.textWidthBasis = TextWidthBasis.longestLine;
11673-
_dateTextPainter.textScaleFactor = textScaleFactor;
11675+
_dateTextPainter.textScaler = TextScaler.linear(textScaleFactor);
1167411676
_dateTextPainter.layout(maxWidth: timeLabelWidth);
1167511677
final double weekNumberPosition = isRTL
1167611678
? (size.width - timeLabelWidth) +
@@ -11810,7 +11812,7 @@ class _ViewHeaderViewPainter extends CustomPainter {
1181011812
_dayTextPainter.textDirection = TextDirection.ltr;
1181111813
_dayTextPainter.textAlign = TextAlign.left;
1181211814
_dayTextPainter.textWidthBasis = TextWidthBasis.longestLine;
11813-
_dayTextPainter.textScaleFactor = textScaleFactor;
11815+
_dayTextPainter.textScaler = TextScaler.linear(textScaleFactor);
1181411816
_dayTextPainter.ellipsis = '...';
1181511817
_dayTextPainter.maxLines = 1;
1181611818

@@ -12423,7 +12425,7 @@ class _TimeRulerView extends CustomPainter {
1242312425
_textPainter.textDirection =
1242412426
CalendarViewHelper.getTextDirectionBasedOnLocale(locale);
1242512427
_textPainter.textWidthBasis = TextWidthBasis.longestLine;
12426-
_textPainter.textScaleFactor = textScaleFactor;
12428+
_textPainter.textScaler = TextScaler.linear(textScaleFactor);
1242712429

1242812430
final TextStyle timeTextStyle = calendarTheme.timeTextStyle!;
1242912431

@@ -13403,7 +13405,7 @@ class _ResizingAppointmentPainter extends CustomPainter {
1340313405
_textPainter.textDirection = TextDirection.ltr;
1340413406
_textPainter.textAlign = isRTL ? TextAlign.right : TextAlign.left;
1340513407
_textPainter.textWidthBasis = TextWidthBasis.longestLine;
13406-
_textPainter.textScaleFactor = textScaleFactor;
13408+
_textPainter.textScaler = TextScaler.linear(textScaleFactor);
1340713409
}
1340813410

1340913411
void _addRecurrenceIcon(Rect rect, Canvas canvas, int? textPadding,
@@ -14058,7 +14060,7 @@ class _DraggingAppointmentRenderObject extends RenderBox
1405814060
_textPainter.textDirection = TextDirection.ltr;
1405914061
_textPainter.textAlign = isRTL ? TextAlign.right : TextAlign.left;
1406014062
_textPainter.textWidthBasis = TextWidthBasis.longestLine;
14061-
_textPainter.textScaleFactor = textScaleFactor;
14063+
_textPainter.textScaler = TextScaler.linear(textScaleFactor);
1406214064
double maxTextWidth =
1406314065
dragDetails.appointmentView!.appointmentRect!.width - textStartPadding;
1406414066
maxTextWidth = maxTextWidth > 0 ? maxTextWidth : 0;
@@ -14106,7 +14108,7 @@ class _DraggingAppointmentRenderObject extends RenderBox
1410614108
_textPainter.textDirection = TextDirection.ltr;
1410714109
_textPainter.textAlign = isRTL ? TextAlign.right : TextAlign.left;
1410814110
_textPainter.textWidthBasis = TextWidthBasis.longestLine;
14109-
_textPainter.textScaleFactor = textScaleFactor;
14111+
_textPainter.textScaler = TextScaler.linear(textScaleFactor);
1411014112
final double timeLabelSize =
1411114113
isTimelineView ? dragDetails.timeIntervalHeight! : timeLabelWidth;
1411214114
_textPainter.layout(maxWidth: timeLabelSize);

0 commit comments

Comments
 (0)