Skip to content

Commit 6bf751b

Browse files
Merge pull request #161 from SuaMusica/feature/3580-add-music-next-queue
Feature/3580 add music next queue
2 parents 7759f93 + 2850098 commit 6bf751b

15 files changed

Lines changed: 310 additions & 96 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,4 +508,4 @@ Thumbs.db
508508

509509
!/gradle/wrapper/gradle-wrapper.jar
510510

511-
# End of https://www.gitignore.io/api/java,swift,kotlin,android,flutter,intellij,objective-c,androidstudio
511+
# End of https://www.gitignore.io/api/java,swift,kotlin,android,flutter,intellij,objective-c,androidstudio

Makefile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
.PHONY: pub-get
2+
3+
PUBSPEC_DIRS := $(sort $(dir $(wildcard packages/*/pubspec.yaml)))
4+
5+
## Run flutter pub get in all packages containing pubspec.yaml
6+
pub-get:
7+
@failed=""; \
8+
for dir in $(PUBSPEC_DIRS); do \
9+
echo "=> pub get: $$dir"; \
10+
(cd $$dir && flutter pub get) || failed="$$failed $$dir"; \
11+
done; \
12+
echo ""; \
13+
if [ -n "$$failed" ]; then \
14+
echo "FAILED in:$$failed"; \
15+
exit 1; \
16+
else \
17+
echo "All packages updated!"; \
18+
fi

packages/mediascanner/example/lib/main.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ class _MyAppState extends State<MyApp> {
7272
primary: false,
7373
padding: const EdgeInsets.all(2),
7474
children: List.generate(
75-
snapshot.data.length,
75+
snapshot.data!.length,
7676
(index) =>
77-
_getScannedMediaWidget(snapshot.data[index])),
77+
_getScannedMediaWidget(snapshot.data![index])),
7878
),
7979
);
8080
},
@@ -98,7 +98,7 @@ class _MyAppState extends State<MyApp> {
9898
crossAxisAlignment: CrossAxisAlignment.start,
9999
mainAxisSize: MainAxisSize.min,
100100
children: [
101-
_getTile("Track", data.track),
101+
_getTile("Track", data.track ?? ""),
102102
_getTile("AlbumId", data.albumId.toString()),
103103
_getTile("Album", data.album),
104104
_getTile("Title", data.title),
@@ -109,10 +109,10 @@ class _MyAppState extends State<MyApp> {
109109
child: Card(
110110
child: Opacity(
111111
opacity: 0.3,
112-
child: data.albumCoverPath.isEmpty
112+
child: (data.albumCoverPath ?? "").isEmpty
113113
? Container()
114114
: Image.file(
115-
File(data.albumCoverPath),
115+
File(data.albumCoverPath!),
116116
fit: BoxFit.fill,
117117
),
118118
),

packages/mediascanner/example/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ description: Demonstrates how to use the mediascanner plugin.
66
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
77

88
environment:
9-
sdk: ">=2.7.0 <3.0.0"
9+
sdk: ">=2.12.0 <4.0.0"
1010

1111
dependencies:
1212
flutter:
1313
sdk: flutter
1414

15-
permission_handler: ^5.0.1
15+
permission_handler: ^11.0.0
1616
mediascanner:
1717
# When depending on this package from a real application you should use:
1818
# mediascanner: ^x.y.z
@@ -23,7 +23,7 @@ dependencies:
2323

2424
# The following adds the Cupertino Icons font to your application.
2525
# Use with the CupertinoIcons class for iOS style icons.
26-
cupertino_icons: ^0.1.3
26+
cupertino_icons: ^1.0.6
2727

2828
dev_dependencies:
2929
flutter_test:

packages/mediascanner/example/test/widget_test.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import 'package:flutter/material.dart';
99
import 'package:flutter_test/flutter_test.dart';
10-
1110
import 'package:mediascanner_example/main.dart';
1211

1312
void main() {
@@ -18,8 +17,8 @@ void main() {
1817
// Verify that platform version is retrieved.
1918
expect(
2019
find.byWidgetPredicate(
21-
(Widget widget) => widget is Text &&
22-
widget.data.startsWith('Running on:'),
20+
(Widget widget) =>
21+
widget is Text && widget.data!.startsWith('Running on:'),
2322
),
2423
findsOneWidget,
2524
);

packages/mediascanner/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version: 1.0.0
44
homepage: https://github.com/suamusica
55

66
environment:
7-
sdk: ">=2.12.0 <3.0.0"
7+
sdk: ">=2.12.0 <4.0.0"
88

99
dependencies:
1010
flutter:

packages/migration/example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ description: Demonstrates how to use the migration plugin.
33
publish_to: 'none'
44

55
environment:
6-
sdk: ">=2.6.0 <3.0.0"
6+
sdk: ">=2.12.0 <4.0.0"
77

88
dependencies:
99
flutter:
1010
sdk: flutter
1111

1212
# The following adds the Cupertino Icons font to your application.
1313
# Use with the CupertinoIcons class for iOS style icons.
14-
cupertino_icons: ^0.1.2
14+
cupertino_icons: ^1.0.6
1515

1616
dev_dependencies:
1717
flutter_test:

packages/migration/example/test/widget_test.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import 'package:flutter/material.dart';
99
import 'package:flutter_test/flutter_test.dart';
10-
1110
import 'package:migration_example/main.dart';
1211

1312
void main() {
@@ -18,8 +17,8 @@ void main() {
1817
// Verify that platform version is retrieved.
1918
expect(
2019
find.byWidgetPredicate(
21-
(Widget widget) => widget is Text &&
22-
widget.data.startsWith('Running on:'),
20+
(Widget widget) =>
21+
widget is Text && widget.data!.startsWith('Running on:'),
2322
),
2423
findsOneWidget,
2524
);

packages/migration/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version: 1.0.0
44
homepage: https://github.com/suamusica
55

66
environment:
7-
sdk: ">=2.12.0 <3.0.0"
7+
sdk: ">=2.12.0 <4.0.0"
88

99
dependencies:
1010
flutter:

packages/player/example/lib/sm_player.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:flutter/material.dart';
1+
import 'package:flutter/material.dart' hide RepeatMode;
22
import 'package:smaws/aws.dart';
33
import 'package:smplayer/player.dart';
44
import 'dart:async';

0 commit comments

Comments
 (0)