Adapt to Flutter 3.16 API changes (#176)

* Adapt to Flutter API changes * Fix tests * Disable lookup, search and share * Format * Suppress linter for textScaleFactor usages * Upgrade action flutter version * Remove use of deprecated member textScaleFactor --------- Co-authored-by: Amir Panahandeh <[email protected]>
fleather-editor · Dec 1, 2023 · 5bac76d · 5bac76d
1 parent cd88559
commit 5bac76d
Show file tree

Hide file tree

Showing 12 changed files with 282 additions and 27 deletions.
diff --git a/.github/workflows/fleather.yml b/.github/workflows/fleather.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.13.0"
+          flutter-version: "3.16.0"
           cache: true
           # Manually Update this `key`
           cache-key: "20230512"

diff --git a/packages/fleather/example/ios/Podfile.lock b/packages/fleather/example/ios/Podfile.lock
@@ -15,8 +15,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  url_launcher_ios: fb12c43172927bb5cf75aeebd073f883801f1993
+  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.14.2
diff --git a/packages/fleather/example/ios/Runner.xcodeproj/project.pbxproj b/packages/fleather/example/ios/Runner.xcodeproj/project.pbxproj
@@ -164,7 +164,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -213,6 +213,7 @@
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (

diff --git a/packages/fleather/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/fleather/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/packages/fleather/lib/src/rendering/paragraph_proxy.dart b/packages/fleather/lib/src/rendering/paragraph_proxy.dart
@@ -10,7 +10,7 @@ class RenderParagraphProxy extends RenderProxyBox
     implements RenderContentProxyBox {
   RenderParagraphProxy({
     required TextStyle textStyle,
-    required double textScaleFactor,
+    required TextScaler textScaler,
     required TextWidthBasis textWidthBasis,
     RenderParagraph? child,
     TextDirection? textDirection,
@@ -21,7 +21,7 @@ class RenderParagraphProxy extends RenderProxyBox
             text: TextSpan(text: ' ', style: textStyle),
             textAlign: TextAlign.left,
             textDirection: textDirection,
-            textScaleFactor: textScaleFactor,
+            textScaler: textScaler,
             strutStyle: strutStyle,
             locale: locale,
             textWidthBasis: textWidthBasis,
@@ -48,9 +48,9 @@ class RenderParagraphProxy extends RenderProxyBox
     markNeedsLayout();
   }
 
-  set textScaleFactor(double value) {
-    if (_prototypePainter.textScaleFactor == value) return;
-    _prototypePainter.textScaleFactor = value;
+  set textScaler(TextScaler value) {
+    if (_prototypePainter.textScaler == value) return;
+    _prototypePainter.textScaler = value;
     markNeedsLayout();
   }
 

diff --git a/packages/fleather/lib/src/widgets/editor.dart b/packages/fleather/lib/src/widgets/editor.dart
@@ -747,6 +747,15 @@ class RawEditor extends StatefulWidget {
 ///
 abstract class EditorState extends State<RawEditor>
     implements TextSelectionDelegate {
+  @override
+  bool lookUpEnabled = false;
+
+  @override
+  bool shareEnabled = false;
+
+  @override
+  bool searchWebEnabled = false;
+
   ClipboardStatusNotifier? get clipboardStatus;
 
   ScrollController get scrollController;
@@ -1637,6 +1646,9 @@ class RawEditorState extends EditorState
         onSelectAll: selectAllEnabled
             ? () => selectAll(SelectionChangedCause.toolbar)
             : null,
+        onLookUp: null,
+        onSearchWeb: null,
+        onShare: null,
         onLiveTextInput: null);
   }
 

diff --git a/packages/fleather/lib/src/widgets/rich_text_proxy.dart b/packages/fleather/lib/src/widgets/rich_text_proxy.dart
@@ -11,14 +11,14 @@ class RichTextProxy extends SingleChildRenderObjectWidget {
     required this.locale,
     required this.strutStyle,
     required this.textAlign,
-    this.textScaleFactor = 1.0,
+    this.textScaler = TextScaler.noScaling,
     this.textWidthBasis = TextWidthBasis.parent,
     this.textHeightBehavior,
   }) : super(key: key, child: child);
 
   final TextStyle textStyle;
   final TextAlign textAlign;
-  final double textScaleFactor;
+  final TextScaler textScaler;
   final Locale? locale;
   final StrutStyle strutStyle;
   final TextWidthBasis textWidthBasis;
@@ -29,7 +29,7 @@ class RichTextProxy extends SingleChildRenderObjectWidget {
     return RenderParagraphProxy(
       textStyle: textStyle,
       textDirection: Directionality.of(context),
-      textScaleFactor: textScaleFactor,
+      textScaler: textScaler,
       locale: locale,
       strutStyle: strutStyle,
       textWidthBasis: textWidthBasis,
@@ -43,7 +43,7 @@ class RichTextProxy extends SingleChildRenderObjectWidget {
     renderObject.textStyle = textStyle;
     renderObject.textDirection = Directionality.of(context);
     renderObject.textAlign = textAlign;
-    renderObject.textScaleFactor = textScaleFactor;
+    renderObject.textScaler = textScaler;
     renderObject.locale = locale;
     renderObject.strutStyle = strutStyle;
     renderObject.textWidthBasis = textWidthBasis;

diff --git a/packages/fleather/lib/src/widgets/single_child_scroll_view.dart b/packages/fleather/lib/src/widgets/single_child_scroll_view.dart
@@ -305,7 +305,8 @@ class _RenderSingleChildViewport extends RenderBox
 
   @override
   RevealedOffset getOffsetToReveal(RenderObject target, double alignment,
-      {Rect? rect}) {
+      {Rect? rect, Axis? axis}) {
+    // axis is ignored as we only support SingleDimensionViewport
     rect ??= target.paintBounds;
     if (target is! RenderBox) {
       return RevealedOffset(offset: offset.pixels, rect: rect);

diff --git a/packages/fleather/lib/src/widgets/text_line.dart b/packages/fleather/lib/src/widgets/text_line.dart
@@ -136,7 +136,7 @@ class _TextLineState extends State<TextLine> {
         text: text,
         textAlign: textAlign,
         strutStyle: strutStyle,
-        textScaleFactor: MediaQuery.textScaleFactorOf(context),
+        textScaler: MediaQuery.textScalerOf(context),
       ),
     );
   }

diff --git a/packages/fleather/test/rendering/editable_text_line_test.dart b/packages/fleather/test/rendering/editable_text_line_test.dart
@@ -42,7 +42,7 @@ void main() {
           inlineCodeTheme: InlineCodeThemeData(style: const TextStyle()));
       renderBox.body = RenderParagraphProxy(
           textStyle: const TextStyle(),
-          textScaleFactor: 1,
+          textScaler: TextScaler.noScaling,
           child: RenderParagraph(
             const TextSpan(
                 text: 'A text with that will be broken into multiple lines'),
@@ -82,7 +82,7 @@ void main() {
       renderBox.body = RenderParagraphProxy(
           child: renderParagraph,
           textStyle: const TextStyle(),
-          textScaleFactor: 1,
+          textScaler: TextScaler.noScaling,
           textDirection: TextDirection.ltr,
           textWidthBasis: TextWidthBasis.parent);
       layout(renderBox);
@@ -118,7 +118,7 @@ void main() {
       renderBox.body = RenderParagraphProxy(
           child: renderParagraph,
           textStyle: const TextStyle(),
-          textScaleFactor: 1,
+          textScaler: TextScaler.noScaling,
           textDirection: TextDirection.ltr,
           textWidthBasis: TextWidthBasis.parent);
       layout(renderBox);