chore: update Java version to 11, Android plugin to 8.2.1, and webview_flutter to ^4.0.10 (#32)(#33)

Initially, the application was compiled for Android. To do this, the following were required:

JavaVersion.VERSION_11
id "com.android.application" version "8.2.1" apply false
The dependency webview_flutter: ^4.0.10

It was also necessary to update the about_file_screen.dart file, which uses this library, and to take the library update into account to ensure compatibility with newer versions.

Author: Tayebsed93

app/.gitignore

@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related

app/android/app/build.gradle

@@ -11,12 +11,12 @@ android {
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_11
     }
 
     defaultConfig {

app/android/settings.gradle

@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.1.0" apply false
+    id "com.android.application" version "8.2.1" apply false
     id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 

app/ios/Podfile.lock

@@ -4,24 +4,25 @@ PODS:
     - Flutter
   - webview_flutter_wkwebview (0.0.1):
     - Flutter
+    - FlutterMacOS
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-  - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
+  - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`)
 
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   webview_flutter_wkwebview:
-    :path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
+    :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin"
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
-  webview_flutter_wkwebview: 6e6160e04b1e85872253adc5322afe416d9cdddc
+  webview_flutter_wkwebview: 44d4dee7d7056d5ad185d25b38404436d56c547c
 
 PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
 

app/ios/Runner.xcodeproj/project.pbxproj

@@ -18,10 +18,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:markdown/markdown.dart' as md;
 import 'package:ouds_flutter_demo/main_app_bar.dart';
-import 'package:path/path.dart' as path;
 import 'package:webview_flutter/webview_flutter.dart';
 
-class AboutFileScreen extends StatelessWidget {
+class AboutFileScreen extends StatefulWidget {
   final String title;
   final String fileMenuItem;
   final bool darkModeEnabled;
@@ -33,56 +32,57 @@ class AboutFileScreen extends StatelessWidget {
       required this.darkModeEnabled});
 
   @override
-  Widget build(BuildContext context) {
-    final colors = Theme.of(context).colorScheme;
-    const horizontalPadding = 13.0;
-    const verticalPadding = 13.0;
+  AboutFileScreenState createState() => AboutFileScreenState();
+}
 
-    return Scaffold(
-      appBar: MainAppBar(title: title, showBackButton: true),
-      body: SafeArea(
-        child: FutureBuilder(
-          future: _loadFileData(),
-          builder: (context, snapshot) {
-            if (snapshot.connectionState == ConnectionState.done) {
-              String markdownContent = snapshot.data as String;
-
-              /// Convert Markdown to HTML using the markdown package
-              String htmlContent = markdownToHtml(markdownContent);
-
-              return WebView(
-                initialUrl: 'about:blank',
-                onWebViewCreated: (WebViewController webViewController) {
-                  webViewController.loadUrl(Uri.dataFromString(
-                    _wrapHtmlWithCss(
-                      htmlContent,
-                      darkModeEnabled,
-                      colors,
-                      horizontalPadding,
-                      verticalPadding,
-                    ),
-                    mimeType: 'text/html',
-                    encoding: Encoding.getByName('utf-8'),
-                  ).toString());
-                },
-                backgroundColor: Colors.transparent,
-              );
-            } else {
-              return const Center(child: CircularProgressIndicator());
-            }
-          },
-        ),
-      ),
-    );
+class AboutFileScreenState extends State<AboutFileScreen> {
+  late WebViewController _webViewController;
+
+  /// Padding
+  final double horizontalPadding = 13.0;
+  final double verticalPadding = 13.0;
+
+  @override
+  void initState() {
+    super.initState();
+
+    /// Initialize WebViewController
+    _webViewController = WebViewController()
+      ..setJavaScriptMode(JavaScriptMode.unrestricted)
+      ..setBackgroundColor(Colors.transparent);
+
+    /// Initialize WebView and load content
+    _initializeWebView();
   }
 
-  bool isHTMLFile(String filePath) {
-    String extension = path.extension(filePath);
-    return extension.toLowerCase() == '.html';
+  Future<void> _initializeWebView() async {
+    String markdownContent = await _loadFileData();
+    String htmlContent = markdownToHtml(markdownContent);
+
+    /// Check if the widget is still mounted before using the context
+    if (!mounted) return;
+
+    /// Wrap the HTML content with necessary CSS
+    String wrappedHtml = _wrapHtmlWithCss(
+      htmlContent,
+      widget.darkModeEnabled,
+      Theme.of(context).colorScheme,
+      horizontalPadding,
+      verticalPadding,
+    );
+
+    /// Load HTML content into the WebViewController
+    _webViewController.loadRequest(
+      Uri.dataFromString(
+        wrappedHtml,
+        mimeType: 'text/html',
+        encoding: Encoding.getByName('utf-8'),
+      ),
+    );
   }
 
   Future<String> _loadFileData() async {
-    return await rootBundle.loadString(fileMenuItem);
+    return await rootBundle.loadString(widget.fileMenuItem);
   }
 
   String markdownToHtml(String markdownContent) {
@@ -150,7 +150,7 @@ a:link {
 
     String themeStyle = darkModeEnabled ? lightStyle : darkStyle;
 
-    String cssApple = '''<style type="text/css">
+    String cssApple = '''<style ="text/css">
        html {
            font: -apple-system-body;
        }
@@ -202,7 +202,7 @@ a:link {
         color: #527EDB;
       }
         </style>''';
-    String cssAndroid = '''<style type="text/css">
+    String cssAndroid = '''<style ="text/css">
 body {
     padding: 0;
     -webkit-text-size-adjust: none;
@@ -293,40 +293,52 @@ a:link {
 
     return convertToHtml(fileContent, cssApple, cssAndroidThemeStyle);
   }
-}
 
-String convertToHtml(
-    String partialHTMLText, String cssApple, String cssAndroid) {
-  String head = """
+  String convertToHtml(
+      String partialHTMLText, String cssApple, String cssAndroid) {
+    String head = """
     <!doctype html>
 <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no'>
 """;
 
-  if (partialHTMLText.contains("<html")) {
-    return partialHTMLText;
-  }
+    if (partialHTMLText.contains("<html")) {
+      return partialHTMLText;
+    }
 
-  var result = "<html>";
-  result += head;
+    var result = "<html>";
+    result += head;
 
-  if (!kIsWeb) {
-    if (Platform.isIOS) {
-      result += cssApple;
-    } else {
-      if (Platform.isAndroid) {
-        result += cssAndroid;
+    if (!kIsWeb) {
+      if (Platform.isIOS) {
+        result += cssApple;
+      } else {
+        if (Platform.isAndroid) {
+          result += cssAndroid;
+        }
       }
     }
-  }
 
-  result += "</head>";
+    result += "</head>";
+
+    if (partialHTMLText.contains("<body")) {
+      result += partialHTMLText;
+    } else {
+      result += "<body><p dir=\"auto\">$partialHTMLText</p></body>";
+    }
 
-  if (partialHTMLText.contains("<body")) {
-    result += partialHTMLText;
-  } else {
-    result += "<body><p dir=\"auto\">$partialHTMLText</p></body>";
+    result += "</html>";
+    return result;
   }
 
-  result += "</html>";
-  return result;
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: MainAppBar(title: widget.title, showBackButton: true),
+      body: SafeArea(
+        child: WebViewWidget(
+          controller: _webViewController,
+        ),
+      ),
+    );
+  }
 }