Jelajahi Sumber

migrated user_details.dart to null safety

ashilkn 2 tahun lalu
induk
melakukan
11a80f4d4d
1 mengubah file dengan 9 tambahan dan 14 penghapusan
  1. 9 14
      lib/models/user_details.dart

+ 9 - 14
lib/models/user_details.dart

@@ -1,4 +1,3 @@
-// @dart = 2.9
 import 'dart:math';
 import 'dart:math';
 
 
 import 'package:collection/collection.dart';
 import 'package:collection/collection.dart';
@@ -10,7 +9,7 @@ class UserDetails {
   final int fileCount;
   final int fileCount;
   final int sharedCollectionsCount;
   final int sharedCollectionsCount;
   final Subscription subscription;
   final Subscription subscription;
-  final FamilyData familyData;
+  final FamilyData? familyData;
 
 
   UserDetails(
   UserDetails(
     this.email,
     this.email,
@@ -27,8 +26,8 @@ class UserDetails {
 
 
   bool isFamilyAdmin() {
   bool isFamilyAdmin() {
     assert(isPartOfFamily(), "verify user is part of family before calling");
     assert(isPartOfFamily(), "verify user is part of family before calling");
-    final FamilyMember currentUserMember = familyData?.members
-        ?.firstWhere((element) => element.email.trim() == email.trim());
+    final FamilyMember currentUserMember = familyData!.members!
+        .firstWhere((element) => element.email.trim() == email.trim());
     return currentUserMember.isAdmin;
     return currentUserMember.isAdmin;
   }
   }
 
 
@@ -36,20 +35,20 @@ class UserDetails {
   // belong to family group. Otherwise, it will return storage consumed by
   // belong to family group. Otherwise, it will return storage consumed by
   // current user
   // current user
   int getFamilyOrPersonalUsage() {
   int getFamilyOrPersonalUsage() {
-    return isPartOfFamily() ? familyData.getTotalUsage() : usage;
+    return isPartOfFamily() ? familyData!.getTotalUsage() : usage;
   }
   }
 
 
   int getFreeStorage() {
   int getFreeStorage() {
     return max(
     return max(
       isPartOfFamily()
       isPartOfFamily()
-          ? (familyData.storage - familyData.getTotalUsage())
+          ? (familyData!.storage - familyData!.getTotalUsage())
           : (subscription.storage - (usage)),
           : (subscription.storage - (usage)),
       0,
       0,
     );
     );
   }
   }
 
 
   int getTotalStorage() {
   int getTotalStorage() {
-    return isPartOfFamily() ? familyData.storage : subscription.storage;
+    return isPartOfFamily() ? familyData!.storage : subscription.storage;
   }
   }
 
 
   factory UserDetails.fromMap(Map<String, dynamic> map) {
   factory UserDetails.fromMap(Map<String, dynamic> map) {
@@ -80,14 +79,10 @@ class FamilyMember {
       map['isAdmin'] as bool,
       map['isAdmin'] as bool,
     );
     );
   }
   }
-
-  Map<String, dynamic> toMap() {
-    return {'email': email, 'usage': usage, 'id': id, 'isAdmin': isAdmin};
-  }
 }
 }
 
 
 class FamilyData {
 class FamilyData {
-  final List<FamilyMember> members;
+  final List<FamilyMember>? members;
 
 
   // Storage available based on the family plan
   // Storage available based on the family plan
   final int storage;
   final int storage;
@@ -96,10 +91,10 @@ class FamilyData {
   FamilyData(this.members, this.storage, this.expiryTime);
   FamilyData(this.members, this.storage, this.expiryTime);
 
 
   int getTotalUsage() {
   int getTotalUsage() {
-    return members.map((e) => e.usage).toList().sum;
+    return members!.map((e) => e.usage).toList().sum;
   }
   }
 
 
-  static fromMap(Map<String, dynamic> map) {
+  static fromMap(Map<String, dynamic>? map) {
     if (map == null) return null;
     if (map == null) return null;
     assert(map['members'] != null && map['members'].length >= 0);
     assert(map['members'] != null && map['members'].length >= 0);
     final members = List<FamilyMember>.from(
     final members = List<FamilyMember>.from(