mirror of
https://github.com/gabehf/Fladder.git
synced 2026-03-08 23:18:16 -07:00
chore: Fix dart deprecation messages
This commit is contained in:
parent
607dea3de1
commit
39a7537116
81 changed files with 258 additions and 195 deletions
|
|
@ -62,7 +62,7 @@ class ErrorLogModel {
|
|||
"\n",
|
||||
"\n",
|
||||
stackTrace,
|
||||
].whereNotNull().join();
|
||||
].nonNulls.join();
|
||||
|
||||
String get clipBoard => [_label, content].toString();
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
import 'dart:typed_data';
|
||||
|
||||
import 'package:collection/collection.dart';
|
||||
import 'package:fladder/models/items/series_model.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
|
||||
import 'package:fladder/jellyfin/jellyfin_open_api.enums.swagger.dart';
|
||||
import 'package:fladder/jellyfin/jellyfin_open_api.swagger.dart' as jelly;
|
||||
import 'package:fladder/models/item_base_model.dart';
|
||||
import 'package:fladder/models/items/item_shared_models.dart';
|
||||
import 'package:fladder/models/items/series_model.dart';
|
||||
import 'package:fladder/providers/image_provider.dart';
|
||||
|
||||
class EditItemsProvider {
|
||||
|
|
@ -118,7 +118,7 @@ class ItemEditingModel {
|
|||
"OfficialRating": {
|
||||
for (String element in (editorInfo?.parentalRatingOptions?.map((e) => e.name).toSet()
|
||||
?..add(json?["OfficialRating"] as String?))
|
||||
?.whereNotNull()
|
||||
?.nonNulls
|
||||
.toList() ??
|
||||
[])
|
||||
element: (editedJson?["OfficialRating"] as String?) == element
|
||||
|
|
@ -126,7 +126,7 @@ class ItemEditingModel {
|
|||
"CustomRating": {
|
||||
for (String element in (editorInfo?.parentalRatingOptions?.map((e) => e.name).toSet()
|
||||
?..add(json?["CustomRating"] as String?))
|
||||
?.whereNotNull()
|
||||
?.nonNulls
|
||||
.toList() ??
|
||||
[])
|
||||
element: (editedJson?["CustomRating"] as String?) == element
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ class AudioStreamModel extends StreamModel {
|
|||
}
|
||||
|
||||
String get title =>
|
||||
[name, language, codec, channelLayout].whereNotNull().where((element) => element.isNotEmpty).join(' - ');
|
||||
[name, language, codec, channelLayout].nonNulls.where((element) => element.isNotEmpty).join(' - ');
|
||||
|
||||
AudioStreamModel.no({
|
||||
super.name = 'Off',
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ class PlaybackModelHelper {
|
|||
trickPlay: syncedItem.trickPlayModel,
|
||||
mediaSegments: syncedItem.mediaSegments,
|
||||
media: Media(url: syncedItem.videoFile.path),
|
||||
queue: itemQueue.whereNotNull().toList(),
|
||||
queue: itemQueue.nonNulls.toList(),
|
||||
syncedQueue: children,
|
||||
mediaStreams: item.streamModel ?? syncedItemModel.streamModel,
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
// ignore_for_file: public_member_api_docs, sort_constructors_first
|
||||
import 'dart:convert';
|
||||
import 'dart:math' as math;
|
||||
|
||||
|
|
@ -9,6 +8,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|||
|
||||
import 'package:fladder/providers/settings/subtitle_settings_provider.dart';
|
||||
import 'package:fladder/providers/settings/video_player_settings_provider.dart';
|
||||
import 'package:fladder/util/color_extensions.dart';
|
||||
|
||||
class SubtitleSettingsModel {
|
||||
final double fontSize;
|
||||
|
|
@ -58,11 +58,11 @@ class SubtitleSettingsModel {
|
|||
? [
|
||||
Shadow(
|
||||
blurRadius: 16,
|
||||
color: Colors.black.withOpacity(shadow),
|
||||
color: Colors.black.withValues(alpha: shadow),
|
||||
),
|
||||
Shadow(
|
||||
blurRadius: 8,
|
||||
color: Colors.black.withOpacity(shadow),
|
||||
color: Colors.black.withValues(alpha: shadow),
|
||||
),
|
||||
]
|
||||
: null,
|
||||
|
|
@ -92,10 +92,10 @@ class SubtitleSettingsModel {
|
|||
'fontSize': fontSize,
|
||||
'fontWeight': fontWeight.value,
|
||||
'verticalOffset': verticalOffset,
|
||||
'color': color.value,
|
||||
'outlineColor': outlineColor.value,
|
||||
'color': color.toMap,
|
||||
'outlineColor': outlineColor.toMap,
|
||||
'outlineSize': outlineSize,
|
||||
'backGroundColor': backGroundColor.value,
|
||||
'backGroundColor': backGroundColor.toMap,
|
||||
'shadow': shadow,
|
||||
};
|
||||
}
|
||||
|
|
@ -109,10 +109,10 @@ class SubtitleSettingsModel {
|
|||
fontSize: map['fontSize'] as double?,
|
||||
fontWeight: FontWeight.values.firstWhereOrNull((element) => element.index == map['fontWeight'] as int?),
|
||||
verticalOffset: map['verticalOffset'] as double?,
|
||||
color: map['color'] != null ? Color(map['color'] as int) : null,
|
||||
outlineColor: map['outlineColor'] != null ? Color(map['outlineColor'] as int) : null,
|
||||
color: colorFromJson(map['color']),
|
||||
outlineColor: colorFromJson(map['outlineColor']),
|
||||
outlineSize: map['outlineSize'] as double?,
|
||||
backGroundColor: map['backGroundColor'] != null ? Color(map['backGroundColor'] as int) : null,
|
||||
backGroundColor: colorFromJson(map['backGroundColor']),
|
||||
shadow: map['shadow'] as double?,
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue