cleaned deps; sdk version 32
This commit is contained in:
Moritz Weber
parent
49a3a8d0af
commit
1ea9fe19f1
6 changed files with 33 additions and 105 deletions
|
|
@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
|
|||
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
|
||||
|
||||
android {
|
||||
compileSdkVersion 31
|
||||
compileSdkVersion 32
|
||||
ndkVersion flutter.ndkVersion
|
||||
|
||||
sourceSets {
|
||||
|
|
@ -40,7 +40,7 @@ android {
|
|||
|
||||
defaultConfig {
|
||||
minSdkVersion 19
|
||||
targetSdkVersion 31
|
||||
targetSdkVersion 32
|
||||
multiDexEnabled true
|
||||
versionCode flutterVersionCode.toInteger()
|
||||
versionName flutterVersionName
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 7.2 KiB |
|
|
@ -1,4 +1,3 @@
|
|||
import 'package:audiotagger/models/tag.dart';
|
||||
import 'package:drift/drift.dart';
|
||||
import 'package:on_audio_query/on_audio_query.dart' as aq;
|
||||
|
||||
|
|
@ -24,22 +23,6 @@ class AlbumModel extends Album {
|
|||
pubYear: moorAlbum.year,
|
||||
);
|
||||
|
||||
factory AlbumModel.fromAudiotagger({
|
||||
required Tag tag,
|
||||
required int albumId,
|
||||
String? albumArtPath,
|
||||
}) {
|
||||
final artist = tag.albumArtist != '' ? tag.albumArtist : tag.artist;
|
||||
|
||||
return AlbumModel(
|
||||
id: albumId,
|
||||
title: tag.album ?? DEF_ALBUM,
|
||||
artist: artist ?? DEF_ARTIST,
|
||||
albumArtPath: albumArtPath,
|
||||
pubYear: tag.year == null ? null : parseYear(tag.year!),
|
||||
);
|
||||
}
|
||||
|
||||
factory AlbumModel.fromOnAudioQuery({
|
||||
required aq.SongModel songModel,
|
||||
required int albumId,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
import 'package:audio_service/audio_service.dart';
|
||||
import 'package:audiotagger/models/audiofile.dart';
|
||||
import 'package:audiotagger/models/tag.dart';
|
||||
import 'package:drift/drift.dart';
|
||||
import 'package:on_audio_query/on_audio_query.dart' as aq;
|
||||
|
||||
|
|
@ -69,36 +67,6 @@ class SongModel extends Song {
|
|||
year: moorSong.year,
|
||||
);
|
||||
|
||||
factory SongModel.fromAudiotagger({
|
||||
required String path,
|
||||
required Tag tag,
|
||||
required AudioFile audioFile,
|
||||
String? albumArtPath,
|
||||
required int albumId,
|
||||
required DateTime lastModified,
|
||||
}) {
|
||||
return SongModel(
|
||||
title: tag.title ?? DEF_TITLE,
|
||||
artist: tag.artist ?? DEF_ARTIST,
|
||||
album: tag.album ?? DEF_ALBUM,
|
||||
albumId: albumId,
|
||||
path: path,
|
||||
duration: Duration(milliseconds: (audioFile.length ?? DEF_DURATION) * 1000),
|
||||
blockLevel: 0,
|
||||
discNumber: _parseNumber(tag.discNumber),
|
||||
trackNumber: _parseNumber(tag.trackNumber),
|
||||
albumArtPath: albumArtPath,
|
||||
next: false,
|
||||
previous: false,
|
||||
likeCount: 0,
|
||||
playCount: 0,
|
||||
skipCount: 0,
|
||||
year: parseYear(tag.year),
|
||||
timeAdded: DateTime.fromMillisecondsSinceEpoch(0),
|
||||
lastModified: lastModified,
|
||||
);
|
||||
}
|
||||
|
||||
factory SongModel.fromOnAudioQuery({
|
||||
required String path,
|
||||
required aq.SongModel songModel,
|
||||
|
|
@ -238,13 +206,6 @@ class SongModel extends Song {
|
|||
'timeAdded': timeAdded.millisecondsSinceEpoch,
|
||||
});
|
||||
|
||||
static int _parseNumber(String? numberString) {
|
||||
if (numberString == null || numberString == '') {
|
||||
return 1;
|
||||
}
|
||||
return int.parse(numberString);
|
||||
}
|
||||
|
||||
static List<int> _parseTrackNumber(int? number) {
|
||||
if (number == null) return [1, 1];
|
||||
|
||||
|
|
|
|||
|
|
@ -63,14 +63,7 @@ packages:
|
|||
name: audio_session
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.1.10"
|
||||
audiotagger:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: audiotagger
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.2.1"
|
||||
version: "0.1.11"
|
||||
boolean_selector:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -91,7 +84,7 @@ packages:
|
|||
name: build_config
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.1.0"
|
||||
version: "1.1.1"
|
||||
build_daemon:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -112,14 +105,14 @@ packages:
|
|||
name: build_runner
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.2.1"
|
||||
version: "2.3.2"
|
||||
build_runner_core:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: build_runner_core
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "7.2.4"
|
||||
version: "7.2.7"
|
||||
built_collection:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -133,7 +126,7 @@ packages:
|
|||
name: built_value
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "8.4.1"
|
||||
version: "8.4.2"
|
||||
characters:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -189,7 +182,7 @@ packages:
|
|||
name: convert
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "3.0.2"
|
||||
version: "3.1.1"
|
||||
crypto:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -299,7 +292,7 @@ packages:
|
|||
name: flutter_mobx
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.6+4"
|
||||
version: "2.0.6+5"
|
||||
flutter_plugin_android_lifecycle:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -330,7 +323,7 @@ packages:
|
|||
name: frontend_server_client
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.1.3"
|
||||
version: "3.2.0"
|
||||
get_it:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
|
@ -344,14 +337,14 @@ packages:
|
|||
name: glob
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.1.0"
|
||||
version: "2.1.1"
|
||||
graphs:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: graphs
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.1.0"
|
||||
version: "2.2.0"
|
||||
http:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -372,7 +365,7 @@ packages:
|
|||
name: http_parser
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "4.0.1"
|
||||
version: "4.0.2"
|
||||
id3:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -414,7 +407,7 @@ packages:
|
|||
name: just_audio
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.9.29"
|
||||
version: "0.9.30"
|
||||
just_audio_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -435,7 +428,7 @@ packages:
|
|||
name: logging
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.0.2"
|
||||
version: "1.1.0"
|
||||
matcher:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -463,28 +456,21 @@ packages:
|
|||
name: mime
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.0.2"
|
||||
version: "1.0.3"
|
||||
mobx:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: mobx
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.1.0"
|
||||
version: "2.1.3"
|
||||
mobx_codegen:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
name: mobx_codegen
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.7+3"
|
||||
mockito:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
name: mockito
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "5.3.2"
|
||||
version: "2.1.1"
|
||||
nested:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -540,7 +526,7 @@ packages:
|
|||
name: path_provider_android
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.20"
|
||||
version: "2.0.22"
|
||||
path_provider_ios:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -596,7 +582,7 @@ packages:
|
|||
name: permission_handler_platform_interface
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "3.8.0"
|
||||
version: "3.9.0"
|
||||
platform:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -631,14 +617,14 @@ packages:
|
|||
name: provider
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "6.0.3"
|
||||
version: "6.0.4"
|
||||
pub_semver:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: pub_semver
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.1.1"
|
||||
version: "2.1.3"
|
||||
pubspec_parse:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -666,7 +652,7 @@ packages:
|
|||
name: rxdart
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.27.5"
|
||||
version: "0.27.7"
|
||||
shelf:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -680,7 +666,7 @@ packages:
|
|||
name: shelf_web_socket
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.0.2"
|
||||
version: "1.0.3"
|
||||
sky_engine:
|
||||
dependency: transitive
|
||||
description: flutter
|
||||
|
|
@ -692,7 +678,7 @@ packages:
|
|||
name: source_gen
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.2.5"
|
||||
version: "1.2.6"
|
||||
source_span:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -706,28 +692,28 @@ packages:
|
|||
name: sqflite
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.1.0"
|
||||
version: "2.2.1"
|
||||
sqflite_common:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: sqflite_common
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.3.0"
|
||||
version: "2.4.0+2"
|
||||
sqlite3:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: sqlite3
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.9.0"
|
||||
version: "1.9.1"
|
||||
sqlite3_flutter_libs:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: sqlite3_flutter_libs
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.5.10"
|
||||
version: "0.5.12"
|
||||
sqlparser:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -755,7 +741,7 @@ packages:
|
|||
name: stream_transform
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.0"
|
||||
version: "2.1.0"
|
||||
string_scanner:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -811,7 +797,7 @@ packages:
|
|||
name: uuid
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "3.0.6"
|
||||
version: "3.0.7"
|
||||
vector_math:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -825,7 +811,7 @@ packages:
|
|||
name: watcher
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.0.1"
|
||||
version: "1.0.2"
|
||||
web_socket_channel:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
|
@ -856,4 +842,4 @@ packages:
|
|||
version: "3.1.1"
|
||||
sdks:
|
||||
dart: ">=2.18.0 <3.0.0"
|
||||
flutter: ">=3.3.0-0"
|
||||
flutter: ">=3.3.0"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ environment:
|
|||
dependencies:
|
||||
audio_service: ^0.18.0 # MIT
|
||||
audio_session: ^0.1.5 # MIT
|
||||
audiotagger: ^2.2.1 # MIT
|
||||
collection: ^1.15.0 # BSD 3
|
||||
drift: ^1.0.0 # MIT
|
||||
equatable: ^2.0.3 # MIT
|
||||
|
|
@ -41,7 +40,6 @@ dev_dependencies:
|
|||
flutter_test:
|
||||
sdk: flutter
|
||||
mobx_codegen: ^2.0.1+3 # MIT
|
||||
mockito: ^5.0.10 # Apache 2.0
|
||||
|
||||
|
||||
# For information on the generic Dart part of this file, see the
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue