From 0ec0601b09c6b2c687646e7c8e021d5814f7f004 Mon Sep 17 00:00:00 2001 From: koukibadr Date: Mon, 31 Aug 2026 19:50:10 +0300 Subject: [PATCH] config: upgrade flutter version with UI decoupling --- analysis_options.yaml | 9 +++ example/analysis_options.yaml | 9 +++ .../ephemeral/flutter_native_integration.env | 12 ++++ example/lib/main.dart | 2 +- example/pubspec.lock | 59 ++++++++++++++----- example/pubspec.yaml | 1 + lib/motion_toast.dart | 2 +- lib/widgets/heart_beat_icon.dart | 2 +- lib/widgets/motion_toast_background.dart | 2 +- lib/widgets/motion_toast_content.dart | 2 +- lib/widgets/motion_toast_icon.dart | 2 +- lib/widgets/motion_toast_side_bar.dart | 2 +- lib/widgets/seperator.dart | 2 +- pubspec.lock | 57 +++++++++++++----- pubspec.yaml | 1 + test/widget_test.dart | 2 +- 16 files changed, 128 insertions(+), 38 deletions(-) create mode 100644 example/ios/Flutter/ephemeral/flutter_native_integration.env diff --git a/analysis_options.yaml b/analysis_options.yaml index be4604d..c8e8a9e 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,3 +1,12 @@ +analyzer: + exclude: + - build/** + - android/** + - ios/** + - web/** + - windows/** + - macos/** + - linux/** include: package:flutter_lints/flutter.yaml linter: diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml index be4604d..c8e8a9e 100644 --- a/example/analysis_options.yaml +++ b/example/analysis_options.yaml @@ -1,3 +1,12 @@ +analyzer: + exclude: + - build/** + - android/** + - ios/** + - web/** + - windows/** + - macos/** + - linux/** include: package:flutter_lints/flutter.yaml linter: diff --git a/example/ios/Flutter/ephemeral/flutter_native_integration.env b/example/ios/Flutter/ephemeral/flutter_native_integration.env new file mode 100644 index 0000000..87d3088 --- /dev/null +++ b/example/ios/Flutter/ephemeral/flutter_native_integration.env @@ -0,0 +1,12 @@ +FLUTTER_ROOT=/Volumes/Data-BK/dev-env/flutter +FLUTTER_APPLICATION_PATH=/Volumes/Data-BK/Packages/Motion-Toast/example +FLUTTER_FRAMEWORK_SWIFT_PACKAGE_PATH=/Volumes/Data-BK/Packages/Motion-Toast/example/ios/Flutter/ephemeral/Packages/.packages/FlutterFramework +COCOAPODS_PARALLEL_CODE_SIGN=true +FLUTTER_TARGET=lib/main.dart +FLUTTER_BUILD_DIR=build +FLUTTER_BUILD_NAME=1.0.0 +FLUTTER_BUILD_NUMBER=1 +DART_OBFUSCATION=false +TRACK_WIDGET_CREATION=true +TREE_SHAKE_ICONS=false +PACKAGE_CONFIG=.dart_tool/package_config.json diff --git a/example/lib/main.dart b/example/lib/main.dart index 1456bc1..d67c784 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:motion_toast/motion_toast.dart'; void main() { diff --git a/example/pubspec.lock b/example/pubspec.lock index 9816a2a..243b8df 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: characters - sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.4.1" clock: dependency: transitive description: @@ -49,6 +49,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.5" + cupertino_ui: + dependency: transitive + description: + name: cupertino_ui + sha256: "2137c0d41f3b62cc4d3d2495e6c354bd6b6133cd21c6bb155736cc31dbd49a11" + url: "https://pub.dev" + source: hosted + version: "1.0.1" fake_async: dependency: transitive description: @@ -83,6 +91,11 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.1" + flutter_localizations: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" flutter_test: dependency: "direct dev" description: flutter @@ -98,6 +111,14 @@ packages: description: flutter source: sdk version: "0.0.0" + intl: + dependency: transitive + description: + name: intl + sha256: "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867" + url: "https://pub.dev" + source: hosted + version: "0.20.3" leak_tracker: dependency: transitive description: @@ -134,33 +155,41 @@ packages: dependency: transitive description: name: matcher - sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + sha256: "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd" url: "https://pub.dev" source: hosted - version: "0.12.17" + version: "0.12.20" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" + url: "https://pub.dev" + source: hosted + version: "0.13.0" + material_ui: + dependency: "direct main" + description: + name: material_ui + sha256: "7ba1ca315d50a004791dbab290417c52a61466d56db2822fe3c5c2994903110c" url: "https://pub.dev" source: hosted - version: "0.11.1" + version: "1.1.0" meta: dependency: transitive description: name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" + sha256: "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.19.0" motion_toast: dependency: "direct main" description: path: ".." relative: true source: path - version: "2.14.0" + version: "2.15.0" path: dependency: transitive description: @@ -242,18 +271,18 @@ packages: dependency: transitive description: name: test_api - sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 + sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11" url: "https://pub.dev" source: hosted - version: "0.7.7" + version: "0.7.12" vector_math: dependency: transitive description: name: vector_math - sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b + sha256: f36f9f3be64c6198714492bb455c11056e33e2f85d9a0b676a48301e44fdcf47 url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.4.2" vm_service: dependency: transitive description: @@ -271,5 +300,5 @@ packages: source: hosted version: "3.0.4" sdks: - dart: ">=3.8.0-0 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + dart: ">=3.12.0 <4.0.0" + flutter: ">=3.44.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 7861883..0765d0b 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -10,6 +10,7 @@ dependencies: motion_toast: path: ../ cupertino_icons: ^1.0.2 + material_ui: any dev_dependencies: flutter_test: sdk: flutter diff --git a/lib/motion_toast.dart b/lib/motion_toast.dart index 2e78cad..97f3142 100644 --- a/lib/motion_toast.dart +++ b/lib/motion_toast.dart @@ -2,7 +2,7 @@ library motion_toast; export 'resources/arrays.dart'; import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:motion_toast/resources/arrays.dart'; import 'package:motion_toast/resources/colors.dart'; import 'package:motion_toast/widgets/motion_toast_background.dart'; diff --git a/lib/widgets/heart_beat_icon.dart b/lib/widgets/heart_beat_icon.dart index e809d50..89746b2 100644 --- a/lib/widgets/heart_beat_icon.dart +++ b/lib/widgets/heart_beat_icon.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Render a heartbeat animated icon class HeartBeatIcon extends StatefulWidget { diff --git a/lib/widgets/motion_toast_background.dart b/lib/widgets/motion_toast_background.dart index c3acf4d..c0a6507 100644 --- a/lib/widgets/motion_toast_background.dart +++ b/lib/widgets/motion_toast_background.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class MotionToastBackground extends StatelessWidget { final double borderRadius; diff --git a/lib/widgets/motion_toast_content.dart b/lib/widgets/motion_toast_content.dart index 8b0206e..756f947 100644 --- a/lib/widgets/motion_toast_content.dart +++ b/lib/widgets/motion_toast_content.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:motion_toast/widgets/seperator.dart'; import 'motion_toast_icon.dart'; diff --git a/lib/widgets/motion_toast_icon.dart b/lib/widgets/motion_toast_icon.dart index c97c8a8..91e75f1 100644 --- a/lib/widgets/motion_toast_icon.dart +++ b/lib/widgets/motion_toast_icon.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'heart_beat_icon.dart'; diff --git a/lib/widgets/motion_toast_side_bar.dart b/lib/widgets/motion_toast_side_bar.dart index eef8b0a..b7d4113 100644 --- a/lib/widgets/motion_toast_side_bar.dart +++ b/lib/widgets/motion_toast_side_bar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class MotionToastSideBar extends StatelessWidget { /// The color of the background. diff --git a/lib/widgets/seperator.dart b/lib/widgets/seperator.dart index 86bdc3e..14c59f7 100644 --- a/lib/widgets/seperator.dart +++ b/lib/widgets/seperator.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class Seperator extends StatelessWidget { // The distance between the contents of the toast. diff --git a/pubspec.lock b/pubspec.lock index 7fa0417..1a2dd8a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: characters - sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.4.1" clock: dependency: transitive description: @@ -41,6 +41,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.19.1" + cupertino_ui: + dependency: transitive + description: + name: cupertino_ui + sha256: "2137c0d41f3b62cc4d3d2495e6c354bd6b6133cd21c6bb155736cc31dbd49a11" + url: "https://pub.dev" + source: hosted + version: "1.0.1" fake_async: dependency: transitive description: @@ -62,11 +70,24 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.1" + flutter_localizations: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" flutter_test: dependency: "direct dev" description: flutter source: sdk version: "0.0.0" + intl: + dependency: transitive + description: + name: intl + sha256: "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867" + url: "https://pub.dev" + source: hosted + version: "0.20.3" leak_tracker: dependency: transitive description: @@ -103,26 +124,34 @@ packages: dependency: transitive description: name: matcher - sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + sha256: "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd" url: "https://pub.dev" source: hosted - version: "0.12.17" + version: "0.12.20" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" + url: "https://pub.dev" + source: hosted + version: "0.13.0" + material_ui: + dependency: "direct main" + description: + name: material_ui + sha256: "7ba1ca315d50a004791dbab290417c52a61466d56db2822fe3c5c2994903110c" url: "https://pub.dev" source: hosted - version: "0.11.1" + version: "1.1.0" meta: dependency: transitive description: name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" + sha256: "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.19.0" path: dependency: transitive description: @@ -180,18 +209,18 @@ packages: dependency: transitive description: name: test_api - sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 + sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11" url: "https://pub.dev" source: hosted - version: "0.7.7" + version: "0.7.12" vector_math: dependency: transitive description: name: vector_math - sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b + sha256: f36f9f3be64c6198714492bb455c11056e33e2f85d9a0b676a48301e44fdcf47 url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.4.2" vm_service: dependency: transitive description: @@ -201,5 +230,5 @@ packages: source: hosted version: "14.3.1" sdks: - dart: ">=3.8.0-0 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + dart: ">=3.12.0 <4.0.0" + flutter: ">=3.44.0" diff --git a/pubspec.yaml b/pubspec.yaml index 98aa05a..3963be7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,6 +14,7 @@ environment: dependencies: flutter: sdk: flutter + material_ui: any dev_dependencies: flutter_test: sdk: flutter diff --git a/test/widget_test.dart b/test/widget_test.dart index ec2326f..328dae0 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -4,7 +4,7 @@ // utility that Flutter provides. For example, you can send tap and scroll // gestures. You can also use WidgetTester to find child widgets in the widget // tree, read text, and verify that the values of widget properties are correct. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:motion_toast/motion_toast.dart';