Skip to content

Commit f1c1d94

Browse files
authored
fix nullability issues (flutter#67443)
1 parent 896c19a commit f1c1d94

File tree

6 files changed

+10
-12
lines changed

6 files changed

+10
-12
lines changed

packages/flutter/lib/src/foundation/diagnostics.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1660,9 +1660,7 @@ abstract class DiagnosticsNode {
16601660
result = toStringDeep(
16611661
parentConfiguration: parentConfiguration, minLevel: minLevel);
16621662
} else {
1663-
String? description = toDescription(parentConfiguration: parentConfiguration);
1664-
assert(description != null);
1665-
description = description!;
1663+
final String description = toDescription(parentConfiguration: parentConfiguration)!;
16661664

16671665
if (name == null || name!.isEmpty || !showName) {
16681666
result = description;

packages/flutter/lib/src/material/chip.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1171,7 +1171,7 @@ class FilterChip extends StatelessWidget
11711171
@override
11721172
final bool selected;
11731173
@override
1174-
final ValueChanged<bool> onSelected;
1174+
final ValueChanged<bool>? onSelected;
11751175
@override
11761176
final double? pressElevation;
11771177
@override

packages/flutter/lib/src/material/tabs.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,13 +459,13 @@ class _ChangeAnimation extends Animation<double> with AnimationWithParentMixin<d
459459

460460
@override
461461
void removeStatusListener(AnimationStatusListener listener) {
462-
if (parent != null)
462+
if (controller.animation != null)
463463
super.removeStatusListener(listener);
464464
}
465465

466466
@override
467467
void removeListener(VoidCallback listener) {
468-
if (parent != null)
468+
if (controller.animation != null)
469469
super.removeListener(listener);
470470
}
471471

packages/flutter/lib/src/material/text_field.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import 'theme.dart';
2626
export 'package:flutter/services.dart' show TextInputType, TextInputAction, TextCapitalization, SmartQuotesType, SmartDashesType;
2727

2828
/// Signature for the [TextField.buildCounter] callback.
29-
typedef InputCounterWidgetBuilder = Widget Function(
29+
typedef InputCounterWidgetBuilder = Widget? Function(
3030
/// The build context for the TextField.
3131
BuildContext context, {
3232
/// The length of the string currently in the input.
@@ -880,7 +880,7 @@ class _TextFieldState extends State<TextField> with RestorationMixin implements
880880
&& effectiveDecoration.counterText == null
881881
&& widget.buildCounter != null) {
882882
final bool isFocused = _effectiveFocusNode.hasFocus;
883-
final Widget builtCounter = widget.buildCounter!(
883+
final Widget? builtCounter = widget.buildCounter!(
884884
context,
885885
currentLength: currentLength,
886886
maxLength: widget.maxLength,

packages/flutter/lib/src/material/text_form_field.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ class _TextFormFieldState extends FormFieldState<String> {
345345
void reset() {
346346
super.reset();
347347
setState(() {
348-
_effectiveController!.text = widget.initialValue!;
348+
_effectiveController!.text = widget.initialValue;
349349
});
350350
}
351351

packages/flutter/lib/src/material/time_picker.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ class _Dial extends StatefulWidget {
910910
final _TimePickerMode mode;
911911
final bool use24HourDials;
912912
final ValueChanged<TimeOfDay>? onChanged;
913-
final VoidCallback onHourSelected;
913+
final VoidCallback? onHourSelected;
914914

915915
@override
916916
_DialState createState() => _DialState();
@@ -1058,7 +1058,7 @@ class _DialState extends State<_Dial> with SingleTickerProviderStateMixin {
10581058
_animateTo(_getThetaForTime(widget.selectedTime));
10591059
if (widget.mode == _TimePickerMode.hour) {
10601060
if (widget.onHourSelected != null) {
1061-
widget.onHourSelected();
1061+
widget.onHourSelected!();
10621062
}
10631063
}
10641064
}
@@ -1076,7 +1076,7 @@ class _DialState extends State<_Dial> with SingleTickerProviderStateMixin {
10761076
_announceToAccessibility(context, localizations.formatDecimal(newTime.hourOfPeriod));
10771077
}
10781078
if (widget.onHourSelected != null) {
1079-
widget.onHourSelected();
1079+
widget.onHourSelected!();
10801080
}
10811081
} else {
10821082
_announceToAccessibility(context, localizations.formatDecimal(newTime.minute));

0 commit comments

Comments
 (0)