chore: update in app webview

Author: robert-virkus

analysis_options.yaml

@@ -8,7 +8,6 @@ linter:
     - always_declare_return_types
     - always_put_control_body_on_new_line
     # - always_put_required_named_parameters_first # not useful for Flutter widgets
-    - always_require_non_null_named_parameters
     #- always_specify_types # This would enforce to write types literally everywhere.
     - annotate_overrides
     #- avoid_annotating_with_dynamic # Explicit annotation of dynamic as type is preferable. Also exclusive with type_annotate_public_apis
@@ -30,8 +29,6 @@ linter:
     - avoid_renaming_method_parameters
     - avoid_relative_lib_imports
     - avoid_return_types_on_setters
-    - avoid_returning_null
-    - avoid_returning_null_for_future
     - avoid_returning_null_for_void
     - avoid_returning_this
     - avoid_setters_without_getters
@@ -62,7 +59,6 @@ linter:
     #- flutter_style_todos # Flutter todos are to verbose for our requirements.
     - hash_and_equals
     - implementation_imports
-    - invariant_booleans
     - iterable_contains_unrelated_type
     # - join_return_with_assignment # leads to less readable code IMHO
     - library_names
@@ -93,7 +89,6 @@ linter:
     - prefer_const_literals_to_create_immutables
     - prefer_constructors_over_static_methods
     - prefer_contains
-    - prefer_equal_for_default_values
     - prefer_expression_function_bodies
     - prefer_final_fields
     - prefer_final_in_for_each

example/pubspec.yaml

@@ -3,7 +3,7 @@ description: Example for enough_mail_flutter usage.
 homepage: https://github.com/enough-software/enough_mail_flutter
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <4.0.0"
   flutter: ">=1.17.0"
 
 dependencies:

lib/src/mime_message_viewer.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:typed_data';
 
 import 'package:enough_mail/enough_mail.dart';
 import 'package:enough_mail_html/enough_mail_html.dart';
@@ -154,8 +153,6 @@ class _HtmlViewerState extends State<_HtmlMimeMessageViewer> {
   bool _isHtmlMessage = true;
   bool _isLoading = true;
 
-  late InAppWebViewController _controller;
-
   @override
   void initState() {
     _generateHtml(widget.config.blockExternalImages,
@@ -262,28 +259,17 @@ class _HtmlViewerState extends State<_HtmlMimeMessageViewer> {
   Widget _buildWebView() {
     final htmlData = _htmlData;
     if (htmlData == null) {
-      return Container();
+      return const SizedBox.shrink();
     }
-    // final theme = Theme.of(context);
-    // final backgroundColor = theme.brightness == Brightness.dark
-    //     ? theme.colorScheme.background
-    //     : null;
+
     return InAppWebView(
       key: ValueKey(htmlData),
-      initialOptions: InAppWebViewGroupOptions(
-        crossPlatform: InAppWebViewOptions(
-          useShouldOverrideUrlLoading: true,
-          transparentBackground: true,
-        ),
-        ios: IOSInAppWebViewOptions(),
-        android: AndroidInAppWebViewOptions(
-          forceDark: widget.config.enableDarkMode
-              ? AndroidForceDark.FORCE_DARK_ON
-              : AndroidForceDark.FORCE_DARK_OFF,
-        ),
+      initialSettings: InAppWebViewSettings(
+        useShouldOverrideUrlLoading: true,
+        transparentBackground: true,
+        forceDark: widget.config.enableDarkMode ? ForceDark.ON : ForceDark.AUTO,
       ),
       onWebViewCreated: (controller) async {
-        _controller = controller;
         if (kDebugMode) {
           print('loading html $htmlData');
         }

pubspec.yaml

@@ -1,10 +1,10 @@
 name: enough_mail_flutter
 description: Widgets for email apps that use the `enough_mail` library. Licensed commercially friendly under MPL 2.0.
-version: 2.0.0
+version: 2.1.0
 homepage: https://github.com/enough-software/enough_mail_flutter
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.12.0 <4.0.0'
   flutter: ">=2.0.0"
 
 dependencies:
@@ -13,7 +13,7 @@ dependencies:
   enough_media: ^2.2.0
   flutter:
     sdk: flutter
-  flutter_inappwebview: ^6.0.0-beta.22
+  flutter_inappwebview: '^6.0.0-beta.24+1'
   url_launcher: ^6.1.2
 
 dependency_overrides: