From 11f84b547fad252bc584ad69190999c0a5ebbd2a Mon Sep 17 00:00:00 2001 From: Ricardo Dalarme Date: Wed, 9 Sep 2026 10:59:28 -0300 Subject: [PATCH] feat(rfw): migrate to material_ui --- packages/rfw/CHANGELOG.md | 3 ++- packages/rfw/lib/src/flutter/argument_decoders.dart | 2 +- packages/rfw/lib/src/flutter/core_widgets.dart | 2 +- packages/rfw/lib/src/flutter/material_widgets.dart | 2 +- packages/rfw/pubspec.yaml | 5 +++-- packages/rfw/test/argument_decoders_test.dart | 2 +- packages/rfw/test/core_widgets_test.dart | 2 +- packages/rfw/test/material_widgets_test.dart | 2 +- packages/rfw/test/readme_test.dart | 2 +- 9 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/rfw/CHANGELOG.md b/packages/rfw/CHANGELOG.md index 1ae2e03f24d6..09f24d147c4f 100644 --- a/packages/rfw/CHANGELOG.md +++ b/packages/rfw/CHANGELOG.md @@ -1,6 +1,7 @@ ## NEXT -* Updates minimum supported SDK version to Flutter 3.38/Dart 3.10. +* Migrates to material_ui. +* Updates minimum supported SDK version to Flutter 3.44/Dart 3.12. ## 1.1.3 diff --git a/packages/rfw/lib/src/flutter/argument_decoders.dart b/packages/rfw/lib/src/flutter/argument_decoders.dart index 8da61794e49c..c69dcc345978 100644 --- a/packages/rfw/lib/src/flutter/argument_decoders.dart +++ b/packages/rfw/lib/src/flutter/argument_decoders.dart @@ -12,7 +12,7 @@ import 'dart:math' as math show pi; // ignore: unnecessary_import, see https://github.com/flutter/flutter/pull/138881 import 'dart:ui' show FontFeature; // TODO(ianh): https://github.com/flutter/flutter/issues/87235 -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'runtime.dart'; diff --git a/packages/rfw/lib/src/flutter/core_widgets.dart b/packages/rfw/lib/src/flutter/core_widgets.dart index b8f479f9646d..eebf7e28ef4d 100644 --- a/packages/rfw/lib/src/flutter/core_widgets.dart +++ b/packages/rfw/lib/src/flutter/core_widgets.dart @@ -12,8 +12,8 @@ import 'dart:ui' show FontFeature; import 'package:flutter/gestures.dart' show DragStartBehavior; -import 'package:flutter/material.dart' show Icons; import 'package:flutter/widgets.dart'; +import 'package:material_ui/material_ui.dart' show Icons; import 'argument_decoders.dart'; import 'runtime.dart'; diff --git a/packages/rfw/lib/src/flutter/material_widgets.dart b/packages/rfw/lib/src/flutter/material_widgets.dart index 25689bbbae58..1aed36a3cd14 100644 --- a/packages/rfw/lib/src/flutter/material_widgets.dart +++ b/packages/rfw/lib/src/flutter/material_widgets.dart @@ -9,7 +9,7 @@ // This file is hand-formatted. import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'argument_decoders.dart'; import 'runtime.dart'; diff --git a/packages/rfw/pubspec.yaml b/packages/rfw/pubspec.yaml index 5a37fa530f6a..b264000b8a8e 100644 --- a/packages/rfw/pubspec.yaml +++ b/packages/rfw/pubspec.yaml @@ -5,12 +5,13 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+ version: 1.1.3 environment: - sdk: ^3.10.0 - flutter: ">=3.38.0" + sdk: ^3.12.0 + flutter: ">=3.44.0" dependencies: flutter: sdk: flutter + material_ui: ^1.0.0 meta: ^1.7.0 dev_dependencies: diff --git a/packages/rfw/test/argument_decoders_test.dart b/packages/rfw/test/argument_decoders_test.dart index a23aadbec8bb..3287b628bd63 100644 --- a/packages/rfw/test/argument_decoders_test.dart +++ b/packages/rfw/test/argument_decoders_test.dart @@ -8,8 +8,8 @@ import 'dart:ui' as ui; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:rfw/formats.dart' show parseLibraryFile; import 'package:rfw/rfw.dart'; diff --git a/packages/rfw/test/core_widgets_test.dart b/packages/rfw/test/core_widgets_test.dart index 421e983e7e5e..5be19e13e768 100644 --- a/packages/rfw/test/core_widgets_test.dart +++ b/packages/rfw/test/core_widgets_test.dart @@ -6,9 +6,9 @@ import 'dart:typed_data'; -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:rfw/formats.dart' show parseLibraryFile; import 'package:rfw/rfw.dart'; diff --git a/packages/rfw/test/material_widgets_test.dart b/packages/rfw/test/material_widgets_test.dart index af47185a8a45..d4d6e08b94f9 100644 --- a/packages/rfw/test/material_widgets_test.dart +++ b/packages/rfw/test/material_widgets_test.dart @@ -6,8 +6,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:rfw/formats.dart' show parseLibraryFile; import 'package:rfw/rfw.dart'; diff --git a/packages/rfw/test/readme_test.dart b/packages/rfw/test/readme_test.dart index 46dd327c1f58..7fd06834ca3a 100644 --- a/packages/rfw/test/readme_test.dart +++ b/packages/rfw/test/readme_test.dart @@ -6,8 +6,8 @@ // This file contains and briefly tests the snippets used in the README.md file. -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:rfw/formats.dart'; import 'package:rfw/rfw.dart';