From ee3ca054ff3f84c56c0c0cecff4e071c1b425a10 Mon Sep 17 00:00:00 2001 From: Nate Wilson Date: Sun, 31 Mar 2024 10:17:21 -0600 Subject: [PATCH 1/4] update pubspec.yaml --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 574b903..ed604c5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: flutter: sdk: flutter http: ">=0.13.1 <2.0.0" - lints: ">=1.0.1 <2.1.2" + lints: ">=1.0.1" permission_handler: ^11.0.0 dev_dependencies: From ce44d1a15ed853fe484b2fb13023b4410c54deca Mon Sep 17 00:00:00 2001 From: Nate Wilson Date: Sun, 31 Mar 2024 10:17:31 -0600 Subject: [PATCH 2/4] use `super` parameters --- example/lib/main.dart | 2 +- lib/src/buttons/buttons.dart | 4 ++-- lib/src/buttons/cloud_recording_button.dart | 7 +++---- lib/src/layout/floating_layout.dart | 8 ++++---- lib/src/layout/grid_layout.dart | 7 +++---- lib/src/layout/layout.dart | 4 ++-- lib/src/layout/one_to_one_layout.dart | 4 ++-- lib/src/layout/widgets/disabled_video_widget.dart | 2 +- lib/src/layout/widgets/host_controls.dart | 4 ++-- lib/src/layout/widgets/number_of_users.dart | 4 ++-- lib/src/layout/widgets/user_av_state_widget.dart | 4 ++-- 11 files changed, 24 insertions(+), 26 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 537c2ae..9933b95 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -6,7 +6,7 @@ void main() { } class MyApp extends StatefulWidget { - const MyApp({Key? key}) : super(key: key); + const MyApp({super.key}); @override State createState() => _MyAppState(); diff --git a/lib/src/buttons/buttons.dart b/lib/src/buttons/buttons.dart index 3c64da0..c8f641a 100644 --- a/lib/src/buttons/buttons.dart +++ b/lib/src/buttons/buttons.dart @@ -52,7 +52,7 @@ class AgoraVideoButtons extends StatefulWidget { final bool? cloudRecordingEnabled; const AgoraVideoButtons({ - Key? key, + super.key, required this.client, this.enabledButtons, this.extraButtons, @@ -69,7 +69,7 @@ class AgoraVideoButtons extends StatefulWidget { this.onDisconnect, this.addScreenSharing = false, this.cloudRecordingEnabled = false, - }) : super(key: key); + }); @override State createState() => _AgoraVideoButtonsState(); diff --git a/lib/src/buttons/cloud_recording_button.dart b/lib/src/buttons/cloud_recording_button.dart index 11db505..8fb05ac 100644 --- a/lib/src/buttons/cloud_recording_button.dart +++ b/lib/src/buttons/cloud_recording_button.dart @@ -6,10 +6,10 @@ class CloudRecordingButton extends StatelessWidget { final Widget? child; final AgoraClient client; const CloudRecordingButton({ - Key? key, + super.key, required this.client, this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -26,8 +26,7 @@ class CloudRecordingButton extends StatelessWidget { class RecordingStateButton extends StatelessWidget { final AgoraClient client; - const RecordingStateButton({Key? key, required this.client}) - : super(key: key); + const RecordingStateButton({super.key, required this.client}); @override Widget build(BuildContext context) { diff --git a/lib/src/layout/floating_layout.dart b/lib/src/layout/floating_layout.dart index 297acc4..ce4f4b5 100644 --- a/lib/src/layout/floating_layout.dart +++ b/lib/src/layout/floating_layout.dart @@ -42,7 +42,7 @@ class FloatingLayout extends StatefulWidget { final bool? useAndroidSurfaceView; const FloatingLayout({ - Key? key, + super.key, required this.client, this.floatingLayoutContainerHeight, this.floatingLayoutContainerWidth, @@ -55,7 +55,7 @@ class FloatingLayout extends StatefulWidget { this.renderModeType = RenderModeType.renderModeHidden, this.useAndroidSurfaceView = false, this.useFlutterTexture = false, - }) : super(key: key); + }); @override State createState() => _FloatingLayoutState(); @@ -262,7 +262,7 @@ class _FloatingLayoutState extends State { ), padding: const EdgeInsets - .all( + .all( 3.0), child: Icon( Icons @@ -381,7 +381,7 @@ class _FloatingLayoutState extends State { ), padding: const EdgeInsets - .all( + .all( 3.0), child: Icon( Icons diff --git a/lib/src/layout/grid_layout.dart b/lib/src/layout/grid_layout.dart index 36f8a5d..bf1db21 100644 --- a/lib/src/layout/grid_layout.dart +++ b/lib/src/layout/grid_layout.dart @@ -18,12 +18,12 @@ class GridLayout extends StatefulWidget { final RenderModeType renderModeType; const GridLayout({ - Key? key, + super.key, required this.client, this.showNumberOfUsers, this.disabledVideoWidget = const DisabledVideoWidget(), this.renderModeType = RenderModeType.renderModeHidden, - }) : super(key: key); + }); @override State createState() => _GridLayoutState(); @@ -183,8 +183,7 @@ class _GridLayoutState extends State { class DisabledVideoStfWidget extends StatefulWidget { final Widget? disabledVideoWidget; - const DisabledVideoStfWidget({Key? key, this.disabledVideoWidget}) - : super(key: key); + const DisabledVideoStfWidget({super.key, this.disabledVideoWidget}); @override State createState() => _DisabledVideoStfWidgetState(); diff --git a/lib/src/layout/layout.dart b/lib/src/layout/layout.dart index e1d9dbf..09efa24 100644 --- a/lib/src/layout/layout.dart +++ b/lib/src/layout/layout.dart @@ -42,7 +42,7 @@ class AgoraVideoViewer extends StatefulWidget { final RenderModeType renderModeType; const AgoraVideoViewer({ - Key? key, + super.key, required this.client, this.layoutType = Layout.grid, this.floatingLayoutContainerHeight, @@ -54,7 +54,7 @@ class AgoraVideoViewer extends StatefulWidget { this.enableHostControls = false, this.showNumberOfUsers = false, this.renderModeType = RenderModeType.renderModeHidden, - }) : super(key: key); + }); @override State createState() => _AgoraVideoViewerState(); diff --git a/lib/src/layout/one_to_one_layout.dart b/lib/src/layout/one_to_one_layout.dart index 3924a79..fa722ff 100644 --- a/lib/src/layout/one_to_one_layout.dart +++ b/lib/src/layout/one_to_one_layout.dart @@ -19,13 +19,13 @@ class OneToOneLayout extends StatefulWidget { final RenderModeType? renderModeType; const OneToOneLayout({ - Key? key, + super.key, required this.client, this.disabledVideoWidget = const DisabledVideoWidget(), this.showAVState, this.enableHostControl, this.renderModeType = RenderModeType.renderModeHidden, - }) : super(key: key); + }); @override State createState() => _OneToOneLayoutState(); diff --git a/lib/src/layout/widgets/disabled_video_widget.dart b/lib/src/layout/widgets/disabled_video_widget.dart index e4c2f7e..1ed132b 100644 --- a/lib/src/layout/widgets/disabled_video_widget.dart +++ b/lib/src/layout/widgets/disabled_video_widget.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; /// Widget that is displayed when local/remote video is disabled. class DisabledVideoWidget extends StatefulWidget { - const DisabledVideoWidget({Key? key}) : super(key: key); + const DisabledVideoWidget({super.key}); @override State createState() => _DisabledVideoWidgetState(); diff --git a/lib/src/layout/widgets/host_controls.dart b/lib/src/layout/widgets/host_controls.dart index 32974b1..e6118cd 100644 --- a/lib/src/layout/widgets/host_controls.dart +++ b/lib/src/layout/widgets/host_controls.dart @@ -9,12 +9,12 @@ class HostControls extends StatefulWidget { final int index; const HostControls({ - Key? key, + super.key, required this.videoDisabled, required this.muted, required this.client, required this.index, - }) : super(key: key); + }); @override State createState() => _HostControlsState(); diff --git a/lib/src/layout/widgets/number_of_users.dart b/lib/src/layout/widgets/number_of_users.dart index 8e5601b..4dacd6a 100644 --- a/lib/src/layout/widgets/number_of_users.dart +++ b/lib/src/layout/widgets/number_of_users.dart @@ -5,9 +5,9 @@ class NumberOfUsers extends StatefulWidget { final int userCount; const NumberOfUsers({ - Key? key, + super.key, this.userCount = 0, - }) : super(key: key); + }); @override State createState() => _NumberOfUsersState(); diff --git a/lib/src/layout/widgets/user_av_state_widget.dart b/lib/src/layout/widgets/user_av_state_widget.dart index b674265..6a10d88 100644 --- a/lib/src/layout/widgets/user_av_state_widget.dart +++ b/lib/src/layout/widgets/user_av_state_widget.dart @@ -7,10 +7,10 @@ class UserAVStateWidget extends StatefulWidget { final bool muted; const UserAVStateWidget({ - Key? key, + super.key, required this.videoDisabled, required this.muted, - }) : super(key: key); + }); @override State createState() => _UserAVStateWidgetState(); From 7f1cc91ed5c3800e88948defb42e774fdedbfb78 Mon Sep 17 00:00:00 2001 From: Nate Wilson Date: Sun, 31 Mar 2024 10:20:52 -0600 Subject: [PATCH 3/4] reduce diffs --- lib/src/layout/floating_layout.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/layout/floating_layout.dart b/lib/src/layout/floating_layout.dart index ce4f4b5..904d1df 100644 --- a/lib/src/layout/floating_layout.dart +++ b/lib/src/layout/floating_layout.dart @@ -262,7 +262,7 @@ class _FloatingLayoutState extends State { ), padding: const EdgeInsets - .all( + .all( 3.0), child: Icon( Icons @@ -381,7 +381,7 @@ class _FloatingLayoutState extends State { ), padding: const EdgeInsets - .all( + .all( 3.0), child: Icon( Icons From cf6062c6a3bb3517ef60f5ca0060a09f40012171 Mon Sep 17 00:00:00 2001 From: Tadas Petra Date: Mon, 29 Apr 2024 12:55:57 -0500 Subject: [PATCH 4/4] Add new version info --- CHANGELOG.md | 3 +++ lib/models/agora_rtm_mute_request.dart | 2 +- pubspec.yaml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3e1863..1a066be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.3.9 +- Update to support newer lints + ## 1.3.8 - Update types from agora_rtc_engine 6.3.0 diff --git a/lib/models/agora_rtm_mute_request.dart b/lib/models/agora_rtm_mute_request.dart index e30d355..ff6bbb3 100644 --- a/lib/models/agora_rtm_mute_request.dart +++ b/lib/models/agora_rtm_mute_request.dart @@ -99,7 +99,7 @@ class AgoraUIKit { String platform = platformStr(); String framework = "flutter"; - String version = "1.3.8"; + String version = "1.3.9"; AgoraUIKit.fromJson(Map json) : platform = json['platform'], diff --git a/pubspec.yaml b/pubspec.yaml index ed604c5..6549d4e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: agora_uikit description: Flutter plugin to simply integrate Agora Video Calling or Live Video Streaming to your app with just a few lines of code. -version: 1.3.8 +version: 1.3.9 homepage: https://www.agora.io/en/ repository: https://github.com/AgoraIO-Community/VideoUIKit-Flutter