Skip to content

Commit 2ad6b65

Browse files
FLUT-931209-[others]: updated latest source changes
1 parent 7e87cef commit 2ad6b65

File tree

10 files changed

+30
-21
lines changed

10 files changed

+30
-21
lines changed

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class AllDayAppointmentLayout extends StatefulWidget {
4848

4949
/// Holds the selection details and user to trigger repaint to draw the
5050
/// selection.
51-
final ValueNotifier<SelectionDetails?> repaintNotifier;
51+
final ValueNotifier<AllDayPanelSelectionDetails?> repaintNotifier;
5252

5353
/// Used to get the calendar state details.
5454
final UpdateCalendarState updateCalendarState;
@@ -449,7 +449,7 @@ class _AllDayAppointmentRenderWidget extends MultiChildRenderObjectWidget {
449449
final CalendarView view;
450450
final List<DateTime> visibleDates;
451451
final List<CalendarAppointment>? visibleAppointments;
452-
final ValueNotifier<SelectionDetails?> repaintNotifier;
452+
final ValueNotifier<AllDayPanelSelectionDetails?> repaintNotifier;
453453
final double timeLabelWidth;
454454
final double allDayPainterHeight;
455455
final bool isRTL;
@@ -766,11 +766,12 @@ class _AllDayAppointmentRenderObject extends CustomCalendarRenderObject {
766766
_allDayHoverPosition.addListener(markNeedsPaint);
767767
}
768768

769-
ValueNotifier<SelectionDetails?> _selectionNotifier;
769+
ValueNotifier<AllDayPanelSelectionDetails?> _selectionNotifier;
770770

771-
ValueNotifier<SelectionDetails?> get selectionNotifier => _selectionNotifier;
771+
ValueNotifier<AllDayPanelSelectionDetails?> get selectionNotifier =>
772+
_selectionNotifier;
772773

773-
set selectionNotifier(ValueNotifier<SelectionDetails?> value) {
774+
set selectionNotifier(ValueNotifier<AllDayPanelSelectionDetails?> value) {
774775
if (_selectionNotifier == value) {
775776
return;
776777
}
@@ -1436,7 +1437,7 @@ class _AllDayAppointmentRenderObject extends CustomCalendarRenderObject {
14361437
/// Used to pass the argument of create box painter and it is called when
14371438
/// decoration have asynchronous data like image.
14381439
void _updateSelectionDecorationPainter() {
1439-
selectionNotifier.value = SelectionDetails(
1440+
selectionNotifier.value = AllDayPanelSelectionDetails(
14401441
selectionNotifier.value!.appointmentView,
14411442
selectionNotifier.value!.selectedDate);
14421443
}

packages/syncfusion_flutter_calendar/lib/src/calendar/common/calendar_view_helper.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,9 +1331,9 @@ class ScheduleViewHoveringDetails {
13311331
/// if all day panel appointment selected then [appointmentView] holds
13321332
/// appointment details, else [selectedDate] holds selected region date value.
13331333
@immutable
1334-
class SelectionDetails {
1334+
class AllDayPanelSelectionDetails {
13351335
/// Constructor to create the selection details.
1336-
const SelectionDetails(this.appointmentView, this.selectedDate);
1336+
const AllDayPanelSelectionDetails(this.appointmentView, this.selectedDate);
13371337

13381338
/// Holds the selected appointment view details.
13391339
final AppointmentView? appointmentView;

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5634,8 +5634,8 @@ class _CalendarViewState extends State<_CalendarView>
56345634
late double _timeIntervalHeight;
56355635
final UpdateCalendarStateDetails _updateCalendarStateDetails =
56365636
UpdateCalendarStateDetails();
5637-
ValueNotifier<SelectionDetails?> _allDaySelectionNotifier =
5638-
ValueNotifier<SelectionDetails?>(null);
5637+
ValueNotifier<AllDayPanelSelectionDetails?> _allDaySelectionNotifier =
5638+
ValueNotifier<AllDayPanelSelectionDetails?>(null);
56395639
late ValueNotifier<Offset?> _viewHeaderNotifier;
56405640
final ValueNotifier<Offset?> _calendarCellNotifier =
56415641
ValueNotifier<Offset?>(null),
@@ -5803,7 +5803,8 @@ class _CalendarViewState extends State<_CalendarView>
58035803
/// select the same month cell and move to day view then the view show
58045804
/// calendar cell selection and all day panel selection.
58055805
if (oldWidget.view != widget.view) {
5806-
_allDaySelectionNotifier = ValueNotifier<SelectionDetails?>(null);
5806+
_allDaySelectionNotifier =
5807+
ValueNotifier<AllDayPanelSelectionDetails?>(null);
58075808
final DateTime today = DateTime.now();
58085809
_currentTimeNotifier = ValueNotifier<int>(
58095810
(today.day * 24 * 60) + (today.hour * 60) + today.minute);
@@ -9401,7 +9402,7 @@ class _CalendarViewState extends State<_CalendarView>
94019402
return;
94029403
}
94039404

9404-
_allDaySelectionNotifier.value = SelectionDetails(view, date);
9405+
_allDaySelectionNotifier.value = AllDayPanelSelectionDetails(view, date);
94059406
}
94069407

94079408
//// Handles the onTap callback for day view cells, all day panel, and view

packages/syncfusion_flutter_charts/lib/src/charts/axis/axis.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,7 +1346,10 @@ abstract class RenderChartAxis extends RenderBox with ChartAreaUpdateMixin {
13461346
set isVertical(bool value) {
13471347
_isVertical = value;
13481348
if (value) {
1349-
effectiveLabelIntersectAction = AxisLabelIntersectAction.hide;
1349+
effectiveLabelIntersectAction =
1350+
labelIntersectAction == AxisLabelIntersectAction.none
1351+
? AxisLabelIntersectAction.none
1352+
: AxisLabelIntersectAction.hide;
13501353
if (_renderer is! _VerticalAxisRenderer) {
13511354
_renderer = _VerticalAxisRenderer(this);
13521355
}
@@ -1510,7 +1513,10 @@ abstract class RenderChartAxis extends RenderBox with ChartAreaUpdateMixin {
15101513
if (_labelIntersectAction != value) {
15111514
_labelIntersectAction = value;
15121515
if (isVertical) {
1513-
effectiveLabelIntersectAction = AxisLabelIntersectAction.hide;
1516+
effectiveLabelIntersectAction =
1517+
labelIntersectAction == AxisLabelIntersectAction.none
1518+
? AxisLabelIntersectAction.none
1519+
: AxisLabelIntersectAction.hide;
15141520
} else {
15151521
effectiveLabelIntersectAction = labelIntersectAction;
15161522
}

packages/syncfusion_flutter_charts/lib/src/charts/behaviors/trackball.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import 'package:syncfusion_flutter_core/theme.dart';
1010

1111
import '../axis/axis.dart';
1212
import '../axis/category_axis.dart';
13-
import '../axis/datetime_category_axis.dart';
1413
import '../axis/logarithmic_axis.dart';
1514
import '../base.dart';
1615
import '../common/callbacks.dart';
@@ -880,8 +879,8 @@ class TrackballBehavior extends ChartBehavior {
880879
num yValue = yAxis.pixelToPoint(bounds, position.dx, position.dy);
881880

882881
if (series.canFindLinearVisibleIndexes &&
883-
((xAxis is RenderCategoryAxis && xAxis.arrangeByIndex) ||
884-
xAxis is RenderDateTimeCategoryAxis)) {
882+
xAxis is RenderCategoryAxis &&
883+
xAxis.arrangeByIndex) {
885884
final DoubleRange range = xAxis.visibleRange!;
886885
final int index = xValue.round();
887886
if (index <= range.maximum &&

packages/syncfusion_flutter_chat/lib/src/assist_view/conversion_area.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,7 @@ class _AssistMessageBubbleState extends MessageBubbleState<AssistMessage> {
538538
if (widget.message.author!.avatar != null) {
539539
result = CircleAvatar(
540540
backgroundImage: widget.message.author!.avatar,
541+
backgroundColor: widget.avatarBackgroundColor,
541542
);
542543
} else {
543544
if (widget.message.author!.name.isNotEmpty) {

packages/syncfusion_flutter_chat/lib/src/assist_view/settings.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ class AssistMessageAuthor extends MessageAuthor {
393393
/// Creates a new [AssistMessageAuthor] with the specified [id], [name], and
394394
/// optional [avatar].
395395
const AssistMessageAuthor({
396-
required this.id,
396+
this.id,
397397
required this.name,
398398
this.avatar,
399399
});
@@ -424,7 +424,7 @@ class AssistMessageAuthor extends MessageAuthor {
424424
/// }
425425
/// ```
426426
@override
427-
final String id;
427+
final String? id;
428428

429429
/// The name of the author who sent the message.
430430
///

packages/syncfusion_flutter_chat/lib/src/chat/conversion_area.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ class _ChatMessageBubbleState extends MessageBubbleState<ChatMessage> {
333333
if (widget.message.author.avatar != null) {
334334
result = CircleAvatar(
335335
backgroundImage: widget.message.author.avatar,
336+
backgroundColor: widget.avatarBackgroundColor,
336337
);
337338
} else {
338339
if (widget.message.author.name.isNotEmpty) {

packages/syncfusion_flutter_chat/lib/src/settings.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ abstract class MessageAuthor {
5858
const MessageAuthor();
5959

6060
/// Unique identifier of the author.
61-
abstract final String id;
61+
abstract final String? id;
6262

6363
/// Name of the author.
6464
abstract final String name;

packages/syncfusion_localizations/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.18.1 <0.20.0'
12+
intl: '>=0.18.1 <0.21.0'
1313
syncfusion_flutter_core:
1414
path: ../syncfusion_flutter_core
1515

0 commit comments

Comments
 (0)