Merge branch 'feature/flutter_inappwebview_windows'

Author: pichillilorenzo

.vscode/settings.json

@@ -0,0 +1,75 @@
+{
+    "cmake.configureOnOpen": false,
+    "files.associations": {
+        "algorithm": "cpp",
+        "any": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "cctype": "cpp",
+        "charconv": "cpp",
+        "chrono": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "coroutine": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "exception": "cpp",
+        "format": "cpp",
+        "forward_list": "cpp",
+        "functional": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "ios": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "iterator": "cpp",
+        "limits": "cpp",
+        "list": "cpp",
+        "locale": "cpp",
+        "map": "cpp",
+        "memory": "cpp",
+        "new": "cpp",
+        "optional": "cpp",
+        "ostream": "cpp",
+        "ratio": "cpp",
+        "set": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "stop_token": "cpp",
+        "streambuf": "cpp",
+        "string": "cpp",
+        "system_error": "cpp",
+        "thread": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "typeinfo": "cpp",
+        "unordered_map": "cpp",
+        "utility": "cpp",
+        "variant": "cpp",
+        "vector": "cpp",
+        "xfacet": "cpp",
+        "xhash": "cpp",
+        "xiosbase": "cpp",
+        "xlocale": "cpp",
+        "xlocbuf": "cpp",
+        "xlocinfo": "cpp",
+        "xlocmes": "cpp",
+        "xlocmon": "cpp",
+        "xlocnum": "cpp",
+        "xloctime": "cpp",
+        "xmemory": "cpp",
+        "xstring": "cpp",
+        "xtr1common": "cpp",
+        "xtree": "cpp",
+        "xutility": "cpp"
+    }
+}

dev_packages/generators/lib/src/exchangeable_enum_generator.dart

@@ -140,6 +140,7 @@ class ExchangeableEnumGenerator
                   <DartObject>[];
           var hasWebSupport = false;
           var webSupportValue = null;
+          var allPlatformsWithoutValue = true;
           if (platforms.isNotEmpty) {
             for (var platform in platforms) {
               final targetPlatformName =
@@ -150,6 +151,9 @@ class ExchangeableEnumGenerator
                       ? platformValueField.toIntValue() ??
                           "'${platformValueField.toStringValue()}'"
                       : null;
+              if (allPlatformsWithoutValue && platformValue != null) {
+                allPlatformsWithoutValue = false;
+              }
               if (targetPlatformName == "web") {
                 hasWebSupport = true;
                 webSupportValue = platformValue;
@@ -170,8 +174,13 @@ class ExchangeableEnumGenerator
           nativeValueBody += "return $defaultValue;";
           nativeValueBody += "}";
 
-          classBuffer.writeln(
-              "static final $fieldName = $extClassName._internalMultiPlatform($constantValue, $nativeValueBody);");
+          if (!allPlatformsWithoutValue) {
+            classBuffer.writeln(
+                "static final $fieldName = $extClassName._internalMultiPlatform($constantValue, $nativeValueBody);");
+          } else {
+            classBuffer.writeln(
+                "static const $fieldName = $extClassName._internal($constantValue, ${defaultValue ?? constantValue});");
+          }
         } else {
           classBuffer.writeln(
               "static const $fieldName = $extClassName._internal($constantValue, $constantValue);");

flutter_inappwebview/example/.metadata

@@ -4,5 +4,27 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: d927c9331005f81157fa39dff7b5dab415ad330b
-  channel: master
+  revision: "78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9"
+  channel: "stable"
+
+project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9
+      base_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9
+    - platform: windows
+      create_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9
+      base_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

flutter_inappwebview/example/lib/headless_in_app_webview.screen.dart

@@ -24,6 +24,7 @@ class _HeadlessInAppWebViewExampleScreenState
         : WebUri("http://localhost:${Uri.base.port}/page.html");
 
     headlessWebView = HeadlessInAppWebView(
+      webViewEnvironment: webViewEnvironment,
       initialUrlRequest: URLRequest(url: url),
       initialSettings: InAppWebViewSettings(
         isInspectable: kDebugMode,

flutter_inappwebview/example/lib/in_app_browser_example.screen.dart

@@ -17,7 +17,8 @@ class MyInAppBrowser extends InAppBrowser {
       : super(
             windowId: windowId,
             initialUserScripts: initialUserScripts,
-            pullToRefreshController: pullToRefreshController);
+            pullToRefreshController: pullToRefreshController,
+            webViewEnvironment: webViewEnvironment,);
 
   @override
   Future onBrowserCreated() async {

flutter_inappwebview/example/lib/in_app_webiew_example.screen.dart

@@ -115,6 +115,7 @@ class _InAppWebViewExampleScreenState extends State<InAppWebViewExampleScreen> {
               children: [
                 InAppWebView(
                   key: webViewKey,
+                  webViewEnvironment: webViewEnvironment,
                   initialUrlRequest:
                       URLRequest(url: WebUri('https://flutter.dev')),
                   // initialUrlRequest:

flutter_inappwebview/example/lib/main.dart

@@ -15,19 +15,26 @@ import 'package:pointer_interceptor/pointer_interceptor.dart';
 // import 'package:permission_handler/permission_handler.dart';
 
 final localhostServer = InAppLocalhostServer(documentRoot: 'assets');
+WebViewEnvironment? webViewEnvironment;
 
 Future main() async {
   WidgetsFlutterBinding.ensureInitialized();
   // await Permission.camera.request();
   // await Permission.microphone.request();
   // await Permission.storage.request();
 
-  if (!kIsWeb && defaultTargetPlatform == TargetPlatform.android) {
-    await InAppWebViewController.setWebContentsDebuggingEnabled(kDebugMode);
+  if (!kIsWeb && defaultTargetPlatform == TargetPlatform.windows) {
+    final availableVersion = await WebViewEnvironment.getAvailableVersion();
+    assert(availableVersion != null, 'Failed to find an installed WebView2 runtime or non-stable Microsoft Edge installation.');
+
+    webViewEnvironment = await WebViewEnvironment.create(settings:
+      WebViewEnvironmentSettings(
+          userDataFolder: 'custom_path'
+      ));
   }
 
-  if (!kIsWeb) {
-    await localhostServer.start();
+  if (!kIsWeb && defaultTargetPlatform == TargetPlatform.android) {
+    await InAppWebViewController.setWebContentsDebuggingEnabled(kDebugMode);
   }
 
   runApp(MyApp());
@@ -108,6 +115,28 @@ PointerInterceptor myDrawer({required BuildContext context}) {
         },
       ),
     ];
+  } else if (defaultTargetPlatform == TargetPlatform.windows ||
+      defaultTargetPlatform == TargetPlatform.linux) {
+    children = [
+      ListTile(
+        title: Text('InAppWebView'),
+        onTap: () {
+          Navigator.pushReplacementNamed(context, '/');
+        },
+      ),
+      ListTile(
+        title: Text('InAppBrowser'),
+        onTap: () {
+          Navigator.pushReplacementNamed(context, '/InAppBrowser');
+        },
+      ),
+      ListTile(
+        title: Text('HeadlessInAppWebView'),
+        onTap: () {
+          Navigator.pushReplacementNamed(context, '/HeadlessInAppWebView');
+        },
+      ),
+    ];
   }
   return PointerInterceptor(
     child: Drawer(
@@ -160,6 +189,14 @@ class _MyAppState extends State<MyApp> {
         '/WebAuthenticationSession': (context) =>
             WebAuthenticationSessionExampleScreen(),
       });
+    } else if (defaultTargetPlatform == TargetPlatform.windows ||
+        defaultTargetPlatform == TargetPlatform.linux) {
+      return MaterialApp(initialRoute: '/', routes: {
+        '/': (context) => InAppWebViewExampleScreen(),
+        '/InAppBrowser': (context) => InAppBrowserExampleScreen(),
+        '/HeadlessInAppWebView': (context) =>
+            HeadlessInAppWebViewExampleScreen(),
+      });
     }
     return MaterialApp(initialRoute: '/', routes: {
       '/': (context) => InAppWebViewExampleScreen(),

flutter_inappwebview/example/pubspec.yaml

@@ -43,6 +43,8 @@ dependency_overrides:
     path: ../../flutter_inappwebview_macos
   flutter_inappwebview_web:
     path: ../../flutter_inappwebview_web
+  flutter_inappwebview_windows:
+    path: ../../flutter_inappwebview_windows
 
 dev_dependencies:
   flutter_test:

flutter_inappwebview/example/test/widget_test.dart

@@ -0,0 +1,30 @@
+// This is a basic Flutter widget test.
+//
+// To perform an interaction with a widget in your test, use the WidgetTester
+// utility in the flutter_test package. For example, you can send tap and scroll
+// gestures. You can also use WidgetTester to find child widgets in the widget
+// tree, read text, and verify that the values of widget properties are correct.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:example/main.dart';
+
+void main() {
+  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
+    // Build our app and trigger a frame.
+    await tester.pumpWidget(const MyApp());
+
+    // Verify that our counter starts at 0.
+    expect(find.text('0'), findsOneWidget);
+    expect(find.text('1'), findsNothing);
+
+    // Tap the '+' icon and trigger a frame.
+    await tester.tap(find.byIcon(Icons.add));
+    await tester.pump();
+
+    // Verify that our counter has incremented.
+    expect(find.text('0'), findsNothing);
+    expect(find.text('1'), findsOneWidget);
+  });
+}

flutter_inappwebview/example/windows/.gitignore

@@ -0,0 +1,19 @@
+flutter/ephemeral/
+
+# Visual Studio user-specific files.
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# Visual Studio build-related files.
+x64/
+x86/
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+cmake-build-*