Merge branch 'main' into TALAO

TalaoDAO · Apr 3, 2024 · 63b3e3a · 63b3e3a
2 parents cb4318e + 6a2514b
commit 63b3e3a
Show file tree

Hide file tree

Showing 54 changed files with 1,228 additions and 614 deletions.
diff --git a/assets/image/blank_transparent_get_card.png b/assets/image/blank_transparent_get_card.png
diff --git a/lib/app/shared/constants/image_strings.dart b/lib/app/shared/constants/image_strings.dart
@@ -157,4 +157,7 @@ class ImageStrings {
   static const String receiveSqure = '$imagePath/receive-square.png';
 
   static const String linkedInBanner = '$imagePath/linkedin_banner.png';
+
+  static const String blankGetCard =
+      '$imagePath/blank_transparent_get_card.png';
 }
diff --git a/lib/app/shared/enum/status/credential_status.dart b/lib/app/shared/enum/status/credential_status.dart
@@ -1,9 +1,9 @@
 enum CredentialStatus {
   pending,
   active,
-  notVerified,
-  suspended,
-  unknown,
   expired,
-  revoked
+  invalidSignature,
+  invalidStatus,
+  unknown,
+  noStatus,
 }
diff --git a/lib/app/shared/enum/type/credential_subject_type/credential_subject_type.dart b/lib/app/shared/enum/type/credential_subject_type/credential_subject_type.dart
@@ -65,4 +65,5 @@ enum CredentialSubjectType {
   legalPersonalCredential,
   identityCredential,
   eudiPid,
+  pid,
 }
diff --git a/lib/app/shared/enum/type/credential_subject_type/credential_subject_type_extension.dart b/lib/app/shared/enum/type/credential_subject_type/credential_subject_type_extension.dart
@@ -87,6 +87,7 @@ extension CredentialSubjectTypeExtension on CredentialSubjectType {
       case CredentialSubjectType.legalPersonalCredential:
       case CredentialSubjectType.identityCredential:
       case CredentialSubjectType.eudiPid:
+      case CredentialSubjectType.pid:
         return Colors.white;
     }
   }
@@ -209,6 +210,8 @@ extension CredentialSubjectTypeExtension on CredentialSubjectType {
         return 'IdentityCredential';
       case CredentialSubjectType.eudiPid:
         return 'EudiPid';
+      case CredentialSubjectType.pid:
+        return 'Pid';
       case CredentialSubjectType.defaultCredential:
         return '';
     }
@@ -334,6 +337,8 @@ extension CredentialSubjectTypeExtension on CredentialSubjectType {
         return IdentityCredentialSubjectModel.fromJson(json);
       case CredentialSubjectType.eudiPid:
         return EudipidSubjectModel.fromJson(json);
+      case CredentialSubjectType.pid:
+        return PidSubjectModel.fromJson(json);
     }
   }
 
@@ -569,6 +574,8 @@ extension CredentialSubjectTypeExtension on CredentialSubjectType {
         return 'Identity Credential';
       case CredentialSubjectType.eudiPid:
         return 'EudiPid';
+      case CredentialSubjectType.pid:
+        return 'Pid';
       case CredentialSubjectType.defaultCredential:
         return '';
     }
@@ -636,6 +643,7 @@ extension CredentialSubjectTypeExtension on CredentialSubjectType {
       case CredentialSubjectType.legalPersonalCredential:
       case CredentialSubjectType.identityCredential:
       case CredentialSubjectType.eudiPid:
+      case CredentialSubjectType.pid:
         return false;
     }
   }
@@ -670,6 +678,7 @@ extension CredentialSubjectTypeExtension on CredentialSubjectType {
 
       case CredentialSubjectType.identityCredential:
       case CredentialSubjectType.eudiPid:
+      case CredentialSubjectType.pid:
         return [VCFormatType.vcSdJWT];
 
       case CredentialSubjectType.over18:
@@ -1018,6 +1027,7 @@ extension CredentialSubjectTypeExtension on CredentialSubjectType {
       case CredentialSubjectType.walletCredential:
       case CredentialSubjectType.identityCredential:
       case CredentialSubjectType.eudiPid:
+      case CredentialSubjectType.pid:
         break;
     }
 
@@ -1154,6 +1164,7 @@ extension CredentialSubjectTypeExtension on CredentialSubjectType {
       case CredentialSubjectType.legalPersonalCredential:
       case CredentialSubjectType.identityCredential:
       case CredentialSubjectType.eudiPid:
+      case CredentialSubjectType.pid:
         return 0;
     }
   }

diff --git a/lib/app/shared/enum/type/profile/did_key_type.dart b/lib/app/shared/enum/type/profile/did_key_type.dart
@@ -59,8 +59,8 @@ extension DidKeyTypeX on DidKeyType {
       case DidKeyType.p256:
       case DidKeyType.jwkP256:
       case DidKeyType.jwtClientAttestation:
-        return true;
       case DidKeyType.edDSA:
+        return true;
       case DidKeyType.ebsiv3:
         return false;
     }

diff --git a/lib/app/shared/extension/bigint_extension.dart b/lib/app/shared/extension/bigint_extension.dart
@@ -0,0 +1,11 @@
+extension BigIntExtension on BigInt {
+  List<int> get toBytes {
+    var value = this;
+    final List<int> bytes = [];
+    while (value > BigInt.zero) {
+      bytes.insert(0, (value & BigInt.from(0xFF)).toInt());
+      value >>= 8;
+    }
+    return bytes;
+  }
+}
diff --git a/lib/app/shared/extension/credential_status.dart b/lib/app/shared/extension/credential_status.dart
@@ -8,30 +8,32 @@ extension CredentialStatusExtension on CredentialStatus {
     final l10n = context.l10n;
     switch (this) {
       case CredentialStatus.active:
-        return l10n.cardsActive;
-      case CredentialStatus.suspended:
-      case CredentialStatus.revoked:
+        return l10n.cardIsValid;
       case CredentialStatus.expired:
-      case CredentialStatus.notVerified:
-        return l10n.cardsProblem;
+        return l10n.cardIsExpired;
+      case CredentialStatus.invalidSignature:
+        return l10n.signatureIsInvalid;
       case CredentialStatus.pending:
         return l10n.cardsPending;
       case CredentialStatus.unknown:
         return l10n.unknown;
+      case CredentialStatus.invalidStatus:
+        return l10n.statusIsInvalid;
+      case CredentialStatus.noStatus:
+        return '';
     }
   }
 
   IconData get icon {
     switch (this) {
       case CredentialStatus.active:
         return Icons.check_circle;
-      case CredentialStatus.suspended:
-      case CredentialStatus.revoked:
+      case CredentialStatus.invalidStatus:
       case CredentialStatus.expired:
-      case CredentialStatus.notVerified:
-        return Icons.error_rounded;
       case CredentialStatus.pending:
       case CredentialStatus.unknown:
+      case CredentialStatus.invalidSignature:
+      case CredentialStatus.noStatus:
         return Icons.circle_outlined;
     }
   }
@@ -40,32 +42,13 @@ extension CredentialStatusExtension on CredentialStatus {
     switch (this) {
       case CredentialStatus.active:
         return Theme.of(context).colorScheme.activeColor;
-      case CredentialStatus.suspended:
-      case CredentialStatus.revoked:
+      case CredentialStatus.invalidStatus:
       case CredentialStatus.expired:
-      case CredentialStatus.notVerified:
-        return Theme.of(context).colorScheme.inactiveColor;
       case CredentialStatus.pending:
-        return Colors.orange;
       case CredentialStatus.unknown:
-        return Colors.blue;
-    }
-  }
-
-  String info(BuildContext context) {
-    final l10n = context.l10n;
-    switch (this) {
-      case CredentialStatus.notVerified:
-        return l10n.incorrectSignature;
-      case CredentialStatus.suspended:
-      case CredentialStatus.revoked:
-        return l10n.revokedOrSuspendedCredential;
-      case CredentialStatus.expired:
-        return l10n.credentialExpired;
-      case CredentialStatus.unknown:
-      case CredentialStatus.pending:
-      case CredentialStatus.active:
-        return '';
+      case CredentialStatus.invalidSignature:
+      case CredentialStatus.noStatus:
+        return Theme.of(context).colorScheme.inactiveColor;
     }
   }
 }
diff --git a/lib/app/shared/extension/extension.dart b/lib/app/shared/extension/extension.dart
@@ -1,3 +1,4 @@
+export 'bigint_extension.dart';
 export 'credential_status.dart';
 export 'iterable_extension.dart';
 export 'string_extension.dart';

diff --git a/lib/app/shared/extension/string_extension.dart b/lib/app/shared/extension/string_extension.dart
@@ -1,3 +1,6 @@
+import 'dart:convert';
+
+import 'package:convert/convert.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
@@ -34,4 +37,10 @@ extension StringExtension on String {
   }
 
   Characters get characters => Characters(this);
+
+  String get char2Bytes {
+    final List<int> encode = utf8.encode(this);
+    final String bytes = hex.encode(encode);
+    return bytes;
+  }
 }