Skip to content

Commit 0a1d6b9

Browse files
author
LavanyaA
authored
Merge pull request syncfusion#1079 from LokeshPalani/master
FLUT-7280- [Others] Moved the source file to master
2 parents 4e8f8c7 + 2842825 commit 0a1d6b9

File tree

54 files changed

+666
-274
lines changed

Some content is hidden

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

54 files changed

+666
-274
lines changed

‎packages/syncfusion_flutter_barcodes/lib/src/barcode_generator/renderers/one_dimensional/code128_renderer.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,7 @@ class Code128Renderer extends SymbologyRenderer {
427427

428428
@override
429429
bool getIsValidateInput(String value) {
430+
// ignore: dead_code
430431
for (int i = 0; i < value.length; i++) {
431432
final int currentCharacter = value[i].codeUnitAt(0);
432433
if (currentCharacter == _fnc1.codeUnitAt(0) ||

‎packages/syncfusion_flutter_barcodes/lib/src/barcode_generator/renderers/one_dimensional/ean8_renderer.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ class EAN8Renderer extends SymbologyRenderer {
153153

154154
/// Method to calculate the input data
155155
int _getCheckSumData(String value) {
156+
// ignore: dead_code
156157
for (int i = 0; i < value.length; i++) {
157158
final int sum1 =
158159
int.parse(value[1]) + int.parse(value[3]) + int.parse(value[5]);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10773,7 +10773,7 @@ class _AppointmentViewHeaderRenderObject extends RenderStack {
1077310773
ScrollableState? _scrollableState;
1077410774

1077510775
/// Current view port.
10776-
RenderAbstractViewport get _stackViewPort => RenderAbstractViewport.of(this)!;
10776+
RenderAbstractViewport get _stackViewPort => RenderAbstractViewport.of(this);
1077710777

1077810778
ScrollableState? get scrollableState => _scrollableState;
1077910779

‎packages/syncfusion_flutter_calendar/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414

1515
syncfusion_flutter_datepicker: ^20.4.38
1616

17-
intl: ">=0.15.0 <0.20.0"
17+
intl: ">=0.17.0 <0.20.0"
1818

1919
dev_dependencies:
2020
flutter_test:

‎packages/syncfusion_flutter_charts/lib/src/chart/base/chart_base.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2382,7 +2382,13 @@ class ContainerArea extends StatelessWidget {
23822382
onPointerSignal: (PointerSignalEvent event) {
23832383
if (_stateProperties.chartState.mounted &&
23842384
event is PointerScrollEvent) {
2385-
_performPointerSignal(event);
2385+
_performPointerEvent(event);
2386+
}
2387+
},
2388+
// To handle the trackpad zooming
2389+
onPointerPanZoomUpdate: (PointerPanZoomUpdateEvent event) {
2390+
if (_stateProperties.chartState.mounted) {
2391+
_performPointerEvent(event);
23862392
}
23872393
},
23882394
child: GestureDetector(
@@ -3293,7 +3299,7 @@ class ContainerArea extends StatelessWidget {
32933299
}
32943300

32953301
/// To perform the pointer signal event
3296-
void _performPointerSignal(PointerScrollEvent event) {
3302+
void _performPointerEvent(PointerEvent event) {
32973303
_mousePointerDetails = event.position;
32983304
if (_mousePointerDetails != null) {
32993305
final Offset position = renderBox.globalToLocal(event.position);

‎packages/syncfusion_flutter_charts/lib/src/chart/user_interaction/zooming_panning.dart

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,9 +1013,18 @@ class ZoomingBehaviorDetails {
10131013

10141014
/// Below method is for mouse wheel Zooming.
10151015
void performMouseWheelZooming(
1016-
PointerScrollEvent event, double mouseX, double mouseY) {
1016+
PointerEvent event, double mouseX, double mouseY) {
10171017
stateProperties.canSetRangeController = true;
1018-
final double direction = (event.scrollDelta.dy / 120) > 0 ? -1 : 1;
1018+
double direction = 0.0;
1019+
if (event is PointerScrollEvent) {
1020+
direction = (event.scrollDelta.dy / 120) > 0 ? -1 : 1;
1021+
} else if (event is PointerPanZoomUpdateEvent) {
1022+
direction = event.panDelta.dy == 0
1023+
? 0
1024+
: (event.panDelta.dy / 120) > 0
1025+
? 1
1026+
: -1;
1027+
}
10191028
double origin = 0.5;
10201029
double cumulative, zoomFactor, zoomPosition, maxZoomFactor;
10211030
stateProperties.zoomProgress = true;

‎packages/syncfusion_flutter_charts/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ environment:
99
dependencies:
1010
flutter:
1111
sdk: flutter
12-
intl: ^0.17.0
12+
intl: ">=0.17.0 <0.20.0"
1313
vector_math: ">=2.1.0 <=3.0.0"
1414
syncfusion_flutter_core: ^20.4.38
1515

‎packages/syncfusion_flutter_core/lib/src/legend/legend.dart

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -921,9 +921,9 @@ class _SfLegendState extends State<SfLegend> {
921921
Widget build(BuildContext context) {
922922
final ThemeData themeData = Theme.of(context);
923923
if (widget.itemBuilder == null) {
924-
_textStyle = themeData.textTheme.caption!
924+
_textStyle = themeData.textTheme.bodySmall!
925925
.copyWith(
926-
color: themeData.textTheme.caption!.color!.withOpacity(0.87))
926+
color: themeData.textTheme.bodySmall!.color!.withOpacity(0.87))
927927
.merge(widget.textStyle);
928928
}
929929
if (!widget.isComplex) {
@@ -1086,11 +1086,6 @@ class _VectorLegendState extends State<_VectorLegend>
10861086
return toggledColor;
10871087
}
10881088

1089-
@override
1090-
void dispose() {
1091-
super.dispose();
1092-
}
1093-
10941089
@override
10951090
Widget build(BuildContext context) {
10961091
final ThemeData themeData = Theme.of(context);

‎packages/syncfusion_flutter_core/lib/src/theme/theme_widget.dart

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,23 @@ class SfThemeData with Diagnosticable {
482482
/// ```
483483
final SfMapsThemeData mapsThemeData;
484484

485-
///ToDO
485+
/// Defines the default configuration of dataPager widgets.
486+
///
487+
/// ```dart
488+
/// Widget build(BuildContext context) {
489+
/// return Scaffold(
490+
/// appBar: AppBar(),
491+
/// body: Center(
492+
/// child: SfTheme(
493+
/// data: SfThemeData(
494+
/// dataPagerThemeData: SfDataPagerThemeData()
495+
/// ),
496+
/// child: SfDataPager(),
497+
/// ),
498+
/// )
499+
/// );
500+
/// }
501+
/// ```
486502
final SfDataPagerThemeData dataPagerThemeData;
487503

488504
/// Creates a copy of this theme but with the given

‎packages/syncfusion_flutter_core/lib/src/widgets/interactive_scroll_viewer.dart

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class InteractiveScrollViewer extends StatefulWidget {
1212
{Key? key,
1313
this.clipBehavior = Clip.hardEdge,
1414
this.onDoubleTapZoomInvoked,
15-
this.alignPanAxis = false,
15+
this.panAxis = PanAxis.free,
1616
this.boundaryMargin = EdgeInsets.zero,
1717
// These default scale values were eyeballed as reasonable
1818
//limits for common use cases.
@@ -45,18 +45,18 @@ class InteractiveScrollViewer extends StatefulWidget {
4545
/// Defaults to [Clip.hardEdge].
4646
final Clip clipBehavior;
4747

48-
/// If true, panning is only allowed in the direction of the horizontal axis
49-
/// or the vertical axis.
48+
/// When set to [PanAxis.aligned], panning is only allowed in the horizontal
49+
/// axis or the vertical axis, diagonal panning is not allowed.
5050
///
51-
/// In other words, when this is true, diagonal panning is not allowed. A
52-
/// single gesture begun along one axis cannot also cause panning along the
53-
/// other axis without stopping and beginning a new gesture. This is a common
54-
/// pattern in tables where data is displayed in columns and rows.
51+
/// When set to [PanAxis.vertical] or [PanAxis.horizontal] panning is only
52+
/// allowed in the specified axis. For example, if set to [PanAxis.vertical],
53+
/// panning will only be allowed in the vertical axis. And if set to
54+
/// [PanAxis.horizontal],panning will only be allowed in the horizontal axis.
5555
///
56-
/// See also:
57-
/// * [constrained], which has an example of creating a table that uses
58-
/// alignPanAxis.
59-
final bool alignPanAxis;
56+
/// When set to [PanAxis.free] panning is allowed in all directions.
57+
///
58+
/// Defaults to [PanAxis.free].
59+
final PanAxis panAxis;
6060

6161
/// A margin for the visible boundaries of the child.
6262
///
@@ -296,7 +296,7 @@ class InteractiveScrollViewerState extends State<InteractiveScrollViewer> {
296296
onInteractionEnd: widget.onInteractionEnd,
297297
scaleEnabled: widget.scaleEnabled,
298298
panEnabled: widget.panEnabled,
299-
alignPanAxis: widget.alignPanAxis,
299+
panAxis: widget.panAxis,
300300
transformationController: widget.transformationController,
301301
boundaryMargin: widget.boundaryMargin,
302302
clipBehavior: widget.clipBehavior,

0 commit comments

Comments
 (0)