Skip to content

Commit 6e62600

Browse files
committed
Handle most lint warnings in the plugin. (flutter_lints 6.0.0)
1 parent 1660214 commit 6e62600

13 files changed

+45
-30
lines changed

lib/flutter_unity_widget.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
library flutter_unity_widget;
1+
library;
22

33
export 'src/facade_controller.dart';
44
export 'src/facade_widget.dart'

lib/src/facade_controller.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
typedef void UnityCreatedCallback(UnityWidgetController controller);
1+
typedef UnityCreatedCallback = void Function(UnityWidgetController controller);
22

33
abstract class UnityWidgetController {
44
static dynamic webRegistrar;

lib/src/facade_widget.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class UnityWidget extends StatefulWidget {
7777
final TextDirection? layoutDirection;
7878

7979
@override
80-
_UnityWidgetState createState() => _UnityWidgetState();
80+
State<UnityWidget> createState() => _UnityWidgetState();
8181
}
8282

8383
class _UnityWidgetState extends State<UnityWidget> {

lib/src/helpers/events.dart

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,31 @@ class UnityEvent<T> {
55
final int unityId;
66

77
/// The value wrapped by this event
8-
final T value;
8+
final T? value;
99

1010
/// Build a Unity Event, that relates a mapId with a given value.
1111
///
1212
/// The `unityId` is the id of the map that triggered the event.
1313
/// `value` may be `null` in events that don't transport any meaningful data.
14-
UnityEvent(this.unityId, this.value);
14+
UnityEvent(this.unityId, [this.value]);
1515
}
1616

1717
class UnitySceneLoadedEvent extends UnityEvent<SceneLoaded?> {
18-
UnitySceneLoadedEvent(int unityId, SceneLoaded? value)
19-
: super(unityId, value);
18+
UnitySceneLoadedEvent(super.unityId, super.value);
2019
}
2120

2221
class UnityLoadedEvent extends UnityEvent<void> {
23-
UnityLoadedEvent(int unityId, void value) : super(unityId, value);
22+
UnityLoadedEvent(super.unityId);
2423
}
2524

2625
class UnityUnLoadedEvent extends UnityEvent<void> {
27-
UnityUnLoadedEvent(int unityId, void value) : super(unityId, value);
26+
UnityUnLoadedEvent(super.unityId);
2827
}
2928

3029
class UnityCreatedEvent extends UnityEvent<void> {
31-
UnityCreatedEvent(int unityId, void value) : super(unityId, value);
30+
UnityCreatedEvent(super.unityId);
3231
}
3332

3433
class UnityMessageEvent extends UnityEvent<dynamic> {
35-
UnityMessageEvent(int unityId, dynamic value) : super(unityId, value);
34+
UnityMessageEvent(super.unityId, super.value);
3635
}

lib/src/helpers/misc.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class UnknownUnityIDError extends Error {
1212
/// Message describing the assertion error.
1313
final Object? message;
1414

15+
@override
1516
String toString() {
1617
if (message != null) {
1718
return "Unknown unity ID $unityId: ${Error.safeToString(message)}";
@@ -20,8 +21,8 @@ class UnknownUnityIDError extends Error {
2021
}
2122
}
2223

23-
typedef void UnityMessageCallback(dynamic handler);
24+
typedef UnityMessageCallback = void Function(dynamic handler);
2425

25-
typedef void UnitySceneChangeCallback(SceneLoaded? message);
26+
typedef UnitySceneChangeCallback = void Function(SceneLoaded? message);
2627

27-
typedef void UnityUnloadCallback();
28+
typedef UnityUnloadCallback = void Function();

lib/src/io/device_method.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ class MethodChannelUnityWidget extends UnityWidgetPlatform {
8686
_unityStreamController.add(UnityMessageEvent(unityId, call.arguments));
8787
break;
8888
case "events#onUnityUnloaded":
89-
_unityStreamController.add(UnityLoadedEvent(unityId, call.arguments));
89+
_unityStreamController.add(UnityLoadedEvent(unityId));
9090
break;
9191
case "events#onUnitySceneLoaded":
9292
_unityStreamController.add(UnitySceneLoadedEvent(
9393
unityId, SceneLoaded.fromMap(call.arguments)));
9494
break;
9595
case "events#onUnityCreated":
96-
_unityStreamController.add(UnityCreatedEvent(unityId, call.arguments));
96+
_unityStreamController.add(UnityCreatedEvent(unityId));
9797
break;
9898
default:
9999
throw UnimplementedError("Unimplemented ${call.method} method");
@@ -158,6 +158,7 @@ class MethodChannelUnityWidget extends UnityWidgetPlatform {
158158
bool? unityWebSource,
159159
String? unitySrcUrl,
160160
}) {
161+
// ignore: no_leading_underscores_for_local_identifiers
161162
final String _viewType = 'plugin.xraph.com/unity_view';
162163

163164
if (useAndroidViewSurf != null) useAndroidViewSurface = useAndroidViewSurf;

lib/src/io/mobile_unity_widget_controller.dart

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ class MobileUnityWidgetController extends UnityWidgetController {
7070

7171
/// Checks to see if unity player is ready to be used
7272
/// Returns `true` if unity player is ready.
73+
@override
7374
Future<bool?>? isReady() {
7475
if (!_unityWidgetState.widget.enablePlaceholder) {
7576
return UnityWidgetPlatform.instance.isReady(unityId: unityId);
@@ -79,6 +80,7 @@ class MobileUnityWidgetController extends UnityWidgetController {
7980

8081
/// Get the current pause state of the unity player
8182
/// Returns `true` if unity player is paused.
83+
@override
8284
Future<bool?>? isPaused() {
8385
if (!_unityWidgetState.widget.enablePlaceholder) {
8486
return UnityWidgetPlatform.instance.isPaused(unityId: unityId);
@@ -88,6 +90,7 @@ class MobileUnityWidgetController extends UnityWidgetController {
8890

8991
/// Get the current load state of the unity player
9092
/// Returns `true` if unity player is loaded.
93+
@override
9194
Future<bool?>? isLoaded() {
9295
if (!_unityWidgetState.widget.enablePlaceholder) {
9396
return UnityWidgetPlatform.instance.isLoaded(unityId: unityId);
@@ -97,6 +100,7 @@ class MobileUnityWidgetController extends UnityWidgetController {
97100

98101
/// Helper method to know if Unity has been put in background mode (WIP) unstable
99102
/// Returns `true` if unity player is in background.
103+
@override
100104
Future<bool?>? inBackground() {
101105
if (!_unityWidgetState.widget.enablePlaceholder) {
102106
return UnityWidgetPlatform.instance.inBackground(unityId: unityId);
@@ -107,6 +111,7 @@ class MobileUnityWidgetController extends UnityWidgetController {
107111
/// Creates a unity player if it's not already created. Please only call this if unity is not ready,
108112
/// or is in unloaded state. Use [isLoaded] to check.
109113
/// Returns `true` if unity player was created succesfully.
114+
@override
110115
Future<bool?>? create() {
111116
if (!_unityWidgetState.widget.enablePlaceholder) {
112117
return UnityWidgetPlatform.instance.createUnityPlayer(unityId: unityId);
@@ -121,6 +126,7 @@ class MobileUnityWidgetController extends UnityWidgetController {
121126
/// ```dart
122127
/// postMessage("GameManager", "openScene", "ThirdScene")
123128
/// ```
129+
@override
124130
Future<void>? postMessage(String gameObject, methodName, message) {
125131
if (!_unityWidgetState.widget.enablePlaceholder) {
126132
return UnityWidgetPlatform.instance.postMessage(
@@ -140,6 +146,7 @@ class MobileUnityWidgetController extends UnityWidgetController {
140146
/// ```dart
141147
/// postJsonMessage("GameManager", "openScene", {"buildIndex": 3, "name": "ThirdScene"})
142148
/// ```
149+
@override
143150
Future<void>? postJsonMessage(
144151
String gameObject, String methodName, Map<String, dynamic> message) {
145152
if (!_unityWidgetState.widget.enablePlaceholder) {
@@ -154,6 +161,7 @@ class MobileUnityWidgetController extends UnityWidgetController {
154161
}
155162

156163
/// Pause the unity in-game player with this method
164+
@override
157165
Future<void>? pause() {
158166
if (!_unityWidgetState.widget.enablePlaceholder) {
159167
return UnityWidgetPlatform.instance.pausePlayer(unityId: unityId);
@@ -162,6 +170,7 @@ class MobileUnityWidgetController extends UnityWidgetController {
162170
}
163171

164172
/// Resume the unity in-game player with this method idf it is in a paused state
173+
@override
165174
Future<void>? resume() {
166175
if (!_unityWidgetState.widget.enablePlaceholder) {
167176
return UnityWidgetPlatform.instance.resumePlayer(unityId: unityId);
@@ -171,6 +180,7 @@ class MobileUnityWidgetController extends UnityWidgetController {
171180

172181
/// Sometimes you want to open unity in it's own process and openInNativeProcess does just that.
173182
/// It works for Android and iOS is WIP
183+
@override
174184
Future<void>? openInNativeProcess() {
175185
if (!_unityWidgetState.widget.enablePlaceholder) {
176186
return UnityWidgetPlatform.instance.openInNativeProcess(unityId: unityId);
@@ -180,6 +190,7 @@ class MobileUnityWidgetController extends UnityWidgetController {
180190

181191
/// Unloads unity player from th current process (Works on Android only for now)
182192
/// iOS is WIP. For more information please read [Unity Docs](https://docs.unity3d.com/2020.2/Documentation/Manual/UnityasaLibrary.html)
193+
@override
183194
Future<void>? unload() {
184195
if (!_unityWidgetState.widget.enablePlaceholder) {
185196
return UnityWidgetPlatform.instance.unloadPlayer(unityId: unityId);
@@ -188,6 +199,7 @@ class MobileUnityWidgetController extends UnityWidgetController {
188199
}
189200

190201
/// Quits unity player. Note that this kills the current flutter process, thus quiting the app
202+
@override
191203
Future<void>? quit() {
192204
if (!_unityWidgetState.widget.enablePlaceholder) {
193205
return UnityWidgetPlatform.instance.quitPlayer(unityId: unityId);
@@ -206,6 +218,7 @@ class MobileUnityWidgetController extends UnityWidgetController {
206218
_onUnityUnloadedSub = null;
207219
}
208220

221+
@override
209222
void dispose() {
210223
_cancelSubscriptions();
211224
UnityWidgetPlatform.instance.dispose(unityId: unityId);

lib/src/io/unity_widget.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class UnityWidget extends StatefulWidget {
126126
final TextDirection? layoutDirection;
127127

128128
@override
129-
_UnityWidgetState createState() => _UnityWidgetState();
129+
State<UnityWidget> createState() => _UnityWidgetState();
130130
}
131131

132132
class _UnityWidgetState extends State<UnityWidget> {

lib/src/io/windows_unity_widget_view.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
22

33
class WindowsUnityWidgetView extends StatefulWidget {
4-
const WindowsUnityWidgetView({Key? key}) : super(key: key);
4+
const WindowsUnityWidgetView({super.key});
55

66
@override
77
State<WindowsUnityWidgetView> createState() => _WindowsUnityWidgetViewState();

lib/src/web/unity_widget.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class UnityWidget extends StatefulWidget {
8181
final TextDirection? layoutDirection;
8282

8383
@override
84-
_UnityWidgetState createState() => _UnityWidgetState();
84+
State<UnityWidget> createState() => _UnityWidgetState();
8585
}
8686

8787
typedef WebUnityWidgetState = _UnityWidgetState;

0 commit comments

Comments
 (0)