gabehf/Fladder
1
0
Fork 0
mirror of https://github.com/gabehf/Fladder.git synced 2026-04-23 12:31:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: Fix dart deprecation messages

Browse source
This commit is contained in:
PartyDonut 2025-01-05 13:53:59 +01:00
parent 607dea3de1
commit 39a7537116
81 changed files with 258 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/providers/items/book_details_provider.dart
View file

@ -26,7 +26,7 @@ class BookProviderModel {
ImagesData? get cover => parentModel?.getPosters ?? book?.getPosters;
List<BookModel> get allBooks {
if (chapters.isEmpty) return [book].whereNotNull().toList();
if (chapters.isEmpty) return [book].nonNulls.toList();
return chapters;
}
@ -141,7 +141,7 @@ class BookDetailsProviderNotifier extends StateNotifier<BookProviderModel> {
state = state.copyWith(
parentModel: !parentIsView ? () => parentResponse.bodyOrThrow : null,
chapters: (siblingsResponse?.body?.items ?? [openedBook]).whereType<BookModel>().whereNotNull().toList(),
chapters: (siblingsResponse?.body?.items ?? [openedBook]).whereType<BookModel>().nonNulls.toList(),
);
return response;

2
lib/providers/items/episode_details_provider.dart
View file

@ -80,7 +80,7 @@ class EpisodeDetailsProvider extends StateNotifier<EpisodeDetailModel> {
.map(
(e) => e.createItemModel(ref),
)
.whereNotNull()
.nonNulls
.whereType<EpisodeModel>()
.toList();
state = state.copyWith(

3
lib/providers/items/series_details_provider.dart
View file

@ -1,5 +1,4 @@
import 'package:chopper/chopper.dart';
import 'package:collection/collection.dart';
import 'package:fladder/models/item_base_model.dart';
import 'package:fladder/providers/service_provider.dart';
import 'package:fladder/providers/sync_provider.dart';
@ -68,7 +67,7 @@ class SeriesDetailViewNotifier extends StateNotifier<SeriesModel?> {
.map(
(e) => e.createItemModel(ref),
)
.whereNotNull()
.nonNulls
.toList();
state = seriesModel.copyWith(
availableEpisodes: allChildren.whereType<EpisodeModel>().toList(),

20
lib/providers/library_search_provider.dart
View file

@ -120,10 +120,10 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
newLastIndices[viewModel.id] = (lastIndices ?? 0) + libraryItems.items.length;
}
return libraryItems;
}).whereNotNull(),
}).nonNulls,
);
List<ItemBaseModel> newPosters = results.whereNotNull().expand((element) => element.items).toList();
List<ItemBaseModel> newPosters = results.nonNulls.expand((element) => element.items).toList();
if (state.views.included.length > 1) {
if (state.sortingOption == SortingOptions.random) {
newPosters = newPosters.random();
@ -220,7 +220,7 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
var tempState = state.copyWith();
final genres = mappedList
.expand((element) => element?.genres ?? <NameGuidPair>[])
.whereNotNull()
.nonNulls
.sorted((a, b) => a.name!.toLowerCase().compareTo(b.name!.toLowerCase()));
final tags = mappedList
.expand((element) => element?.tags ?? <String>[])
@ -437,7 +437,7 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
final response = await api.collectionsCollectionIdItemsDelete(
collectionId: state.nestedCurrentItem?.id, ids: state.selectedPosters.map((e) => e.id).toList());
if (response.isSuccessful) {
removeFromPosters([state.nestedCurrentItem?.id].whereNotNull().toList());
removeFromPosters([state.nestedCurrentItem?.id].nonNulls.toList());
}
return response;
}
@ -445,9 +445,9 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
Future<Response> removeSelectedFromPlaylist() async {
final response = await api.playlistsPlaylistIdItemsDelete(
playlistId: state.nestedCurrentItem?.id,
entryIds: state.selectedPosters.map((e) => e.playlistId).whereNotNull().toList());
entryIds: state.selectedPosters.map((e) => e.playlistId).nonNulls.toList());
if (response.isSuccessful) {
removeFromPosters([state.nestedCurrentItem?.id].whereNotNull().toList());
removeFromPosters([state.nestedCurrentItem?.id].nonNulls.toList());
}
return response;
}
@ -463,7 +463,7 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
Future<Response> removeFromPlaylist({required List<ItemBaseModel> items}) async {
final response = await api.playlistsPlaylistIdItemsDelete(
playlistId: state.nestedCurrentItem?.id, entryIds: items.map((e) => e.playlistId).whereNotNull().toList());
playlistId: state.nestedCurrentItem?.id, entryIds: items.map((e) => e.playlistId).nonNulls.toList());
if (response.isSuccessful) {
removeFromPosters(items.map((e) => e.id).toList());
}
@ -489,7 +489,7 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
void updateUserDataMain(UserData? userData) {
state = state.copyWith(
folderOverwrite: [state.folderOverwrite.lastOrNull?.copyWith(userData: userData)].whereNotNull().toList(),
folderOverwrite: [state.folderOverwrite.lastOrNull?.copyWith(userData: userData)].nonNulls.toList(),
);
}
@ -529,10 +529,10 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
limit: limit,
);
return libraryItems;
}).whereNotNull(),
}).nonNulls,
);
List<ItemBaseModel> newPosters = results.whereNotNull().expand((element) => element.items).toList();
List<ItemBaseModel> newPosters = results.nonNulls.expand((element) => element.items).toList();
if (state.views.included.length > 1) {
if (shuffle || state.sortingOption == SortingOptions.random) {
newPosters = newPosters.random();

9
lib/providers/settings/book_viewer_settings_provider.dart
View file

@ -1,7 +1,8 @@
import 'dart:convert';
import 'package:collection/collection.dart';
import 'package:flutter/widgets.dart';
import 'package:collection/collection.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:screen_brightness/screen_brightness.dart';
@ -124,15 +125,15 @@ class BookViewerSettingsNotifier extends StateNotifier<BookViewerSettingsModel>
screenBrightness: () => value,
);
if (state.screenBrightness != null) {
ScreenBrightness().setScreenBrightness(state.screenBrightness!);
ScreenBrightness().setSystemScreenBrightness(state.screenBrightness!);
} else {
ScreenBrightness().resetScreenBrightness();
ScreenBrightness().resetApplicationScreenBrightness();
}
}
void setSavedBrightness() {
if (state.screenBrightness != null) {
ScreenBrightness().setScreenBrightness(state.screenBrightness!);
ScreenBrightness().setSystemScreenBrightness(state.screenBrightness!);
}
}

2
lib/providers/settings/subtitle_settings_provider.dart
View file

@ -34,7 +34,7 @@ class SubtitleSettingsNotifier extends StateNotifier<SubtitleSettingsModel> {
void setFontWeight(FontWeight? value) => state = state.copyWith(fontWeight: value);
SubtitleSettingsModel setBackGroundOpacity(double value) =>
state = state.copyWith(backGroundColor: state.backGroundColor.withOpacity(value));
state = state.copyWith(backGroundColor: state.backGroundColor.withValues(alpha: value));
SubtitleSettingsModel setShadowIntensity(double value) => state = state.copyWith(shadow: value);
}

6
lib/providers/settings/video_player_settings_provider.dart
View file

@ -33,15 +33,15 @@ class VideoPlayerSettingsProviderNotifier extends StateNotifier<VideoPlayerSetti
screenBrightness: value,
);
if (state.screenBrightness != null) {
ScreenBrightness().setScreenBrightness(state.screenBrightness!);
ScreenBrightness().setSystemScreenBrightness(state.screenBrightness!);
} else {
ScreenBrightness().resetScreenBrightness();
ScreenBrightness().resetApplicationScreenBrightness();
}
}
void setSavedBrightness() {
if (state.screenBrightness != null) {
ScreenBrightness().setScreenBrightness(state.screenBrightness!);
ScreenBrightness().setSystemScreenBrightness(state.screenBrightness!);
}
}

3
lib/providers/sync/background_download_provider.dart
View file

@ -1,10 +1,11 @@
import 'package:background_downloader/background_downloader.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
part 'background_download_provider.g.dart';
@Riverpod(keepAlive: true)
FileDownloader backgroundDownloader(BackgroundDownloaderRef ref) {
FileDownloader backgroundDownloader(Ref ref) {
return FileDownloader()
..trackTasks()
..configureNotification(

4
lib/providers/sync_provider.dart
View file

@ -359,7 +359,7 @@ class SyncNotifier extends StateNotifier<SyncSettingsModel> {
return data.copyWith(
primary: () => primary,
logo: () => logo,
backDrop: () => backdrops.whereNotNull().toList(),
backDrop: () => backdrops.nonNulls.toList(),
);
}
@ -381,7 +381,7 @@ class SyncNotifier extends StateNotifier<SyncSettingsModel> {
imageUrl: path.joinAll(["Chapters", fileName]),
);
}).toList();
return saveChapters.whereNotNull().toList();
return saveChapters.nonNulls.toList();
}
Future<ImageData?> urlDataToFileData(ImageData? data, Directory directory, String fileName) async {

3
lib/providers/user_provider.dart
View file

@ -1,5 +1,6 @@
import 'package:chopper/chopper.dart';
import 'package:collection/collection.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:fladder/jellyfin/enum_models.dart';
@ -14,7 +15,7 @@ import 'package:fladder/providers/sync_provider.dart';
part 'user_provider.g.dart';
@riverpod
bool showSyncButtonProvider(ShowSyncButtonProviderRef ref) {
bool showSyncButtonProvider(Ref ref) {
final userCanSync = ref.watch(userProvider.select((value) => value?.canDownload ?? false));
final hasSyncedItems = ref.watch(syncProvider.select((value) => value.items.isNotEmpty));
return userCanSync || hasSyncedItems;