diff --git a/lib/models/friend_status.dart b/lib/models/friend_status.dart index 5a0814e..0c8b367 100644 --- a/lib/models/friend_status.dart +++ b/lib/models/friend_status.dart @@ -1,5 +1,3 @@ - - /// Simple friendship status /// /// @author Pierre HUBERT @@ -17,11 +15,7 @@ class FriendStatus { required this.sentRequest, required this.receivedRequest, required this.following, - }) : assert(userID != null), - assert(areFriend != null), - assert(sentRequest != null), - assert(receivedRequest != null), - assert(following != null); + }); bool get noRequestExchanged => !areFriend && !sentRequest && !receivedRequest; } diff --git a/lib/models/general_settings.dart b/lib/models/general_settings.dart index c47358f..48a4eb7 100644 --- a/lib/models/general_settings.dart +++ b/lib/models/general_settings.dart @@ -33,16 +33,5 @@ class GeneralSettings { required this.personalWebsite, required this.publicNote, required this.location, - }) : assert(email != null), - assert(firstName != null), - assert(lastName != null), - assert(pageVisibility != null), - assert(allowComments != null), - assert(allowPostsFromFriends != null), - assert(allowComunicEmails != null), - assert(publicFriendsList != null), - assert(publicEmail != null), - assert(virtualDirectory != null), - assert(personalWebsite != null), - assert(publicNote != null); + }); } diff --git a/lib/models/group.dart b/lib/models/group.dart index 6523c84..a456db9 100644 --- a/lib/models/group.dart +++ b/lib/models/group.dart @@ -28,7 +28,6 @@ String membershipToText(GroupMembershipLevel level) { case GroupMembershipLevel.VISITOR: return tr("Visitor")!; } - throw new Exception("Unreachable statement!"); } enum GroupVisibilityLevel { OPEN, PRIVATE, SECRETE } @@ -60,15 +59,7 @@ class Group implements Comparable { required this.postCreationLevel, required this.virtualDirectory, required this.following, - }) : assert(id != null), - assert(name != null), - assert(iconURL != null), - assert(numberMembers != null), - assert(membershipLevel != null), - assert(visibilityLevel != null), - assert(registrationLevel != null), - assert(postCreationLevel != null), - assert(following != null); + }); get displayName => this.name; diff --git a/lib/models/group_membership.dart b/lib/models/group_membership.dart index fa0e4b4..081a96d 100644 --- a/lib/models/group_membership.dart +++ b/lib/models/group_membership.dart @@ -15,10 +15,7 @@ class GroupMembership { required this.groupID, required this.timeCreate, required this.level, - }) : assert(userID != null), - assert(groupID != null), - assert(timeCreate != null), - assert(level != null); + }); String get membershipText => membershipToText(level); diff --git a/lib/models/membership.dart b/lib/models/membership.dart index 1516eea..dc01252 100644 --- a/lib/models/membership.dart +++ b/lib/models/membership.dart @@ -18,22 +18,19 @@ class Membership { : type = MembershipType.CONVERSATION, friend = null, groupID = null, - groupLastActive = null, - assert(conversation != null); + groupLastActive = null; Membership.friend(Friend this.friend) : type = MembershipType.FRIEND, conversation = null, groupID = null, - groupLastActive = null, - assert(friend != null); + groupLastActive = null; - Membership.group({required int this.groupID, required int this.groupLastActive}) + Membership.group( + {required int this.groupID, required int this.groupLastActive}) : type = MembershipType.GROUP, conversation = null, - friend = null, - assert(groupID != null), - assert(groupLastActive != null); + friend = null; int? get lastActive { switch (type) { diff --git a/lib/models/new_account.dart b/lib/models/new_account.dart index 524a13a..6e0f953 100644 --- a/lib/models/new_account.dart +++ b/lib/models/new_account.dart @@ -1,5 +1,3 @@ - - /// New account information container /// /// @author Pierre HUBERT @@ -15,8 +13,5 @@ class NewAccount { required this.lastName, required this.email, required this.password, - }) : assert(firstName != null), - assert(lastName != null), - assert(email != null), - assert(password != null); + }); } diff --git a/lib/models/new_comment.dart b/lib/models/new_comment.dart index 885dcfd..af6dbda 100644 --- a/lib/models/new_comment.dart +++ b/lib/models/new_comment.dart @@ -13,9 +13,9 @@ class NewComment { required this.postID, required this.content, required this.image, - }) : assert(postID != null); + }); - bool get hasContent => content != null && content.length > 0; + bool get hasContent => content.length > 0; bool get hasImage => image != null; } diff --git a/lib/models/new_conversation_settings.dart b/lib/models/new_conversation_settings.dart index 6c580b7..1896d1c 100644 --- a/lib/models/new_conversation_settings.dart +++ b/lib/models/new_conversation_settings.dart @@ -19,9 +19,6 @@ class NewConversationsSettings { required this.name, required this.canEveryoneAddMembers, required this.color, - }) : assert(convID != null), - assert(convID > 0), - assert(following != null), - assert(isComplete != null), + }) : assert(convID > 0), assert(!isComplete || canEveryoneAddMembers != null); } diff --git a/lib/models/new_emoji.dart b/lib/models/new_emoji.dart index 1749898..67f9a00 100644 --- a/lib/models/new_emoji.dart +++ b/lib/models/new_emoji.dart @@ -11,6 +11,5 @@ class NewEmoji { const NewEmoji({ required this.shortcut, required this.image, - }) : assert(shortcut != null), - assert(image != null); + }); } diff --git a/lib/models/new_group_conversation.dart b/lib/models/new_group_conversation.dart index ac5ca33..aa390f5 100644 --- a/lib/models/new_group_conversation.dart +++ b/lib/models/new_group_conversation.dart @@ -14,7 +14,5 @@ class NewGroupConversation { required this.groupID, required this.name, required this.minMembershipLevel, - }) : assert(groupID != null), - assert(name != null), - assert(minMembershipLevel != null); + }); } diff --git a/lib/models/new_post.dart b/lib/models/new_post.dart index 16165c3..d88564a 100644 --- a/lib/models/new_post.dart +++ b/lib/models/new_post.dart @@ -17,9 +17,7 @@ class NewSurvey { required this.question, required this.answers, required this.allowNewChoicesCreation, - }) : assert(question != null), - assert(answers.length > 1), - assert(allowNewChoicesCreation != null); + }) : assert(answers.length > 1); } class NewPost { @@ -47,11 +45,7 @@ class NewPost { required this.timeEnd, required this.survey, required this.youtubeId, - }) : assert(target != null), - assert(targetID != null), - assert(visibility != null), - assert(content != null), - assert(kind != PostKind.TEXT || content.length > 3), + }) : assert(kind != PostKind.TEXT || content.length > 3), assert(kind != PostKind.IMAGE || image != null), assert(kind != PostKind.WEB_LINK || url != null), assert(kind != PostKind.PDF || pdf != null), diff --git a/lib/models/notification.dart b/lib/models/notification.dart index 09865cc..5ad23b1 100644 --- a/lib/models/notification.dart +++ b/lib/models/notification.dart @@ -1,5 +1,3 @@ - - /// Notification model /// /// @author Pierre HUBERT @@ -58,11 +56,5 @@ class Notification { required this.type, required this.fromContainerId, required this.fromContainerType, - }) : assert(id != null), - assert(timeCreate != null), - assert(seen != null), - assert(fromUser != null), - assert(onElemId != null), - assert(onElemType != null), - assert(type != null); + }); } diff --git a/lib/models/notifications_settings.dart b/lib/models/notifications_settings.dart index ce39e1d..61c86c8 100644 --- a/lib/models/notifications_settings.dart +++ b/lib/models/notifications_settings.dart @@ -1,5 +1,3 @@ - - /// Notifications settings /// /// @author Pierre Hubert @@ -11,6 +9,5 @@ class NotificationsSettings { NotificationsSettings({ required this.allowConversations, required this.allowNotificationsSound, - }) : assert(allowConversations != null), - assert(allowNotificationsSound != null); + }); } diff --git a/lib/models/server_config.dart b/lib/models/server_config.dart index 3cc1445..5ca50c4 100644 --- a/lib/models/server_config.dart +++ b/lib/models/server_config.dart @@ -12,8 +12,7 @@ class NotificationsPolicy { const NotificationsPolicy({ required this.hasFirebase, required this.hasIndependent, - }) : assert(hasFirebase != null), - assert(hasIndependent != null); + }); } class PasswordPolicy { diff --git a/lib/ui/widgets/text_rich_content_widget.dart b/lib/ui/widgets/text_rich_content_widget.dart index 7f841d5..10c2a37 100644 --- a/lib/ui/widgets/text_rich_content_widget.dart +++ b/lib/ui/widgets/text_rich_content_widget.dart @@ -19,7 +19,7 @@ class TextRichContentWidget extends StatelessWidget { this.text, { this.textAlign, this.style, - }) : assert(text != null); + }); /// Parse the text and return it as a list of span elements static List _parse(String text, TextStyle? style) {