From cef91bc73004e3bdfbd131489fd2d53027777cec Mon Sep 17 00:00:00 2001 From: LongCatIsLooong <31859944+LongCatIsLooong@users.noreply.github.com> Date: Wed, 14 Jun 2023 15:33:07 -0700 Subject: [PATCH] Ignore `textScaleFactor` deprecation (#4209) Ignore `textScaleFactor` deprecation, as suggested in https://github.com/flutter/flutter/issues/128825 --- .../flutter_markdown/lib/src/_functions_io.dart | 3 ++- .../flutter_markdown/lib/src/_functions_web.dart | 3 ++- packages/flutter_markdown/lib/src/builder.dart | 6 ++++-- .../test/text_scale_factor_test.dart | 13 ++++++++----- packages/rfw/lib/src/flutter/core_widgets.dart | 2 +- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/packages/flutter_markdown/lib/src/_functions_io.dart b/packages/flutter_markdown/lib/src/_functions_io.dart index 7c35ba4853..b3fa99ea63 100644 --- a/packages/flutter_markdown/lib/src/_functions_io.dart +++ b/packages/flutter_markdown/lib/src/_functions_io.dart @@ -66,7 +66,8 @@ final MarkdownStyleSheet Function(BuildContext, MarkdownStyleSheetBaseTheme?) } return result.copyWith( - textScaleFactor: MediaQuery.textScaleFactorOf(context), + textScaleFactor: + MediaQuery.textScaleFactorOf(context), // ignore: deprecated_member_use ); }; diff --git a/packages/flutter_markdown/lib/src/_functions_web.dart b/packages/flutter_markdown/lib/src/_functions_web.dart index a58a9cea37..828388613a 100644 --- a/packages/flutter_markdown/lib/src/_functions_web.dart +++ b/packages/flutter_markdown/lib/src/_functions_web.dart @@ -68,7 +68,8 @@ final MarkdownStyleSheet Function(BuildContext, MarkdownStyleSheetBaseTheme?) } return result.copyWith( - textScaleFactor: MediaQuery.textScaleFactorOf(context), + textScaleFactor: + MediaQuery.textScaleFactorOf(context), // ignore: deprecated_member_use ); }; diff --git a/packages/flutter_markdown/lib/src/builder.dart b/packages/flutter_markdown/lib/src/builder.dart index 475c510be9..b688427e8c 100644 --- a/packages/flutter_markdown/lib/src/builder.dart +++ b/packages/flutter_markdown/lib/src/builder.dart @@ -829,7 +829,8 @@ class MarkdownBuilder implements md.NodeVisitor { if (selectable) { return SelectableText.rich( text!, - textScaleFactor: styleSheet.textScaleFactor, + textScaleFactor: + styleSheet.textScaleFactor, // ignore: deprecated_member_use textAlign: textAlign ?? TextAlign.start, onTap: onTapText, key: k, @@ -837,7 +838,8 @@ class MarkdownBuilder implements md.NodeVisitor { } else { return RichText( text: text!, - textScaleFactor: styleSheet.textScaleFactor!, + textScaleFactor: + styleSheet.textScaleFactor!, // ignore: deprecated_member_use textAlign: textAlign ?? TextAlign.start, key: k, ); diff --git a/packages/flutter_markdown/test/text_scale_factor_test.dart b/packages/flutter_markdown/test/text_scale_factor_test.dart index 3710b3e0a6..41b5ec7c9b 100644 --- a/packages/flutter_markdown/test/text_scale_factor_test.dart +++ b/packages/flutter_markdown/test/text_scale_factor_test.dart @@ -25,7 +25,7 @@ void defineTests() { ); final RichText richText = tester.widget(find.byType(RichText)); - expect(richText.textScaleFactor, 2.0); + expect(richText.textScaleFactor, 2.0); // ignore: deprecated_member_use }, ); @@ -36,7 +36,8 @@ void defineTests() { await tester.pumpWidget( boilerplate( const MediaQuery( - data: MediaQueryData(textScaleFactor: 2.0), + data: MediaQueryData( + textScaleFactor: 2.0), // ignore: deprecated_member_use child: MarkdownBody( data: data, ), @@ -45,7 +46,7 @@ void defineTests() { ); final RichText richText = tester.widget(find.byType(RichText)); - expect(richText.textScaleFactor, 2.0); + expect(richText.textScaleFactor, 2.0); // ignore: deprecated_member_use }, ); @@ -56,7 +57,8 @@ void defineTests() { await tester.pumpWidget( boilerplate( const MediaQuery( - data: MediaQueryData(textScaleFactor: 2.0), + data: MediaQueryData( + textScaleFactor: 2.0), // ignore: deprecated_member_use child: MarkdownBody( data: data, selectable: true, @@ -67,7 +69,8 @@ void defineTests() { final SelectableText selectableText = tester.widget(find.byType(SelectableText)); - expect(selectableText.textScaleFactor, 2.0); + expect(selectableText.textScaleFactor, + 2.0); // ignore: deprecated_member_use }, ); }); diff --git a/packages/rfw/lib/src/flutter/core_widgets.dart b/packages/rfw/lib/src/flutter/core_widgets.dart index 0ff1b12269..99a9f7a04c 100644 --- a/packages/rfw/lib/src/flutter/core_widgets.dart +++ b/packages/rfw/lib/src/flutter/core_widgets.dart @@ -644,7 +644,7 @@ Map get _coreWidgetsDefinitions => (['softWrap']), overflow: ArgumentDecoders.enumValue(TextOverflow.values, source, ['overflow']), - textScaleFactor: source.v(['textScaleFactor']), + textScaleFactor: source.v(['textScaleFactor']), // ignore: deprecated_member_use maxLines: source.v(['maxLines']), semanticsLabel: source.v(['semanticsLabel']), textWidthBasis: ArgumentDecoders.enumValue(TextWidthBasis.values, source, ['textWidthBasis']),