Merge branch 'master' into video_player/prevent_screensaver

flutter-tizen · Aug 31, 2023 · 6b5569c · 6b5569c
2 parents fb72684 + 10ea31d
commit 6b5569c
Show file tree

Hide file tree

Showing 14 changed files with 64 additions and 29 deletions.
diff --git a/packages/audioplayers/CHANGELOG.md b/packages/audioplayers/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.0.1
+
+* Update audioplayers to 5.1.0.
+* Update audioplayers_platform_interface to 6.0.0.
+* Update example app.
+
 ## 3.0.0
 
 * Update audioplayers to 4.1.0.

diff --git a/packages/audioplayers/README.md b/packages/audioplayers/README.md
@@ -10,8 +10,8 @@ This package is not an _endorsed_ implementation of `audioplayers`. Therefore, y
 
 ```yaml
 dependencies:
-  audioplayers: ^4.1.0
-  audioplayers_tizen: ^3.0.0
+  audioplayers: ^5.1.0
+  audioplayers_tizen: ^3.0.1
 
 ```
 
@@ -51,6 +51,7 @@ For detailed information on Tizen privileges, see [Tizen Docs: API Privileges](h
 - [x] `AudioPlayer.resume`
 - [x] `AudioPlayer.release`
 - [x] `AudioPlayer.seek`
+- [ ] `AudioPlayer.setBalance` (not supported)
 - [x] `AudioPlayer.setVolume`
 - [x] `AudioPlayer.setReleaseMode`
 - [x] `AudioPlayer.setPlaybackRate`

diff --git a/packages/audioplayers/example/assets/ambient_c_motion.mp3 b/packages/audioplayers/example/assets/ambient_c_motion.mp3
diff --git a/packages/audioplayers/example/assets/coins.wav b/packages/audioplayers/example/assets/coins.wav
diff --git a/packages/audioplayers/example/assets/invalid.txt b/packages/audioplayers/example/assets/invalid.txt
@@ -0,0 +1 @@
+This represents an invalid audio file.
diff --git a/packages/audioplayers/example/lib/components/properties_widget.dart b/packages/audioplayers/example/lib/components/properties_widget.dart
@@ -74,6 +74,30 @@ class _PropertiesWidgetState extends State<PropertiesWidget> {
           subtitle: const Text('Source'),
           leading: const Icon(Icons.audio_file),
         ),
+        ListTile(
+          title: Text(
+            widget.player.volume.toString(),
+            key: const Key('volumeText'),
+          ),
+          subtitle: const Text('Volume'),
+          leading: const Icon(Icons.volume_up),
+        ),
+        ListTile(
+          title: Text(
+            widget.player.balance.toString(),
+            key: const Key('balanceText'),
+          ),
+          subtitle: const Text('Balance'),
+          leading: const Icon(Icons.balance),
+        ),
+        ListTile(
+          title: Text(
+            widget.player.playbackRate.toString(),
+            key: const Key('playbackRateText'),
+          ),
+          subtitle: const Text('Playback Rate'),
+          leading: const Icon(Icons.speed),
+        ),
       ],
     );
   }

diff --git a/packages/audioplayers/example/lib/tabs/audio_context.dart b/packages/audioplayers/example/lib/tabs/audio_context.dart
@@ -103,11 +103,14 @@ class AudioContextTabState extends State<AudioContextTab>
   Widget _genericTab() {
     return TabContent(
       children: [
-        Cbx(
-          'Force Speaker',
-          value: audioContextConfig.forceSpeaker,
-          ({value}) =>
-              updateConfig(audioContextConfig.copy(forceSpeaker: value)),
+        LabeledDropDown<AudioContextConfigRoute>(
+          label: 'Audio Route',
+          key: const Key('audioRoute'),
+          options: {for (final e in AudioContextConfigRoute.values) e: e.name},
+          selected: audioContextConfig.route,
+          onChange: (v) => updateConfig(
+            audioContextConfig.copy(route: v),
+          ),
         ),
         Cbx(
           'Duck Audio',
@@ -151,7 +154,7 @@ class AudioContextTabState extends State<AudioContextTab>
         LabeledDropDown<AndroidContentType>(
           label: 'contentType',
           key: const Key('contentType'),
-          options: {for (var e in AndroidContentType.values) e: e.name},
+          options: {for (final e in AndroidContentType.values) e: e.name},
           selected: audioContext.android.contentType,
           onChange: (v) => updateAudioContextAndroid(
             audioContext.android.copy(contentType: v),
@@ -160,7 +163,7 @@ class AudioContextTabState extends State<AudioContextTab>
         LabeledDropDown<AndroidUsageType>(
           label: 'usageType',
           key: const Key('usageType'),
-          options: {for (var e in AndroidUsageType.values) e: e.name},
+          options: {for (final e in AndroidUsageType.values) e: e.name},
           selected: audioContext.android.usageType,
           onChange: (v) => updateAudioContextAndroid(
             audioContext.android.copy(usageType: v),
@@ -169,7 +172,7 @@ class AudioContextTabState extends State<AudioContextTab>
         LabeledDropDown<AndroidAudioFocus?>(
           key: const Key('audioFocus'),
           label: 'audioFocus',
-          options: {for (var e in AndroidAudioFocus.values) e: e.name},
+          options: {for (final e in AndroidAudioFocus.values) e: e.name},
           selected: audioContext.android.audioFocus,
           onChange: (v) => updateAudioContextAndroid(
             audioContext.android.copy(audioFocus: v),
@@ -178,7 +181,7 @@ class AudioContextTabState extends State<AudioContextTab>
         LabeledDropDown<AndroidAudioMode>(
           key: const Key('audioMode'),
           label: 'audioMode',
-          options: {for (var e in AndroidAudioMode.values) e: e.name},
+          options: {for (final e in AndroidAudioMode.values) e: e.name},
           selected: audioContext.android.audioMode,
           onChange: (v) => updateAudioContextAndroid(
             audioContext.android.copy(audioMode: v),
@@ -191,7 +194,7 @@ class AudioContextTabState extends State<AudioContextTab>
   Widget _iosTab() {
     final iosOptions = AVAudioSessionOptions.values.map(
       (option) {
-        final options = audioContext.iOS.options.toList();
+        final options = audioContext.iOS.options;
         return Cbx(
           option.name,
           value: options.contains(option),
@@ -213,13 +216,13 @@ class AudioContextTabState extends State<AudioContextTab>
         LabeledDropDown<AVAudioSessionCategory>(
           key: const Key('category'),
           label: 'category',
-          options: {for (var e in AVAudioSessionCategory.values) e: e.name},
+          options: {for (final e in AVAudioSessionCategory.values) e: e.name},
           selected: audioContext.iOS.category,
           onChange: (v) => updateAudioContextIOS(
             audioContext.iOS.copy(category: v),
           ),
         ),
-        ...iosOptions
+        ...iosOptions,
       ],
     );
   }

diff --git a/packages/audioplayers/example/lib/tabs/controls.dart b/packages/audioplayers/example/lib/tabs/controls.dart
@@ -116,8 +116,8 @@ class _ControlsTabState extends State<ControlsTab>
             EnumTgl<PlayerMode>(
               key: const Key('control-player-mode'),
               options: {
-                for (var e in PlayerMode.values)
-                  'control-player-mode-${e.name}': e
+                for (final e in PlayerMode.values)
+                  'control-player-mode-${e.name}': e,
               },
               selected: widget.player.mode,
               onChange: (playerMode) async {
@@ -132,8 +132,8 @@ class _ControlsTabState extends State<ControlsTab>
             EnumTgl<ReleaseMode>(
               key: const Key('control-release-mode'),
               options: {
-                for (var e in ReleaseMode.values)
-                  'control-release-mode-${e.name}': e
+                for (final e in ReleaseMode.values)
+                  'control-release-mode-${e.name}': e,
               },
               selected: widget.player.releaseMode,
               onChange: (releaseMode) async {

diff --git a/packages/audioplayers/example/lib/tabs/logger.dart b/packages/audioplayers/example/lib/tabs/logger.dart
@@ -149,7 +149,7 @@ class LogView extends StatelessWidget {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Text(title),
-            IconButton(onPressed: onDelete, icon: const Icon(Icons.delete))
+            IconButton(onPressed: onDelete, icon: const Icon(Icons.delete)),
           ],
         ),
         Expanded(
@@ -165,7 +165,7 @@ class LogView extends StatelessWidget {
                             ? const TextStyle(color: Colors.red)
                             : null,
                       ),
-                      Divider(color: Colors.grey.shade400)
+                      Divider(color: Colors.grey.shade400),
                     ],
                   ),
                 )

diff --git a/packages/audioplayers/example/lib/tabs/sources.dart b/packages/audioplayers/example/lib/tabs/sources.dart
@@ -6,7 +6,7 @@ import 'package:audioplayers_tizen_example/utils.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:http/http.dart';
+import 'package:http/http.dart' as http;
 
 final localhost = kIsWeb || !Platform.isAndroid ? 'localhost' : '10.0.2.2';
 const host = 'https://luan.xyz';
@@ -86,7 +86,7 @@ class _SourcesTabState extends State<SourcesTab>
     Future<void> Function(Source) fun, {
     required String url,
   }) async {
-    final bytes = await readBytes(Uri.parse(url));
+    final bytes = await http.readBytes(Uri.parse(url));
     await fun(BytesSource(bytes));
   }
 
@@ -117,7 +117,7 @@ class _SourcesTabState extends State<SourcesTab>
         ),
         _createSourceTile(
           setSourceKey: const Key('setSource-url-remote-mp3-1'),
-          title: 'Remote URL MP3 1',
+          title: 'Remote URL MP3 1 (VBR)',
           subtitle: 'ambient_c_motion.mp3',
           source: UrlSource(mp3Url1),
         ),

diff --git a/packages/audioplayers/example/pubspec.yaml b/packages/audioplayers/example/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  audioplayers: ^4.1.0
+  audioplayers: ^5.1.0
   audioplayers_tizen:
     path: ../
   collection: ^1.16.0

diff --git a/packages/audioplayers/pubspec.yaml b/packages/audioplayers/pubspec.yaml
@@ -2,7 +2,7 @@ name: audioplayers_tizen
 description: Tizen implementation of the audioplayers plugin.
 homepage: https://github.com/flutter-tizen/plugins
 repository: https://github.com/flutter-tizen/plugins/tree/master/packages/audioplayers
-version: 3.0.0
+version: 3.0.1
 
 environment:
   sdk: ">=2.18.0 <4.0.0"
@@ -16,7 +16,7 @@ flutter:
         fileName: audioplayers_tizen_plugin.h
 
 dependencies:
-  audioplayers_platform_interface: ^5.0.1
+  audioplayers_platform_interface: ^6.0.0
   flutter:
     sdk: flutter
 

diff --git a/packages/flutter_secure_storage/example/lib/main.dart b/packages/flutter_secure_storage/example/lib/main.dart
@@ -108,7 +108,7 @@ class ItemsWidgetState extends State<ItemsWidget> {
                   child: Text('Delete all'),
                 ),
               ],
-            )
+            ),
           ],
         ),
         body: Column(
@@ -186,6 +186,7 @@ class ItemsWidgetState extends State<ItemsWidget> {
 
         break;
       case _ItemActions.edit:
+        if (!context.mounted) return;
         final result = await showDialog<String>(
           context: context,
           builder: (context) => _EditItemWidget(item.value),

diff --git a/packages/sqflite/analysis_options.yaml b/packages/sqflite/analysis_options.yaml
@@ -39,8 +39,7 @@ linter:
     - directives_ordering
     - empty_catches
     - hash_and_equals
-    - iterable_contains_unrelated_type
-    - list_remove_unrelated_type
+    - collection_methods_unrelated_type
     - no_adjacent_strings_in_list
     - no_duplicate_case_values
     - non_constant_identifier_names