From 0cdb3bf582f00cbb9bc4a3701263ab655b09db69 Mon Sep 17 00:00:00 2001 From: Alexandre Ardhuin Date: Thu, 9 Jun 2022 20:53:11 +0200 Subject: [PATCH] Export public API types from foundation/*.dart library. (#105648) --- packages/flutter/lib/src/cupertino/text_theme.dart | 1 - packages/flutter/lib/src/cupertino/theme.dart | 3 +-- packages/flutter/lib/src/foundation/_isolates_io.dart | 2 ++ packages/flutter/lib/src/foundation/_isolates_web.dart | 2 ++ packages/flutter/lib/src/foundation/assertions.dart | 4 ++++ packages/flutter/lib/src/foundation/binding.dart | 3 ++- packages/flutter/lib/src/foundation/change_notifier.dart | 2 ++ packages/flutter/lib/src/foundation/consolidate_response.dart | 3 +++ packages/flutter/lib/src/foundation/debug.dart | 4 ++++ packages/flutter/lib/src/foundation/serialization.dart | 2 +- packages/flutter/lib/src/services/text_input.dart | 1 - packages/flutter/lib/src/widgets/media_query.dart | 1 - packages/flutter/test/foundation/serialization_test.dart | 2 -- 13 files changed, 21 insertions(+), 9 deletions(-) diff --git a/packages/flutter/lib/src/cupertino/text_theme.dart b/packages/flutter/lib/src/cupertino/text_theme.dart index 51ed4dd3a9..2ea7fecb0d 100644 --- a/packages/flutter/lib/src/cupertino/text_theme.dart +++ b/packages/flutter/lib/src/cupertino/text_theme.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'package:flutter/foundation.dart'; -import 'package:flutter/services.dart' show Brightness; import 'package:flutter/widgets.dart'; import 'colors.dart'; diff --git a/packages/flutter/lib/src/cupertino/theme.dart b/packages/flutter/lib/src/cupertino/theme.dart index 94f882621e..521a419dd9 100644 --- a/packages/flutter/lib/src/cupertino/theme.dart +++ b/packages/flutter/lib/src/cupertino/theme.dart @@ -3,14 +3,13 @@ // found in the LICENSE file. import 'package:flutter/foundation.dart'; -import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'colors.dart'; import 'icon_theme_data.dart'; import 'text_theme.dart'; -export 'package:flutter/services.dart' show Brightness; +export 'package:flutter/foundation.dart' show Brightness; // Values derived from https://developer.apple.com/design/resources/. const _CupertinoThemeDefaults _kDefaultTheme = _CupertinoThemeDefaults( diff --git a/packages/flutter/lib/src/foundation/_isolates_io.dart b/packages/flutter/lib/src/foundation/_isolates_io.dart index 9b5386fd45..49d149f9fb 100644 --- a/packages/flutter/lib/src/foundation/_isolates_io.dart +++ b/packages/flutter/lib/src/foundation/_isolates_io.dart @@ -10,6 +10,8 @@ import 'package:meta/meta.dart'; import 'constants.dart'; import 'isolates.dart' as isolates; +export 'isolates.dart' show ComputeCallback; + /// The dart:io implementation of [isolate.compute]. Future compute(isolates.ComputeCallback callback, Q message, { String? debugLabel }) async { debugLabel ??= kReleaseMode ? 'compute' : callback.toString(); diff --git a/packages/flutter/lib/src/foundation/_isolates_web.dart b/packages/flutter/lib/src/foundation/_isolates_web.dart index e325678c52..2a2d343acb 100644 --- a/packages/flutter/lib/src/foundation/_isolates_web.dart +++ b/packages/flutter/lib/src/foundation/_isolates_web.dart @@ -4,6 +4,8 @@ import 'isolates.dart' as isolates; +export 'isolates.dart' show ComputeCallback; + /// The dart:html implementation of [isolate.compute]. Future compute(isolates.ComputeCallback callback, Q message, { String? debugLabel }) async { // To avoid blocking the UI immediately for an expensive function call, we diff --git a/packages/flutter/lib/src/foundation/assertions.dart b/packages/flutter/lib/src/foundation/assertions.dart index d869c767e1..0e353151bd 100644 --- a/packages/flutter/lib/src/foundation/assertions.dart +++ b/packages/flutter/lib/src/foundation/assertions.dart @@ -10,6 +10,10 @@ import 'diagnostics.dart'; import 'print.dart'; import 'stack_frame.dart'; +export 'basic_types.dart' show IterableFilter; +export 'diagnostics.dart' show DiagnosticLevel, DiagnosticsNode, DiagnosticPropertiesBuilder, DiagnosticsTreeStyle; +export 'stack_frame.dart' show StackFrame; + // Examples can assume: // late String runtimeType; // late bool draconisAlive; diff --git a/packages/flutter/lib/src/foundation/binding.dart b/packages/flutter/lib/src/foundation/binding.dart index f3cfe65685..866f4e962e 100644 --- a/packages/flutter/lib/src/foundation/binding.dart +++ b/packages/flutter/lib/src/foundation/binding.dart @@ -14,11 +14,12 @@ import 'assertions.dart'; import 'basic_types.dart'; import 'constants.dart'; import 'debug.dart'; -import 'diagnostics.dart'; import 'object.dart'; import 'platform.dart'; import 'print.dart'; +export 'basic_types.dart' show AsyncCallback, AsyncValueGetter, AsyncValueSetter; + // Examples can assume: // mixin BarBinding on BindingBase { } diff --git a/packages/flutter/lib/src/foundation/change_notifier.dart b/packages/flutter/lib/src/foundation/change_notifier.dart index 2b22a7fd98..8721bc15fa 100644 --- a/packages/flutter/lib/src/foundation/change_notifier.dart +++ b/packages/flutter/lib/src/foundation/change_notifier.dart @@ -8,6 +8,8 @@ import 'assertions.dart'; import 'basic_types.dart'; import 'diagnostics.dart'; +export 'dart:ui' show VoidCallback; + /// An object that maintains a list of listeners. /// /// The listeners are typically used to notify clients that the object has been diff --git a/packages/flutter/lib/src/foundation/consolidate_response.dart b/packages/flutter/lib/src/foundation/consolidate_response.dart index 5150ab2037..4d0f44c039 100644 --- a/packages/flutter/lib/src/foundation/consolidate_response.dart +++ b/packages/flutter/lib/src/foundation/consolidate_response.dart @@ -7,6 +7,9 @@ import 'dart:convert'; import 'dart:io'; import 'dart:typed_data'; +export 'dart:io' show HttpClientResponse; +export 'dart:typed_data' show Uint8List; + /// Signature for getting notified when chunks of bytes are received while /// consolidating the bytes of an [HttpClientResponse] into a [Uint8List]. /// diff --git a/packages/flutter/lib/src/foundation/debug.dart b/packages/flutter/lib/src/foundation/debug.dart index 64fa73adc5..5cf29fce66 100644 --- a/packages/flutter/lib/src/foundation/debug.dart +++ b/packages/flutter/lib/src/foundation/debug.dart @@ -8,6 +8,10 @@ import 'assertions.dart'; import 'platform.dart'; import 'print.dart'; +export 'dart:ui' show Brightness; + +export 'print.dart' show DebugPrintCallback; + /// Returns true if none of the foundation library debug variables have been /// changed. /// diff --git a/packages/flutter/lib/src/foundation/serialization.dart b/packages/flutter/lib/src/foundation/serialization.dart index 982dc0ed4e..b0ade7d158 100644 --- a/packages/flutter/lib/src/foundation/serialization.dart +++ b/packages/flutter/lib/src/foundation/serialization.dart @@ -5,7 +5,7 @@ import 'dart:math' as math; import 'dart:typed_data'; -export 'dart:typed_data' show ByteData, Float32List, Float64List, Int32List, Int64List, Uint8List; +export 'dart:typed_data' show ByteData, Endian, Float32List, Float64List, Int32List, Int64List, Uint8List; /// Write-only buffer for incrementally building a [ByteData] instance. /// diff --git a/packages/flutter/lib/src/services/text_input.dart b/packages/flutter/lib/src/services/text_input.dart index d31e4c7bd8..585f83aa50 100644 --- a/packages/flutter/lib/src/services/text_input.dart +++ b/packages/flutter/lib/src/services/text_input.dart @@ -20,7 +20,6 @@ import 'autofill.dart'; import 'message_codec.dart'; import 'platform_channel.dart'; import 'system_channels.dart'; -import 'system_chrome.dart'; import 'text_editing.dart'; import 'text_editing_delta.dart'; diff --git a/packages/flutter/lib/src/widgets/media_query.dart b/packages/flutter/lib/src/widgets/media_query.dart index 4c20c776f8..b25637c69a 100644 --- a/packages/flutter/lib/src/widgets/media_query.dart +++ b/packages/flutter/lib/src/widgets/media_query.dart @@ -4,7 +4,6 @@ import 'dart:math' as math; import 'dart:ui' as ui; -import 'dart:ui' show Brightness; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; diff --git a/packages/flutter/test/foundation/serialization_test.dart b/packages/flutter/test/foundation/serialization_test.dart index c2b6e9542d..e9fa615d7c 100644 --- a/packages/flutter/test/foundation/serialization_test.dart +++ b/packages/flutter/test/foundation/serialization_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:typed_data'; - import 'package:flutter/foundation.dart'; import 'package:flutter_test/flutter_test.dart';