Update flutter_lints and fix lint warnings.

timbotimbo · timbotimbo · commit 36c9b65f9475 · 2025-08-04T12:01:25.000+02:00
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -1 +1,2 @@
-analyzer:
+include: package:flutter_lints/flutter.yaml
+
diff --git a/example/lib/screens/no_interaction_screen.dart b/example/lib/screens/no_interaction_screen.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: avoid_print
+
 import 'package:flutter/material.dart';
 import 'package:flutter_unity_widget/flutter_unity_widget.dart';
 import 'package:pointer_interceptor/pointer_interceptor.dart';
diff --git a/example/lib/screens/orientation_screen.dart b/example/lib/screens/orientation_screen.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: avoid_print
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_unity_widget/flutter_unity_widget.dart';
diff --git a/example/lib/screens/simple_screen.dart b/example/lib/screens/simple_screen.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: avoid_print
+
 import 'package:flutter/material.dart';
 import 'package:flutter_unity_widget/flutter_unity_widget.dart';
 import 'package:pointer_interceptor/pointer_interceptor.dart';
diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart
@@ -13,7 +13,7 @@ import 'package:flutter_unity_widget_example/main.dart';
 void main() {
   testWidgets('Verify Platform version', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(MyApp());
+    await tester.pumpWidget(const MyApp());
 
     // Verify that platform version is retrieved.
     expect(
diff --git a/lib/src/facade_widget.dart b/lib/src/facade_widget.dart
@@ -6,8 +6,8 @@ import 'package:flutter_unity_widget/src/facade_controller.dart';
 import 'helpers/misc.dart';
 
 class UnityWidget extends StatefulWidget {
-  UnityWidget({
-    Key? key,
+  const UnityWidget({
+    super.key,
     required this.onUnityCreated,
     this.onUnityMessage,
     this.fullscreen = false,
diff --git a/lib/src/io/device_method.dart b/lib/src/io/device_method.dart
@@ -159,14 +159,14 @@ class MethodChannelUnityWidget extends UnityWidgetPlatform {
     String? unitySrcUrl,
   }) {
     // ignore: no_leading_underscores_for_local_identifiers
-    final String _viewType = 'plugin.xraph.com/unity_view';
+    const String _viewType = 'plugin.xraph.com/unity_view';
 
     if (useAndroidViewSurf != null) useAndroidViewSurface = useAndroidViewSurf;
 
     final Map<String, dynamic> creationParams = unityOptions;
 
     if (defaultTargetPlatform == TargetPlatform.windows) {
-      return WindowsUnityWidgetView();
+      return const WindowsUnityWidgetView();
     }
 
     if (defaultTargetPlatform == TargetPlatform.android) {
diff --git a/lib/src/io/unity_widget.dart b/lib/src/io/unity_widget.dart
@@ -51,8 +51,8 @@ class AndroidUnityWidgetFlutter {
 typedef MobileUnityWidgetState = _UnityWidgetState;
 
 class UnityWidget extends StatefulWidget {
-  UnityWidget({
-    Key? key,
+  const UnityWidget({
+    super.key,
     required this.onUnityCreated,
     this.onUnityMessage,
     this.fullscreen = false,
@@ -171,7 +171,7 @@ class _UnityWidgetState extends State<UnityWidget> {
 
     if (widget.enablePlaceholder) {
       return widget.placeholder ??
-          Text('Placeholder mode enabled, no native code will be called');
+          const Text('Placeholder mode enabled, no native code will be called');
     }
 
     return UnityWidgetPlatform.instance.buildViewWithTextDirection(
diff --git a/lib/src/io/windows_unity_widget_view.dart b/lib/src/io/windows_unity_widget_view.dart
@@ -11,7 +11,7 @@ class _WindowsUnityWidgetViewState extends State<WindowsUnityWidgetView> {
   @override
   Widget build(BuildContext context) {
     // TODO: Rex Update windows view
-    return MouseRegion(
+    return const MouseRegion(
       child: Texture(
         textureId: 0,
       ),
diff --git a/lib/src/web/unity_widget.dart b/lib/src/web/unity_widget.dart
@@ -10,8 +10,8 @@ import 'web_unity_widget_controller.dart';
 import 'web_unity_widget_view.dart';
 
 class UnityWidget extends StatefulWidget {
-  UnityWidget({
-    Key? key,
+  const UnityWidget({
+    super.key,
     required this.onUnityCreated,
     this.onUnityMessage,
     this.fullscreen = false,
@@ -108,7 +108,7 @@ class _UnityWidgetState extends State<UnityWidget> {
 
     if (widget.enablePlaceholder) {
       return widget.placeholder ??
-          Text('Placeholder mode enabled, no native code will be called');
+          const Text('Placeholder mode enabled, no native code will be called');
     }
 
     return WebUnityWidgetView(
diff --git a/lib/src/web/web_unity_widget_controller.dart b/lib/src/web/web_unity_widget_controller.dart
@@ -104,22 +104,23 @@ class WebUnityWidgetController extends UnityWidgetController {
   void _registerEvents() {
     if (kIsWeb) {
       _messageListener = ((web.Event event) {
-        if (event is web.MessageEvent) {
-          final jsData = event.data;
+        final JSAny? jsEvent = event.jsify();
+        if (_isJsObjectOfType(jsEvent, 'MessageEvent')) {
+          final jsData = (event as web.MessageEvent).data;
           String data = "";
 
           // Handle a raw JS Object [Object object] instead of a json string.
-          if (jsData is JSObject) {
+          if (_isJsObject(jsData)) {
             try {
-              data = jsonStringify(jsData).toDart;
+              data = jsonStringify(jsData as JSObject).toDart;
             } catch (e) {
               log('Failed to stringify JS object', error: e);
               return;
             }
           }
           // this can be either a raw string like "unityReady" or a json string "{\"name\":\"\", ..}"
-          else if (jsData is JSString) {
-            data = jsData.toDart;
+          else if (_isJsString(jsData)) {
+            data = (jsData as JSString).toDart;
           }
 
           if (data.isNotEmpty) {
@@ -255,8 +256,8 @@ class WebUnityWidgetController extends UnityWidgetController {
         .querySelector('flt-platform-view')
         ?.querySelector('iframe');
 
-    if (frame != null && frame is web.HTMLIFrameElement) {
-      frame.focus();
+    if (frame != null && _isJsObjectOfType(frame, 'HTMLIFrameElement')) {
+      (frame as web.HTMLIFrameElement).focus();
     }
   }
 
@@ -329,4 +330,24 @@ class WebUnityWidgetController extends UnityWidgetController {
       web.window.removeEventListener('message', _messageListener);
     }
   }
+
+  // Manual type checks because `a is b` gives warning on js_interop types.
+  // https://dart.dev/tools/linter-rules/invalid_runtime_check_with_js_interop_types
+
+  // TODO: Replace these `_isJs()` checks with `a.isA<b>()` when upgrading to Dart >= 3.4.
+
+  // This check could be replaced with `.isA<JSObject>()` on Dart 3.4+
+  bool _isJsObject(JSAny? data) {
+    return data?.typeofEquals('object') ?? false;
+  }
+
+  // This check could be simplified with `.isA<JSString>()` on Dart 3.4+
+  bool _isJsString(JSAny? data) {
+    return data?.typeofEquals('string') ?? false;
+  }
+
+  // This check could be simplified with `.isA<T>()` on Dart 3.4+
+  bool _isJsObjectOfType(JSAny? data, String type) {
+    return _isJsObject(data) && (data as JSObject).instanceOfString(type);
+  }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -27,7 +27,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^2.0.1
+  flutter_lints: ^5.0.0 # Requires Flutter 3.24+ for development, to match github workflow.
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-analyzer:`
	`1`	`+include: package:flutter_lints/flutter.yaml`
	`2`	`+`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// ignore_for_file: avoid_print`
	`2`	`+`
`1`	`3`	`import 'package:flutter/material.dart';`
`2`	`4`	`import 'package:flutter_unity_widget/flutter_unity_widget.dart';`
`3`	`5`	`import 'package:pointer_interceptor/pointer_interceptor.dart';`