* Migrate to Flutter 3.16.0

Author: zmtzawqlp

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 12.0.0
+
+* Migrate to Flutter 3.16.0
+
+
 ## 11.1.0
 
 * Migrate to Flutter 3.13.0

analysis_options.yaml

@@ -29,7 +29,7 @@ analyzer:
  # Ignore analyzer hints for updating pubspecs when using Future or
  # Stream and not importing dart:async
  # Please see https://github.com/flutter/flutter/pull/24528 for details.
- sdk_version_async_exported_from_core: ignore
+ # sdk_version_async_exported_from_core: ignore
  # exclude:
  # - "bin/cache/**"
  # # the following two are relative to the stocks example and the flutter package respectively

example/analysis_options.yaml

@@ -29,7 +29,7 @@ analyzer:
  # Ignore analyzer hints for updating pubspecs when using Future or
  # Stream and not importing dart:async
  # Please see https://github.com/flutter/flutter/pull/24528 for details.
- sdk_version_async_exported_from_core: ignore
+ # sdk_version_async_exported_from_core: ignore
  # exclude:
  # - "bin/cache/**"
  # # the following two are relative to the stocks example and the flutter package respectively

example/lib/main.dart

@@ -25,7 +25,7 @@ class MyApp extends StatelessWidget {
  if (!kIsWeb) {
  final MediaQueryData data = MediaQuery.of(c);
  return MediaQuery(
- data: data.copyWith(textScaleFactor: 1.0),
+ data: data.copyWith(textScaler: TextScaler.noScaling),
  child: w!,
  );
  }

example/lib/text/selection_area.dart

@@ -65,8 +65,8 @@ class CommonSelectionArea extends StatelessWidget {
  Clipboard.getData('text/plain').then((ClipboardData? value) {
  if (value != null) {
  // remove zeroWidthSpace
- final String? plainText =
- value.text?.replaceAll(ExtendedTextLibraryUtils.zeroWidthSpace, '');
+ final String? plainText = value.text?.replaceAll(
+ ExtendedTextLibraryUtils.zeroWidthSpace, '');
  if (plainText != null) {
  Clipboard.setData(ClipboardData(text: plainText));
  }

example/pubspec.yaml

@@ -11,7 +11,7 @@ version: 1.0.0+1
 
 environment:
  sdk: '>=3.0.0 <4.0.0'
- flutter: ">=3.13.0"
+ flutter: ">=3.16.0"
 dependencies:
  cupertino_icons: ^1.0.2
  ff_annotation_route_library: ^3.0.0

lib/extended_text.dart

@@ -5,4 +5,3 @@ export 'package:extended_text_library/extended_text_library.dart';
 export 'src/extended/widgets/rich_text.dart';
 export 'src/extended/widgets/text.dart';
 export 'src/extended/widgets/text_overflow_widget.dart';
- 

lib/src/extended/rendering/paragraph.dart

@@ -32,7 +32,7 @@ class ExtendedRenderParagraph extends _RenderParagraph
  required super.textDirection,
  super.softWrap = true,
  super.overflow = TextOverflow.clip,
- super.textScaleFactor = 1.0,
+ super.textScaler = TextScaler.noScaling,
  super.maxLines,
  super.locale,
  super.strutStyle,
@@ -125,7 +125,7 @@ class ExtendedRenderParagraph extends _RenderParagraph
  final TextPainter fadeSizePainter = TextPainter(
  text: TextSpan(style: _textPainter.text!.style, text: '\u2026'),
  textDirection: textDirection,
- textScaleFactor: textScaleFactor,
+ textScaler: textScaler,
  locale: locale,
  )..layout();
  if (didOverflowWidth) {

lib/src/extended/text_overflow_mixin.dart

@@ -619,7 +619,7 @@ mixin TextOverflowMixin on _RenderParagraph {
  text: inlineSpan ?? text,
  textAlign: _textPainter.textAlign,
  textDirection: _textPainter.textDirection,
- textScaleFactor: _textPainter.textScaleFactor,
+ textScaler: _textPainter.textScaler,
  maxLines: maxLines,
  ellipsis: null,
  locale: _textPainter.locale,

lib/src/extended/widgets/rich_text.dart

@@ -14,7 +14,7 @@ class ExtendedRichText extends _RichText {
  super.textDirection,
  super.softWrap = true,
  super.overflow = TextOverflow.clip,
- super.textScaleFactor = 1.0,
+ super.textScaler = TextScaler.noScaling,
  super.maxLines,
  super.locale,
  super.strutStyle,
@@ -25,7 +25,7 @@ class ExtendedRichText extends _RichText {
  this.overflowWidget,
  this.canSelectPlaceholderSpan = true,
  }) : super(
- children: _extractChildren(text, overflowWidget, textScaleFactor),
+ children: _extractChildren(text, overflowWidget, textScaler),
  );
 
  final TextOverflowWidget? overflowWidget;
@@ -42,7 +42,7 @@ class ExtendedRichText extends _RichText {
  textDirection: textDirection ?? Directionality.of(context),
  softWrap: softWrap,
  overflow: overflow,
- textScaleFactor: textScaleFactor,
+ textScaler: textScaler,
  maxLines: maxLines,
  strutStyle: strutStyle,
  textWidthBasis: textWidthBasis,
@@ -65,7 +65,7 @@ class ExtendedRichText extends _RichText {
  ..textDirection = textDirection ?? Directionality.of(context)
  ..softWrap = softWrap
  ..overflow = overflow
- ..textScaleFactor = textScaleFactor
+ ..textScaler = textScaler
  ..maxLines = maxLines
  ..strutStyle = strutStyle
  ..textWidthBasis = textWidthBasis
@@ -77,21 +77,21 @@ class ExtendedRichText extends _RichText {
  ..canSelectPlaceholderSpan = canSelectPlaceholderSpan;
  }
 
- // Traverses the InlineSpan tree and depth-first collects the list of
- // child widgets that are created in WidgetSpans.
+ /// Traverses the InlineSpan tree and depth-first collects the list of
+ /// child widgets that are created in WidgetSpans.
+ // TODO(zmtzawqlp): _extractChildren has replace with WidgetSpan.extractFromInlineSpan
  static List<Widget> _extractChildren(
  InlineSpan span,
  TextOverflowWidget? overflowWidget,
- double textScaleFactor,
+ TextScaler textScaler,
  ) {
- int index = 0;
  final List<Widget> result = <Widget>[
- ...WidgetSpan.extractFromInlineSpan(span, textScaleFactor)
+ ...WidgetSpan.extractFromInlineSpan(span, textScaler)
  ];
 
  if (overflowWidget != null) {
  result.add(Semantics(
- tagForChildren: PlaceholderSpanIndexSemanticsTag(index++),
+ tagForChildren: PlaceholderSpanIndexSemanticsTag(result.length),
  child: overflowWidget,
  ));
  }