diff --git a/.fvmrc b/.fvmrc
index 14b86e4..679f8e1 100644
--- a/.fvmrc
+++ b/.fvmrc
@@ -1,4 +1,4 @@
{
- "flutter": "3.7.11",
+ "flutter": "3.24.5",
"flavors": {}
}
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index aa6b4ec..2bc03f4 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,3 +1,9 @@
+plugins {
+ id "com.android.application"
+ id "kotlin-android"
+ id "dev.flutter.flutter-gradle-plugin"
+}
+
def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
}
}
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
- throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
@@ -21,10 +22,6 @@ if (flutterVersionName == null) {
flutterVersionName = '1.0'
}
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) {
@@ -53,7 +50,7 @@ android {
applicationId "com.subtracks2"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
- minSdkVersion 19
+ minSdkVersion flutter.minSdkVersion
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
@@ -81,8 +78,4 @@ android {
flutter {
source '../..'
-}
-
-dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
+}
\ No newline at end of file
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index a4bd2dd..97f618a 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -5,4 +5,9 @@
to allow setting breakpoints, to provide hot reload, etc.
-->
+
+
+
+
+
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index adb244b..d987d34 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -69,4 +69,5 @@
+
diff --git a/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java b/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java
deleted file mode 100644
index 752fc18..0000000
--- a/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java
+++ /dev/null
@@ -1,25 +0,0 @@
-// Generated file.
-//
-// If you wish to remove Flutter's multidex support, delete this entire file.
-//
-// Modifications to this file should be done in a copy under a different name
-// as this file may be regenerated.
-
-package io.flutter.app;
-
-import android.app.Application;
-import android.content.Context;
-import androidx.annotation.CallSuper;
-import androidx.multidex.MultiDex;
-
-/**
- * Extension of {@link android.app.Application}, adding multidex support.
- */
-public class FlutterMultiDexApplication extends Application {
- @Override
- @CallSuper
- protected void attachBaseContext(Context base) {
- super.attachBaseContext(base);
- MultiDex.install(this);
- }
-}
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index a4bd2dd..97f618a 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -5,4 +5,9 @@
to allow setting breakpoints, to provide hot reload, etc.
-->
+
+
+
+
+
diff --git a/android/build.gradle b/android/build.gradle
index 58a8c74..bc157bd 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,16 +1,3 @@
-buildscript {
- ext.kotlin_version = '1.7.10'
- repositories {
- google()
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:7.2.0'
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- }
-}
-
allprojects {
repositories {
google()
@@ -26,6 +13,6 @@ subprojects {
project.evaluationDependsOn(':app')
}
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
delete rootProject.buildDir
}
diff --git a/android/settings.gradle b/android/settings.gradle
index 44e62bc..ce6907c 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,11 +1,25 @@
-include ':app'
+pluginManagement {
+ def flutterSdkPath = {
+ def properties = new Properties()
+ file("local.properties").withInputStream { properties.load(it) }
+ def flutterSdkPath = properties.getProperty("flutter.sdk")
+ assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+ return flutterSdkPath
+ }()
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+ includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+ repositories {
+ google()
+ mavenCentral()
+ gradlePluginPortal()
+ }
+}
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+ id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+ id "com.android.application" version "7.2.0" apply false
+ id "org.jetbrains.kotlin.android" version "2.0.21" apply false
+}
+
+include ":app"
\ No newline at end of file
diff --git a/lib/app/app.g.dart b/lib/app/app.g.dart
index 0ccf782..b0cc085 100644
--- a/lib/app/app.g.dart
+++ b/lib/app/app.g.dart
@@ -20,4 +20,5 @@ final lastPathProvider = NotifierProvider.internal(
);
typedef _$LastPath = Notifier;
-// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/lib/app/context_menus.dart b/lib/app/context_menus.dart
index c051d13..c562bc8 100644
--- a/lib/app/context_menus.dart
+++ b/lib/app/context_menus.dart
@@ -25,7 +25,7 @@ Future showContextMenu({
required WidgetBuilder builder,
}) {
return showModalBottomSheet(
- backgroundColor: ref.read(baseThemeProvider).theme.colorScheme.background,
+ backgroundColor: ref.read(baseThemeProvider).theme.colorScheme.surface,
useRootNavigator: true,
isScrollControlled: true,
context: context,
diff --git a/lib/app/hooks/use_download_actions.dart b/lib/app/hooks/use_download_actions.dart
index 4d2aa70..579b9e6 100644
--- a/lib/app/hooks/use_download_actions.dart
+++ b/lib/app/hooks/use_download_actions.dart
@@ -112,9 +112,9 @@ List useListDownloadActions({
DownloadAction cancel() {
return DownloadAction(
type: DownloadActionType.cancel,
- iconBuilder: (context) => Stack(
+ iconBuilder: (context) => const Stack(
alignment: Alignment.center,
- children: const [
+ children: [
Icon(Icons.cancel_rounded),
SizedBox(
height: 32,
diff --git a/lib/app/images.dart b/lib/app/images.dart
index c158570..6867576 100644
--- a/lib/app/images.dart
+++ b/lib/app/images.dart
@@ -213,7 +213,7 @@ class CardClip extends StatelessWidget {
final cardShape = Theme.of(context).cardTheme.shape;
return ClipRRect(
borderRadius:
- cardShape is RoundedRectangleBorder ? cardShape.borderRadius : null,
+ cardShape is RoundedRectangleBorder ? cardShape.borderRadius : BorderRadius.zero,
child: !square
? child
: AspectRatio(
diff --git a/lib/app/images.g.dart b/lib/app/images.g.dart
index f4f84e5..6f585e3 100644
--- a/lib/app/images.g.dart
+++ b/lib/app/images.g.dart
@@ -30,8 +30,6 @@ class _SystemHash {
}
}
-typedef _ArtistArtCacheInfoRef = AutoDisposeProviderRef;
-
/// See also [_artistArtCacheInfo].
@ProviderFor(_artistArtCacheInfo)
const _artistArtCacheInfoProvider = _ArtistArtCacheInfoFamily();
@@ -81,11 +79,11 @@ class _ArtistArtCacheInfoFamily extends Family {
class _ArtistArtCacheInfoProvider extends AutoDisposeProvider {
/// See also [_artistArtCacheInfo].
_ArtistArtCacheInfoProvider({
- required this.artistId,
- this.thumbnail = true,
- }) : super.internal(
+ required String artistId,
+ bool thumbnail = true,
+ }) : this._internal(
(ref) => _artistArtCacheInfo(
- ref,
+ ref as _ArtistArtCacheInfoRef,
artistId: artistId,
thumbnail: thumbnail,
),
@@ -98,11 +96,48 @@ class _ArtistArtCacheInfoProvider extends AutoDisposeProvider {
dependencies: _ArtistArtCacheInfoFamily._dependencies,
allTransitiveDependencies:
_ArtistArtCacheInfoFamily._allTransitiveDependencies,
+ artistId: artistId,
+ thumbnail: thumbnail,
);
+ _ArtistArtCacheInfoProvider._internal(
+ super._createNotifier, {
+ required super.name,
+ required super.dependencies,
+ required super.allTransitiveDependencies,
+ required super.debugGetCreateSourceHash,
+ required super.from,
+ required this.artistId,
+ required this.thumbnail,
+ }) : super.internal();
+
final String artistId;
final bool thumbnail;
+ @override
+ Override overrideWith(
+ CacheInfo Function(_ArtistArtCacheInfoRef provider) create,
+ ) {
+ return ProviderOverride(
+ origin: this,
+ override: _ArtistArtCacheInfoProvider._internal(
+ (ref) => create(ref as _ArtistArtCacheInfoRef),
+ from: from,
+ name: null,
+ dependencies: null,
+ allTransitiveDependencies: null,
+ debugGetCreateSourceHash: null,
+ artistId: artistId,
+ thumbnail: thumbnail,
+ ),
+ );
+ }
+
+ @override
+ AutoDisposeProviderElement createElement() {
+ return _ArtistArtCacheInfoProviderElement(this);
+ }
+
@override
bool operator ==(Object other) {
return other is _ArtistArtCacheInfoProvider &&
@@ -120,9 +155,26 @@ class _ArtistArtCacheInfoProvider extends AutoDisposeProvider {
}
}
+mixin _ArtistArtCacheInfoRef on AutoDisposeProviderRef {
+ /// The parameter `artistId` of this provider.
+ String get artistId;
+
+ /// The parameter `thumbnail` of this provider.
+ bool get thumbnail;
+}
+
+class _ArtistArtCacheInfoProviderElement
+ extends AutoDisposeProviderElement with _ArtistArtCacheInfoRef {
+ _ArtistArtCacheInfoProviderElement(super.provider);
+
+ @override
+ String get artistId => (origin as _ArtistArtCacheInfoProvider).artistId;
+ @override
+ bool get thumbnail => (origin as _ArtistArtCacheInfoProvider).thumbnail;
+}
+
String _$artistArtCachedUrlHash() =>
r'2a5e0fea614ff12a1d562faccec6cfe98394af42';
-typedef _ArtistArtCachedUrlRef = AutoDisposeFutureProviderRef;
/// See also [_artistArtCachedUrl].
@ProviderFor(_artistArtCachedUrl)
@@ -173,11 +225,11 @@ class _ArtistArtCachedUrlFamily extends Family> {
class _ArtistArtCachedUrlProvider extends AutoDisposeFutureProvider {
/// See also [_artistArtCachedUrl].
_ArtistArtCachedUrlProvider({
- required this.artistId,
- this.thumbnail = true,
- }) : super.internal(
+ required String artistId,
+ bool thumbnail = true,
+ }) : this._internal(
(ref) => _artistArtCachedUrl(
- ref,
+ ref as _ArtistArtCachedUrlRef,
artistId: artistId,
thumbnail: thumbnail,
),
@@ -190,11 +242,48 @@ class _ArtistArtCachedUrlProvider extends AutoDisposeFutureProvider {
dependencies: _ArtistArtCachedUrlFamily._dependencies,
allTransitiveDependencies:
_ArtistArtCachedUrlFamily._allTransitiveDependencies,
+ artistId: artistId,
+ thumbnail: thumbnail,
);
+ _ArtistArtCachedUrlProvider._internal(
+ super._createNotifier, {
+ required super.name,
+ required super.dependencies,
+ required super.allTransitiveDependencies,
+ required super.debugGetCreateSourceHash,
+ required super.from,
+ required this.artistId,
+ required this.thumbnail,
+ }) : super.internal();
+
final String artistId;
final bool thumbnail;
+ @override
+ Override overrideWith(
+ FutureOr Function(_ArtistArtCachedUrlRef provider) create,
+ ) {
+ return ProviderOverride(
+ origin: this,
+ override: _ArtistArtCachedUrlProvider._internal(
+ (ref) => create(ref as _ArtistArtCachedUrlRef),
+ from: from,
+ name: null,
+ dependencies: null,
+ allTransitiveDependencies: null,
+ debugGetCreateSourceHash: null,
+ artistId: artistId,
+ thumbnail: thumbnail,
+ ),
+ );
+ }
+
+ @override
+ AutoDisposeFutureProviderElement createElement() {
+ return _ArtistArtCachedUrlProviderElement(this);
+ }
+
@override
bool operator ==(Object other) {
return other is _ArtistArtCachedUrlProvider &&
@@ -212,9 +301,27 @@ class _ArtistArtCachedUrlProvider extends AutoDisposeFutureProvider {
}
}
+mixin _ArtistArtCachedUrlRef on AutoDisposeFutureProviderRef {
+ /// The parameter `artistId` of this provider.
+ String get artistId;
+
+ /// The parameter `thumbnail` of this provider.
+ bool get thumbnail;
+}
+
+class _ArtistArtCachedUrlProviderElement
+ extends AutoDisposeFutureProviderElement
+ with _ArtistArtCachedUrlRef {
+ _ArtistArtCachedUrlProviderElement(super.provider);
+
+ @override
+ String get artistId => (origin as _ArtistArtCachedUrlProvider).artistId;
+ @override
+ bool get thumbnail => (origin as _ArtistArtCachedUrlProvider).thumbnail;
+}
+
String _$artistArtUriCacheInfoHash() =>
r'9bdc0f5654882265236ef746ea697a6d107a4b6f';
-typedef _ArtistArtUriCacheInfoRef = AutoDisposeFutureProviderRef;
/// See also [_artistArtUriCacheInfo].
@ProviderFor(_artistArtUriCacheInfo)
@@ -266,11 +373,11 @@ class _ArtistArtUriCacheInfoProvider
extends AutoDisposeFutureProvider {
/// See also [_artistArtUriCacheInfo].
_ArtistArtUriCacheInfoProvider({
- required this.artistId,
- this.thumbnail = true,
- }) : super.internal(
+ required String artistId,
+ bool thumbnail = true,
+ }) : this._internal(
(ref) => _artistArtUriCacheInfo(
- ref,
+ ref as _ArtistArtUriCacheInfoRef,
artistId: artistId,
thumbnail: thumbnail,
),
@@ -283,11 +390,48 @@ class _ArtistArtUriCacheInfoProvider
dependencies: _ArtistArtUriCacheInfoFamily._dependencies,
allTransitiveDependencies:
_ArtistArtUriCacheInfoFamily._allTransitiveDependencies,
+ artistId: artistId,
+ thumbnail: thumbnail,
);
+ _ArtistArtUriCacheInfoProvider._internal(
+ super._createNotifier, {
+ required super.name,
+ required super.dependencies,
+ required super.allTransitiveDependencies,
+ required super.debugGetCreateSourceHash,
+ required super.from,
+ required this.artistId,
+ required this.thumbnail,
+ }) : super.internal();
+
final String artistId;
final bool thumbnail;
+ @override
+ Override overrideWith(
+ FutureOr Function(_ArtistArtUriCacheInfoRef provider) create,
+ ) {
+ return ProviderOverride(
+ origin: this,
+ override: _ArtistArtUriCacheInfoProvider._internal(
+ (ref) => create(ref as _ArtistArtUriCacheInfoRef),
+ from: from,
+ name: null,
+ dependencies: null,
+ allTransitiveDependencies: null,
+ debugGetCreateSourceHash: null,
+ artistId: artistId,
+ thumbnail: thumbnail,
+ ),
+ );
+ }
+
+ @override
+ AutoDisposeFutureProviderElement createElement() {
+ return _ArtistArtUriCacheInfoProviderElement(this);
+ }
+
@override
bool operator ==(Object other) {
return other is _ArtistArtUriCacheInfoProvider &&
@@ -304,4 +448,24 @@ class _ArtistArtUriCacheInfoProvider
return _SystemHash.finish(hash);
}
}
-// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
+
+mixin _ArtistArtUriCacheInfoRef on AutoDisposeFutureProviderRef {
+ /// The parameter `artistId` of this provider.
+ String get artistId;
+
+ /// The parameter `thumbnail` of this provider.
+ bool get thumbnail;
+}
+
+class _ArtistArtUriCacheInfoProviderElement
+ extends AutoDisposeFutureProviderElement
+ with _ArtistArtUriCacheInfoRef {
+ _ArtistArtUriCacheInfoProviderElement(super.provider);
+
+ @override
+ String get artistId => (origin as _ArtistArtUriCacheInfoProvider).artistId;
+ @override
+ bool get thumbnail => (origin as _ArtistArtUriCacheInfoProvider).thumbnail;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/lib/app/lists.dart b/lib/app/lists.dart
index 3b5c552..ccb3f23 100644
--- a/lib/app/lists.dart
+++ b/lib/app/lists.dart
@@ -127,6 +127,7 @@ class SyncAllRefresh extends HookConsumerWidget {
try {
await ref.read(syncServiceProvider.notifier).syncAll();
} catch (e) {
+ if (!context.mounted) return;
showErrorSnackbar(context, e.toString());
}
},
diff --git a/lib/app/now_playing_bar.dart b/lib/app/now_playing_bar.dart
index ba5300a..a718847 100644
--- a/lib/app/now_playing_bar.dart
+++ b/lib/app/now_playing_bar.dart
@@ -30,13 +30,13 @@ class NowPlayingBar extends HookConsumerWidget {
elevation: 3,
color: colors?.darkBackground,
// surfaceTintColor: theme?.colorScheme.background,
- child: Column(
+ child: const Column(
children: [
SizedBox(
height: 70,
child: Row(
mainAxisSize: MainAxisSize.max,
- children: const [
+ children: [
Padding(
padding: EdgeInsets.all(10),
child: _ArtImage(),
@@ -54,7 +54,7 @@ class NowPlayingBar extends HookConsumerWidget {
],
),
),
- const _ProgressBar(),
+ _ProgressBar(),
],
),
),
@@ -173,7 +173,7 @@ class PlayPauseButton extends HookConsumerWidget {
width: size / 3,
child: CircularProgressIndicator(
strokeWidth: size / 16,
- color: Theme.of(context).colorScheme.background,
+ color: Theme.of(context).colorScheme.surface,
),
),
],
@@ -195,7 +195,7 @@ class PlayPauseButton extends HookConsumerWidget {
}
},
icon: icon,
- color: Theme.of(context).colorScheme.onBackground,
+ color: Theme.of(context).colorScheme.surface,
);
}
}
diff --git a/lib/app/pages/bottom_nav_page.dart b/lib/app/pages/bottom_nav_page.dart
index 5a5a3be..e5dbcdc 100644
--- a/lib/app/pages/bottom_nav_page.dart
+++ b/lib/app/pages/bottom_nav_page.dart
@@ -111,13 +111,13 @@ class OfflineIndicator extends HookConsumerWidget {
),
child: FilledButton.tonal(
style: const ButtonStyle(
- padding: MaterialStatePropertyAll(
+ padding: WidgetStatePropertyAll(
EdgeInsets.zero,
),
- fixedSize: MaterialStatePropertyAll(
+ fixedSize: WidgetStatePropertyAll(
Size(42, 42),
),
- minimumSize: MaterialStatePropertyAll(
+ minimumSize: WidgetStatePropertyAll(
Size(42, 42),
),
),
diff --git a/lib/app/pages/bottom_nav_page.g.dart b/lib/app/pages/bottom_nav_page.g.dart
index 3980e96..fa31e36 100644
--- a/lib/app/pages/bottom_nav_page.g.dart
+++ b/lib/app/pages/bottom_nav_page.g.dart
@@ -53,4 +53,5 @@ final lastBottomNavStateServiceProvider =
);
typedef _$LastBottomNavStateService = AsyncNotifier;
-// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/lib/app/pages/browse_page.g.dart b/lib/app/pages/browse_page.g.dart
index b5f0cb9..c946775 100644
--- a/lib/app/pages/browse_page.g.dart
+++ b/lib/app/pages/browse_page.g.dart
@@ -30,8 +30,6 @@ class _SystemHash {
}
}
-typedef AlbumsCategoryListRef = AutoDisposeStreamProviderRef>;
-
/// See also [albumsCategoryList].
@ProviderFor(albumsCategoryList)
const albumsCategoryListProvider = AlbumsCategoryListFamily();
@@ -79,10 +77,10 @@ class AlbumsCategoryListProvider
extends AutoDisposeStreamProvider> {
/// See also [albumsCategoryList].
AlbumsCategoryListProvider(
- this.opt,
- ) : super.internal(
+ ListQuery opt,
+ ) : this._internal(
(ref) => albumsCategoryList(
- ref,
+ ref as AlbumsCategoryListRef,
opt,
),
from: albumsCategoryListProvider,
@@ -94,10 +92,44 @@ class AlbumsCategoryListProvider
dependencies: AlbumsCategoryListFamily._dependencies,
allTransitiveDependencies:
AlbumsCategoryListFamily._allTransitiveDependencies,
+ opt: opt,
);
+ AlbumsCategoryListProvider._internal(
+ super._createNotifier, {
+ required super.name,
+ required super.dependencies,
+ required super.allTransitiveDependencies,
+ required super.debugGetCreateSourceHash,
+ required super.from,
+ required this.opt,
+ }) : super.internal();
+
final ListQuery opt;
+ @override
+ Override overrideWith(
+ Stream> Function(AlbumsCategoryListRef provider) create,
+ ) {
+ return ProviderOverride(
+ origin: this,
+ override: AlbumsCategoryListProvider._internal(
+ (ref) => create(ref as AlbumsCategoryListRef),
+ from: from,
+ name: null,
+ dependencies: null,
+ allTransitiveDependencies: null,
+ debugGetCreateSourceHash: null,
+ opt: opt,
+ ),
+ );
+ }
+
+ @override
+ AutoDisposeStreamProviderElement> createElement() {
+ return _AlbumsCategoryListProviderElement(this);
+ }
+
@override
bool operator ==(Object other) {
return other is AlbumsCategoryListProvider && other.opt == opt;
@@ -111,4 +143,19 @@ class AlbumsCategoryListProvider
return _SystemHash.finish(hash);
}
}
-// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
+
+mixin AlbumsCategoryListRef on AutoDisposeStreamProviderRef> {
+ /// The parameter `opt` of this provider.
+ ListQuery get opt;
+}
+
+class _AlbumsCategoryListProviderElement
+ extends AutoDisposeStreamProviderElement>
+ with AlbumsCategoryListRef {
+ _AlbumsCategoryListProviderElement(super.provider);
+
+ @override
+ ListQuery get opt => (origin as AlbumsCategoryListProvider).opt;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/lib/app/pages/library_page.g.dart b/lib/app/pages/library_page.g.dart
index 65ddfa2..094c3ec 100644
--- a/lib/app/pages/library_page.g.dart
+++ b/lib/app/pages/library_page.g.dart
@@ -60,8 +60,6 @@ class _SystemHash {
}
}
-typedef LibraryListQueryRef = ProviderRef;
-
/// See also [libraryListQuery].
@ProviderFor(libraryListQuery)
const libraryListQueryProvider = LibraryListQueryFamily();
@@ -108,10 +106,10 @@ class LibraryListQueryFamily extends Family {
class LibraryListQueryProvider extends Provider {
/// See also [libraryListQuery].
LibraryListQueryProvider(
- this.index,
- ) : super.internal(
+ int index,
+ ) : this._internal(
(ref) => libraryListQuery(
- ref,
+ ref as LibraryListQueryRef,
index,
),
from: libraryListQueryProvider,
@@ -123,10 +121,44 @@ class LibraryListQueryProvider extends Provider {
dependencies: LibraryListQueryFamily._dependencies,
allTransitiveDependencies:
LibraryListQueryFamily._allTransitiveDependencies,
+ index: index,
);
+ LibraryListQueryProvider._internal(
+ super._createNotifier, {
+ required super.name,
+ required super.dependencies,
+ required super.allTransitiveDependencies,
+ required super.debugGetCreateSourceHash,
+ required super.from,
+ required this.index,
+ }) : super.internal();
+
final int index;
+ @override
+ Override overrideWith(
+ LibraryListQuery Function(LibraryListQueryRef provider) create,
+ ) {
+ return ProviderOverride(
+ origin: this,
+ override: LibraryListQueryProvider._internal(
+ (ref) => create(ref as LibraryListQueryRef),
+ from: from,
+ name: null,
+ dependencies: null,
+ allTransitiveDependencies: null,
+ debugGetCreateSourceHash: null,
+ index: index,
+ ),
+ );
+ }
+
+ @override
+ ProviderElement createElement() {
+ return _LibraryListQueryProviderElement(this);
+ }
+
@override
bool operator ==(Object other) {
return other is LibraryListQueryProvider && other.index == index;
@@ -141,6 +173,19 @@ class LibraryListQueryProvider extends Provider {
}
}
+mixin LibraryListQueryRef on ProviderRef {
+ /// The parameter `index` of this provider.
+ int get index;
+}
+
+class _LibraryListQueryProviderElement extends ProviderElement
+ with LibraryListQueryRef {
+ _LibraryListQueryProviderElement(super.provider);
+
+ @override
+ int get index => (origin as LibraryListQueryProvider).index;
+}
+
String _$lastLibraryStateServiceHash() =>
r'a49e26b5dc0fcb0f697ec2def08e7336f64c4cb3';
@@ -173,4 +218,5 @@ final libraryListsProvider =
);
typedef _$LibraryLists = Notifier>;
-// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/lib/app/pages/library_songs_page.g.dart b/lib/app/pages/library_songs_page.g.dart
index 11190d5..8d5638f 100644
--- a/lib/app/pages/library_songs_page.g.dart
+++ b/lib/app/pages/library_songs_page.g.dart
@@ -29,8 +29,6 @@ class _SystemHash {
}
}
-typedef SongsListRef = AutoDisposeFutureProviderRef>;
-
/// See also [songsList].
@ProviderFor(songsList)
const songsListProvider = SongsListFamily();
@@ -77,10 +75,10 @@ class SongsListFamily extends Family>> {
class SongsListProvider extends AutoDisposeFutureProvider> {
/// See also [songsList].
SongsListProvider(
- this.opt,
- ) : super.internal(
+ ListQuery opt,
+ ) : this._internal(
(ref) => songsList(
- ref,
+ ref as SongsListRef,
opt,
),
from: songsListProvider,
@@ -91,10 +89,44 @@ class SongsListProvider extends AutoDisposeFutureProvider> {
: _$songsListHash,
dependencies: SongsListFamily._dependencies,
allTransitiveDependencies: SongsListFamily._allTransitiveDependencies,
+ opt: opt,
);
+ SongsListProvider._internal(
+ super._createNotifier, {
+ required super.name,
+ required super.dependencies,
+ required super.allTransitiveDependencies,
+ required super.debugGetCreateSourceHash,
+ required super.from,
+ required this.opt,
+ }) : super.internal();
+
final ListQuery opt;
+ @override
+ Override overrideWith(
+ FutureOr> Function(SongsListRef provider) create,
+ ) {
+ return ProviderOverride(
+ origin: this,
+ override: SongsListProvider._internal(
+ (ref) => create(ref as SongsListRef),
+ from: from,
+ name: null,
+ dependencies: null,
+ allTransitiveDependencies: null,
+ debugGetCreateSourceHash: null,
+ opt: opt,
+ ),
+ );
+ }
+
+ @override
+ AutoDisposeFutureProviderElement> createElement() {
+ return _SongsListProviderElement(this);
+ }
+
@override
bool operator ==(Object other) {
return other is SongsListProvider && other.opt == opt;
@@ -108,4 +140,18 @@ class SongsListProvider extends AutoDisposeFutureProvider> {
return _SystemHash.finish(hash);
}
}
-// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
+
+mixin SongsListRef on AutoDisposeFutureProviderRef> {
+ /// The parameter `opt` of this provider.
+ ListQuery get opt;
+}
+
+class _SongsListProviderElement
+ extends AutoDisposeFutureProviderElement> with SongsListRef {
+ _SongsListProviderElement(super.provider);
+
+ @override
+ ListQuery get opt => (origin as SongsListProvider).opt;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/lib/app/pages/now_playing_page.dart b/lib/app/pages/now_playing_page.dart
index 8eecb00..426955b 100644
--- a/lib/app/pages/now_playing_page.dart
+++ b/lib/app/pages/now_playing_page.dart
@@ -55,13 +55,13 @@ class NowPlayingPage extends HookConsumerWidget {
],
),
),
- body: Stack(
+ body: const Stack(
children: [
- const MediaItemGradient(),
+ MediaItemGradient(),
Padding(
- padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+ padding: EdgeInsets.symmetric(horizontal: 8, vertical: 8),
child: Column(
- children: const [
+ children: [
Expanded(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16),
@@ -229,8 +229,8 @@ class _Progress extends HookConsumerWidget {
value: changing.value ? changeValue.value : position.toDouble(),
min: 0,
max: max(duration.toDouble(), position.toDouble()),
- thumbColor: colors?.theme.colorScheme.onBackground,
- activeColor: colors?.theme.colorScheme.onBackground,
+ thumbColor: colors?.theme.colorScheme.surface,
+ activeColor: colors?.theme.colorScheme.surface,
inactiveColor: colors?.theme.colorScheme.surface,
onChanged: (value) {
changeValue.value = value;
@@ -354,7 +354,7 @@ class _Controls extends HookConsumerWidget {
final audio = ref.watch(audioControlProvider);
return IconTheme(
- data: IconThemeData(color: base.theme.colorScheme.onBackground),
+ data: IconThemeData(color: base.theme.colorScheme.surface),
child: Column(
children: [
SizedBox(
diff --git a/lib/app/pages/search_page.g.dart b/lib/app/pages/search_page.g.dart
index 4a0b674..7592a56 100644
--- a/lib/app/pages/search_page.g.dart
+++ b/lib/app/pages/search_page.g.dart
@@ -35,4 +35,5 @@ final searchQueryProvider =
);
typedef _$SearchQuery = AutoDisposeNotifier;
-// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/lib/app/pages/settings_page.dart b/lib/app/pages/settings_page.dart
index ab90bdf..1af0854 100644
--- a/lib/app/pages/settings_page.dart
+++ b/lib/app/pages/settings_page.dart
@@ -191,7 +191,7 @@ class _ShareLogsButton extends StatelessWidget {
final files = await logFiles();
if (files.isEmpty) return;
- // ignore: use_build_context_synchronously
+ if (!context.mounted) return;
final value = await showDialog(
context: context,
builder: (context) => MultipleChoiceDialog(
diff --git a/lib/app/pages/source_page.dart b/lib/app/pages/source_page.dart
index 8e635c2..6f44a71 100644
--- a/lib/app/pages/source_page.dart
+++ b/lib/app/pages/source_page.dart
@@ -76,8 +76,8 @@ class SourcePage extends HookConsumerWidget {
onChanged: (value) => forcePlaintextPassword.value = value,
);
- return WillPopScope(
- onWillPop: () async => !isSaving.value && !isDeleting.value,
+ return PopScope(
+ canPop: !isSaving.value && !isDeleting.value,
child: Scaffold(
appBar: AppBar(),
floatingActionButton: Row(
@@ -164,6 +164,7 @@ class SourcePage extends HookConsumerWidget {
);
}
} catch (e, st) {
+ if (!context.mounted) return;
showErrorSnackbar(context, e.toString());
log.severe('Saving source', e, st);
error = true;
diff --git a/lib/cache/image_cache.g.dart b/lib/cache/image_cache.g.dart
index 9534c05..7683085 100644
--- a/lib/cache/image_cache.g.dart
+++ b/lib/cache/image_cache.g.dart
@@ -20,4 +20,5 @@ final imageCacheProvider = Provider.internal(
);
typedef ImageCacheRef = ProviderRef;
-// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/lib/database/database.g.dart b/lib/database/database.g.dart
index a379bea..2a57500 100644
--- a/lib/database/database.g.dart
+++ b/lib/database/database.g.dart
@@ -53,9 +53,10 @@ class Queue extends Table with TableInfo {
List get $columns =>
[index, sourceId, id, context, contextId, currentTrack];
@override
- String get aliasedName => _alias ?? 'queue';
+ String get aliasedName => _alias ?? actualTableName;
@override
- String get actualTableName => 'queue';
+ String get actualTableName => $name;
+ static const String $name = 'queue';
@override
VerificationContext validateIntegrity(Insertable instance,
{bool isInserting = false}) {
@@ -144,8 +145,7 @@ class QueueData extends DataClass implements Insertable {
map['source_id'] = Variable(sourceId);
map['id'] = Variable(id);
{
- final converter = Queue.$convertercontext;
- map['context'] = Variable(converter.toSql(context));
+ map['context'] = Variable(Queue.$convertercontext.toSql(context));
}
if (!nullToAbsent || contextId != null) {
map['context_id'] = Variable(contextId);
@@ -315,8 +315,8 @@ class QueueCompanion extends UpdateCompanion {
map['id'] = Variable(id.value);
}
if (context.present) {
- final converter = Queue.$convertercontext;
- map['context'] = Variable(converter.toSql(context.value));
+ map['context'] =
+ Variable(Queue.$convertercontext.toSql(context.value));
}
if (contextId.present) {
map['context_id'] = Variable(contextId.value);
@@ -382,9 +382,10 @@ class LastAudioState extends Table
List get $columns =>
[id, queueMode, shuffleIndicies, repeat];
@override
- String get aliasedName => _alias ?? 'last_audio_state';
+ String get aliasedName => _alias ?? actualTableName;
@override
- String get actualTableName => 'last_audio_state';
+ String get actualTableName => $name;
+ static const String $name = 'last_audio_state';
@override
VerificationContext validateIntegrity(Insertable instance,
{bool isInserting = false}) {
@@ -452,17 +453,16 @@ class LastAudioStateData extends DataClass
final map = {};
map['id'] = Variable(id);
{
- final converter = LastAudioState.$converterqueueMode;
- map['queue_mode'] = Variable(converter.toSql(queueMode));
+ map['queue_mode'] =
+ Variable(LastAudioState.$converterqueueMode.toSql(queueMode));
}
if (!nullToAbsent || shuffleIndicies != null) {
- final converter = LastAudioState.$convertershuffleIndiciesn;
- map['shuffle_indicies'] =
- Variable(converter.toSql(shuffleIndicies));
+ map['shuffle_indicies'] = Variable(
+ LastAudioState.$convertershuffleIndiciesn.toSql(shuffleIndicies));
}
{
- final converter = LastAudioState.$converterrepeat;
- map['repeat'] = Variable(converter.toSql(repeat));
+ map['repeat'] =
+ Variable(LastAudioState.$converterrepeat.toSql(repeat));
}
return map;
}
@@ -592,17 +592,17 @@ class LastAudioStateCompanion extends UpdateCompanion {
map['id'] = Variable(id.value);
}
if (queueMode.present) {
- final converter = LastAudioState.$converterqueueMode;
- map['queue_mode'] = Variable(converter.toSql(queueMode.value));
+ map['queue_mode'] = Variable(
+ LastAudioState.$converterqueueMode.toSql(queueMode.value));
}
if (shuffleIndicies.present) {
- final converter = LastAudioState.$convertershuffleIndiciesn;
- map['shuffle_indicies'] =
- Variable(converter.toSql(shuffleIndicies.value));
+ map['shuffle_indicies'] = Variable(LastAudioState
+ .$convertershuffleIndiciesn
+ .toSql(shuffleIndicies.value));
}
if (repeat.present) {
- final converter = LastAudioState.$converterrepeat;
- map['repeat'] = Variable(converter.toSql(repeat.value));
+ map['repeat'] =
+ Variable(LastAudioState.$converterrepeat.toSql(repeat.value));
}
return map;
}
@@ -640,9 +640,10 @@ class LastBottomNavState extends Table
@override
List get $columns => [id, tab];
@override
- String get aliasedName => _alias ?? 'last_bottom_nav_state';
+ String get aliasedName => _alias ?? actualTableName;
@override
- String get actualTableName => 'last_bottom_nav_state';
+ String get actualTableName => $name;
+ static const String $name = 'last_bottom_nav_state';
@override
VerificationContext validateIntegrity(
Insertable instance,
@@ -849,9 +850,10 @@ class LastLibraryState extends Table
List get $columns =>
[id, tab, albumsList, artistsList, playlistsList, songsList];
@override
- String get aliasedName => _alias ?? 'last_library_state';
+ String get aliasedName => _alias ?? actualTableName;
@override
- String get actualTableName => 'last_library_state';
+ String get actualTableName => $name;
+ static const String $name = 'last_library_state';
@override
VerificationContext validateIntegrity(
Insertable instance,
@@ -937,20 +939,20 @@ class LastLibraryStateData extends DataClass
map['id'] = Variable(id);
map['tab'] = Variable(tab);
{
- final converter = LastLibraryState.$converteralbumsList;
- map['albums_list'] = Variable(converter.toSql(albumsList));
+ map['albums_list'] = Variable(
+ LastLibraryState.$converteralbumsList.toSql(albumsList));
}
{
- final converter = LastLibraryState.$converterartistsList;
- map['artists_list'] = Variable(converter.toSql(artistsList));
+ map['artists_list'] = Variable(
+ LastLibraryState.$converterartistsList.toSql(artistsList));
}
{
- final converter = LastLibraryState.$converterplaylistsList;
- map['playlists_list'] = Variable(converter.toSql(playlistsList));
+ map['playlists_list'] = Variable(
+ LastLibraryState.$converterplaylistsList.toSql(playlistsList));
}
{
- final converter = LastLibraryState.$convertersongsList;
- map['songs_list'] = Variable(converter.toSql(songsList));
+ map['songs_list'] = Variable(
+ LastLibraryState.$convertersongsList.toSql(songsList));
}
return map;
}
@@ -1106,22 +1108,20 @@ class LastLibraryStateCompanion extends UpdateCompanion {
map['tab'] = Variable(tab.value);
}
if (albumsList.present) {
- final converter = LastLibraryState.$converteralbumsList;
- map['albums_list'] = Variable(converter.toSql(albumsList.value));
+ map['albums_list'] = Variable(
+ LastLibraryState.$converteralbumsList.toSql(albumsList.value));
}
if (artistsList.present) {
- final converter = LastLibraryState.$converterartistsList;
- map['artists_list'] =
- Variable(converter.toSql(artistsList.value));
+ map['artists_list'] = Variable(
+ LastLibraryState.$converterartistsList.toSql(artistsList.value));
}
if (playlistsList.present) {
- final converter = LastLibraryState.$converterplaylistsList;
- map['playlists_list'] =
- Variable(converter.toSql(playlistsList.value));
+ map['playlists_list'] = Variable(
+ LastLibraryState.$converterplaylistsList.toSql(playlistsList.value));
}
if (songsList.present) {
- final converter = LastLibraryState.$convertersongsList;
- map['songs_list'] = Variable(converter.toSql(songsList.value));
+ map['songs_list'] = Variable(
+ LastLibraryState.$convertersongsList.toSql(songsList.value));
}
return map;
}
@@ -1177,9 +1177,10 @@ class AppSettingsTable extends Table
List get $columns =>
[id, maxBitrateWifi, maxBitrateMobile, streamFormat];
@override
- String get aliasedName => _alias ?? 'app_settings';
+ String get aliasedName => _alias ?? actualTableName;
@override
- String get actualTableName => 'app_settings';
+ String get actualTableName => $name;
+ static const String $name = 'app_settings';
@override
VerificationContext validateIntegrity(Insertable instance,
{bool isInserting = false}) {
@@ -1359,9 +1360,10 @@ class Sources extends Table with TableInfo {
List get $columns =>
[id, name, address, isActive, createdAt];
@override
- String get aliasedName => _alias ?? 'sources';
+ String get aliasedName => _alias ?? actualTableName;
@override
- String get actualTableName => 'sources';
+ String get actualTableName => $name;
+ static const String $name = 'sources';
@override
VerificationContext validateIntegrity(Insertable instance,
{bool isInserting = false}) {
@@ -1435,8 +1437,8 @@ class Source extends DataClass implements Insertable {
map['id'] = Variable(id);
map['name'] = Variable(name);
{
- final converter = Sources.$converteraddress;
- map['address'] = Variable(converter.toSql(address));
+ map['address'] =
+ Variable(Sources.$converteraddress.toSql(address));
}
if (!nullToAbsent || isActive != null) {
map['is_active'] = Variable(isActive);
@@ -1580,8 +1582,8 @@ class SourcesCompanion extends UpdateCompanion {
map['name'] = Variable(name.value);
}
if (address.present) {
- final converter = Sources.$converteraddress;
- map['address'] = Variable(converter.toSql(address.value));
+ map['address'] =
+ Variable(Sources.$converteraddress.toSql(address.value));
}
if (isActive.present) {
map['is_active'] = Variable(isActive.value);
@@ -1653,9 +1655,10 @@ class SubsonicSources extends Table
List get $columns =>
[sourceId, features, username, password, useTokenAuth];
@override
- String get aliasedName => _alias ?? 'subsonic_sources';
+ String get aliasedName => _alias ?? actualTableName;
@override
- String get actualTableName => 'subsonic_sources';
+ String get actualTableName => $name;
+ static const String $name = 'subsonic_sources';
@override
VerificationContext validateIntegrity(Insertable instance,
{bool isInserting = false}) {
@@ -1738,8 +1741,8 @@ class SubsonicSource extends DataClass implements Insertable {
final map = {};
map['source_id'] = Variable(sourceId);
{
- final converter = SubsonicSources.$converterfeatures;
- map['features'] = Variable(converter.toSql(features));
+ map['features'] =
+ Variable(SubsonicSources.$converterfeatures.toSql(features));
}
map['username'] = Variable(username);
map['password'] = Variable(password);
@@ -1879,8 +1882,8 @@ class SubsonicSourcesCompanion extends UpdateCompanion {
map['source_id'] = Variable(sourceId.value);
}
if (features.present) {
- final converter = SubsonicSources.$converterfeatures;
- map['features'] = Variable(converter.toSql(features.value));
+ map['features'] = Variable(
+ SubsonicSources.$converterfeatures.toSql(features.value));
}
if (username.present) {
map['username'] = Variable(username.value);
@@ -1959,9 +1962,10 @@ class Artists extends Table with TableInfo {
List get $columns =>
[sourceId, id, name, albumCount, starred, updated];
@override
- String get aliasedName => _alias ?? 'artists';
+ String get aliasedName => _alias ?? actualTableName;
@override
- String get actualTableName => 'artists';
+ String get actualTableName => $name;
+ static const String $name = 'artists';
@override
VerificationContext validateIntegrity(Insertable instance,
{bool isInserting = false}) {
@@ -2170,9 +2174,10 @@ class ArtistsFts extends Table
@override
List get $columns => [sourceId, name];
@override
- String get aliasedName => _alias ?? 'artists_fts';
+ String get aliasedName => _alias ?? actualTableName;
@override
- String get actualTableName => 'artists_fts';
+ String get actualTableName => $name;
+ static const String $name = 'artists_fts';
@override
VerificationContext validateIntegrity(Insertable instance,
{bool isInserting = false}) {
@@ -2468,9 +2473,10 @@ class Albums extends Table with TableInfo {
updated
];
@override
- String get aliasedName => _alias ?? 'albums';
+ String get aliasedName => _alias ?? actualTableName;
@override
- String get actualTableName => 'albums';
+ String get actualTableName => $name;
+ static const String $name = 'albums';
@override
VerificationContext validateIntegrity(Insertable instance,
{bool isInserting = false}) {
@@ -2837,9 +2843,10 @@ class AlbumsFts extends Table
@override
List get $columns => [sourceId, name];
@override
- String get aliasedName => _alias ?? 'albums_fts';
+ String get aliasedName => _alias ?? actualTableName;
@override
- String get actualTableName => 'albums_fts';
+ String get actualTableName => $name;
+ static const String $name = 'albums_fts';
@override
VerificationContext validateIntegrity(Insertable instance,
{bool isInserting = false}) {
@@ -3072,9 +3079,10 @@ class Playlists extends Table with TableInfo {
List get $columns =>
[sourceId, id, name, comment, coverArt, songCount, created, updated];
@override
- String get aliasedName => _alias ?? 'playlists';
+ String get aliasedName => _alias ?? actualTableName;
@override
- String get actualTableName => 'playlists';
+ String get actualTableName => $name;
+ static const String $name = 'playlists';
@override
VerificationContext validateIntegrity(Insertable instance,
{bool isInserting = false}) {
@@ -3340,9 +3348,10 @@ class PlaylistSongs extends Table with TableInfo {
List get $columns =>
[sourceId, playlistId, songId, position, updated];
@override
- String get aliasedName => _alias ?? 'playlist_songs';
+ String get aliasedName => _alias ?? actualTableName;
@override
- String get actualTableName => 'playlist_songs';
+ String get actualTableName => $name;
+ static const String $name = 'playlist_songs';
@override
VerificationContext validateIntegrity(Insertable instance,
{bool isInserting = false}) {
@@ -3632,9 +3641,10 @@ class PlaylistsFts extends Table
@override
List get $columns => [sourceId, name];
@override
- String get aliasedName => _alias ?? 'playlists_fts';
+ String get aliasedName => _alias ?? actualTableName;
@override
- String get actualTableName => 'playlists_fts';
+ String get actualTableName => $name;
+ static const String $name = 'playlists_fts';
@override
VerificationContext validateIntegrity(Insertable instance,
{bool isInserting = false}) {
@@ -3936,9 +3946,10 @@ class Songs extends Table with TableInfo {
updated
];
@override
- String get aliasedName => _alias ?? 'songs';
+ String get aliasedName => _alias ?? actualTableName;
@override
- String get actualTableName => 'songs';
+ String get actualTableName => $name;
+ static const String $name = 'songs';
@override
VerificationContext validateIntegrity(Insertable instance,
{bool isInserting = false}) {
@@ -4236,8 +4247,8 @@ class SongsCompanion extends UpdateCompanion {
map['artist'] = Variable(artist.value);
}
if (duration.present) {
- final converter = Songs.$converterdurationn;
- map['duration'] = Variable(converter.toSql(duration.value));
+ map['duration'] =
+ Variable(Songs.$converterdurationn.toSql(duration.value));
}
if (track.present) {
map['track'] = Variable(track.value);
@@ -4316,9 +4327,10 @@ class SongsFts extends Table
@override
List get $columns => [sourceId, title];
@override
- String get aliasedName => _alias ?? 'songs_fts';
+ String get aliasedName => _alias ?? actualTableName;
@override
- String get actualTableName => 'songs_fts';
+ String get actualTableName => $name;
+ static const String $name = 'songs_fts';
@override
VerificationContext validateIntegrity(Insertable instance,
{bool isInserting = false}) {
@@ -5570,4 +5582,5 @@ final databaseProvider = Provider.internal(
);
typedef DatabaseRef = ProviderRef;
-// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/lib/http/client.g.dart b/lib/http/client.g.dart
index 36e5986..cf39bbe 100644
--- a/lib/http/client.g.dart
+++ b/lib/http/client.g.dart
@@ -20,4 +20,5 @@ final httpClientProvider = Provider.internal(
);
typedef HttpClientRef = ProviderRef;
-// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/lib/models/music.freezed.dart b/lib/models/music.freezed.dart
index ff88468..ffe6873 100644
--- a/lib/models/music.freezed.dart
+++ b/lib/models/music.freezed.dart
@@ -12,7 +12,7 @@ part of 'music.dart';
T _$identity(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
- 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
+ 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
/// @nodoc
mixin _$SourceId {
@@ -62,21 +62,22 @@ class _$SourceIdCopyWithImpl<$Res, $Val extends SourceId>
}
/// @nodoc
-abstract class _$$_SourceIdCopyWith<$Res> implements $SourceIdCopyWith<$Res> {
- factory _$$_SourceIdCopyWith(
- _$_SourceId value, $Res Function(_$_SourceId) then) =
- __$$_SourceIdCopyWithImpl<$Res>;
+abstract class _$$SourceIdImplCopyWith<$Res>
+ implements $SourceIdCopyWith<$Res> {
+ factory _$$SourceIdImplCopyWith(
+ _$SourceIdImpl value, $Res Function(_$SourceIdImpl) then) =
+ __$$SourceIdImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({int sourceId, String id});
}
/// @nodoc
-class __$$_SourceIdCopyWithImpl<$Res>
- extends _$SourceIdCopyWithImpl<$Res, _$_SourceId>
- implements _$$_SourceIdCopyWith<$Res> {
- __$$_SourceIdCopyWithImpl(
- _$_SourceId _value, $Res Function(_$_SourceId) _then)
+class __$$SourceIdImplCopyWithImpl<$Res>
+ extends _$SourceIdCopyWithImpl<$Res, _$SourceIdImpl>
+ implements _$$SourceIdImplCopyWith<$Res> {
+ __$$SourceIdImplCopyWithImpl(
+ _$SourceIdImpl _value, $Res Function(_$SourceIdImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -85,7 +86,7 @@ class __$$_SourceIdCopyWithImpl<$Res>
Object? sourceId = null,
Object? id = null,
}) {
- return _then(_$_SourceId(
+ return _then(_$SourceIdImpl(
sourceId: null == sourceId
? _value.sourceId
: sourceId // ignore: cast_nullable_to_non_nullable
@@ -100,8 +101,8 @@ class __$$_SourceIdCopyWithImpl<$Res>
/// @nodoc
-class _$_SourceId with DiagnosticableTreeMixin implements _SourceId {
- const _$_SourceId({required this.sourceId, required this.id});
+class _$SourceIdImpl with DiagnosticableTreeMixin implements _SourceId {
+ const _$SourceIdImpl({required this.sourceId, required this.id});
@override
final int sourceId;
@@ -123,10 +124,10 @@ class _$_SourceId with DiagnosticableTreeMixin implements _SourceId {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_SourceId &&
+ other is _$SourceIdImpl &&
(identical(other.sourceId, sourceId) ||
other.sourceId == sourceId) &&
(identical(other.id, id) || other.id == id));
@@ -138,13 +139,13 @@ class _$_SourceId with DiagnosticableTreeMixin implements _SourceId {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_SourceIdCopyWith<_$_SourceId> get copyWith =>
- __$$_SourceIdCopyWithImpl<_$_SourceId>(this, _$identity);
+ _$$SourceIdImplCopyWith<_$SourceIdImpl> get copyWith =>
+ __$$SourceIdImplCopyWithImpl<_$SourceIdImpl>(this, _$identity);
}
abstract class _SourceId implements SourceId {
const factory _SourceId(
- {required final int sourceId, required final String id}) = _$_SourceId;
+ {required final int sourceId, required final String id}) = _$SourceIdImpl;
@override
int get sourceId;
@@ -152,7 +153,7 @@ abstract class _SourceId implements SourceId {
String get id;
@override
@JsonKey(ignore: true)
- _$$_SourceIdCopyWith<_$_SourceId> get copyWith =>
+ _$$SourceIdImplCopyWith<_$SourceIdImpl> get copyWith =>
throw _privateConstructorUsedError;
}
@@ -205,22 +206,22 @@ class _$SourceIdSetCopyWithImpl<$Res, $Val extends SourceIdSet>
}
/// @nodoc
-abstract class _$$_SourceIdSetCopyWith<$Res>
+abstract class _$$SourceIdSetImplCopyWith<$Res>
implements $SourceIdSetCopyWith<$Res> {
- factory _$$_SourceIdSetCopyWith(
- _$_SourceIdSet value, $Res Function(_$_SourceIdSet) then) =
- __$$_SourceIdSetCopyWithImpl<$Res>;
+ factory _$$SourceIdSetImplCopyWith(
+ _$SourceIdSetImpl value, $Res Function(_$SourceIdSetImpl) then) =
+ __$$SourceIdSetImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({int sourceId, ISet ids});
}
/// @nodoc
-class __$$_SourceIdSetCopyWithImpl<$Res>
- extends _$SourceIdSetCopyWithImpl<$Res, _$_SourceIdSet>
- implements _$$_SourceIdSetCopyWith<$Res> {
- __$$_SourceIdSetCopyWithImpl(
- _$_SourceIdSet _value, $Res Function(_$_SourceIdSet) _then)
+class __$$SourceIdSetImplCopyWithImpl<$Res>
+ extends _$SourceIdSetCopyWithImpl<$Res, _$SourceIdSetImpl>
+ implements _$$SourceIdSetImplCopyWith<$Res> {
+ __$$SourceIdSetImplCopyWithImpl(
+ _$SourceIdSetImpl _value, $Res Function(_$SourceIdSetImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -229,7 +230,7 @@ class __$$_SourceIdSetCopyWithImpl<$Res>
Object? sourceId = null,
Object? ids = null,
}) {
- return _then(_$_SourceIdSet(
+ return _then(_$SourceIdSetImpl(
sourceId: null == sourceId
? _value.sourceId
: sourceId // ignore: cast_nullable_to_non_nullable
@@ -244,8 +245,8 @@ class __$$_SourceIdSetCopyWithImpl<$Res>
/// @nodoc
-class _$_SourceIdSet with DiagnosticableTreeMixin implements _SourceIdSet {
- const _$_SourceIdSet({required this.sourceId, required this.ids});
+class _$SourceIdSetImpl with DiagnosticableTreeMixin implements _SourceIdSet {
+ const _$SourceIdSetImpl({required this.sourceId, required this.ids});
@override
final int sourceId;
@@ -267,10 +268,10 @@ class _$_SourceIdSet with DiagnosticableTreeMixin implements _SourceIdSet {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_SourceIdSet &&
+ other is _$SourceIdSetImpl &&
(identical(other.sourceId, sourceId) ||
other.sourceId == sourceId) &&
const DeepCollectionEquality().equals(other.ids, ids));
@@ -283,14 +284,14 @@ class _$_SourceIdSet with DiagnosticableTreeMixin implements _SourceIdSet {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_SourceIdSetCopyWith<_$_SourceIdSet> get copyWith =>
- __$$_SourceIdSetCopyWithImpl<_$_SourceIdSet>(this, _$identity);
+ _$$SourceIdSetImplCopyWith<_$SourceIdSetImpl> get copyWith =>
+ __$$SourceIdSetImplCopyWithImpl<_$SourceIdSetImpl>(this, _$identity);
}
abstract class _SourceIdSet implements SourceIdSet {
const factory _SourceIdSet(
{required final int sourceId,
- required final ISet ids}) = _$_SourceIdSet;
+ required final ISet ids}) = _$SourceIdSetImpl;
@override
int get sourceId;
@@ -298,7 +299,7 @@ abstract class _SourceIdSet implements SourceIdSet {
ISet get ids;
@override
@JsonKey(ignore: true)
- _$$_SourceIdSetCopyWith<_$_SourceIdSet> get copyWith =>
+ _$$SourceIdSetImplCopyWith<_$SourceIdSetImpl> get copyWith =>
throw _privateConstructorUsedError;
}
@@ -372,9 +373,10 @@ class _$ArtistCopyWithImpl<$Res, $Val extends Artist>
}
/// @nodoc
-abstract class _$$_ArtistCopyWith<$Res> implements $ArtistCopyWith<$Res> {
- factory _$$_ArtistCopyWith(_$_Artist value, $Res Function(_$_Artist) then) =
- __$$_ArtistCopyWithImpl<$Res>;
+abstract class _$$ArtistImplCopyWith<$Res> implements $ArtistCopyWith<$Res> {
+ factory _$$ArtistImplCopyWith(
+ _$ArtistImpl value, $Res Function(_$ArtistImpl) then) =
+ __$$ArtistImplCopyWithImpl<$Res>;
@override
@useResult
$Res call(
@@ -386,10 +388,11 @@ abstract class _$$_ArtistCopyWith<$Res> implements $ArtistCopyWith<$Res> {
}
/// @nodoc
-class __$$_ArtistCopyWithImpl<$Res>
- extends _$ArtistCopyWithImpl<$Res, _$_Artist>
- implements _$$_ArtistCopyWith<$Res> {
- __$$_ArtistCopyWithImpl(_$_Artist _value, $Res Function(_$_Artist) _then)
+class __$$ArtistImplCopyWithImpl<$Res>
+ extends _$ArtistCopyWithImpl<$Res, _$ArtistImpl>
+ implements _$$ArtistImplCopyWith<$Res> {
+ __$$ArtistImplCopyWithImpl(
+ _$ArtistImpl _value, $Res Function(_$ArtistImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -401,7 +404,7 @@ class __$$_ArtistCopyWithImpl<$Res>
Object? albumCount = null,
Object? starred = freezed,
}) {
- return _then(_$_Artist(
+ return _then(_$ArtistImpl(
sourceId: null == sourceId
? _value.sourceId
: sourceId // ignore: cast_nullable_to_non_nullable
@@ -428,8 +431,8 @@ class __$$_ArtistCopyWithImpl<$Res>
/// @nodoc
-class _$_Artist with DiagnosticableTreeMixin implements _Artist {
- const _$_Artist(
+class _$ArtistImpl with DiagnosticableTreeMixin implements _Artist {
+ const _$ArtistImpl(
{required this.sourceId,
required this.id,
required this.name,
@@ -465,10 +468,10 @@ class _$_Artist with DiagnosticableTreeMixin implements _Artist {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_Artist &&
+ other is _$ArtistImpl &&
(identical(other.sourceId, sourceId) ||
other.sourceId == sourceId) &&
(identical(other.id, id) || other.id == id) &&
@@ -485,8 +488,8 @@ class _$_Artist with DiagnosticableTreeMixin implements _Artist {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_ArtistCopyWith<_$_Artist> get copyWith =>
- __$$_ArtistCopyWithImpl<_$_Artist>(this, _$identity);
+ _$$ArtistImplCopyWith<_$ArtistImpl> get copyWith =>
+ __$$ArtistImplCopyWithImpl<_$ArtistImpl>(this, _$identity);
}
abstract class _Artist implements Artist {
@@ -495,7 +498,7 @@ abstract class _Artist implements Artist {
required final String id,
required final String name,
required final int albumCount,
- final DateTime? starred}) = _$_Artist;
+ final DateTime? starred}) = _$ArtistImpl;
@override
int get sourceId;
@@ -509,7 +512,7 @@ abstract class _Artist implements Artist {
DateTime? get starred;
@override
@JsonKey(ignore: true)
- _$$_ArtistCopyWith<_$_Artist> get copyWith =>
+ _$$ArtistImplCopyWith<_$ArtistImpl> get copyWith =>
throw _privateConstructorUsedError;
}
@@ -648,9 +651,10 @@ class _$AlbumCopyWithImpl<$Res, $Val extends Album>
}
/// @nodoc
-abstract class _$$_AlbumCopyWith<$Res> implements $AlbumCopyWith<$Res> {
- factory _$$_AlbumCopyWith(_$_Album value, $Res Function(_$_Album) then) =
- __$$_AlbumCopyWithImpl<$Res>;
+abstract class _$$AlbumImplCopyWith<$Res> implements $AlbumCopyWith<$Res> {
+ factory _$$AlbumImplCopyWith(
+ _$AlbumImpl value, $Res Function(_$AlbumImpl) then) =
+ __$$AlbumImplCopyWithImpl<$Res>;
@override
@useResult
$Res call(
@@ -671,9 +675,11 @@ abstract class _$$_AlbumCopyWith<$Res> implements $AlbumCopyWith<$Res> {
}
/// @nodoc
-class __$$_AlbumCopyWithImpl<$Res> extends _$AlbumCopyWithImpl<$Res, _$_Album>
- implements _$$_AlbumCopyWith<$Res> {
- __$$_AlbumCopyWithImpl(_$_Album _value, $Res Function(_$_Album) _then)
+class __$$AlbumImplCopyWithImpl<$Res>
+ extends _$AlbumCopyWithImpl<$Res, _$AlbumImpl>
+ implements _$$AlbumImplCopyWith<$Res> {
+ __$$AlbumImplCopyWithImpl(
+ _$AlbumImpl _value, $Res Function(_$AlbumImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -694,7 +700,7 @@ class __$$_AlbumCopyWithImpl<$Res> extends _$AlbumCopyWithImpl<$Res, _$_Album>
Object? frequentRank = freezed,
Object? recentRank = freezed,
}) {
- return _then(_$_Album(
+ return _then(_$AlbumImpl(
sourceId: null == sourceId
? _value.sourceId
: sourceId // ignore: cast_nullable_to_non_nullable
@@ -757,8 +763,8 @@ class __$$_AlbumCopyWithImpl<$Res> extends _$AlbumCopyWithImpl<$Res, _$_Album>
/// @nodoc
-class _$_Album with DiagnosticableTreeMixin implements _Album {
- const _$_Album(
+class _$AlbumImpl with DiagnosticableTreeMixin implements _Album {
+ const _$AlbumImpl(
{required this.sourceId,
required this.id,
required this.name,
@@ -833,10 +839,10 @@ class _$_Album with DiagnosticableTreeMixin implements _Album {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_Album &&
+ other is _$AlbumImpl &&
(identical(other.sourceId, sourceId) ||
other.sourceId == sourceId) &&
(identical(other.id, id) || other.id == id) &&
@@ -882,8 +888,8 @@ class _$_Album with DiagnosticableTreeMixin implements _Album {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_AlbumCopyWith<_$_Album> get copyWith =>
- __$$_AlbumCopyWithImpl<_$_Album>(this, _$identity);
+ _$$AlbumImplCopyWith<_$AlbumImpl> get copyWith =>
+ __$$AlbumImplCopyWithImpl<_$AlbumImpl>(this, _$identity);
}
abstract class _Album implements Album {
@@ -901,7 +907,7 @@ abstract class _Album implements Album {
required final int songCount,
final bool isDeleted,
final int? frequentRank,
- final int? recentRank}) = _$_Album;
+ final int? recentRank}) = _$AlbumImpl;
@override
int get sourceId;
@@ -933,7 +939,7 @@ abstract class _Album implements Album {
int? get recentRank;
@override
@JsonKey(ignore: true)
- _$$_AlbumCopyWith<_$_Album> get copyWith =>
+ _$$AlbumImplCopyWith<_$AlbumImpl> get copyWith =>
throw _privateConstructorUsedError;
}
@@ -1022,10 +1028,11 @@ class _$PlaylistCopyWithImpl<$Res, $Val extends Playlist>
}
/// @nodoc
-abstract class _$$_PlaylistCopyWith<$Res> implements $PlaylistCopyWith<$Res> {
- factory _$$_PlaylistCopyWith(
- _$_Playlist value, $Res Function(_$_Playlist) then) =
- __$$_PlaylistCopyWithImpl<$Res>;
+abstract class _$$PlaylistImplCopyWith<$Res>
+ implements $PlaylistCopyWith<$Res> {
+ factory _$$PlaylistImplCopyWith(
+ _$PlaylistImpl value, $Res Function(_$PlaylistImpl) then) =
+ __$$PlaylistImplCopyWithImpl<$Res>;
@override
@useResult
$Res call(
@@ -1039,11 +1046,11 @@ abstract class _$$_PlaylistCopyWith<$Res> implements $PlaylistCopyWith<$Res> {
}
/// @nodoc
-class __$$_PlaylistCopyWithImpl<$Res>
- extends _$PlaylistCopyWithImpl<$Res, _$_Playlist>
- implements _$$_PlaylistCopyWith<$Res> {
- __$$_PlaylistCopyWithImpl(
- _$_Playlist _value, $Res Function(_$_Playlist) _then)
+class __$$PlaylistImplCopyWithImpl<$Res>
+ extends _$PlaylistCopyWithImpl<$Res, _$PlaylistImpl>
+ implements _$$PlaylistImplCopyWith<$Res> {
+ __$$PlaylistImplCopyWithImpl(
+ _$PlaylistImpl _value, $Res Function(_$PlaylistImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -1057,7 +1064,7 @@ class __$$_PlaylistCopyWithImpl<$Res>
Object? songCount = null,
Object? created = null,
}) {
- return _then(_$_Playlist(
+ return _then(_$PlaylistImpl(
sourceId: null == sourceId
? _value.sourceId
: sourceId // ignore: cast_nullable_to_non_nullable
@@ -1092,8 +1099,8 @@ class __$$_PlaylistCopyWithImpl<$Res>
/// @nodoc
-class _$_Playlist with DiagnosticableTreeMixin implements _Playlist {
- const _$_Playlist(
+class _$PlaylistImpl with DiagnosticableTreeMixin implements _Playlist {
+ const _$PlaylistImpl(
{required this.sourceId,
required this.id,
required this.name,
@@ -1137,10 +1144,10 @@ class _$_Playlist with DiagnosticableTreeMixin implements _Playlist {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_Playlist &&
+ other is _$PlaylistImpl &&
(identical(other.sourceId, sourceId) ||
other.sourceId == sourceId) &&
(identical(other.id, id) || other.id == id) &&
@@ -1160,8 +1167,8 @@ class _$_Playlist with DiagnosticableTreeMixin implements _Playlist {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_PlaylistCopyWith<_$_Playlist> get copyWith =>
- __$$_PlaylistCopyWithImpl<_$_Playlist>(this, _$identity);
+ _$$PlaylistImplCopyWith<_$PlaylistImpl> get copyWith =>
+ __$$PlaylistImplCopyWithImpl<_$PlaylistImpl>(this, _$identity);
}
abstract class _Playlist implements Playlist {
@@ -1172,7 +1179,7 @@ abstract class _Playlist implements Playlist {
final String? comment,
final String? coverArt,
required final int songCount,
- required final DateTime created}) = _$_Playlist;
+ required final DateTime created}) = _$PlaylistImpl;
@override
int get sourceId;
@@ -1190,7 +1197,7 @@ abstract class _Playlist implements Playlist {
DateTime get created;
@override
@JsonKey(ignore: true)
- _$$_PlaylistCopyWith<_$_Playlist> get copyWith =>
+ _$$PlaylistImplCopyWith<_$PlaylistImpl> get copyWith =>
throw _privateConstructorUsedError;
}
@@ -1334,9 +1341,10 @@ class _$SongCopyWithImpl<$Res, $Val extends Song>
}
/// @nodoc
-abstract class _$$_SongCopyWith<$Res> implements $SongCopyWith<$Res> {
- factory _$$_SongCopyWith(_$_Song value, $Res Function(_$_Song) then) =
- __$$_SongCopyWithImpl<$Res>;
+abstract class _$$SongImplCopyWith<$Res> implements $SongCopyWith<$Res> {
+ factory _$$SongImplCopyWith(
+ _$SongImpl value, $Res Function(_$SongImpl) then) =
+ __$$SongImplCopyWithImpl<$Res>;
@override
@useResult
$Res call(
@@ -1358,9 +1366,10 @@ abstract class _$$_SongCopyWith<$Res> implements $SongCopyWith<$Res> {
}
/// @nodoc
-class __$$_SongCopyWithImpl<$Res> extends _$SongCopyWithImpl<$Res, _$_Song>
- implements _$$_SongCopyWith<$Res> {
- __$$_SongCopyWithImpl(_$_Song _value, $Res Function(_$_Song) _then)
+class __$$SongImplCopyWithImpl<$Res>
+ extends _$SongCopyWithImpl<$Res, _$SongImpl>
+ implements _$$SongImplCopyWith<$Res> {
+ __$$SongImplCopyWithImpl(_$SongImpl _value, $Res Function(_$SongImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -1382,7 +1391,7 @@ class __$$_SongCopyWithImpl<$Res> extends _$SongCopyWithImpl<$Res, _$_Song>
Object? downloadFilePath = freezed,
Object? isDeleted = null,
}) {
- return _then(_$_Song(
+ return _then(_$SongImpl(
sourceId: null == sourceId
? _value.sourceId
: sourceId // ignore: cast_nullable_to_non_nullable
@@ -1449,8 +1458,8 @@ class __$$_SongCopyWithImpl<$Res> extends _$SongCopyWithImpl<$Res, _$_Song>
/// @nodoc
-class _$_Song with DiagnosticableTreeMixin implements _Song {
- const _$_Song(
+class _$SongImpl with DiagnosticableTreeMixin implements _Song {
+ const _$SongImpl(
{required this.sourceId,
required this.id,
this.albumId,
@@ -1527,10 +1536,10 @@ class _$_Song with DiagnosticableTreeMixin implements _Song {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_Song &&
+ other is _$SongImpl &&
(identical(other.sourceId, sourceId) ||
other.sourceId == sourceId) &&
(identical(other.id, id) || other.id == id) &&
@@ -1576,8 +1585,8 @@ class _$_Song with DiagnosticableTreeMixin implements _Song {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_SongCopyWith<_$_Song> get copyWith =>
- __$$_SongCopyWithImpl<_$_Song>(this, _$identity);
+ _$$SongImplCopyWith<_$SongImpl> get copyWith =>
+ __$$SongImplCopyWithImpl<_$SongImpl>(this, _$identity);
}
abstract class _Song implements Song {
@@ -1596,7 +1605,7 @@ abstract class _Song implements Song {
final String? genre,
final String? downloadTaskId,
final String? downloadFilePath,
- final bool isDeleted}) = _$_Song;
+ final bool isDeleted}) = _$SongImpl;
@override
int get sourceId;
@@ -1630,7 +1639,8 @@ abstract class _Song implements Song {
bool get isDeleted;
@override
@JsonKey(ignore: true)
- _$$_SongCopyWith<_$_Song> get copyWith => throw _privateConstructorUsedError;
+ _$$SongImplCopyWith<_$SongImpl> get copyWith =>
+ throw _privateConstructorUsedError;
}
/// @nodoc
@@ -1698,11 +1708,11 @@ class _$SearchResultsCopyWithImpl<$Res, $Val extends SearchResults>
}
/// @nodoc
-abstract class _$$_SearchResultsCopyWith<$Res>
+abstract class _$$SearchResultsImplCopyWith<$Res>
implements $SearchResultsCopyWith<$Res> {
- factory _$$_SearchResultsCopyWith(
- _$_SearchResults value, $Res Function(_$_SearchResults) then) =
- __$$_SearchResultsCopyWithImpl<$Res>;
+ factory _$$SearchResultsImplCopyWith(
+ _$SearchResultsImpl value, $Res Function(_$SearchResultsImpl) then) =
+ __$$SearchResultsImplCopyWithImpl<$Res>;
@override
@useResult
$Res call(
@@ -1713,11 +1723,11 @@ abstract class _$$_SearchResultsCopyWith<$Res>
}
/// @nodoc
-class __$$_SearchResultsCopyWithImpl<$Res>
- extends _$SearchResultsCopyWithImpl<$Res, _$_SearchResults>
- implements _$$_SearchResultsCopyWith<$Res> {
- __$$_SearchResultsCopyWithImpl(
- _$_SearchResults _value, $Res Function(_$_SearchResults) _then)
+class __$$SearchResultsImplCopyWithImpl<$Res>
+ extends _$SearchResultsCopyWithImpl<$Res, _$SearchResultsImpl>
+ implements _$$SearchResultsImplCopyWith<$Res> {
+ __$$SearchResultsImplCopyWithImpl(
+ _$SearchResultsImpl _value, $Res Function(_$SearchResultsImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -1728,7 +1738,7 @@ class __$$_SearchResultsCopyWithImpl<$Res>
Object? albums = null,
Object? artists = null,
}) {
- return _then(_$_SearchResults(
+ return _then(_$SearchResultsImpl(
query: freezed == query
? _value.query
: query // ignore: cast_nullable_to_non_nullable
@@ -1751,8 +1761,10 @@ class __$$_SearchResultsCopyWithImpl<$Res>
/// @nodoc
-class _$_SearchResults with DiagnosticableTreeMixin implements _SearchResults {
- const _$_SearchResults(
+class _$SearchResultsImpl
+ with DiagnosticableTreeMixin
+ implements _SearchResults {
+ const _$SearchResultsImpl(
{this.query,
this.songs = const IListConst([]),
this.albums = const IListConst([]),
@@ -1787,10 +1799,10 @@ class _$_SearchResults with DiagnosticableTreeMixin implements _SearchResults {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_SearchResults &&
+ other is _$SearchResultsImpl &&
(identical(other.query, query) || other.query == query) &&
const DeepCollectionEquality().equals(other.songs, songs) &&
const DeepCollectionEquality().equals(other.albums, albums) &&
@@ -1808,8 +1820,8 @@ class _$_SearchResults with DiagnosticableTreeMixin implements _SearchResults {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_SearchResultsCopyWith<_$_SearchResults> get copyWith =>
- __$$_SearchResultsCopyWithImpl<_$_SearchResults>(this, _$identity);
+ _$$SearchResultsImplCopyWith<_$SearchResultsImpl> get copyWith =>
+ __$$SearchResultsImplCopyWithImpl<_$SearchResultsImpl>(this, _$identity);
}
abstract class _SearchResults implements SearchResults {
@@ -1817,7 +1829,7 @@ abstract class _SearchResults implements SearchResults {
{final String? query,
final IList songs,
final IList albums,
- final IList artists}) = _$_SearchResults;
+ final IList artists}) = _$SearchResultsImpl;
@override
String? get query;
@@ -1829,6 +1841,6 @@ abstract class _SearchResults implements SearchResults {
IList get artists;
@override
@JsonKey(ignore: true)
- _$$_SearchResultsCopyWith<_$_SearchResults> get copyWith =>
+ _$$SearchResultsImplCopyWith<_$SearchResultsImpl> get copyWith =>
throw _privateConstructorUsedError;
}
diff --git a/lib/models/query.freezed.dart b/lib/models/query.freezed.dart
index 5700e4b..12b51c9 100644
--- a/lib/models/query.freezed.dart
+++ b/lib/models/query.freezed.dart
@@ -12,7 +12,7 @@ part of 'query.dart';
T _$identity(T value) => value;
final _privateConstructorUsedError = UnsupportedError(
- 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
+ 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
Pagination _$PaginationFromJson(Map json) {
return _Pagination.fromJson(json);
@@ -68,22 +68,22 @@ class _$PaginationCopyWithImpl<$Res, $Val extends Pagination>
}
/// @nodoc
-abstract class _$$_PaginationCopyWith<$Res>
+abstract class _$$PaginationImplCopyWith<$Res>
implements $PaginationCopyWith<$Res> {
- factory _$$_PaginationCopyWith(
- _$_Pagination value, $Res Function(_$_Pagination) then) =
- __$$_PaginationCopyWithImpl<$Res>;
+ factory _$$PaginationImplCopyWith(
+ _$PaginationImpl value, $Res Function(_$PaginationImpl) then) =
+ __$$PaginationImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({int limit, int offset});
}
/// @nodoc
-class __$$_PaginationCopyWithImpl<$Res>
- extends _$PaginationCopyWithImpl<$Res, _$_Pagination>
- implements _$$_PaginationCopyWith<$Res> {
- __$$_PaginationCopyWithImpl(
- _$_Pagination _value, $Res Function(_$_Pagination) _then)
+class __$$PaginationImplCopyWithImpl<$Res>
+ extends _$PaginationCopyWithImpl<$Res, _$PaginationImpl>
+ implements _$$PaginationImplCopyWith<$Res> {
+ __$$PaginationImplCopyWithImpl(
+ _$PaginationImpl _value, $Res Function(_$PaginationImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -92,7 +92,7 @@ class __$$_PaginationCopyWithImpl<$Res>
Object? limit = null,
Object? offset = null,
}) {
- return _then(_$_Pagination(
+ return _then(_$PaginationImpl(
limit: null == limit
? _value.limit
: limit // ignore: cast_nullable_to_non_nullable
@@ -107,11 +107,11 @@ class __$$_PaginationCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
-class _$_Pagination implements _Pagination {
- const _$_Pagination({required this.limit, this.offset = 0});
+class _$PaginationImpl implements _Pagination {
+ const _$PaginationImpl({required this.limit, this.offset = 0});
- factory _$_Pagination.fromJson(Map json) =>
- _$$_PaginationFromJson(json);
+ factory _$PaginationImpl.fromJson(Map json) =>
+ _$$PaginationImplFromJson(json);
@override
final int limit;
@@ -125,10 +125,10 @@ class _$_Pagination implements _Pagination {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_Pagination &&
+ other is _$PaginationImpl &&
(identical(other.limit, limit) || other.limit == limit) &&
(identical(other.offset, offset) || other.offset == offset));
}
@@ -140,12 +140,12 @@ class _$_Pagination implements _Pagination {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_PaginationCopyWith<_$_Pagination> get copyWith =>
- __$$_PaginationCopyWithImpl<_$_Pagination>(this, _$identity);
+ _$$PaginationImplCopyWith<_$PaginationImpl> get copyWith =>
+ __$$PaginationImplCopyWithImpl<_$PaginationImpl>(this, _$identity);
@override
Map toJson() {
- return _$$_PaginationToJson(
+ return _$$PaginationImplToJson(
this,
);
}
@@ -153,10 +153,10 @@ class _$_Pagination implements _Pagination {
abstract class _Pagination implements Pagination {
const factory _Pagination({required final int limit, final int offset}) =
- _$_Pagination;
+ _$PaginationImpl;
factory _Pagination.fromJson(Map json) =
- _$_Pagination.fromJson;
+ _$PaginationImpl.fromJson;
@override
int get limit;
@@ -164,7 +164,7 @@ abstract class _Pagination implements Pagination {
int get offset;
@override
@JsonKey(ignore: true)
- _$$_PaginationCopyWith<_$_Pagination> get copyWith =>
+ _$$PaginationImplCopyWith<_$PaginationImpl> get copyWith =>
throw _privateConstructorUsedError;
}
@@ -220,19 +220,21 @@ class _$SortByCopyWithImpl<$Res, $Val extends SortBy>
}
/// @nodoc
-abstract class _$$_SortByCopyWith<$Res> implements $SortByCopyWith<$Res> {
- factory _$$_SortByCopyWith(_$_SortBy value, $Res Function(_$_SortBy) then) =
- __$$_SortByCopyWithImpl<$Res>;
+abstract class _$$SortByImplCopyWith<$Res> implements $SortByCopyWith<$Res> {
+ factory _$$SortByImplCopyWith(
+ _$SortByImpl value, $Res Function(_$SortByImpl) then) =
+ __$$SortByImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String column, SortDirection dir});
}
/// @nodoc
-class __$$_SortByCopyWithImpl<$Res>
- extends _$SortByCopyWithImpl<$Res, _$_SortBy>
- implements _$$_SortByCopyWith<$Res> {
- __$$_SortByCopyWithImpl(_$_SortBy _value, $Res Function(_$_SortBy) _then)
+class __$$SortByImplCopyWithImpl<$Res>
+ extends _$SortByCopyWithImpl<$Res, _$SortByImpl>
+ implements _$$SortByImplCopyWith<$Res> {
+ __$$SortByImplCopyWithImpl(
+ _$SortByImpl _value, $Res Function(_$SortByImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -241,7 +243,7 @@ class __$$_SortByCopyWithImpl<$Res>
Object? column = null,
Object? dir = null,
}) {
- return _then(_$_SortBy(
+ return _then(_$SortByImpl(
column: null == column
? _value.column
: column // ignore: cast_nullable_to_non_nullable
@@ -256,11 +258,11 @@ class __$$_SortByCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
-class _$_SortBy implements _SortBy {
- const _$_SortBy({required this.column, this.dir = SortDirection.asc});
+class _$SortByImpl implements _SortBy {
+ const _$SortByImpl({required this.column, this.dir = SortDirection.asc});
- factory _$_SortBy.fromJson(Map json) =>
- _$$_SortByFromJson(json);
+ factory _$SortByImpl.fromJson(Map json) =>
+ _$$SortByImplFromJson(json);
@override
final String column;
@@ -274,10 +276,10 @@ class _$_SortBy implements _SortBy {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_SortBy &&
+ other is _$SortByImpl &&
(identical(other.column, column) || other.column == column) &&
(identical(other.dir, dir) || other.dir == dir));
}
@@ -289,12 +291,12 @@ class _$_SortBy implements _SortBy {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_SortByCopyWith<_$_SortBy> get copyWith =>
- __$$_SortByCopyWithImpl<_$_SortBy>(this, _$identity);
+ _$$SortByImplCopyWith<_$SortByImpl> get copyWith =>
+ __$$SortByImplCopyWithImpl<_$SortByImpl>(this, _$identity);
@override
Map toJson() {
- return _$$_SortByToJson(
+ return _$$SortByImplToJson(
this,
);
}
@@ -302,9 +304,9 @@ class _$_SortBy implements _SortBy {
abstract class _SortBy implements SortBy {
const factory _SortBy(
- {required final String column, final SortDirection dir}) = _$_SortBy;
+ {required final String column, final SortDirection dir}) = _$SortByImpl;
- factory _SortBy.fromJson(Map json) = _$_SortBy.fromJson;
+ factory _SortBy.fromJson(Map json) = _$SortByImpl.fromJson;
@override
String get column;
@@ -312,7 +314,7 @@ abstract class _SortBy implements SortBy {
SortDirection get dir;
@override
@JsonKey(ignore: true)
- _$$_SortByCopyWith<_$_SortBy> get copyWith =>
+ _$$SortByImplCopyWith<_$SortByImpl> get copyWith =>
throw _privateConstructorUsedError;
}
@@ -436,22 +438,22 @@ class _$FilterWithCopyWithImpl<$Res, $Val extends FilterWith>
}
/// @nodoc
-abstract class _$$_FilterWithEqualsCopyWith<$Res>
+abstract class _$$FilterWithEqualsImplCopyWith<$Res>
implements $FilterWithCopyWith<$Res> {
- factory _$$_FilterWithEqualsCopyWith(
- _$_FilterWithEquals value, $Res Function(_$_FilterWithEquals) then) =
- __$$_FilterWithEqualsCopyWithImpl<$Res>;
+ factory _$$FilterWithEqualsImplCopyWith(_$FilterWithEqualsImpl value,
+ $Res Function(_$FilterWithEqualsImpl) then) =
+ __$$FilterWithEqualsImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String column, String value, bool invert});
}
/// @nodoc
-class __$$_FilterWithEqualsCopyWithImpl<$Res>
- extends _$FilterWithCopyWithImpl<$Res, _$_FilterWithEquals>
- implements _$$_FilterWithEqualsCopyWith<$Res> {
- __$$_FilterWithEqualsCopyWithImpl(
- _$_FilterWithEquals _value, $Res Function(_$_FilterWithEquals) _then)
+class __$$FilterWithEqualsImplCopyWithImpl<$Res>
+ extends _$FilterWithCopyWithImpl<$Res, _$FilterWithEqualsImpl>
+ implements _$$FilterWithEqualsImplCopyWith<$Res> {
+ __$$FilterWithEqualsImplCopyWithImpl(_$FilterWithEqualsImpl _value,
+ $Res Function(_$FilterWithEqualsImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -461,7 +463,7 @@ class __$$_FilterWithEqualsCopyWithImpl<$Res>
Object? value = null,
Object? invert = null,
}) {
- return _then(_$_FilterWithEquals(
+ return _then(_$FilterWithEqualsImpl(
column: null == column
? _value.column
: column // ignore: cast_nullable_to_non_nullable
@@ -480,16 +482,16 @@ class __$$_FilterWithEqualsCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
-class _$_FilterWithEquals implements _FilterWithEquals {
- const _$_FilterWithEquals(
+class _$FilterWithEqualsImpl implements _FilterWithEquals {
+ const _$FilterWithEqualsImpl(
{required this.column,
required this.value,
this.invert = false,
final String? $type})
: $type = $type ?? 'equals';
- factory _$_FilterWithEquals.fromJson(Map json) =>
- _$$_FilterWithEqualsFromJson(json);
+ factory _$FilterWithEqualsImpl.fromJson(Map json) =>
+ _$$FilterWithEqualsImplFromJson(json);
@override
final String column;
@@ -508,10 +510,10 @@ class _$_FilterWithEquals implements _FilterWithEquals {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_FilterWithEquals &&
+ other is _$FilterWithEqualsImpl &&
(identical(other.column, column) || other.column == column) &&
(identical(other.value, value) || other.value == value) &&
(identical(other.invert, invert) || other.invert == invert));
@@ -524,8 +526,9 @@ class _$_FilterWithEquals implements _FilterWithEquals {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_FilterWithEqualsCopyWith<_$_FilterWithEquals> get copyWith =>
- __$$_FilterWithEqualsCopyWithImpl<_$_FilterWithEquals>(this, _$identity);
+ _$$FilterWithEqualsImplCopyWith<_$FilterWithEqualsImpl> get copyWith =>
+ __$$FilterWithEqualsImplCopyWithImpl<_$FilterWithEqualsImpl>(
+ this, _$identity);
@override
@optionalTypeArgs
@@ -611,7 +614,7 @@ class _$_FilterWithEquals implements _FilterWithEquals {
@override
Map toJson() {
- return _$$_FilterWithEqualsToJson(
+ return _$$FilterWithEqualsImplToJson(
this,
);
}
@@ -621,10 +624,10 @@ abstract class _FilterWithEquals implements FilterWith {
const factory _FilterWithEquals(
{required final String column,
required final String value,
- final bool invert}) = _$_FilterWithEquals;
+ final bool invert}) = _$FilterWithEqualsImpl;
factory _FilterWithEquals.fromJson(Map json) =
- _$_FilterWithEquals.fromJson;
+ _$FilterWithEqualsImpl.fromJson;
@override
String get column;
@@ -632,27 +635,28 @@ abstract class _FilterWithEquals implements FilterWith {
bool get invert;
@override
@JsonKey(ignore: true)
- _$$_FilterWithEqualsCopyWith<_$_FilterWithEquals> get copyWith =>
+ _$$FilterWithEqualsImplCopyWith<_$FilterWithEqualsImpl> get copyWith =>
throw _privateConstructorUsedError;
}
/// @nodoc
-abstract class _$$_FilterWithGreaterThanCopyWith<$Res>
+abstract class _$$FilterWithGreaterThanImplCopyWith<$Res>
implements $FilterWithCopyWith<$Res> {
- factory _$$_FilterWithGreaterThanCopyWith(_$_FilterWithGreaterThan value,
- $Res Function(_$_FilterWithGreaterThan) then) =
- __$$_FilterWithGreaterThanCopyWithImpl<$Res>;
+ factory _$$FilterWithGreaterThanImplCopyWith(
+ _$FilterWithGreaterThanImpl value,
+ $Res Function(_$FilterWithGreaterThanImpl) then) =
+ __$$FilterWithGreaterThanImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String column, String value, bool orEquals});
}
/// @nodoc
-class __$$_FilterWithGreaterThanCopyWithImpl<$Res>
- extends _$FilterWithCopyWithImpl<$Res, _$_FilterWithGreaterThan>
- implements _$$_FilterWithGreaterThanCopyWith<$Res> {
- __$$_FilterWithGreaterThanCopyWithImpl(_$_FilterWithGreaterThan _value,
- $Res Function(_$_FilterWithGreaterThan) _then)
+class __$$FilterWithGreaterThanImplCopyWithImpl<$Res>
+ extends _$FilterWithCopyWithImpl<$Res, _$FilterWithGreaterThanImpl>
+ implements _$$FilterWithGreaterThanImplCopyWith<$Res> {
+ __$$FilterWithGreaterThanImplCopyWithImpl(_$FilterWithGreaterThanImpl _value,
+ $Res Function(_$FilterWithGreaterThanImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -662,7 +666,7 @@ class __$$_FilterWithGreaterThanCopyWithImpl<$Res>
Object? value = null,
Object? orEquals = null,
}) {
- return _then(_$_FilterWithGreaterThan(
+ return _then(_$FilterWithGreaterThanImpl(
column: null == column
? _value.column
: column // ignore: cast_nullable_to_non_nullable
@@ -681,16 +685,16 @@ class __$$_FilterWithGreaterThanCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
-class _$_FilterWithGreaterThan implements _FilterWithGreaterThan {
- const _$_FilterWithGreaterThan(
+class _$FilterWithGreaterThanImpl implements _FilterWithGreaterThan {
+ const _$FilterWithGreaterThanImpl(
{required this.column,
required this.value,
this.orEquals = false,
final String? $type})
: $type = $type ?? 'greaterThan';
- factory _$_FilterWithGreaterThan.fromJson(Map json) =>
- _$$_FilterWithGreaterThanFromJson(json);
+ factory _$FilterWithGreaterThanImpl.fromJson(Map json) =>
+ _$$FilterWithGreaterThanImplFromJson(json);
@override
final String column;
@@ -709,10 +713,10 @@ class _$_FilterWithGreaterThan implements _FilterWithGreaterThan {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_FilterWithGreaterThan &&
+ other is _$FilterWithGreaterThanImpl &&
(identical(other.column, column) || other.column == column) &&
(identical(other.value, value) || other.value == value) &&
(identical(other.orEquals, orEquals) ||
@@ -726,9 +730,9 @@ class _$_FilterWithGreaterThan implements _FilterWithGreaterThan {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_FilterWithGreaterThanCopyWith<_$_FilterWithGreaterThan> get copyWith =>
- __$$_FilterWithGreaterThanCopyWithImpl<_$_FilterWithGreaterThan>(
- this, _$identity);
+ _$$FilterWithGreaterThanImplCopyWith<_$FilterWithGreaterThanImpl>
+ get copyWith => __$$FilterWithGreaterThanImplCopyWithImpl<
+ _$FilterWithGreaterThanImpl>(this, _$identity);
@override
@optionalTypeArgs
@@ -814,7 +818,7 @@ class _$_FilterWithGreaterThan implements _FilterWithGreaterThan {
@override
Map toJson() {
- return _$$_FilterWithGreaterThanToJson(
+ return _$$FilterWithGreaterThanImplToJson(
this,
);
}
@@ -824,10 +828,10 @@ abstract class _FilterWithGreaterThan implements FilterWith {
const factory _FilterWithGreaterThan(
{required final String column,
required final String value,
- final bool orEquals}) = _$_FilterWithGreaterThan;
+ final bool orEquals}) = _$FilterWithGreaterThanImpl;
factory _FilterWithGreaterThan.fromJson(Map json) =
- _$_FilterWithGreaterThan.fromJson;
+ _$FilterWithGreaterThanImpl.fromJson;
@override
String get column;
@@ -835,27 +839,27 @@ abstract class _FilterWithGreaterThan implements FilterWith {
bool get orEquals;
@override
@JsonKey(ignore: true)
- _$$_FilterWithGreaterThanCopyWith<_$_FilterWithGreaterThan> get copyWith =>
- throw _privateConstructorUsedError;
+ _$$FilterWithGreaterThanImplCopyWith<_$FilterWithGreaterThanImpl>
+ get copyWith => throw _privateConstructorUsedError;
}
/// @nodoc
-abstract class _$$_FilterWithIsNullCopyWith<$Res>
+abstract class _$$FilterWithIsNullImplCopyWith<$Res>
implements $FilterWithCopyWith<$Res> {
- factory _$$_FilterWithIsNullCopyWith(
- _$_FilterWithIsNull value, $Res Function(_$_FilterWithIsNull) then) =
- __$$_FilterWithIsNullCopyWithImpl<$Res>;
+ factory _$$FilterWithIsNullImplCopyWith(_$FilterWithIsNullImpl value,
+ $Res Function(_$FilterWithIsNullImpl) then) =
+ __$$FilterWithIsNullImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String column, bool invert});
}
/// @nodoc
-class __$$_FilterWithIsNullCopyWithImpl<$Res>
- extends _$FilterWithCopyWithImpl<$Res, _$_FilterWithIsNull>
- implements _$$_FilterWithIsNullCopyWith<$Res> {
- __$$_FilterWithIsNullCopyWithImpl(
- _$_FilterWithIsNull _value, $Res Function(_$_FilterWithIsNull) _then)
+class __$$FilterWithIsNullImplCopyWithImpl<$Res>
+ extends _$FilterWithCopyWithImpl<$Res, _$FilterWithIsNullImpl>
+ implements _$$FilterWithIsNullImplCopyWith<$Res> {
+ __$$FilterWithIsNullImplCopyWithImpl(_$FilterWithIsNullImpl _value,
+ $Res Function(_$FilterWithIsNullImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -864,7 +868,7 @@ class __$$_FilterWithIsNullCopyWithImpl<$Res>
Object? column = null,
Object? invert = null,
}) {
- return _then(_$_FilterWithIsNull(
+ return _then(_$FilterWithIsNullImpl(
column: null == column
? _value.column
: column // ignore: cast_nullable_to_non_nullable
@@ -879,13 +883,13 @@ class __$$_FilterWithIsNullCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
-class _$_FilterWithIsNull implements _FilterWithIsNull {
- const _$_FilterWithIsNull(
+class _$FilterWithIsNullImpl implements _FilterWithIsNull {
+ const _$FilterWithIsNullImpl(
{required this.column, this.invert = false, final String? $type})
: $type = $type ?? 'isNull';
- factory _$_FilterWithIsNull.fromJson(Map json) =>
- _$$_FilterWithIsNullFromJson(json);
+ factory _$FilterWithIsNullImpl.fromJson(Map json) =>
+ _$$FilterWithIsNullImplFromJson(json);
@override
final String column;
@@ -902,10 +906,10 @@ class _$_FilterWithIsNull implements _FilterWithIsNull {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_FilterWithIsNull &&
+ other is _$FilterWithIsNullImpl &&
(identical(other.column, column) || other.column == column) &&
(identical(other.invert, invert) || other.invert == invert));
}
@@ -917,8 +921,9 @@ class _$_FilterWithIsNull implements _FilterWithIsNull {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_FilterWithIsNullCopyWith<_$_FilterWithIsNull> get copyWith =>
- __$$_FilterWithIsNullCopyWithImpl<_$_FilterWithIsNull>(this, _$identity);
+ _$$FilterWithIsNullImplCopyWith<_$FilterWithIsNullImpl> get copyWith =>
+ __$$FilterWithIsNullImplCopyWithImpl<_$FilterWithIsNullImpl>(
+ this, _$identity);
@override
@optionalTypeArgs
@@ -1004,7 +1009,7 @@ class _$_FilterWithIsNull implements _FilterWithIsNull {
@override
Map toJson() {
- return _$$_FilterWithIsNullToJson(
+ return _$$FilterWithIsNullImplToJson(
this,
);
}
@@ -1012,37 +1017,38 @@ class _$_FilterWithIsNull implements _FilterWithIsNull {
abstract class _FilterWithIsNull implements FilterWith {
const factory _FilterWithIsNull(
- {required final String column, final bool invert}) = _$_FilterWithIsNull;
+ {required final String column,
+ final bool invert}) = _$FilterWithIsNullImpl;
factory _FilterWithIsNull.fromJson(Map json) =
- _$_FilterWithIsNull.fromJson;
+ _$FilterWithIsNullImpl.fromJson;
@override
String get column;
bool get invert;
@override
@JsonKey(ignore: true)
- _$$_FilterWithIsNullCopyWith<_$_FilterWithIsNull> get copyWith =>
+ _$$FilterWithIsNullImplCopyWith<_$FilterWithIsNullImpl> get copyWith =>
throw _privateConstructorUsedError;
}
/// @nodoc
-abstract class _$$_FilterWithBetweenIntCopyWith<$Res>
+abstract class _$$FilterWithBetweenIntImplCopyWith<$Res>
implements $FilterWithCopyWith<$Res> {
- factory _$$_FilterWithBetweenIntCopyWith(_$_FilterWithBetweenInt value,
- $Res Function(_$_FilterWithBetweenInt) then) =
- __$$_FilterWithBetweenIntCopyWithImpl<$Res>;
+ factory _$$FilterWithBetweenIntImplCopyWith(_$FilterWithBetweenIntImpl value,
+ $Res Function(_$FilterWithBetweenIntImpl) then) =
+ __$$FilterWithBetweenIntImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String column, int from, int to});
}
/// @nodoc
-class __$$_FilterWithBetweenIntCopyWithImpl<$Res>
- extends _$FilterWithCopyWithImpl<$Res, _$_FilterWithBetweenInt>
- implements _$$_FilterWithBetweenIntCopyWith<$Res> {
- __$$_FilterWithBetweenIntCopyWithImpl(_$_FilterWithBetweenInt _value,
- $Res Function(_$_FilterWithBetweenInt) _then)
+class __$$FilterWithBetweenIntImplCopyWithImpl<$Res>
+ extends _$FilterWithCopyWithImpl<$Res, _$FilterWithBetweenIntImpl>
+ implements _$$FilterWithBetweenIntImplCopyWith<$Res> {
+ __$$FilterWithBetweenIntImplCopyWithImpl(_$FilterWithBetweenIntImpl _value,
+ $Res Function(_$FilterWithBetweenIntImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -1052,7 +1058,7 @@ class __$$_FilterWithBetweenIntCopyWithImpl<$Res>
Object? from = null,
Object? to = null,
}) {
- return _then(_$_FilterWithBetweenInt(
+ return _then(_$FilterWithBetweenIntImpl(
column: null == column
? _value.column
: column // ignore: cast_nullable_to_non_nullable
@@ -1071,16 +1077,16 @@ class __$$_FilterWithBetweenIntCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
-class _$_FilterWithBetweenInt implements _FilterWithBetweenInt {
- const _$_FilterWithBetweenInt(
+class _$FilterWithBetweenIntImpl implements _FilterWithBetweenInt {
+ const _$FilterWithBetweenIntImpl(
{required this.column,
required this.from,
required this.to,
final String? $type})
: $type = $type ?? 'betweenInt';
- factory _$_FilterWithBetweenInt.fromJson(Map json) =>
- _$$_FilterWithBetweenIntFromJson(json);
+ factory _$FilterWithBetweenIntImpl.fromJson(Map json) =>
+ _$$FilterWithBetweenIntImplFromJson(json);
@override
final String column;
@@ -1098,10 +1104,10 @@ class _$_FilterWithBetweenInt implements _FilterWithBetweenInt {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_FilterWithBetweenInt &&
+ other is _$FilterWithBetweenIntImpl &&
(identical(other.column, column) || other.column == column) &&
(identical(other.from, from) || other.from == from) &&
(identical(other.to, to) || other.to == to));
@@ -1114,9 +1120,10 @@ class _$_FilterWithBetweenInt implements _FilterWithBetweenInt {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_FilterWithBetweenIntCopyWith<_$_FilterWithBetweenInt> get copyWith =>
- __$$_FilterWithBetweenIntCopyWithImpl<_$_FilterWithBetweenInt>(
- this, _$identity);
+ _$$FilterWithBetweenIntImplCopyWith<_$FilterWithBetweenIntImpl>
+ get copyWith =>
+ __$$FilterWithBetweenIntImplCopyWithImpl<_$FilterWithBetweenIntImpl>(
+ this, _$identity);
@override
@optionalTypeArgs
@@ -1202,7 +1209,7 @@ class _$_FilterWithBetweenInt implements _FilterWithBetweenInt {
@override
Map toJson() {
- return _$$_FilterWithBetweenIntToJson(
+ return _$$FilterWithBetweenIntImplToJson(
this,
);
}
@@ -1212,10 +1219,10 @@ abstract class _FilterWithBetweenInt implements FilterWith {
const factory _FilterWithBetweenInt(
{required final String column,
required final int from,
- required final int to}) = _$_FilterWithBetweenInt;
+ required final int to}) = _$FilterWithBetweenIntImpl;
factory _FilterWithBetweenInt.fromJson(Map json) =
- _$_FilterWithBetweenInt.fromJson;
+ _$FilterWithBetweenIntImpl.fromJson;
@override
String get column;
@@ -1223,27 +1230,27 @@ abstract class _FilterWithBetweenInt implements FilterWith {
int get to;
@override
@JsonKey(ignore: true)
- _$$_FilterWithBetweenIntCopyWith<_$_FilterWithBetweenInt> get copyWith =>
- throw _privateConstructorUsedError;
+ _$$FilterWithBetweenIntImplCopyWith<_$FilterWithBetweenIntImpl>
+ get copyWith => throw _privateConstructorUsedError;
}
/// @nodoc
-abstract class _$$_FilterWithIsInCopyWith<$Res>
+abstract class _$$FilterWithIsInImplCopyWith<$Res>
implements $FilterWithCopyWith<$Res> {
- factory _$$_FilterWithIsInCopyWith(
- _$_FilterWithIsIn value, $Res Function(_$_FilterWithIsIn) then) =
- __$$_FilterWithIsInCopyWithImpl<$Res>;
+ factory _$$FilterWithIsInImplCopyWith(_$FilterWithIsInImpl value,
+ $Res Function(_$FilterWithIsInImpl) then) =
+ __$$FilterWithIsInImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({String column, bool invert, IList values});
}
/// @nodoc
-class __$$_FilterWithIsInCopyWithImpl<$Res>
- extends _$FilterWithCopyWithImpl<$Res, _$_FilterWithIsIn>
- implements _$$_FilterWithIsInCopyWith<$Res> {
- __$$_FilterWithIsInCopyWithImpl(
- _$_FilterWithIsIn _value, $Res Function(_$_FilterWithIsIn) _then)
+class __$$FilterWithIsInImplCopyWithImpl<$Res>
+ extends _$FilterWithCopyWithImpl<$Res, _$FilterWithIsInImpl>
+ implements _$$FilterWithIsInImplCopyWith<$Res> {
+ __$$FilterWithIsInImplCopyWithImpl(
+ _$FilterWithIsInImpl _value, $Res Function(_$FilterWithIsInImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -1253,7 +1260,7 @@ class __$$_FilterWithIsInCopyWithImpl<$Res>
Object? invert = null,
Object? values = null,
}) {
- return _then(_$_FilterWithIsIn(
+ return _then(_$FilterWithIsInImpl(
column: null == column
? _value.column
: column // ignore: cast_nullable_to_non_nullable
@@ -1272,16 +1279,16 @@ class __$$_FilterWithIsInCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
-class _$_FilterWithIsIn implements _FilterWithIsIn {
- const _$_FilterWithIsIn(
+class _$FilterWithIsInImpl implements _FilterWithIsIn {
+ const _$FilterWithIsInImpl(
{required this.column,
this.invert = false,
this.values = const IListConst([]),
final String? $type})
: $type = $type ?? 'isIn';
- factory _$_FilterWithIsIn.fromJson(Map json) =>
- _$$_FilterWithIsInFromJson(json);
+ factory _$FilterWithIsInImpl.fromJson(Map json) =>
+ _$$FilterWithIsInImplFromJson(json);
@override
final String column;
@@ -1301,10 +1308,10 @@ class _$_FilterWithIsIn implements _FilterWithIsIn {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_FilterWithIsIn &&
+ other is _$FilterWithIsInImpl &&
(identical(other.column, column) || other.column == column) &&
(identical(other.invert, invert) || other.invert == invert) &&
const DeepCollectionEquality().equals(other.values, values));
@@ -1318,8 +1325,9 @@ class _$_FilterWithIsIn implements _FilterWithIsIn {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_FilterWithIsInCopyWith<_$_FilterWithIsIn> get copyWith =>
- __$$_FilterWithIsInCopyWithImpl<_$_FilterWithIsIn>(this, _$identity);
+ _$$FilterWithIsInImplCopyWith<_$FilterWithIsInImpl> get copyWith =>
+ __$$FilterWithIsInImplCopyWithImpl<_$FilterWithIsInImpl>(
+ this, _$identity);
@override
@optionalTypeArgs
@@ -1405,7 +1413,7 @@ class _$_FilterWithIsIn implements _FilterWithIsIn {
@override
Map toJson() {
- return _$$_FilterWithIsInToJson(
+ return _$$FilterWithIsInImplToJson(
this,
);
}
@@ -1415,10 +1423,10 @@ abstract class _FilterWithIsIn implements FilterWith {
const factory _FilterWithIsIn(
{required final String column,
final bool invert,
- final IList values}) = _$_FilterWithIsIn;
+ final IList values}) = _$FilterWithIsInImpl;
factory _FilterWithIsIn.fromJson(Map json) =
- _$_FilterWithIsIn.fromJson;
+ _$FilterWithIsInImpl.fromJson;
@override
String get column;
@@ -1426,7 +1434,7 @@ abstract class _FilterWithIsIn implements FilterWith {
IList get values;
@override
@JsonKey(ignore: true)
- _$$_FilterWithIsInCopyWith<_$_FilterWithIsIn> get copyWith =>
+ _$$FilterWithIsInImplCopyWith<_$FilterWithIsInImpl> get copyWith =>
throw _privateConstructorUsedError;
}
@@ -1512,10 +1520,11 @@ class _$ListQueryCopyWithImpl<$Res, $Val extends ListQuery>
}
/// @nodoc
-abstract class _$$_ListQueryCopyWith<$Res> implements $ListQueryCopyWith<$Res> {
- factory _$$_ListQueryCopyWith(
- _$_ListQuery value, $Res Function(_$_ListQuery) then) =
- __$$_ListQueryCopyWithImpl<$Res>;
+abstract class _$$ListQueryImplCopyWith<$Res>
+ implements $ListQueryCopyWith<$Res> {
+ factory _$$ListQueryImplCopyWith(
+ _$ListQueryImpl value, $Res Function(_$ListQueryImpl) then) =
+ __$$ListQueryImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({Pagination page, SortBy? sort, IList filters});
@@ -1527,11 +1536,11 @@ abstract class _$$_ListQueryCopyWith<$Res> implements $ListQueryCopyWith<$Res> {
}
/// @nodoc
-class __$$_ListQueryCopyWithImpl<$Res>
- extends _$ListQueryCopyWithImpl<$Res, _$_ListQuery>
- implements _$$_ListQueryCopyWith<$Res> {
- __$$_ListQueryCopyWithImpl(
- _$_ListQuery _value, $Res Function(_$_ListQuery) _then)
+class __$$ListQueryImplCopyWithImpl<$Res>
+ extends _$ListQueryCopyWithImpl<$Res, _$ListQueryImpl>
+ implements _$$ListQueryImplCopyWith<$Res> {
+ __$$ListQueryImplCopyWithImpl(
+ _$ListQueryImpl _value, $Res Function(_$ListQueryImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -1541,7 +1550,7 @@ class __$$_ListQueryCopyWithImpl<$Res>
Object? sort = freezed,
Object? filters = null,
}) {
- return _then(_$_ListQuery(
+ return _then(_$ListQueryImpl(
page: null == page
? _value.page
: page // ignore: cast_nullable_to_non_nullable
@@ -1560,14 +1569,14 @@ class __$$_ListQueryCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
-class _$_ListQuery implements _ListQuery {
- const _$_ListQuery(
+class _$ListQueryImpl implements _ListQuery {
+ const _$ListQueryImpl(
{this.page = const Pagination(limit: -1, offset: 0),
this.sort,
this.filters = const IListConst([])});
- factory _$_ListQuery.fromJson(Map json) =>
- _$$_ListQueryFromJson(json);
+ factory _$ListQueryImpl.fromJson(Map json) =>
+ _$$ListQueryImplFromJson(json);
@override
@JsonKey()
@@ -1584,10 +1593,10 @@ class _$_ListQuery implements _ListQuery {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_ListQuery &&
+ other is _$ListQueryImpl &&
(identical(other.page, page) || other.page == page) &&
(identical(other.sort, sort) || other.sort == sort) &&
const DeepCollectionEquality().equals(other.filters, filters));
@@ -1601,12 +1610,12 @@ class _$_ListQuery implements _ListQuery {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_ListQueryCopyWith<_$_ListQuery> get copyWith =>
- __$$_ListQueryCopyWithImpl<_$_ListQuery>(this, _$identity);
+ _$$ListQueryImplCopyWith<_$ListQueryImpl> get copyWith =>
+ __$$ListQueryImplCopyWithImpl<_$ListQueryImpl>(this, _$identity);
@override
Map toJson() {
- return _$$_ListQueryToJson(
+ return _$$ListQueryImplToJson(
this,
);
}
@@ -1616,10 +1625,10 @@ abstract class _ListQuery implements ListQuery {
const factory _ListQuery(
{final Pagination page,
final SortBy? sort,
- final IList filters}) = _$_ListQuery;
+ final IList filters}) = _$ListQueryImpl;
factory _ListQuery.fromJson(Map json) =
- _$_ListQuery.fromJson;
+ _$ListQueryImpl.fromJson;
@override
Pagination get page;
@@ -1629,7 +1638,7 @@ abstract class _ListQuery implements ListQuery {
IList get filters;
@override
@JsonKey(ignore: true)
- _$$_ListQueryCopyWith<_$_ListQuery> get copyWith =>
+ _$$ListQueryImplCopyWith<_$ListQueryImpl> get copyWith =>
throw _privateConstructorUsedError;
}
@@ -1682,22 +1691,22 @@ class _$ListQueryOptionsCopyWithImpl<$Res, $Val extends ListQueryOptions>
}
/// @nodoc
-abstract class _$$_ListQueryOptionsCopyWith<$Res>
+abstract class _$$ListQueryOptionsImplCopyWith<$Res>
implements $ListQueryOptionsCopyWith<$Res> {
- factory _$$_ListQueryOptionsCopyWith(
- _$_ListQueryOptions value, $Res Function(_$_ListQueryOptions) then) =
- __$$_ListQueryOptionsCopyWithImpl<$Res>;
+ factory _$$ListQueryOptionsImplCopyWith(_$ListQueryOptionsImpl value,
+ $Res Function(_$ListQueryOptionsImpl) then) =
+ __$$ListQueryOptionsImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({IList sortColumns, IList filterColumns});
}
/// @nodoc
-class __$$_ListQueryOptionsCopyWithImpl<$Res>
- extends _$ListQueryOptionsCopyWithImpl<$Res, _$_ListQueryOptions>
- implements _$$_ListQueryOptionsCopyWith<$Res> {
- __$$_ListQueryOptionsCopyWithImpl(
- _$_ListQueryOptions _value, $Res Function(_$_ListQueryOptions) _then)
+class __$$ListQueryOptionsImplCopyWithImpl<$Res>
+ extends _$ListQueryOptionsCopyWithImpl<$Res, _$ListQueryOptionsImpl>
+ implements _$$ListQueryOptionsImplCopyWith<$Res> {
+ __$$ListQueryOptionsImplCopyWithImpl(_$ListQueryOptionsImpl _value,
+ $Res Function(_$ListQueryOptionsImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -1706,7 +1715,7 @@ class __$$_ListQueryOptionsCopyWithImpl<$Res>
Object? sortColumns = null,
Object? filterColumns = null,
}) {
- return _then(_$_ListQueryOptions(
+ return _then(_$ListQueryOptionsImpl(
sortColumns: null == sortColumns
? _value.sortColumns
: sortColumns // ignore: cast_nullable_to_non_nullable
@@ -1721,8 +1730,8 @@ class __$$_ListQueryOptionsCopyWithImpl<$Res>
/// @nodoc
-class _$_ListQueryOptions implements _ListQueryOptions {
- const _$_ListQueryOptions(
+class _$ListQueryOptionsImpl implements _ListQueryOptions {
+ const _$ListQueryOptionsImpl(
{required this.sortColumns, required this.filterColumns});
@override
@@ -1736,10 +1745,10 @@ class _$_ListQueryOptions implements _ListQueryOptions {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_ListQueryOptions &&
+ other is _$ListQueryOptionsImpl &&
const DeepCollectionEquality()
.equals(other.sortColumns, sortColumns) &&
const DeepCollectionEquality()
@@ -1755,14 +1764,15 @@ class _$_ListQueryOptions implements _ListQueryOptions {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_ListQueryOptionsCopyWith<_$_ListQueryOptions> get copyWith =>
- __$$_ListQueryOptionsCopyWithImpl<_$_ListQueryOptions>(this, _$identity);
+ _$$ListQueryOptionsImplCopyWith<_$ListQueryOptionsImpl> get copyWith =>
+ __$$ListQueryOptionsImplCopyWithImpl<_$ListQueryOptionsImpl>(
+ this, _$identity);
}
abstract class _ListQueryOptions implements ListQueryOptions {
const factory _ListQueryOptions(
{required final IList sortColumns,
- required final IList filterColumns}) = _$_ListQueryOptions;
+ required final IList filterColumns}) = _$ListQueryOptionsImpl;
@override
IList get sortColumns;
@@ -1770,7 +1780,7 @@ abstract class _ListQueryOptions implements ListQueryOptions {
IList get filterColumns;
@override
@JsonKey(ignore: true)
- _$$_ListQueryOptionsCopyWith<_$_ListQueryOptions> get copyWith =>
+ _$$ListQueryOptionsImplCopyWith<_$ListQueryOptionsImpl> get copyWith =>
throw _privateConstructorUsedError;
}
@@ -1842,11 +1852,11 @@ class _$LibraryListQueryCopyWithImpl<$Res, $Val extends LibraryListQuery>
}
/// @nodoc
-abstract class _$$_LibraryListQueryCopyWith<$Res>
+abstract class _$$LibraryListQueryImplCopyWith<$Res>
implements $LibraryListQueryCopyWith<$Res> {
- factory _$$_LibraryListQueryCopyWith(
- _$_LibraryListQuery value, $Res Function(_$_LibraryListQuery) then) =
- __$$_LibraryListQueryCopyWithImpl<$Res>;
+ factory _$$LibraryListQueryImplCopyWith(_$LibraryListQueryImpl value,
+ $Res Function(_$LibraryListQueryImpl) then) =
+ __$$LibraryListQueryImplCopyWithImpl<$Res>;
@override
@useResult
$Res call({ListQueryOptions options, ListQuery query});
@@ -1858,11 +1868,11 @@ abstract class _$$_LibraryListQueryCopyWith<$Res>
}
/// @nodoc
-class __$$_LibraryListQueryCopyWithImpl<$Res>
- extends _$LibraryListQueryCopyWithImpl<$Res, _$_LibraryListQuery>
- implements _$$_LibraryListQueryCopyWith<$Res> {
- __$$_LibraryListQueryCopyWithImpl(
- _$_LibraryListQuery _value, $Res Function(_$_LibraryListQuery) _then)
+class __$$LibraryListQueryImplCopyWithImpl<$Res>
+ extends _$LibraryListQueryCopyWithImpl<$Res, _$LibraryListQueryImpl>
+ implements _$$LibraryListQueryImplCopyWith<$Res> {
+ __$$LibraryListQueryImplCopyWithImpl(_$LibraryListQueryImpl _value,
+ $Res Function(_$LibraryListQueryImpl) _then)
: super(_value, _then);
@pragma('vm:prefer-inline')
@@ -1871,7 +1881,7 @@ class __$$_LibraryListQueryCopyWithImpl<$Res>
Object? options = null,
Object? query = null,
}) {
- return _then(_$_LibraryListQuery(
+ return _then(_$LibraryListQueryImpl(
options: null == options
? _value.options
: options // ignore: cast_nullable_to_non_nullable
@@ -1886,8 +1896,8 @@ class __$$_LibraryListQueryCopyWithImpl<$Res>
/// @nodoc
-class _$_LibraryListQuery implements _LibraryListQuery {
- const _$_LibraryListQuery({required this.options, required this.query});
+class _$LibraryListQueryImpl implements _LibraryListQuery {
+ const _$LibraryListQueryImpl({required this.options, required this.query});
@override
final ListQueryOptions options;
@@ -1900,10 +1910,10 @@ class _$_LibraryListQuery implements _LibraryListQuery {
}
@override
- bool operator ==(dynamic other) {
+ bool operator ==(Object other) {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
- other is _$_LibraryListQuery &&
+ other is _$LibraryListQueryImpl &&
(identical(other.options, options) || other.options == options) &&
(identical(other.query, query) || other.query == query));
}
@@ -1914,14 +1924,15 @@ class _$_LibraryListQuery implements _LibraryListQuery {
@JsonKey(ignore: true)
@override
@pragma('vm:prefer-inline')
- _$$_LibraryListQueryCopyWith<_$_LibraryListQuery> get copyWith =>
- __$$_LibraryListQueryCopyWithImpl<_$_LibraryListQuery>(this, _$identity);
+ _$$LibraryListQueryImplCopyWith<_$LibraryListQueryImpl> get copyWith =>
+ __$$LibraryListQueryImplCopyWithImpl<_$LibraryListQueryImpl>(
+ this, _$identity);
}
abstract class _LibraryListQuery implements LibraryListQuery {
const factory _LibraryListQuery(
{required final ListQueryOptions options,
- required final ListQuery query}) = _$_LibraryListQuery;
+ required final ListQuery query}) = _$LibraryListQueryImpl;
@override
ListQueryOptions get options;
@@ -1929,6 +1940,6 @@ abstract class _LibraryListQuery implements LibraryListQuery {
ListQuery get query;
@override
@JsonKey(ignore: true)
- _$$_LibraryListQueryCopyWith<_$_LibraryListQuery> get copyWith =>
+ _$$LibraryListQueryImplCopyWith<_$LibraryListQueryImpl> get copyWith =>
throw _privateConstructorUsedError;
}
diff --git a/lib/models/query.g.dart b/lib/models/query.g.dart
index 1eed329..1aca521 100644
--- a/lib/models/query.g.dart
+++ b/lib/models/query.g.dart
@@ -6,25 +6,26 @@ part of 'query.dart';
// JsonSerializableGenerator
// **************************************************************************
-_$_Pagination _$$_PaginationFromJson(Map json) =>
- _$_Pagination(
- limit: json['limit'] as int,
- offset: json['offset'] as int? ?? 0,
+_$PaginationImpl _$$PaginationImplFromJson(Map json) =>
+ _$PaginationImpl(
+ limit: (json['limit'] as num).toInt(),
+ offset: (json['offset'] as num?)?.toInt() ?? 0,
);
-Map _$$_PaginationToJson(_$_Pagination instance) =>
+Map _$$PaginationImplToJson(_$PaginationImpl instance) =>
{
'limit': instance.limit,
'offset': instance.offset,
};
-_$_SortBy _$$_SortByFromJson(Map json) => _$_SortBy(
+_$SortByImpl _$$SortByImplFromJson(Map json) => _$SortByImpl(
column: json['column'] as String,
dir: $enumDecodeNullable(_$SortDirectionEnumMap, json['dir']) ??
SortDirection.asc,
);
-Map _$$_SortByToJson(_$_SortBy instance) => {
+Map _$$SortByImplToJson(_$SortByImpl instance) =>
+ {
'column': instance.column,
'dir': _$SortDirectionEnumMap[instance.dir]!,
};
@@ -34,15 +35,17 @@ const _$SortDirectionEnumMap = {
SortDirection.desc: 'desc',
};
-_$_FilterWithEquals _$$_FilterWithEqualsFromJson(Map json) =>
- _$_FilterWithEquals(
+_$FilterWithEqualsImpl _$$FilterWithEqualsImplFromJson(
+ Map