Skip to content

Commit e1d7fb6

Browse files
authored
refactor: Adapt to flame_lint v0.2.0+2 (#1477)
Adapt code to comply with new lint rules published in `flame_lint` v0.2.0+2
1 parent 61d4c39 commit e1d7fb6

24 files changed

+104
-60
lines changed

packages/audioplayers/example/integration_test/test_utils.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,9 @@ Duration? _parseDuration(String? s) {
177177
if (s == null || s.isEmpty) {
178178
return null;
179179
}
180-
var hours = 0, minutes = 0, micros = 0;
180+
var hours = 0;
181+
var minutes = 0;
182+
var micros = 0;
181183
final parts = s.split(':');
182184
if (parts.length > 2) {
183185
hours = int.parse(parts[parts.length - 3]);

packages/audioplayers/example/lib/components/btn.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ class Btn extends StatelessWidget {
44
final String txt;
55
final VoidCallback onPressed;
66

7-
const Btn({super.key, required this.txt, required this.onPressed});
7+
const Btn({
8+
required this.txt,
9+
required this.onPressed,
10+
super.key,
11+
});
812

913
@override
1014
Widget build(BuildContext context) {

packages/audioplayers/example/lib/components/cbx.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ class Cbx extends StatelessWidget {
77

88
const Cbx(
99
this.label,
10-
this.value,
1110
this.update, {
11+
required this.value,
1212
super.key,
1313
});
1414

packages/audioplayers/example/lib/components/dlg.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ import 'package:audioplayers_example/components/btn.dart';
22
import 'package:flutter/material.dart';
33

44
class SimpleDlg extends StatelessWidget {
5-
final String message, action;
5+
final String message;
6+
final String action;
67

78
const SimpleDlg({
8-
super.key,
99
required this.message,
1010
required this.action,
11+
super.key,
1112
});
1213

1314
@override
@@ -31,8 +32,8 @@ class Dlg extends StatelessWidget {
3132
final Widget child;
3233

3334
const Dlg({
34-
super.key,
3535
required this.child,
36+
super.key,
3637
});
3738

3839
@override

packages/audioplayers/example/lib/components/drop_down.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ class LabeledDropDown<T> extends StatelessWidget {
77
final void Function(T?) onChange;
88

99
const LabeledDropDown({
10-
super.key,
1110
required this.label,
1211
required this.options,
1312
required this.selected,
1413
required this.onChange,
14+
super.key,
1515
});
1616

1717
@override
@@ -34,11 +34,11 @@ class CustomDropDown<T> extends StatelessWidget {
3434
final bool isExpanded;
3535

3636
const CustomDropDown({
37-
super.key,
3837
required this.options,
3938
required this.selected,
4039
required this.onChange,
4140
this.isExpanded = false,
41+
super.key,
4242
});
4343

4444
@override

packages/audioplayers/example/lib/components/list_tile.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ class WrappedListTile extends StatelessWidget {
66
final Widget? trailing;
77

88
const WrappedListTile({
9-
super.key,
109
required this.children,
1110
this.leading,
1211
this.trailing,
12+
super.key,
1313
});
1414

1515
@override

packages/audioplayers/example/lib/components/pad.dart

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

33
class Pad extends StatelessWidget {
4-
final double width, height;
4+
final double width;
5+
final double height;
56

67
const Pad({super.key, this.width = 0, this.height = 0});
78

packages/audioplayers/example/lib/components/player_widget.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ import 'package:flutter/material.dart';
66
class PlayerWidget extends StatefulWidget {
77
final AudioPlayer player;
88

9-
const PlayerWidget({super.key, required this.player});
9+
const PlayerWidget({
10+
required this.player,
11+
super.key,
12+
});
1013

1114
@override
1215
State<StatefulWidget> createState() {

packages/audioplayers/example/lib/components/properties_widget.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ import 'package:flutter/material.dart';
55
class PropertiesWidget extends StatefulWidget {
66
final AudioPlayer player;
77

8-
const PropertiesWidget({super.key, required this.player});
8+
const PropertiesWidget({
9+
required this.player,
10+
super.key,
11+
});
912

1013
@override
1114
State<PropertiesWidget> createState() => _PropertiesWidgetState();

packages/audioplayers/example/lib/components/stream_widget.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,18 @@ import 'package:flutter/material.dart';
77
class StreamWidget extends StatefulWidget {
88
final AudioPlayer player;
99

10-
const StreamWidget({super.key, required this.player});
10+
const StreamWidget({
11+
required this.player,
12+
super.key,
13+
});
1114

1215
@override
1316
State<StreamWidget> createState() => _StreamWidgetState();
1417
}
1518

1619
class _StreamWidgetState extends State<StreamWidget> {
17-
Duration? streamDuration, streamPosition;
20+
Duration? streamDuration;
21+
Duration? streamPosition;
1822
PlayerState? streamState;
1923
late List<StreamSubscription> streams;
2024

packages/audioplayers/example/lib/components/tab_content.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ import 'package:flutter/material.dart';
33
class TabContent extends StatelessWidget {
44
final List<Widget> children;
55

6-
const TabContent({super.key, required this.children});
6+
const TabContent({
7+
required this.children,
8+
super.key,
9+
});
710

811
@override
912
Widget build(BuildContext context) {

packages/audioplayers/example/lib/components/tabs.dart

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ import 'package:flutter/material.dart';
33
class Tabs extends StatelessWidget {
44
final List<TabData> tabs;
55

6-
const Tabs({super.key, required this.tabs});
6+
const Tabs({
7+
required this.tabs,
8+
super.key,
9+
});
710

811
@override
912
Widget build(BuildContext context) {
@@ -41,5 +44,9 @@ class TabData {
4144
final String label;
4245
final Widget content;
4346

44-
TabData({this.key, required this.label, required this.content});
47+
TabData({
48+
required this.label,
49+
required this.content,
50+
this.key,
51+
});
4552
}

packages/audioplayers/example/lib/components/tgl.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ class Tgl extends StatelessWidget {
77
final void Function(int) onChange;
88

99
const Tgl({
10-
super.key,
1110
required this.options,
1211
required this.selected,
1312
required this.onChange,
13+
super.key,
1414
});
1515

1616
@override
@@ -43,10 +43,10 @@ class EnumTgl<T extends Enum> extends StatelessWidget {
4343
final void Function(T) onChange;
4444

4545
const EnumTgl({
46-
super.key,
4746
required this.options,
4847
required this.selected,
4948
required this.onChange,
49+
super.key,
5050
});
5151

5252
@override

packages/audioplayers/example/lib/components/txt.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ import 'package:flutter/material.dart';
33
class TxtBox extends StatefulWidget {
44
final String value;
55
final void Function(String) onChange;
6+
67
const TxtBox({
7-
super.key,
88
required this.value,
99
required this.onChange,
10+
super.key,
1011
});
1112

1213
@override

packages/audioplayers/example/lib/main.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ const defaultPlayerCount = 4;
1717
typedef OnError = void Function(Exception exception);
1818

1919
void main() {
20-
runApp(const MaterialApp(home: ExampleApp()));
20+
runApp(const MaterialApp(home: _ExampleApp()));
2121
}
2222

23-
class ExampleApp extends StatefulWidget {
24-
const ExampleApp({super.key});
23+
class _ExampleApp extends StatefulWidget {
24+
const _ExampleApp();
2525

2626
@override
2727
_ExampleAppState createState() => _ExampleAppState();
2828
}
2929

30-
class _ExampleAppState extends State<ExampleApp> {
30+
class _ExampleAppState extends State<_ExampleApp> {
3131
List<AudioPlayer> audioPlayers = List.generate(
3232
defaultPlayerCount,
3333
(_) => AudioPlayer()..setReleaseMode(ReleaseMode.stop),

packages/audioplayers/example/lib/tabs/audio_context.dart

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ import 'package:flutter/material.dart';
88
class AudioContextTab extends StatefulWidget {
99
final AudioPlayer player;
1010

11-
const AudioContextTab({super.key, required this.player});
11+
const AudioContextTab({
12+
required this.player,
13+
super.key,
14+
});
1215

1316
@override
14-
_AudioContextTabState createState() => _AudioContextTabState();
17+
AudioContextTabState createState() => AudioContextTabState();
1518
}
1619

17-
class _AudioContextTabState extends State<AudioContextTab>
20+
class AudioContextTabState extends State<AudioContextTab>
1821
with AutomaticKeepAliveClientMixin<AudioContextTab> {
1922
static GlobalAudioScope get _global => AudioPlayer.global;
2023

@@ -102,22 +105,22 @@ class _AudioContextTabState extends State<AudioContextTab>
102105
children: [
103106
Cbx(
104107
'Force Speaker',
105-
audioContextConfig.forceSpeaker,
108+
value: audioContextConfig.forceSpeaker,
106109
(v) => updateConfig(audioContextConfig.copy(forceSpeaker: v)),
107110
),
108111
Cbx(
109112
'Duck Audio',
110-
audioContextConfig.duckAudio,
113+
value: audioContextConfig.duckAudio,
111114
(v) => updateConfig(audioContextConfig.copy(duckAudio: v)),
112115
),
113116
Cbx(
114117
'Respect Silence',
115-
audioContextConfig.respectSilence,
118+
value: audioContextConfig.respectSilence,
116119
(v) => updateConfig(audioContextConfig.copy(respectSilence: v)),
117120
),
118121
Cbx(
119122
'Stay Awake',
120-
audioContextConfig.stayAwake,
123+
value: audioContextConfig.stayAwake,
121124
(v) => updateConfig(audioContextConfig.copy(stayAwake: v)),
122125
),
123126
],
@@ -129,14 +132,14 @@ class _AudioContextTabState extends State<AudioContextTab>
129132
children: [
130133
Cbx(
131134
'isSpeakerphoneOn',
132-
audioContext.android.isSpeakerphoneOn,
135+
value: audioContext.android.isSpeakerphoneOn,
133136
(v) => updateAudioContextAndroid(
134137
audioContext.android.copy(isSpeakerphoneOn: v),
135138
),
136139
),
137140
Cbx(
138141
'stayAwake',
139-
audioContext.android.stayAwake,
142+
value: audioContext.android.stayAwake,
140143
(v) => updateAudioContextAndroid(
141144
audioContext.android.copy(stayAwake: v),
142145
),
@@ -187,7 +190,7 @@ class _AudioContextTabState extends State<AudioContextTab>
187190
final options = audioContext.iOS.options.toList();
188191
return Cbx(
189192
option.name,
190-
options.contains(option),
193+
value: options.contains(option),
191194
(v) {
192195
if (v) {
193196
options.add(option);

packages/audioplayers/example/lib/tabs/controls.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ import 'package:flutter/material.dart';
1010
class ControlsTab extends StatefulWidget {
1111
final AudioPlayer player;
1212

13-
const ControlsTab({super.key, required this.player});
13+
const ControlsTab({
14+
required this.player,
15+
super.key,
16+
});
1417

1518
@override
1619
State<ControlsTab> createState() => _ControlsTabState();
@@ -188,11 +191,11 @@ class SeekDialog extends StatelessWidget {
188191
final String value;
189192

190193
const SeekDialog({
191-
super.key,
192194
required this.seekDuration,
193195
required this.seekPercent,
194196
required this.value,
195197
required this.setValue,
198+
super.key,
196199
});
197200

198201
@override

packages/audioplayers/example/lib/tabs/logger.dart

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,16 @@ import 'package:flutter/material.dart';
55
class LoggerTab extends StatefulWidget {
66
final AudioPlayer player;
77

8-
const LoggerTab({super.key, required this.player});
8+
const LoggerTab({
9+
required this.player,
10+
super.key,
11+
});
912

1013
@override
11-
_LoggerTabState createState() => _LoggerTabState();
14+
LoggerTabState createState() => LoggerTabState();
1215
}
1316

14-
class _LoggerTabState extends State<LoggerTab>
17+
class LoggerTabState extends State<LoggerTab>
1518
with AutomaticKeepAliveClientMixin<LoggerTab> {
1619
AudioLogLevel get currentLogLevel => AudioLogger.logLevel;
1720

@@ -132,10 +135,10 @@ class LogView extends StatelessWidget {
132135
final VoidCallback onDelete;
133136

134137
const LogView({
135-
super.key,
136138
required this.logs,
137139
required this.title,
138140
required this.onDelete,
141+
super.key,
139142
});
140143

141144
@override

packages/audioplayers/example/lib/tabs/sources.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ const invalidAsset = 'invalid.txt';
2929
class SourcesTab extends StatefulWidget {
3030
final AudioPlayer player;
3131

32-
const SourcesTab({super.key, required this.player});
32+
const SourcesTab({
33+
required this.player,
34+
super.key,
35+
});
3336

3437
@override
3538
State<SourcesTab> createState() => _SourcesTabState();

0 commit comments

Comments
 (0)