Fix the collapse issues

Add fontFamily options
This commit is contained in:
chen08209
2024-10-26 16:52:10 +08:00
parent 25764fc4d3
commit c94f64cf78
21 changed files with 489 additions and 141 deletions

View File

@@ -14,16 +14,12 @@ Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
.toList() ??
[]
..currentProfileId = json['currentProfileId'] as String?
..themeMode = $enumDecodeNullable(_$ThemeModeEnumMap, json['themeMode']) ??
ThemeMode.system
..primaryColor = (json['primaryColor'] as num?)?.toInt()
..isAccessControl = json['isAccessControl'] as bool? ?? false
..accessControl =
AccessControl.fromJson(json['accessControl'] as Map<String, dynamic>)
..dav = json['dav'] == null
? null
: DAV.fromJson(json['dav'] as Map<String, dynamic>)
..prueBlack = json['prueBlack'] as bool? ?? false
..windowProps =
WindowProps.fromJson(json['windowProps'] as Map<String, dynamic>?)
..vpnProps = VpnProps.fromJson(json['vpnProps'] as Map<String, dynamic>?)
@@ -35,32 +31,26 @@ Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
.toList() ??
[]
..proxiesStyle =
ProxiesStyle.fromJson(json['proxiesStyle'] as Map<String, dynamic>?);
ProxiesStyle.fromJson(json['proxiesStyle'] as Map<String, dynamic>?)
..themeProps =
ThemeProps.realFromJson(json['themeProps'] as Map<String, Object?>?);
Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
'appSetting': instance.appSetting,
'profiles': instance.profiles,
'currentProfileId': instance.currentProfileId,
'themeMode': _$ThemeModeEnumMap[instance.themeMode]!,
'primaryColor': instance.primaryColor,
'isAccessControl': instance.isAccessControl,
'accessControl': instance.accessControl,
'dav': instance.dav,
'prueBlack': instance.prueBlack,
'windowProps': instance.windowProps,
'vpnProps': instance.vpnProps,
'desktopProps': instance.desktopProps,
'overrideDns': instance.overrideDns,
'hotKeyActions': instance.hotKeyActions,
'proxiesStyle': instance.proxiesStyle,
'themeProps': instance.themeProps,
};
const _$ThemeModeEnumMap = {
ThemeMode.system: 'system',
ThemeMode.light: 'light',
ThemeMode.dark: 'dark',
};
_$AppSettingImpl _$$AppSettingImplFromJson(Map<String, dynamic> json) =>
_$AppSettingImpl(
locale: json['locale'] as String?,
@@ -241,3 +231,35 @@ const _$ProxyCardTypeEnumMap = {
ProxyCardType.shrink: 'shrink',
ProxyCardType.min: 'min',
};
_$ThemePropsImpl _$$ThemePropsImplFromJson(Map<String, dynamic> json) =>
_$ThemePropsImpl(
primaryColor: (json['primaryColor'] as num?)?.toInt() ?? 0xFF795548,
themeMode: $enumDecodeNullable(_$ThemeModeEnumMap, json['themeMode']) ??
ThemeMode.system,
prueBlack: json['prueBlack'] as bool? ?? false,
fontFamily:
$enumDecodeNullable(_$FontFamilyEnumMap, json['fontFamily']) ??
FontFamily.system,
);
Map<String, dynamic> _$$ThemePropsImplToJson(_$ThemePropsImpl instance) =>
<String, dynamic>{
'primaryColor': instance.primaryColor,
'themeMode': _$ThemeModeEnumMap[instance.themeMode]!,
'prueBlack': instance.prueBlack,
'fontFamily': _$FontFamilyEnumMap[instance.fontFamily]!,
};
const _$ThemeModeEnumMap = {
ThemeMode.system: 'system',
ThemeMode.light: 'light',
ThemeMode.dark: 'dark',
};
const _$FontFamilyEnumMap = {
FontFamily.system: 'system',
FontFamily.miSans: 'miSans',
FontFamily.twEmoji: 'twEmoji',
FontFamily.icon: 'icon',
};