DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Make PlatformDispatcher.locale and locales return consistent values (#22267)" (flutter/engine#22461)

Browse Source 
This reverts commit b5812aaaa3df6c2d7e0eb6256c4b6c54d5d658cf.
This commit is contained in:
Jim Graham 2020-11-11 23:39:59 -08:00 committed by GitHub
parent fbfb27f515
commit 698b69f417
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engine/src/flutter/lib/ui/platform_dispatcher.dart
View File

@ -551,7 +551,12 @@ class PlatformDispatcher {
///
/// This is equivalent to `locales.first` and will provide an empty non-null
/// locale if the [locales] list has not been set or is empty.
Locale get locale => locales.first;
Locale? get locale {
if (locales != null && locales!.isNotEmpty) {
return locales!.first;
}
return null;
}
/// The full system-reported supported locales of the device.
///
@ -568,7 +573,7 @@ class PlatformDispatcher {
///
/// * [WidgetsBindingObserver], for a mechanism at the widgets layer to
/// observe when this value changes.
List<Locale> get locales => configuration.locales;
List<Locale>? get locales => configuration.locales;
/// Performs the platform-native locale resolution.
///
@ -644,7 +649,12 @@ class PlatformDispatcher {
}
// Called from the engine, via hooks.dart
String _localeClosure() => locale.toString();
String _localeClosure() {
if (locale == null) {
return '';
}
return locale.toString();
}
/// The lifecycle state immediately after dart isolate initialization.
///

8
engine/src/flutter/lib/ui/window.dart
View File

@ -340,7 +340,7 @@ class SingletonFlutterWindow extends FlutterWindow {
///
/// This is equivalent to `locales.first` and will provide an empty non-null
/// locale if the [locales] list has not been set or is empty.
Locale get locale => platformDispatcher.locale;
Locale? get locale => platformDispatcher.locale;
/// The full system-reported supported locales of the device.
///
@ -358,7 +358,7 @@ class SingletonFlutterWindow extends FlutterWindow {
///
/// * [WidgetsBindingObserver], for a mechanism at the widgets layer to
/// observe when this value changes.
List<Locale> get locales => platformDispatcher.locales;
List<Locale>? get locales => platformDispatcher.locales;
/// Performs the platform-native locale resolution.
///
@ -850,11 +850,11 @@ class Window extends SingletonFlutterWindow {
@override
// ignore: unnecessary_overrides
Locale get locale => super.locale;
Locale? get locale => super.locale;
@override
// ignore: unnecessary_overrides
List<Locale> get locales => super.locales;
List<Locale>? get locales => super.locales;
@override
// ignore: unnecessary_overrides