chore: changes from latest master

.all-contributorsrc

@@ -766,6 +766,105 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "nnnlog",
+      "name": "nlog (solrin)",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20399222?v=4",
+      "profile": "https://nlog.dev",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Murmurl912",
+      "name": "Murmurl912",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36264246?v=4",
+      "profile": "https://github.com/Murmurl912",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "bschulz87",
+      "name": "Benjamin Schulz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30199362?v=4",
+      "profile": "https://github.com/bschulz87",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "ShuheiSuzuki-07",
+      "name": "seal-app",
+      "avatar_url": "https://avatars.githubusercontent.com/u/118415919?v=4",
+      "profile": "https://github.com/ShuheiSuzuki-07",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "takuyaaaaaaahaaaaaa",
+      "name": "Takuya Tominaga",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31458194?v=4",
+      "profile": "https://github.com/takuyaaaaaaahaaaaaa",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "yamaha252",
+      "name": "Sergey",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4444068?v=4",
+      "profile": "https://github.com/yamaha252",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "lyb5834",
+      "name": "yuanbo li",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16265810?v=4",
+      "profile": "https://github.com/lyb5834",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Mecharyry",
+      "name": "Ryan Feline",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3380092?v=4",
+      "profile": "https://github.com/Mecharyry",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "fuzzybinary",
+      "name": "Jeff Ward",
+      "avatar_url": "https://avatars.githubusercontent.com/u/249982?v=4",
+      "profile": "https://fuzzybinary.com",
+      "contributions": [
+        "test"
+      ]
+    },
+    {
+      "login": "yerkejs",
+      "name": "Yelzhan Yerkebulan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33483071?v=4",
+      "profile": "https://hero.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "GooRingX",
+      "name": "GooRingX",
+      "avatar_url": "https://avatars.githubusercontent.com/u/167741400?v=4",
+      "profile": "https://github.com/GooRingX",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/stale.yaml

@@ -2,7 +2,7 @@ name: Close Stale Issues
 
 on:
   schedule:
-    - cron: '0 * * * *' # Run every hour
+    - cron: '0 0 * * *' # Run every day at midnight
 
 jobs:
   close-issues:

README.md

@@ -5,7 +5,7 @@
 ![InAppWebView-logo](https://user-images.githubusercontent.com/5956938/195422744-bdcfed16-73f0-4bc9-94ab-ecf10771a1c4.png)
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-84-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-95-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 [![flutter_inappwebview version](https://img.shields.io/pub/v/flutter_inappwebview?include_prereleases)](https://pub.dartlang.org/packages/flutter_inappwebview)
@@ -191,6 +191,21 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/gmackall"><img src="https://avatars.githubusercontent.com/u/34871572?v=4?s=100" width="100px;" alt="Gray Mackall"/><br /><sub><b>Gray Mackall</b></sub></a><br /><a href="https://github.com/pichillilorenzo/flutter_inappwebview/commits?author=gmackall" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/p-mazhnik"><img src="https://avatars.githubusercontent.com/u/25964451?v=4?s=100" width="100px;" alt="Pavel Mazhnik"/><br /><sub><b>Pavel Mazhnik</b></sub></a><br /><a href="https://github.com/pichillilorenzo/flutter_inappwebview/commits?author=p-mazhnik" title="Code">💻</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://nlog.dev"><img src="https://avatars.githubusercontent.com/u/20399222?v=4?s=100" width="100px;" alt="nlog (solrin)"/><br /><sub><b>nlog (solrin)</b></sub></a><br /><a href="https://github.com/pichillilorenzo/flutter_inappwebview/commits?author=nnnlog" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Murmurl912"><img src="https://avatars.githubusercontent.com/u/36264246?v=4?s=100" width="100px;" alt="Murmurl912"/><br /><sub><b>Murmurl912</b></sub></a><br /><a href="https://github.com/pichillilorenzo/flutter_inappwebview/commits?author=Murmurl912" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/bschulz87"><img src="https://avatars.githubusercontent.com/u/30199362?v=4?s=100" width="100px;" alt="Benjamin Schulz"/><br /><sub><b>Benjamin Schulz</b></sub></a><br /><a href="#ideas-bschulz87" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ShuheiSuzuki-07"><img src="https://avatars.githubusercontent.com/u/118415919?v=4?s=100" width="100px;" alt="seal-app"/><br /><sub><b>seal-app</b></sub></a><br /><a href="https://github.com/pichillilorenzo/flutter_inappwebview/commits?author=ShuheiSuzuki-07" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/takuyaaaaaaahaaaaaa"><img src="https://avatars.githubusercontent.com/u/31458194?v=4?s=100" width="100px;" alt="Takuya Tominaga"/><br /><sub><b>Takuya Tominaga</b></sub></a><br /><a href="https://github.com/pichillilorenzo/flutter_inappwebview/commits?author=takuyaaaaaaahaaaaaa" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yamaha252"><img src="https://avatars.githubusercontent.com/u/4444068?v=4?s=100" width="100px;" alt="Sergey"/><br /><sub><b>Sergey</b></sub></a><br /><a href="https://github.com/pichillilorenzo/flutter_inappwebview/commits?author=yamaha252" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lyb5834"><img src="https://avatars.githubusercontent.com/u/16265810?v=4?s=100" width="100px;" alt="yuanbo li"/><br /><sub><b>yuanbo li</b></sub></a><br /><a href="https://github.com/pichillilorenzo/flutter_inappwebview/commits?author=lyb5834" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Mecharyry"><img src="https://avatars.githubusercontent.com/u/3380092?v=4?s=100" width="100px;" alt="Ryan Feline"/><br /><sub><b>Ryan Feline</b></sub></a><br /><a href="https://github.com/pichillilorenzo/flutter_inappwebview/commits?author=Mecharyry" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://fuzzybinary.com"><img src="https://avatars.githubusercontent.com/u/249982?v=4?s=100" width="100px;" alt="Jeff Ward"/><br /><sub><b>Jeff Ward</b></sub></a><br /><a href="https://github.com/pichillilorenzo/flutter_inappwebview/commits?author=fuzzybinary" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://hero.io"><img src="https://avatars.githubusercontent.com/u/33483071?v=4?s=100" width="100px;" alt="Yelzhan Yerkebulan"/><br /><sub><b>Yelzhan Yerkebulan</b></sub></a><br /><a href="https://github.com/pichillilorenzo/flutter_inappwebview/commits?author=yerkejs" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/GooRingX"><img src="https://avatars.githubusercontent.com/u/167741400?v=4?s=100" width="100px;" alt="GooRingX"/><br /><sub><b>GooRingX</b></sub></a><br /><a href="https://github.com/pichillilorenzo/flutter_inappwebview/commits?author=GooRingX" title="Code">💻</a></td>
+    </tr>
   </tbody>
 </table>
 

dev_packages/flutter_inappwebview_internal_annotations/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2.0
+
+- Updated `ExchangeableEnum` and `ExchangeableObjectProperty`.
+
 ## 1.1.1
 
 - Added `ExchangeableObject.fromMapForceAllInline`.

dev_packages/flutter_inappwebview_internal_annotations/lib/src/exchangeable_enum.dart

@@ -4,6 +4,10 @@ class ExchangeableEnum {
   final bool fromValueMethod;
   final bool toNativeValueMethod;
   final bool fromNativeValueMethod;
+  final bool nameMethod;
+  final bool toNameMethod;
+  final bool byNameMethod;
+  final bool asNameMapMethod;
   final bool toStringMethod;
   final bool hashCodeMethod;
   final bool equalsOperator;
@@ -15,6 +19,10 @@ class ExchangeableEnum {
     this.fromValueMethod = true,
     this.toNativeValueMethod = true,
     this.fromNativeValueMethod = true,
+    this.nameMethod = true,
+    this.toNameMethod = true,
+    this.byNameMethod = true,
+    this.asNameMapMethod = true,
     this.toStringMethod = true,
     this.hashCodeMethod = true,
     this.equalsOperator = true,

dev_packages/flutter_inappwebview_internal_annotations/lib/src/exchangeable_object_property.dart

@@ -1,9 +1,17 @@
 class ExchangeableObjectProperty {
   final Function? serializer;
   final Function? deserializer;
+  final bool deprecatedUseNewFieldNameInConstructor;
+  final bool deprecatedUseNewFieldNameInFromMapMethod;
+  final bool leaveDeprecatedInFromMapMethod;
+  final bool leaveDeprecatedInToMapMethod;
 
   const ExchangeableObjectProperty({
     this.serializer,
-    this.deserializer
+    this.deserializer,
+    this.deprecatedUseNewFieldNameInConstructor = true,
+    this.deprecatedUseNewFieldNameInFromMapMethod = true,
+    this.leaveDeprecatedInFromMapMethod = false,
+    this.leaveDeprecatedInToMapMethod = false,
   });
 }

dev_packages/flutter_inappwebview_internal_annotations/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_inappwebview_internal_annotations
 description: Internal annotations used by the generator of flutter_inappwebview plugin
-version: 1.1.1
+version: 1.2.0
 homepage: https://github.com/pichillilorenzo/flutter_inappwebview
 
 environment:

dev_packages/generators/lib/src/exchangeable_enum_generator.dart

@@ -204,13 +204,13 @@ class ExchangeableEnumGenerator
     }
 
     if (annotation.read("fromValueMethod").boolValue && (!visitor.methods.containsKey("fromValue") ||
-        Util.methodHasIgnore(visitor.methods['fromNativeValue']!))) {
+        Util.methodHasIgnore(visitor.methods['fromValue']!))) {
       final hasBitwiseOrOperator =
           annotation.read("bitwiseOrOperator").boolValue;
       classBuffer.writeln("""
       ///Gets a possible [$extClassName] instance from [${enumValue.type}] value.
       static $extClassName? fromValue(${enumValue.type}${!Util.typeIsNullable(enumValue.type) ? '?' : ''} value) {
-          if (value != null) {
+        if (value != null) {
           try {
             return $extClassName.values
                 .firstWhere((element) => element.toValue() == value);
@@ -230,7 +230,7 @@ class ExchangeableEnumGenerator
       classBuffer.writeln("""
       ///Gets a possible [$extClassName] instance from a native value.
       static $extClassName? fromNativeValue(${enumNativeValue.type}${!Util.typeIsNullable(enumNativeValue.type) ? '?' : ''} value) {
-          if (value != null) {
+        if (value != null) {
           try {
             return $extClassName.values
                 .firstWhere((element) => element.toNativeValue() == value);
@@ -243,6 +243,44 @@ class ExchangeableEnumGenerator
       """);
     }
 
+    if (annotation.read("nameMethod").boolValue && annotation.read("byNameMethod").boolValue &&
+        (!visitor.methods.containsKey("byName") || Util.methodHasIgnore(visitor.methods['byName']!))) {
+      classBuffer.writeln("""
+      /// Gets a possible [$extClassName] instance value with name [name].
+      ///
+      /// Goes through [$extClassName.values] looking for a value with
+      /// name [name], as reported by [$extClassName.name].
+      /// Returns the first value with the given name, otherwise `null`.
+      static $extClassName? byName(String? name) {
+        if (name != null) {
+          try {
+            return $extClassName.values
+                .firstWhere((element) => element.name() == name);
+          } catch (e) {
+            return null;
+          }
+        }
+        return null;
+      }
+      """);
+    }
+
+    if (annotation.read("nameMethod").boolValue && annotation.read("asNameMapMethod").boolValue &&
+        (!visitor.methods.containsKey("asNameMap") || Util.methodHasIgnore(visitor.methods['asNameMap']!))) {
+      classBuffer.writeln("""
+      /// Creates a map from the names of [$extClassName] values to the values.
+      ///
+      /// The collection that this method is called on is expected to have
+      /// values with distinct names, like the `values` list of an enum class.
+      /// Only one value for each name can occur in the created map,
+      /// so if two or more values have the same name (either being the
+      /// same value, or being values of different enum type), at most one of
+      /// them will be represented in the returned map.
+      static Map<String, $extClassName> asNameMap() =>
+          <String, $extClassName>{for (final value in $extClassName.values) value.name(): value};
+      """);
+    }
+
     for (final entry in methodEntriesSorted) {
       final methodElement = entry.value;
       if (Util.methodHasIgnore(methodElement)) {
@@ -282,6 +320,28 @@ class ExchangeableEnumGenerator
       """);
     }
 
+    if (annotation.read("nameMethod").boolValue && (!visitor.methods.containsKey("name") ||
+        Util.methodHasIgnore(visitor.methods['name']!))) {
+      classBuffer.writeln('///Gets the name of the value.');
+      classBuffer.writeln('String name() {');
+      classBuffer.writeln('switch(_value) {');
+      for (final entry in fieldEntriesSorted) {
+        final fieldName = entry.key;
+        final fieldElement = entry.value;
+        if (!fieldElement.isPrivate && fieldElement.isStatic) {
+          final fieldValue = fieldElement.computeConstantValue()?.getField("_value");
+          dynamic constantValue = fieldValue?.toIntValue();
+          if (enumValue.type.isDartCoreString) {
+            constantValue = "'${fieldValue?.toStringValue()}'";
+          }
+          classBuffer.writeln("case $constantValue: return '$fieldName';");
+        }
+      }
+      classBuffer.writeln('}');
+      classBuffer.writeln('return _value.toString();');
+      classBuffer.writeln('}');
+    }
+
     if (annotation.read("hashCodeMethod").boolValue && (!visitor.fields.containsKey("hashCode") ||
         Util.methodHasIgnore(visitor.methods['hashCode']!))) {
       classBuffer.writeln("""
@@ -315,19 +375,23 @@ class ExchangeableEnumGenerator
       if (enumValue.type.isDartCoreString) {
         classBuffer.writeln('return _value;');
       } else {
-        classBuffer.writeln('switch(_value) {');
-        for (final entry in fieldEntriesSorted) {
-          final fieldName = entry.key;
-          final fieldElement = entry.value;
-          if (!fieldElement.isPrivate && fieldElement.isStatic) {
-            final fieldValue =
-                fieldElement.computeConstantValue()?.getField("_value");
-            final constantValue = fieldValue?.toIntValue();
-            classBuffer.writeln("case $constantValue: return '$fieldName';");
+        if (annotation.read("nameMethod").boolValue) {
+          classBuffer.writeln('return name();');
+        } else {
+          classBuffer.writeln('switch(_value) {');
+          for (final entry in fieldEntriesSorted) {
+            final fieldName = entry.key;
+            final fieldElement = entry.value;
+            if (!fieldElement.isPrivate && fieldElement.isStatic) {
+              final fieldValue =
+              fieldElement.computeConstantValue()?.getField("_value");
+              final constantValue = fieldValue?.toIntValue();
+              classBuffer.writeln("case $constantValue: return '$fieldName';");
+            }
           }
+          classBuffer.writeln('}');
+          classBuffer.writeln('return _value.toString();');
         }
-        classBuffer.writeln('}');
-        classBuffer.writeln('return _value.toString();');
       }
       classBuffer.writeln('}');
     }