fix: deprecation warning

ilteoood · Aug 15, 2023 · a134a55 · a134a55
1 parent 535cf30
commit a134a55
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -280,4 +280,5 @@ Support for Dart 3 and Flutter 3.10
 Fix for #204
 
 ## [0.34.0]
-Upgrade http@1.1.0, logging@1.2.0, xml2json@6.2.0, yaml@3.1.2, path@1.8.3
+Upgrade http@1.1.0, logging@1.2.0, xml2json@6.2.0, yaml@3.1.2, path@1.8.3
+Fix: deprecation warnings
diff --git a/lib/loaders/translation_loader.dart b/lib/loaders/translation_loader.dart
@@ -1,5 +1,4 @@
-import 'dart:ui' as ui;
-
+import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_i18n/utils/message_printer.dart';
 
@@ -23,7 +22,7 @@ abstract class TranslationLoader {
 
   /// Return the device current locale
   Future<Locale> findDeviceLocale() async {
-    final systemLocale = ui.window.locale;
+    final systemLocale = PlatformDispatcher.instance.locale;
     MessagePrinter.info("The system locale is $systemLocale");
     return Future.value(systemLocale);
   }

diff --git a/test/flutter_i18n_test.dart b/test/flutter_i18n_test.dart
@@ -7,12 +7,14 @@ void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
   setUp(() {
-    channel.setMockMethodCallHandler((MethodCall methodCall) async {
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(channel, (MethodCall methodCall) async {
       return '42';
     });
   });
 
   tearDown(() {
-    channel.setMockMethodCallHandler(null);
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(channel, null);
   });
 }