fix: Undo removing of default values in constructors

This commit is contained in:
PartyDonut 2025-10-19 13:59:33 +02:00
parent 666f831053
commit 5530c6fd0c
6 changed files with 17 additions and 10 deletions

View file

@ -65,7 +65,7 @@ abstract class ClientSettingsModel with _$ClientSettingsModel {
ColorThemes? themeColor,
@Default(true) bool deriveColorsFromItem,
@Default(false) bool amoledBlack,
required bool blurPlaceHolders,
@Default(true) bool blurPlaceHolders,
@Default(false) bool blurUpcomingEpisodes,
@LocaleConvert() Locale? selectedLocale,
@Default(true) bool enableMediaKeys,
@ -76,7 +76,7 @@ abstract class ClientSettingsModel with _$ClientSettingsModel {
@Default(false) bool showAllCollectionTypes,
@Default(2) int maxConcurrentDownloads,
@Default(DynamicSchemeVariant.rainbow) DynamicSchemeVariant schemeVariant,
required BackgroundType backgroundImage,
@Default(BackgroundType.blurred) BackgroundType backgroundImage,
@Default(true) bool checkForUpdates,
@Default(false) bool usePosterForLibrary,
@Default(false) bool useSystemIME,
@ -89,6 +89,7 @@ abstract class ClientSettingsModel with _$ClientSettingsModel {
return ClientSettingsModel(
blurPlaceHolders: leanBackMode ? false : true,
backgroundImage: leanBackMode ? BackgroundType.disabled : BackgroundType.blurred,
themeMode: leanBackMode ? ThemeMode.dark : ThemeMode.system,
);
}

View file

@ -621,7 +621,7 @@ class _ClientSettingsModel extends ClientSettingsModel
this.themeColor,
this.deriveColorsFromItem = true,
this.amoledBlack = false,
required this.blurPlaceHolders,
this.blurPlaceHolders = true,
this.blurUpcomingEpisodes = false,
@LocaleConvert() this.selectedLocale,
this.enableMediaKeys = true,
@ -632,7 +632,7 @@ class _ClientSettingsModel extends ClientSettingsModel
this.showAllCollectionTypes = false,
this.maxConcurrentDownloads = 2,
this.schemeVariant = DynamicSchemeVariant.rainbow,
required this.backgroundImage,
this.backgroundImage = BackgroundType.blurred,
this.checkForUpdates = true,
this.usePosterForLibrary = false,
this.useSystemIME = false,
@ -669,6 +669,7 @@ class _ClientSettingsModel extends ClientSettingsModel
@JsonKey()
final bool amoledBlack;
@override
@JsonKey()
final bool blurPlaceHolders;
@override
@JsonKey()
@ -701,6 +702,7 @@ class _ClientSettingsModel extends ClientSettingsModel
@JsonKey()
final DynamicSchemeVariant schemeVariant;
@override
@JsonKey()
final BackgroundType backgroundImage;
@override
@JsonKey()

View file

@ -26,7 +26,7 @@ _ClientSettingsModel _$ClientSettingsModelFromJson(Map<String, dynamic> json) =>
themeColor: $enumDecodeNullable(_$ColorThemesEnumMap, json['themeColor']),
deriveColorsFromItem: json['deriveColorsFromItem'] as bool? ?? true,
amoledBlack: json['amoledBlack'] as bool? ?? false,
blurPlaceHolders: json['blurPlaceHolders'] as bool,
blurPlaceHolders: json['blurPlaceHolders'] as bool? ?? true,
blurUpcomingEpisodes: json['blurUpcomingEpisodes'] as bool? ?? false,
selectedLocale:
const LocaleConvert().fromJson(json['selectedLocale'] as String?),
@ -41,8 +41,9 @@ _ClientSettingsModel _$ClientSettingsModelFromJson(Map<String, dynamic> json) =>
schemeVariant: $enumDecodeNullable(
_$DynamicSchemeVariantEnumMap, json['schemeVariant']) ??
DynamicSchemeVariant.rainbow,
backgroundImage:
$enumDecode(_$BackgroundTypeEnumMap, json['backgroundImage']),
backgroundImage: $enumDecodeNullable(
_$BackgroundTypeEnumMap, json['backgroundImage']) ??
BackgroundType.blurred,
checkForUpdates: json['checkForUpdates'] as bool? ?? true,
usePosterForLibrary: json['usePosterForLibrary'] as bool? ?? false,
useSystemIME: json['useSystemIME'] as bool? ?? false,

View file

@ -16,7 +16,7 @@ abstract class HomeSettingsModel with _$HomeSettingsModel {
factory HomeSettingsModel({
@Default({...LayoutMode.values}) Set<LayoutMode> screenLayouts,
@Default({...ViewSize.values}) Set<ViewSize> layoutStates,
required HomeBanner homeBanner,
@Default(HomeBanner.carousel) HomeBanner homeBanner,
@Default(HomeCarouselSettings.combined) HomeCarouselSettings carouselSettings,
@Default(HomeNextUp.separate) HomeNextUp nextUp,
}) = _HomeSettingsModel;

View file

@ -279,7 +279,7 @@ class _HomeSettingsModel extends HomeSettingsModel {
_HomeSettingsModel(
{final Set<LayoutMode> screenLayouts = const {...LayoutMode.values},
final Set<ViewSize> layoutStates = const {...ViewSize.values},
required this.homeBanner,
this.homeBanner = HomeBanner.carousel,
this.carouselSettings = HomeCarouselSettings.combined,
this.nextUp = HomeNextUp.separate})
: _screenLayouts = screenLayouts,
@ -307,6 +307,7 @@ class _HomeSettingsModel extends HomeSettingsModel {
}
@override
@JsonKey()
final HomeBanner homeBanner;
@override
@JsonKey()

View file

@ -16,7 +16,9 @@ _HomeSettingsModel _$HomeSettingsModelFromJson(Map<String, dynamic> json) =>
?.map((e) => $enumDecode(_$ViewSizeEnumMap, e))
.toSet() ??
const {...ViewSize.values},
homeBanner: $enumDecode(_$HomeBannerEnumMap, json['homeBanner']),
homeBanner:
$enumDecodeNullable(_$HomeBannerEnumMap, json['homeBanner']) ??
HomeBanner.carousel,
carouselSettings: $enumDecodeNullable(
_$HomeCarouselSettingsEnumMap, json['carouselSettings']) ??
HomeCarouselSettings.combined,