make language nullable

This commit is contained in:
Salvatore Giordano
2021-07-28 11:20:07 +02:00
parent ba251e4d88
commit fe7a8a1ed0
7 changed files with 82 additions and 28 deletions
@@ -27,7 +27,7 @@ class OwnUser extends User {
Map<String, Object?> extraData = const {},
bool banned = false,
List<String> teams = const [],
String language = 'en',
String? language,
}) : super(
id: id,
role: role,
@@ -39,6 +39,6 @@ OwnUser _$OwnUserFromJson(Map<String, dynamic> json) {
teams:
(json['teams'] as List<dynamic>?)?.map((e) => e as String).toList() ??
[],
language: json['language'] as String? ?? 'en',
language: json['language'] as String,
);
}
@@ -18,7 +18,7 @@ class User extends Equatable {
this.extraData = const {},
this.banned = false,
this.teams = const [],
this.language = 'en',
this.language,
}) : createdAt = createdAt ?? DateTime.now(),
updatedAt = updatedAt ?? DateTime.now();
@@ -87,12 +87,8 @@ class User extends Equatable {
/// The language this user prefers.
///
/// Defaults to 'en'.
@JsonKey(
includeIfNull: false,
toJson: Serializer.readOnly,
defaultValue: 'en',
)
final String language;
@JsonKey(includeIfNull: false)
final String? language;
/// Shortcut for user name
String get name {
@@ -25,7 +25,7 @@ User _$UserFromJson(Map<String, dynamic> json) {
teams:
(json['teams'] as List<dynamic>?)?.map((e) => e as String).toList() ??
[],
language: json['language'] as String? ?? 'en',
language: json['language'] as String?,
);
}
@@ -48,6 +48,6 @@ Map<String, dynamic> _$UserToJson(User instance) {
writeNotNull('online', readonly(instance.online));
writeNotNull('banned', readonly(instance.banned));
val['extra_data'] = instance.extraData;
writeNotNull('language', readonly(instance.language));
writeNotNull('language', instance.language);
return val;
}