From 5530c6fd0c9289df3d6233b88194d25a4084efde Mon Sep 17 00:00:00 2001 From: PartyDonut Date: Sun, 19 Oct 2025 13:59:33 +0200 Subject: [PATCH] fix: Undo removing of default values in constructors --- lib/models/settings/client_settings_model.dart | 5 +++-- lib/models/settings/client_settings_model.freezed.dart | 6 ++++-- lib/models/settings/client_settings_model.g.dart | 7 ++++--- lib/models/settings/home_settings_model.dart | 2 +- lib/models/settings/home_settings_model.freezed.dart | 3 ++- lib/models/settings/home_settings_model.g.dart | 4 +++- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/lib/models/settings/client_settings_model.dart b/lib/models/settings/client_settings_model.dart index 7910ff6..4e45ec2 100644 --- a/lib/models/settings/client_settings_model.dart +++ b/lib/models/settings/client_settings_model.dart @@ -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, ); } diff --git a/lib/models/settings/client_settings_model.freezed.dart b/lib/models/settings/client_settings_model.freezed.dart index 000460d..ea1425c 100644 --- a/lib/models/settings/client_settings_model.freezed.dart +++ b/lib/models/settings/client_settings_model.freezed.dart @@ -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() diff --git a/lib/models/settings/client_settings_model.g.dart b/lib/models/settings/client_settings_model.g.dart index 5dcd973..92e2a58 100644 --- a/lib/models/settings/client_settings_model.g.dart +++ b/lib/models/settings/client_settings_model.g.dart @@ -26,7 +26,7 @@ _ClientSettingsModel _$ClientSettingsModelFromJson(Map 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 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, diff --git a/lib/models/settings/home_settings_model.dart b/lib/models/settings/home_settings_model.dart index 3af4f0d..e5e4d05 100644 --- a/lib/models/settings/home_settings_model.dart +++ b/lib/models/settings/home_settings_model.dart @@ -16,7 +16,7 @@ abstract class HomeSettingsModel with _$HomeSettingsModel { factory HomeSettingsModel({ @Default({...LayoutMode.values}) Set screenLayouts, @Default({...ViewSize.values}) Set layoutStates, - required HomeBanner homeBanner, + @Default(HomeBanner.carousel) HomeBanner homeBanner, @Default(HomeCarouselSettings.combined) HomeCarouselSettings carouselSettings, @Default(HomeNextUp.separate) HomeNextUp nextUp, }) = _HomeSettingsModel; diff --git a/lib/models/settings/home_settings_model.freezed.dart b/lib/models/settings/home_settings_model.freezed.dart index e163934..5e04c50 100644 --- a/lib/models/settings/home_settings_model.freezed.dart +++ b/lib/models/settings/home_settings_model.freezed.dart @@ -279,7 +279,7 @@ class _HomeSettingsModel extends HomeSettingsModel { _HomeSettingsModel( {final Set screenLayouts = const {...LayoutMode.values}, final Set 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() diff --git a/lib/models/settings/home_settings_model.g.dart b/lib/models/settings/home_settings_model.g.dart index e51bf0d..8cb95ce 100644 --- a/lib/models/settings/home_settings_model.g.dart +++ b/lib/models/settings/home_settings_model.g.dart @@ -16,7 +16,9 @@ _HomeSettingsModel _$HomeSettingsModelFromJson(Map 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,