From 5cd611505334afb9fcc23f9165069101c5675cfe Mon Sep 17 00:00:00 2001 From: Gustl22 Date: Mon, 20 Mar 2023 16:22:06 +0100 Subject: [PATCH 1/2] feat(example): add invalid asset, rename some asset variables, coloring of source tab buttons --- .../audioplayers/example/assets/invalid.txt | 1 + .../example/integration_test/lib_test.dart | 4 +-- .../example/lib/tabs/sources.dart | 29 ++++++++++++++----- 3 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 packages/audioplayers/example/assets/invalid.txt diff --git a/packages/audioplayers/example/assets/invalid.txt b/packages/audioplayers/example/assets/invalid.txt new file mode 100644 index 000000000..5cd09fd42 --- /dev/null +++ b/packages/audioplayers/example/assets/invalid.txt @@ -0,0 +1 @@ +This represents an invalid audio file. diff --git a/packages/audioplayers/example/integration_test/lib_test.dart b/packages/audioplayers/example/integration_test/lib_test.dart index 298fbd99d..3b0acfb1a 100644 --- a/packages/audioplayers/example/integration_test/lib_test.dart +++ b/packages/audioplayers/example/integration_test/lib_test.dart @@ -50,12 +50,12 @@ void main() { ), if (features.hasAssetSource) LibSourceTestData( - source: AssetSource(asset1), + source: AssetSource(wavAsset), duration: const Duration(seconds: 1, milliseconds: 068), ), if (features.hasAssetSource) LibSourceTestData( - source: AssetSource(asset2), + source: AssetSource(mp3Asset), duration: const Duration(minutes: 1, seconds: 34, milliseconds: 119), ), ]; diff --git a/packages/audioplayers/example/lib/tabs/sources.dart b/packages/audioplayers/example/lib/tabs/sources.dart index 5bbc7e355..ba6e46b75 100644 --- a/packages/audioplayers/example/lib/tabs/sources.dart +++ b/packages/audioplayers/example/lib/tabs/sources.dart @@ -22,8 +22,9 @@ final m3u8StreamUrl = useLocalServer : 'https://a.files.bbci.co.uk/media/live/manifesto/audio/simulcast/hls/nonuk/sbr_low/ak/bbc_radio_one.m3u8'; const mpgaStreamUrl = 'https://timesradio.wireless.radio/stream'; -const asset1 = 'laser.wav'; -const asset2 = 'nasa_on_a_mission.mp3'; +const wavAsset = 'laser.wav'; +const mp3Asset = 'nasa_on_a_mission.mp3'; +const invalidAsset = 'invalid.txt'; class SourcesTab extends StatefulWidget { final AudioPlayer player; @@ -60,6 +61,7 @@ class _SourcesTabState extends State required String subtitle, required Source source, Key? setSourceKey, + Color? buttonColor, Key? playKey, }) => _SourceTile( @@ -69,6 +71,7 @@ class _SourcesTabState extends State subtitle: subtitle, setSourceKey: setSourceKey, playKey: playKey, + buttonColor: buttonColor, ); Future _setSourceBytesAsset( @@ -140,18 +143,18 @@ class _SourcesTabState extends State setSourceKey: const Key('setSource-asset-wav'), title: 'Asset 1', subtitle: 'laser.wav', - source: AssetSource(asset1), + source: AssetSource(wavAsset), ), _createSourceTile( setSourceKey: const Key('setSource-asset-mp3'), title: 'Asset 2', subtitle: 'nasa.mp3', - source: AssetSource(asset2), + source: AssetSource(mp3Asset), ), _SourceTile( - setSource: () => _setSourceBytesAsset(_setSource, asset: asset1), + setSource: () => _setSourceBytesAsset(_setSource, asset: wavAsset), setSourceKey: const Key('setSource-bytes-local'), - play: () => _setSourceBytesAsset(_play, asset: asset1), + play: () => _setSourceBytesAsset(_play, asset: wavAsset), title: 'Bytes - Local', subtitle: 'laser.wav', ), @@ -168,6 +171,14 @@ class _SourcesTabState extends State play: () => _setSourceFilePicker(_play), title: 'Device File', subtitle: 'Pick local file from device', + buttonColor: Colors.green, + ), + _createSourceTile( + setSourceKey: const Key('setSource-asset-invalid'), + title: 'Invalid Asset', + subtitle: 'invalid.txt', + source: AssetSource(invalidAsset), + buttonColor: Colors.red ), ], ); @@ -184,6 +195,7 @@ class _SourceTile extends StatelessWidget { final String? subtitle; final Key? setSourceKey; final Key? playKey; + final Color? buttonColor; const _SourceTile({ required this.setSource, @@ -192,6 +204,7 @@ class _SourceTile extends StatelessWidget { this.subtitle, this.setSourceKey, this.playKey, + this.buttonColor, }); @override @@ -207,14 +220,14 @@ class _SourceTile extends StatelessWidget { key: setSourceKey, onPressed: setSource, icon: const Icon(Icons.upload_file), - color: Theme.of(context).primaryColor, + color: buttonColor ?? Theme.of(context).primaryColor, ), IconButton( key: playKey, tooltip: 'Play', onPressed: play, icon: const Icon(Icons.play_arrow), - color: Theme.of(context).primaryColor, + color: buttonColor ?? Theme.of(context).primaryColor, ), ], ), From bcf33444ee6d7894dbd04665f9500e8f75003fcc Mon Sep 17 00:00:00 2001 From: Gustl22 Date: Mon, 20 Mar 2023 16:44:44 +0100 Subject: [PATCH 2/2] dart format & flutter analyze --- packages/audioplayers/example/lib/tabs/sources.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/audioplayers/example/lib/tabs/sources.dart b/packages/audioplayers/example/lib/tabs/sources.dart index ba6e46b75..afcf4387f 100644 --- a/packages/audioplayers/example/lib/tabs/sources.dart +++ b/packages/audioplayers/example/lib/tabs/sources.dart @@ -178,7 +178,7 @@ class _SourcesTabState extends State title: 'Invalid Asset', subtitle: 'invalid.txt', source: AssetSource(invalidAsset), - buttonColor: Colors.red + buttonColor: Colors.red, ), ], );