chore: merge master branch and fix conflicts

singerdmx · Sep 27, 2024 · 8d0cdb1 · 8d0cdb1
2 parents 6939289 + a8f4a18
commit 8d0cdb1
Show file tree

Hide file tree

Showing 19 changed files with 448 additions and 24 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -1,9 +1,5 @@
 include: package:flutter_lints/flutter.yaml
 
-analyzer:
-  errors:
-    undefined_prefixed_name: ignore
-    unsafe_html: ignore
 linter:
   rules:
     always_declare_return_types: true
@@ -33,3 +29,4 @@ linter:
     unnecessary_lambdas: true
     unnecessary_parenthesis: true
     unnecessary_string_interpolations: true
+    avoid_web_libraries_in_flutter: true
diff --git a/dart_quill_delta/pubspec.yaml b/dart_quill_delta/pubspec.yaml
@@ -15,5 +15,6 @@ dependencies:
   quiver: ^3.2.1
 
 dev_dependencies:
+  # TODO: Using 4.0.0 to not require higher version of Dart SDK
   lints: ^4.0.0
   test: ^1.24.0
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -78,7 +78,7 @@ dependency_overrides:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^4.0.0
+  flutter_lints: ^5.0.0
   build_runner: ^2.4.8
   flutter_gen_runner: ^5.4.0
 

diff --git a/flutter_quill_extensions/analysis_options.yaml b/flutter_quill_extensions/analysis_options.yaml
@@ -1,9 +1,5 @@
 include: package:flutter_lints/flutter.yaml
 
-analyzer:
-  errors:
-    undefined_prefixed_name: ignore
-    unsafe_html: ignore
 linter:
   rules:
     always_declare_return_types: true
@@ -34,3 +30,4 @@ linter:
     unnecessary_lambdas: true
     unnecessary_parenthesis: true
     unnecessary_string_interpolations: true
+    avoid_web_libraries_in_flutter: true
diff --git a/flutter_quill_extensions/lib/flutter_quill_extensions.dart b/flutter_quill_extensions/lib/flutter_quill_extensions.dart
@@ -1,4 +1,4 @@
-library flutter_quill_extensions;
+library;
 
 import 'package:flutter_quill/flutter_quill_internal.dart'
     show ClipboardServiceProvider;

diff --git a/flutter_quill_extensions/pubspec.yaml b/flutter_quill_extensions/pubspec.yaml
@@ -51,7 +51,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^4.0.0
+  flutter_lints: ^5.0.0
 
 flutter:
   uses-material-design: true
diff --git a/flutter_quill_test/analysis_options.yaml b/flutter_quill_test/analysis_options.yaml
@@ -1,9 +1,5 @@
 include: package:flutter_lints/flutter.yaml
 
-analyzer:
-  errors:
-    undefined_prefixed_name: ignore
-    unsafe_html: ignore
 linter:
   rules:
     always_declare_return_types: true
@@ -34,3 +30,4 @@ linter:
     unnecessary_lambdas: true
     unnecessary_parenthesis: true
     unnecessary_string_interpolations: true
+    avoid_web_libraries_in_flutter: true
diff --git a/flutter_quill_test/lib/flutter_quill_test.dart b/flutter_quill_test/lib/flutter_quill_test.dart
@@ -1,3 +1,3 @@
-library flutter_quill_test;
+library;
 
 export 'src/test/widget_tester_extension.dart';
diff --git a/flutter_quill_test/pubspec.yaml b/flutter_quill_test/pubspec.yaml
@@ -33,7 +33,7 @@ dependencies:
     sdk: flutter
 
 dev_dependencies:
-  flutter_lints: ^4.0.0
+  flutter_lints: ^5.0.0
 
 flutter:
   uses-material-design: true
diff --git a/lib/extensions.dart b/lib/extensions.dart
@@ -3,7 +3,7 @@
   'to expose certain internal APIs and should not be used directly, as it is subject to breaking changes.\n'
   'The replacement is flutter_quill_internal.dart which is also for internal use only.',
 )
-library flutter_quill.extensions;
+library;
 
 // This file contains exports that are meant to be used
 // internally and are not part of the public API as

diff --git a/lib/flutter_quill.dart b/lib/flutter_quill.dart
@@ -1,4 +1,4 @@
-library flutter_quill;
+library;
 
 export 'src/common/structs/horizontal_spacing.dart';
 export 'src/common/structs/image_url.dart';

diff --git a/lib/quill_delta.dart b/lib/quill_delta.dart
@@ -1,3 +1,3 @@
-library flutter_quill.delta;
+library;
 
 export 'package:dart_quill_delta/dart_quill_delta.dart';
diff --git a/lib/src/l10n/generated/quill_localizations.dart b/lib/src/l10n/generated/quill_localizations.dart
@@ -19,6 +19,7 @@ import 'quill_localizations_fa.dart';
 import 'quill_localizations_fr.dart';
 import 'quill_localizations_he.dart';
 import 'quill_localizations_hi.dart';
+import 'quill_localizations_hu.dart';
 import 'quill_localizations_id.dart';
 import 'quill_localizations_it.dart';
 import 'quill_localizations_ja.dart';
@@ -146,6 +147,7 @@ abstract class FlutterQuillLocalizations {
     Locale('fr'),
     Locale('he'),
     Locale('hi'),
+    Locale('hu'),
     Locale('id'),
     Locale('it'),
     Locale('ja'),
@@ -786,6 +788,7 @@ class _FlutterQuillLocalizationsDelegate
         'fr',
         'he',
         'hi',
+        'hu',
         'id',
         'it',
         'ja',
@@ -893,6 +896,8 @@ FlutterQuillLocalizations lookupFlutterQuillLocalizations(Locale locale) {
       return FlutterQuillLocalizationsHe();
     case 'hi':
       return FlutterQuillLocalizationsHi();
+    case 'hu':
+      return FlutterQuillLocalizationsHu();
     case 'id':
       return FlutterQuillLocalizationsId();
     case 'it':