Merge 3c932f4 into abfa854

impaktfull · Oct 29, 2021 · db25934 · db25934
2 parents abfa854 + 3c932f4
commit db25934
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/example/lib/screen/home_screen.dart b/example/lib/screen/home_screen.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:locale_gen_example/util/locale/localization.dart';
 import 'package:locale_gen_example/viewmodel/locale/locale_viewmodel.dart';
 import 'package:provider/provider.dart';
@@ -8,7 +9,7 @@ class HomeScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        brightness: Brightness.dark,
+        systemOverlayStyle: SystemUiOverlayStyle.dark,
         title: const Text('locale gen'),
       ),
       body: Center(

diff --git a/lib/src/locale_gen_params.dart b/lib/src/locale_gen_params.dart
@@ -1,8 +1,8 @@
 import 'dart:io';
 
+import 'package:meta/meta.dart';
 import 'package:path/path.dart';
 import 'package:yaml/yaml.dart';
-import 'package:meta/meta.dart';
 
 final defaultOutputDir = join('lib', 'util', 'locale');
 final defaultAssetsDir = join('assets', 'locale');

diff --git a/lib/src/locale_gen_writer.dart b/lib/src/locale_gen_writer.dart
@@ -87,13 +87,16 @@ class LocaleGenWriter {
       Map<String, Map<String, dynamic>> allTranslations) {
     final sb = StringBuffer()
       ..writeln("import 'dart:convert';")
-      ..writeln()
-      ..writeln("import 'package:flutter/services.dart';")
-      ..writeln("import 'package:flutter/widgets.dart';")
-      ..writeln(
-          "import 'package:${params.projectName}/util/locale/localization_keys.dart';")
-      ..writeln(
-          "import 'package:${params.projectName}/util/locale/localization_overrides.dart';")
+      ..writeln();
+    [
+      "import 'package:flutter/services.dart';",
+      "import 'package:flutter/widgets.dart';",
+      "import 'package:${params.projectName}/util/locale/localization_keys.dart';",
+      "import 'package:${params.projectName}/util/locale/localization_overrides.dart';",
+    ]
+      ..sort((i1, i2) => i1.compareTo(i2))
+      ..forEach(sb.writeln);
+    sb
       ..writeln()
       ..writeln(
           '//============================================================//')
@@ -188,13 +191,16 @@ class LocaleGenWriter {
   static void _createLocalizationDelegateFile(LocaleGenParams params) {
     final sb = StringBuffer()
       ..writeln("import 'dart:async';")
-      ..writeln()
-      ..writeln("import 'package:flutter/foundation.dart';")
-      ..writeln("import 'package:flutter/widgets.dart';")
-      ..writeln(
-          "import 'package:${params.projectName}/util/locale/localization.dart';")
-      ..writeln(
-          "import 'package:${params.projectName}/util/locale/localization_overrides.dart';")
+      ..writeln();
+    [
+      "import 'package:flutter/services.dart';",
+      "import 'package:flutter/widgets.dart';",
+      "import 'package:${params.projectName}/util/locale/localization.dart';",
+      "import 'package:${params.projectName}/util/locale/localization_overrides.dart';",
+    ]
+      ..sort((i1, i2) => i1.compareTo(i2))
+      ..forEach(sb.writeln);
+    sb
       ..writeln()
       ..writeln(
           '//============================================================//')