Skip to content

Commit 5468113

Browse files
authored
chore: address Dart 3.6.0 analysis warnings (singerdmx#2417)
* chore(flutter_quill_extensions): address warnings of unreachable_switch_default instead of ignoring them * chore: address warnings of unreachable_switch_default instead of ignoring them
1 parent 2a83b6b commit 5468113

File tree

7 files changed

+14
-37
lines changed

7 files changed

+14
-37
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
1111
## [Unreleased]
1212

13+
### Changed
14+
15+
- Address warnings of `unreachable_switch_default` (introduced in Dart 3.6).
16+
1317
## [11.0.0-dev.15] - 2024-12-13
1418

1519
### Added

analysis_options.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
include: package:flutter_lints/flutter.yaml
22

3-
analyzer:
4-
# TODO: Included for backward compatibility, remove when the minimum Dart SDK is 3.6.0
5-
errors:
6-
unreachable_switch_default: ignore
73
linter:
84
rules:
95
always_declare_return_types: true

flutter_quill_extensions/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
1111
## [Unreleased]
1212

13+
### Changed
14+
15+
- Address warnings of `unreachable_switch_default` (introduced in Dart 3.6).
16+
- Use `Slider.adaptive` for the image resize slider on Apple platforms for consistency with `CupertinoActionSheet`.
17+
1318
## [11.0.0-dev.6] - 2024-12-13
1419

1520
### Changed

flutter_quill_extensions/analysis_options.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
include: package:flutter_lints/flutter.yaml
22

3-
analyzer:
4-
# TODO: Included for backward compatibility, remove when the minimum Dart SDK is 3.6.0
5-
errors:
6-
unreachable_switch_default: ignore
73
linter:
84
rules:
95
always_declare_return_types: true

flutter_quill_extensions/lib/src/editor/image/widgets/image_resizer.dart

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import 'package:flutter/cupertino.dart'
22
show CupertinoActionSheet, CupertinoActionSheetAction;
3-
import 'package:flutter/foundation.dart' show defaultTargetPlatform;
4-
import 'package:flutter/material.dart' show Slider, Card;
3+
import 'package:flutter/material.dart';
54
import 'package:flutter/scheduler.dart' show SchedulerBinding;
6-
import 'package:flutter/widgets.dart';
75
import 'package:flutter_quill/internal.dart';
86

97
class ImageResizer extends StatefulWidget {
@@ -39,21 +37,10 @@ class ImageResizerState extends State<ImageResizer> {
3937

4038
@override
4139
Widget build(BuildContext context) {
42-
switch (defaultTargetPlatform) {
43-
case TargetPlatform.iOS:
44-
return _showCupertinoMenu();
45-
case TargetPlatform.android:
46-
return _showMaterialMenu();
47-
case TargetPlatform.macOS:
48-
case TargetPlatform.windows:
49-
case TargetPlatform.linux:
50-
case TargetPlatform.fuchsia:
51-
return _showMaterialMenu();
52-
default:
53-
throw UnsupportedError(
54-
'Not supposed to be invoked for $defaultTargetPlatform',
55-
);
40+
if (Theme.of(context).isCupertino) {
41+
return _showCupertinoMenu();
5642
}
43+
return _showMaterialMenu();
5744
}
5845

5946
Widget _showMaterialMenu() {
@@ -88,7 +75,7 @@ class ImageResizerState extends State<ImageResizer> {
8875
return Padding(
8976
padding: const EdgeInsets.symmetric(horizontal: 8),
9077
child: Card(
91-
child: Slider(
78+
child: Slider.adaptive(
9279
value: isWidth ? _width : _height,
9380
max: isWidth ? widget.maxWidth : widget.maxHeight,
9481
divisions: 1000,

lib/src/editor/raw_editor/raw_editor_state.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,11 +323,6 @@ class QuillRawEditorState extends EditorState
323323
case TargetPlatform.windows:
324324
widget.config.focusNode.unfocus();
325325
break;
326-
default:
327-
throw UnsupportedError(
328-
'The platform ${defaultTargetPlatform.name} is not supported in the'
329-
' _defaultOnTapOutside()',
330-
);
331326
}
332327
}
333328

lib/src/editor/widgets/text/text_selection.dart

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,6 @@ class EditorTextSelectionOverlay {
317317
? newSelection.extent
318318
: const TextPosition(offset: 0);
319319
break;
320-
default:
321-
throw ArgumentError('Invalid position');
322320
}
323321

324322
final currSelection = newSelection != null
@@ -456,8 +454,6 @@ class _TextSelectionHandleOverlay extends StatefulWidget {
456454
return renderObject.selectionStartInViewport;
457455
case _TextSelectionHandlePosition.end:
458456
return renderObject.selectionEndInViewport;
459-
default:
460-
throw ArgumentError('Invalid position');
461457
}
462458
}
463459
}
@@ -547,8 +543,6 @@ class _TextSelectionHandleOverlayState
547543
isNormalized ? position.offset : widget.selection.extentOffset,
548544
);
549545
break;
550-
default:
551-
throw ArgumentError('Invalid widget.position');
552546
}
553547

554548
if (newSelection.baseOffset >= newSelection.extentOffset) {

0 commit comments

Comments
 (0)