⚡️ Adapt Flutter 3.3 (#354)

Author: AlexV525

CHANGELOG.md

@@ -4,6 +4,12 @@ that can be found in the LICENSE file. -->
 
 # Changelog
 
+## 8.0.2
+
+### Improvements
+
+- Adapt Flutter 3.3. (#354)
+
 ## 8.0.1
 
 ### Fixes

README-ZH.md

@@ -102,12 +102,12 @@ Language: [English](README.md) | 中文
 
 ### 版本兼容
 
-|        | 2.8.0 | 2.10.0 | 3.0.0 |
-|--------|:-----:|:------:|:-----:|
-| 8.0.0+ |  不适用  |  不适用   |   ✅   |
-| 7.3.0+ |  不适用  |  不适用   |   ✅   |
-| 7.0.0+ |   ✅   |   ✅    |   ❌   |
-| 6.3.0+ |   ✅   |   ✅    |   ❌   |
+|        | 2.8.0 | 2.10.0 | 3.0.0 | 3.3.0 |
+|--------|:-----:|:------:|:-----:|:-----:|
+| 8.0.0+ |  不适用  |  不适用   |   ✅   |   ✅   |
+| 7.3.0+ |  不适用  |  不适用   |   ✅   |   ✅   |
+| 7.0.0+ |   ✅   |   ✅    |   ❌   |   ❌   |
+| 6.3.0+ |   ✅   |   ✅    |   ❌   |   ❌   |
 
 如果在 `flutter pub get` 时遇到了 `resolve conflict` 失败问题，
 请使用 `dependency_overrides` 解决。

README.md

@@ -103,12 +103,12 @@ before you have any questions.
 
 ### Versions compatibility
 
-|        | 2.8.0 | 2.10.0 | 3.0.0 |
-|--------|:-----:|:------:|:-----:|
-| 8.0.0+ |  N/A  |  N/A   |   ✅   |
-| 7.3.0+ |  N/A  |  N/A   |   ✅   |
-| 7.0.0+ |   ✅   |   ✅    |   ❌   |
-| 6.3.0+ |   ✅   |   ✅    |   ❌   |
+|        | 2.8.0 | 2.10.0 | 3.0.0 | 3.3.0 |
+|--------|:-----:|:------:|:-----:|:-----:|
+| 8.0.0+ |  N/A  |  N/A   |   ✅   |   ✅   |
+| 7.3.0+ |  N/A  |  N/A   |   ✅   |   ✅   |
+| 7.0.0+ |   ✅   |   ✅    |   ❌   |   ❌   |
+| 6.3.0+ |   ✅   |   ✅    |   ❌   |   ❌   |
 
 If you got a `resolve conflict` error when running `flutter pub get`,
 please use `dependency_overrides` to fix it.

example/lib/customs/pickers/directory_file_asset_picker.dart

@@ -4,7 +4,7 @@
 
 import 'dart:io';
 import 'dart:math' as math;
-import 'dart:typed_data';
+import 'dart:typed_data' as typed_data;
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -332,14 +332,14 @@ class FileAssetPickerProvider extends AssetPickerProvider<File, Directory> {
   }
 
   @override
-  Future<Uint8List?> getThumbnailFromPath(PathWrapper<Directory> path) async {
+  Future<typed_data.Uint8List?> getThumbnailFromPath(PathWrapper<Directory> path) async {
     final List<FileSystemEntity> entities =
         path.path.listSync().whereType<File>().toList();
     currentAssets.clear();
     for (final FileSystemEntity entity in entities) {
       final String extension = basename(entity.path).split('.').last;
       if (entity is File && imagesExtensions.contains(extension)) {
-        final Uint8List data = await entity.readAsBytes();
+        final typed_data.Uint8List data = await entity.readAsBytes();
         return data;
       }
     }
@@ -938,7 +938,7 @@ class FileAssetPickerBuilder
   }) {
     final PathWrapper<Directory> wrapper = list[index];
     final Directory path = wrapper.path;
-    final Uint8List? data = wrapper.thumbnailData;
+    final typed_data.Uint8List? data = wrapper.thumbnailData;
 
     Widget builder() {
       if (data != null) {

example/pubspec.yaml

@@ -1,6 +1,6 @@
 name: wechat_assets_picker_demo
 description: The demo project for the wechat_assets_picker package.
-version: 8.0.1+22
+version: 8.0.2+23
 publish_to: none
 
 environment:

lib/src/constants/custom_scroll_physics.dart

@@ -3,7 +3,7 @@
 // in the LICENSE file.
 
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/physics.dart';
+import 'package:flutter/physics.dart' as physics show SpringDescription;
 
 class CustomBouncingScrollPhysics extends BouncingScrollPhysics {
   const CustomBouncingScrollPhysics({
@@ -16,8 +16,8 @@ class CustomBouncingScrollPhysics extends BouncingScrollPhysics {
   }
 
   @override
-  SpringDescription get spring {
-    return SpringDescription.withDampingRatio(
+  physics.SpringDescription get spring {
+    return physics.SpringDescription.withDampingRatio(
       mass: 0.5,
       stiffness: 400.0,
       ratio: 1.1,
@@ -36,8 +36,8 @@ class CustomClampingScrollPhysics extends ClampingScrollPhysics {
   }
 
   @override
-  SpringDescription get spring {
-    return SpringDescription.withDampingRatio(
+  physics.SpringDescription get spring {
+    return physics.SpringDescription.withDampingRatio(
       mass: 0.5,
       stiffness: 400.0,
       ratio: 1.1,

lib/src/delegates/asset_picker_builder_delegate.dart

@@ -2,10 +2,9 @@
 // Use of this source code is governed by an Apache license that can be found
 // in the LICENSE file.
 
-import 'dart:async';
-import 'dart:io';
+import 'dart:io' show Platform;
 import 'dart:math' as math;
-import 'dart:typed_data';
+import 'dart:typed_data' as typed_data;
 import 'dart:ui' as ui;
 
 import 'package:flutter/gestures.dart';
@@ -1785,7 +1784,7 @@ class DefaultAssetPickerBuilderDelegate
   }) {
     final PathWrapper<AssetPathEntity> wrapper = list[index];
     final AssetPathEntity pathEntity = wrapper.path;
-    final Uint8List? data = wrapper.thumbnailData;
+    final typed_data.Uint8List? data = wrapper.thumbnailData;
 
     Widget builder() {
       if (data != null) {

lib/src/models/path_wrapper.dart

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an Apache license that can be found
 // in the LICENSE file.
 
-import 'dart:typed_data';
+import 'dart:typed_data' as typed_data;
 
 import 'package:flutter/foundation.dart';
 
@@ -39,15 +39,15 @@ class PathWrapper<Path> {
   /// See also:
   ///  * [AssetEntity.thumbnailData] API document:
   ///    https://pub.dev/documentation/photo_manager/latest/photo_manager/AssetEntity/thumbnailData.html
-  final Uint8List? thumbnailData;
+  final typed_data.Uint8List? thumbnailData;
 
   /// Creates a modified copy of the object.
   ///
   /// Explicitly specified fields get the specified value, all other fields get
   /// the same value of the current object.
   PathWrapper<Path> copyWith({
     int? assetCount,
-    Uint8List? thumbnailData,
+    typed_data.Uint8List? thumbnailData,
   }) {
     return PathWrapper<Path>(
       path: path,

pubspec.yaml

@@ -1,6 +1,6 @@
 name: wechat_assets_picker
 description: An audio/video/image picker in pure Dart which is the same with WeChat, support multi picking.
-version: 8.0.1
+version: 8.0.2
 homepage: https://github.com/fluttercandies/flutter_wechat_assets_picker
 
 environment: