Merge branch 'test_integration' into EUDI

TalaoDAO · Jun 5, 2024 · 67510b9 · 67510b9
2 parents 32b3111 + 3d87a25
commit 67510b9
Show file tree

Hide file tree

Showing 232 changed files with 4,137 additions and 2,506 deletions.
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
diff --git a/.github/workflows/credential_manifest.yaml b/.github/workflows/credential_manifest.yaml
@@ -1,13 +1,13 @@
 name: credential_manifest
 
-on: [ pull_request, push ]
+on: [pull_request, push]
 
 jobs:
   build:
     uses: TalaoDAO/AltMe/.github/workflows/flutter_package.yaml@main
     with:
       flutter_channel: stable
-      flutter_version: 3.19.6
+      flutter_version: 3.22.1
       min_coverage: 30
       working_directory: packages/credential_manifest
-      dart_sdk: 3.3.4
+      dart_sdk: 3.4.1
diff --git a/.github/workflows/cryptocurrency_keys.yaml b/.github/workflows/cryptocurrency_keys.yaml
@@ -1,13 +1,13 @@
 name: cryptocurrency_keys
 
-on: [ pull_request, push ]
+on: [pull_request, push]
 
 jobs:
   build:
     uses: TalaoDAO/AltMe/.github/workflows/flutter_package.yaml@main
     with:
       flutter_channel: stable
-      flutter_version: 3.19.6
+      flutter_version: 3.22.1
       min_coverage: 30
       working_directory: packages/cryptocurrency_keys
-      dart_sdk: 3.3.4
+      dart_sdk: 3.4.1
diff --git a/.github/workflows/did_kit.yaml b/.github/workflows/did_kit.yaml
@@ -0,0 +1,14 @@
+name: did_kit
+
+on: [pull_request, push]
+
+jobs:
+  build:
+    uses: TalaoDAO/AltMe/.github/workflows/flutter_package.yaml@main
+    with:
+      flutter_channel: stable
+      flutter_version: 3.22.1
+      min_coverage: 30
+      working_directory: packages/did_kit
+      dart_sdk: 3.4.1
+      build_runner: false
diff --git a/.github/workflows/flutter_package.yaml b/.github/workflows/flutter_package.yaml
@@ -101,9 +101,23 @@ jobs:
 
       - name: 📦 Install Dependencies
         run: |
+          if grep -q 'path: ../../../didkit/lib/flutter' ../did_kit/pubspec.yaml; then 
+            sed -i 's|path: ../../../didkit/lib/flutter|git:\n      url: https://github.com/spruceid/didkit.git\n      path: lib/flutter|' ../did_kit/pubspec.yaml
+          fi  
           flutter pub global activate very_good_cli
           very_good packages get --recursive --ignore=${{inputs.package_get_excludes}}
 
+      - name: 📦 Run build_runner for nested package if necessary
+        run: |
+          if grep -q 'path: ../credential_manifest' pubspec.yaml; then
+            initial_dir=$(pwd)
+            echo $initial_dir
+            cd ../credential_manifest
+            flutter pub get
+            dart pub run build_runner build --delete-conflicting-outputs
+            cd $initial_dir
+          fi
+
       - name: ⚙️ Run Setup
         if: "${{inputs.setup != ''}}"
         run: ${{inputs.setup}}
@@ -131,4 +145,4 @@ jobs:
         with:
           path: ${{inputs.working_directory}}/coverage/lcov.info
           exclude: ${{inputs.coverage_excludes}}
-          min_coverage: ${{inputs.min_coverage}}
+          min_coverage: ${{inputs.min_coverage}}
diff --git a/.github/workflows/jwt_decode.yaml b/.github/workflows/jwt_decode.yaml
@@ -1,14 +1,14 @@
 name: jwt_decode
 
-on: [ pull_request, push ]
+on: [pull_request, push]
 
 jobs:
   build:
     uses: TalaoDAO/AltMe/.github/workflows/flutter_package.yaml@main
     with:
       flutter_channel: stable
-      flutter_version: 3.19.6
+      flutter_version: 3.22.1
       min_coverage: 30
       working_directory: packages/jwt_decode
-      dart_sdk: 3.3.4
+      dart_sdk: 3.4.1
       build_runner: false
diff --git a/.github/workflows/key_generator.yaml b/.github/workflows/key_generator.yaml
@@ -0,0 +1,14 @@
+name: key_generator
+
+on: [pull_request, push]
+
+jobs:
+  build:
+    uses: TalaoDAO/AltMe/.github/workflows/flutter_package.yaml@main
+    with:
+      flutter_channel: stable
+      flutter_version: 3.22.1
+      min_coverage: 30
+      working_directory: packages/key_generator
+      dart_sdk: 3.4.1
+      build_runner: false
diff --git a/.github/workflows/oidc4vc.yaml b/.github/workflows/oidc4vc.yaml
@@ -0,0 +1,14 @@
+name: oidc4vc
+
+on: [pull_request, push]
+
+jobs:
+  build:
+    uses: TalaoDAO/AltMe/.github/workflows/flutter_package.yaml@main
+    with:
+      flutter_channel: stable
+      flutter_version: 3.22.1
+      min_coverage: 30
+      working_directory: packages/oidc4vc
+      dart_sdk: 3.4.1
+      build_runner: true
diff --git a/.github/workflows/polygonid.yaml b/.github/workflows/polygonid.yaml
@@ -0,0 +1,14 @@
+name: polygonid
+
+on: [pull_request, push]
+
+jobs:
+  build:
+    uses: TalaoDAO/AltMe/.github/workflows/flutter_package.yaml@main
+    with:
+      flutter_channel: stable
+      flutter_version: 3.22.1
+      min_coverage: 30
+      working_directory: packages/polygonid
+      dart_sdk: 3.4.1
+      build_runner: false
diff --git a/.github/workflows/secure_storage.yaml b/.github/workflows/secure_storage.yaml
@@ -7,8 +7,8 @@ jobs:
     uses: TalaoDAO/AltMe/.github/workflows/flutter_package.yaml@main
     with:
       flutter_channel: stable
-      flutter_version: 3.19.6
+      flutter_version: 3.22.1
       min_coverage: 30
       working_directory: packages/secure_storage
-      dart_sdk: 3.3.4
+      dart_sdk: 3.4.1
       build_runner: false
diff --git a/lib/app/shared/enum/status/credential_status_extension.dart b/lib/app/shared/enum/status/credential_status_extension.dart
@@ -1,6 +1,5 @@
 import 'package:altme/app/app.dart';
 import 'package:altme/l10n/l10n.dart';
-import 'package:altme/theme/theme.dart';
 import 'package:flutter/material.dart';
 
 extension CredentialStatusExtension on CredentialStatus {
@@ -44,15 +43,15 @@ extension CredentialStatusExtension on CredentialStatus {
   Color color(BuildContext context) {
     switch (this) {
       case CredentialStatus.active:
-        return Theme.of(context).colorScheme.activeColor;
+        return Theme.of(context).colorScheme.onTertiary;
       case CredentialStatus.invalidStatus:
       case CredentialStatus.expired:
       case CredentialStatus.pending:
       case CredentialStatus.unknown:
       case CredentialStatus.invalidSignature:
       case CredentialStatus.statusListInvalidSignature:
       case CredentialStatus.noStatus:
-        return Theme.of(context).colorScheme.inactiveColor;
+        return Theme.of(context).colorScheme.error;
     }
   }
 }
diff --git a/lib/app/shared/enum/type/message_type/message_type.dart b/lib/app/shared/enum/type/message_type/message_type.dart
@@ -1,5 +1,4 @@
 import 'package:altme/app/shared/constants/icon_strings.dart';
-import 'package:altme/theme/theme.dart';
 import 'package:flutter/material.dart';
 
 part 'message_type_extension.dart';

diff --git a/lib/app/shared/enum/type/message_type/message_type_extension.dart b/lib/app/shared/enum/type/message_type/message_type_extension.dart
@@ -4,13 +4,13 @@ extension MessageTypeX on MessageType {
   Color getColor(BuildContext context) {
     switch (this) {
       case MessageType.error:
-        return Theme.of(context).colorScheme.alertErrorMessage;
+        return Theme.of(context).colorScheme.error;
       case MessageType.warning:
-        return Theme.of(context).colorScheme.alertWarningMessage;
+        return Theme.of(context).colorScheme.onErrorContainer;
       case MessageType.info:
-        return Theme.of(context).colorScheme.alertInfoMessage;
+        return Theme.of(context).colorScheme.outline;
       case MessageType.success:
-        return Theme.of(context).colorScheme.alertSuccessMessage;
+        return Theme.of(context).colorScheme.onTertiary;
     }
   }
 

diff --git a/lib/app/shared/extension/extension.dart b/lib/app/shared/extension/extension.dart
@@ -2,4 +2,4 @@ export 'bigint_extension.dart';
 export 'double_extension.dart';
 export 'iterable_extension.dart';
 export 'string_extension.dart';
-export 'unit8List_extension.dart';
+export 'unit8_list_extension.dart';
diff --git a/...shared/extension/unit8List_extension.dart → ...hared/extension/unit8_list_extension.dart b/...shared/extension/unit8List_extension.dart → ...hared/extension/unit8_list_extension.dart
diff --git a/lib/app/shared/loading/loading_view.dart b/lib/app/shared/loading/loading_view.dart
@@ -54,7 +54,7 @@ class LoadingView {
                 minWidth: size.width * 0.5,
               ),
               decoration: BoxDecoration(
-                color: Theme.of(context).colorScheme.background,
+                color: Theme.of(context).colorScheme.surface,
                 borderRadius: BorderRadius.circular(10),
               ),
               child: Padding(

diff --git a/lib/app/shared/widget/base/background_card.dart b/lib/app/shared/widget/base/background_card.dart
@@ -26,7 +26,7 @@ class BackgroundCard extends StatelessWidget {
       height: height,
       width: width,
       decoration: BoxDecoration(
-        color: color ?? Theme.of(context).colorScheme.surface,
+        color: color ?? Theme.of(context).colorScheme.surfaceBright,
         borderRadius: const BorderRadius.all(Radius.circular(15)),
       ),
       child: child,

diff --git a/lib/app/shared/widget/base/markdown_page.dart b/lib/app/shared/widget/base/markdown_page.dart
@@ -1,5 +1,4 @@
 import 'package:altme/app/app.dart';
-import 'package:altme/theme/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
@@ -33,13 +32,17 @@ class MarkdownPage extends StatelessWidget {
                 data: snapshot.data!,
                 styleSheet: MarkdownStyleSheet(
                   h1: TextStyle(
-                    color: Theme.of(context).colorScheme.markDownH1,
+                    color: Theme.of(context).colorScheme.onSurface,
                   ),
                   h2: TextStyle(
-                    color: Theme.of(context).colorScheme.markDownH2,
+                    color: Theme.of(context).colorScheme.onSurface,
                   ),
-                  a: TextStyle(color: Theme.of(context).colorScheme.markDownA),
-                  p: TextStyle(color: Theme.of(context).colorScheme.markDownP),
+                  a: TextStyle(color: Theme.of(context).colorScheme.primary),
+                  p: TextStyle(
+                      color: Theme.of(context)
+                          .colorScheme
+                          .onSurface
+                          .withOpacity(0.6),),
                 ),
                 onTapLink: (text, href, title) => _onTapLink(href),
               );

diff --git a/lib/app/shared/widget/base/otp_textfield.dart b/lib/app/shared/widget/base/otp_textfield.dart
@@ -1,4 +1,3 @@
-import 'package:altme/theme/theme.dart';
 import 'package:flutter/material.dart';
 
 class OtpTextField extends StatelessWidget {
@@ -27,7 +26,7 @@ class OtpTextField extends StatelessWidget {
         style: Theme.of(context).textTheme.labelLarge,
         cursorColor: Theme.of(context).colorScheme.onPrimary,
         decoration: InputDecoration(
-          fillColor: Theme.of(context).colorScheme.lightPurple,
+          fillColor: Theme.of(context).colorScheme.secondary,
           filled: true,
           border: OutlineInputBorder(
             borderRadius: BorderRadius.circular(10),

diff --git a/lib/app/shared/widget/button/my_elevated_button.dart b/lib/app/shared/widget/button/my_elevated_button.dart
@@ -1,4 +1,3 @@
-import 'package:altme/theme/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 
@@ -90,16 +89,16 @@ ButtonStyle elevatedStyleFrom({
   GestureTapCallback? onPressed,
 }) {
   return ButtonStyle(
-    elevation: MaterialStateProperty.all(elevation),
-    padding: MaterialStateProperty.all(
+    elevation: WidgetStateProperty.all(elevation),
+    padding: WidgetStateProperty.all(
       EdgeInsets.symmetric(vertical: verticalSpacing),
     ),
-    backgroundColor: MaterialStateProperty.all(
+    backgroundColor: WidgetStateProperty.all(
       onPressed == null
-          ? Theme.of(context).colorScheme.disabledBgColor
+          ? Theme.of(context).colorScheme.onSurface.withOpacity(0.12)
           : backgroundColor ?? Theme.of(context).colorScheme.primary,
     ),
-    shape: MaterialStateProperty.all(
+    shape: WidgetStateProperty.all(
       RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(borderRadius),
       ),
@@ -124,7 +123,7 @@ class ElevatedButtonText extends StatelessWidget {
     return Text(
       text.toUpperCase(),
       style: GoogleFonts.nunito(
-        color: textColor ?? Theme.of(context).colorScheme.onElevatedButton,
+        color: textColor ?? Theme.of(context).colorScheme.onPrimary,
         fontSize: fontSize,
         fontWeight: FontWeight.w700,
       ),

diff --git a/lib/app/shared/widget/button/my_gradient_button.dart b/lib/app/shared/widget/button/my_gradient_button.dart
@@ -1,5 +1,4 @@
 import 'package:altme/app/app.dart';
-import 'package:altme/theme/theme.dart';
 import 'package:flutter/material.dart';
 
 class MyGradientButton extends StatelessWidget {
@@ -46,8 +45,8 @@ class MyGradientButton extends StatelessWidget {
           begin: Alignment.topCenter,
           end: Alignment.bottomCenter,
           colors: [
-            Theme.of(context).colorScheme.startButtonColorA,
-            Theme.of(context).colorScheme.startButtonColorB,
+            Theme.of(context).colorScheme.primary,
+            Theme.of(context).colorScheme.primaryContainer,
           ],
         );
     return SizedBox(
@@ -57,7 +56,7 @@ class MyGradientButton extends StatelessWidget {
           borderRadius: BorderRadius.circular(borderRadius),
           gradient: onPressed == null ? null : gradientValue,
           color: onPressed == null
-              ? Theme.of(context).colorScheme.disabledBgColor
+              ? Theme.of(context).colorScheme.onSurface.withOpacity(0.12)
               : null,
         ),
         child: icon == null
@@ -106,8 +105,8 @@ ButtonStyle gradientStyleFrom({
   return ElevatedButton.styleFrom(
     elevation: elevation,
     padding: EdgeInsets.symmetric(vertical: verticalSpacing),
-    backgroundColor: Theme.of(context).colorScheme.transparent,
-    shadowColor: Theme.of(context).colorScheme.transparent,
+    backgroundColor: Colors.transparent,
+    shadowColor: Colors.transparent,
     shape: RoundedRectangleBorder(
       borderRadius: BorderRadius.circular(borderRadius),
     ),
@@ -136,8 +135,8 @@ class GradientButtonText extends StatelessWidget {
         upperCase ? text.toUpperCase() : text,
         style: TextStyle(
           color: onPressed != null
-              ? Theme.of(context).colorScheme.onElevatedButton
-              : Theme.of(context).colorScheme.disabledTextColor,
+              ? Theme.of(context).colorScheme.onPrimary
+              : Theme.of(context).colorScheme.onSurface.withOpacity(0.38),
           fontSize: fontSize,
           fontWeight: FontWeight.w700,
         ),

diff --git a/lib/app/shared/widget/button/my_outlined_button.dart b/lib/app/shared/widget/button/my_outlined_button.dart
@@ -1,4 +1,3 @@
-import 'package:altme/theme/theme.dart';
 import 'package:flutter/material.dart';
 
 class MyOutlinedButton extends StatelessWidget {
@@ -103,7 +102,7 @@ ButtonStyle outlinedStyleFrom({
         backgroundColor ?? Theme.of(context).colorScheme.surface,
     side: BorderSide(
       color: onPressed == null
-          ? Theme.of(context).colorScheme.disabledBgColor
+          ? Theme.of(context).colorScheme.onSurface.withOpacity(0.12)
           : borderColor ?? Theme.of(context).colorScheme.primary,
       width: 2,
     ),
@@ -133,8 +132,8 @@ class OutlinedButtonText extends StatelessWidget {
       text.toUpperCase(),
       style: TextStyle(
         color: onPressed == null
-            ? Theme.of(context).colorScheme.disabledBgColor
-            : textColor ?? Theme.of(context).colorScheme.onOutlineButton,
+            ? Theme.of(context).colorScheme.onSurface.withOpacity(0.12)
+            : textColor ?? Theme.of(context).colorScheme.primary,
         fontSize: fontSize,
         fontWeight: FontWeight.w700,
       ),