Merge branch 'main' into TALAO

TalaoDAO · Jun 28, 2024 · fcedae0 · fcedae0
2 parents 6f41914 + 6ad0642
commit fcedae0
Show file tree

Hide file tree

Showing 90 changed files with 1,241 additions and 1,028 deletions.
diff --git a/lib/app/shared/constants/sizes.dart b/lib/app/shared/constants/sizes.dart
@@ -23,7 +23,7 @@ abstract class Sizes {
   ///borderRadius
   static const double credentialBorderRadius = 16;
   static const double smallRadius = 8;
-  static const double normalRadius = 12;
+  static const double normalRadius = 10;
   static const double largeRadius = 18;
 
   static const double credentialAspectRatio = 500 / 300;

diff --git a/lib/app/shared/helper_functions/helper_functions.dart b/lib/app/shared/helper_functions/helper_functions.dart
@@ -19,6 +19,7 @@ import 'package:key_generator/key_generator.dart';
 import 'package:oidc4vc/oidc4vc.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:secure_storage/secure_storage.dart';
+import 'package:uuid/uuid.dart';
 import 'package:x509/x509.dart' as x509;
 import 'package:x509/x509.dart';
 
@@ -1568,7 +1569,12 @@ bool supportCryptoCredential(ProfileModel profileModel) {
   return supportAssociatedCredential;
 }
 
-Future<(String?, String?, String?, String?)> getClientDetails({
+// clientId,
+// clientSecret,
+// authorization,
+// oAuthClientAttestation,
+// oAuthClientAttestationPop
+Future<(String?, String?, String?, String?, String?)> getClientDetails({
   required ProfileCubit profileCubit,
   required bool isEBSIV3,
   required String issuer,
@@ -1577,7 +1583,8 @@ Future<(String?, String?, String?, String?)> getClientDetails({
     String? clientId;
     String? clientSecret;
     String? authorization;
-    String? clientAssertion;
+    String? oAuthClientAttestation;
+    String? oAuthClientAttestationPop;
 
     final customOidc4vcProfile = profileCubit.state.model.profileSetting
         .selfSovereignIdentityOptions.customOidc4vcProfile;
@@ -1663,6 +1670,7 @@ Future<(String?, String?, String?, String?)> getClientDetails({
           'aud': issuer,
           'nbf': nbf,
           'exp': nbf + 60,
+          'jti': const Uuid().v4(),
         };
 
         final jwtProofOfPossession = profileCubit.oidc4vc.generateToken(
@@ -1671,12 +1679,19 @@ Future<(String?, String?, String?, String?)> getClientDetails({
           ignoreProofHeaderType: true,
         );
 
-        clientAssertion = '$walletAttestationData~$jwtProofOfPossession';
+        oAuthClientAttestation = walletAttestationData;
+        oAuthClientAttestationPop = jwtProofOfPossession;
     }
 
-    return (clientId, clientSecret, authorization, clientAssertion);
+    return (
+      clientId,
+      clientSecret,
+      authorization,
+      oAuthClientAttestation,
+      oAuthClientAttestationPop
+    );
   } catch (e) {
-    return (null, null, null, null);
+    return (null, null, null, null, null);
   }
 }
 

diff --git a/lib/app/shared/loading/loading_view.dart b/lib/app/shared/loading/loading_view.dart
@@ -1,11 +1,9 @@
 import 'dart:async';
 
 import 'package:altme/app/app.dart';
-import 'package:altme/dashboard/dashboard.dart';
 import 'package:altme/l10n/l10n.dart';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 
 class LoadingView {
   factory LoadingView() => _shared;
@@ -67,7 +65,6 @@ class LoadingView {
                     children: [
                       const SizedBox(height: 10),
                       WalletLogo(
-                        profileModel: context.read<ProfileCubit>().state.model,
                         height: Sizes.logoNormal,
                         width: MediaQuery.of(context).size.shortestSide * 0.5,
                         showPoweredBy: true,

diff --git a/lib/app/shared/widget/base/background_card.dart b/lib/app/shared/widget/base/background_card.dart
@@ -9,6 +9,7 @@ class BackgroundCard extends StatelessWidget {
     this.color,
     this.height,
     this.width,
+    this.borderRadius = 10,
   });
 
   final Widget? child;
@@ -17,6 +18,7 @@ class BackgroundCard extends StatelessWidget {
   final Color? color;
   final double? height;
   final double? width;
+  final double borderRadius;
 
   @override
   Widget build(BuildContext context) {
@@ -27,7 +29,7 @@ class BackgroundCard extends StatelessWidget {
       width: width,
       decoration: BoxDecoration(
         color: color ?? Theme.of(context).colorScheme.surfaceContainer,
-        borderRadius: const BorderRadius.all(Radius.circular(15)),
+        borderRadius: BorderRadius.all(Radius.circular(borderRadius)),
       ),
       child: child,
     );

diff --git a/lib/app/shared/widget/base/page.dart b/lib/app/shared/widget/base/page.dart
@@ -171,8 +171,8 @@ class _BasePageState extends State<BasePage> with WidgetsBindingObserver {
             floatingActionButton: widget.floatingActionButton,
             floatingActionButtonLocation: widget.floatingActionButtonLocation,
             extendBody: widget.extendBelow ?? false,
-            backgroundColor: widget.backgroundColor ??
-                Theme.of(context).colorScheme.surface,
+            backgroundColor:
+                widget.backgroundColor ?? Theme.of(context).colorScheme.surface,
             appBar: (widget.title == null &&
                     widget.titleLeading == null &&
                     widget.titleTrailing == null)

diff --git a/lib/app/shared/widget/button/my_elevated_button.dart b/lib/app/shared/widget/button/my_elevated_button.dart
@@ -56,13 +56,14 @@ class MyElevatedButton extends StatelessWidget {
                 text.toUpperCase(),
                 style: Theme.of(context).textTheme.titleLarge!.copyWith(
                       fontWeight: FontWeight.bold,
+                      color: Theme.of(context).colorScheme.onPrimaryContainer,
                     ),
               ),
             )
           : ElevatedButton.icon(
               icon: ColorFiltered(
                 colorFilter: ColorFilter.mode(
-                  textColor ?? Theme.of(context).textTheme.titleLarge!.color!,
+                  textColor ?? Theme.of(context).colorScheme.onPrimaryContainer,
                   BlendMode.srcIn,
                 ),
                 child: icon,
@@ -80,6 +81,7 @@ class MyElevatedButton extends StatelessWidget {
                 text.toUpperCase(),
                 style: Theme.of(context).textTheme.titleLarge!.copyWith(
                       fontWeight: FontWeight.bold,
+                      color: Theme.of(context).colorScheme.onPrimaryContainer,
                     ),
               ),
             ),
@@ -103,7 +105,15 @@ ButtonStyle elevatedStyleFrom({
     backgroundColor: WidgetStateProperty.all(
       onPressed == null
           ? Theme.of(context).colorScheme.outline
-          : backgroundColor ?? Theme.of(context).colorScheme.secondaryContainer,
+          : backgroundColor ?? Theme.of(context).colorScheme.primaryContainer,
+    ),
+    side: WidgetStatePropertyAll(
+      BorderSide(
+        color: onPressed == null
+            ? Theme.of(context).colorScheme.outline
+            : Theme.of(context).colorScheme.primaryContainer,
+        width: 2,
+      ),
     ),
     shape: WidgetStateProperty.all(
       RoundedRectangleBorder(

diff --git a/lib/app/shared/widget/button/my_outlined_button.dart b/lib/app/shared/widget/button/my_outlined_button.dart
@@ -63,10 +63,10 @@ class MyOutlinedButton extends StatelessWidget {
                       color: onPressed == null
                           ? Theme.of(context)
                               .colorScheme
-                              .onSurface
+                              .inverseSurface
                               .withOpacity(0.12)
                           : textColor ??
-                              Theme.of(context).colorScheme.secondaryContainer,
+                              Theme.of(context).colorScheme.inverseSurface,
                     ),
               ),
             )
@@ -118,11 +118,11 @@ ButtonStyle outlinedStyleFrom({
   return OutlinedButton.styleFrom(
     padding: EdgeInsets.symmetric(vertical: verticalSpacing),
     elevation: elevation,
-    backgroundColor: backgroundColor ?? Theme.of(context).colorScheme.surface,
+    backgroundColor: backgroundColor ?? Colors.transparent,
     side: BorderSide(
       color: onPressed == null
-          ? Theme.of(context).colorScheme.onSurface.withOpacity(0.12)
-          : borderColor ?? Theme.of(context).colorScheme.secondaryContainer,
+          ? Theme.of(context).colorScheme.inverseSurface.withOpacity(0.12)
+          : borderColor ?? Theme.of(context).colorScheme.inverseSurface,
       width: 2,
     ),
     shape: RoundedRectangleBorder(

diff --git a/lib/app/shared/widget/custom_app_bar.dart b/lib/app/shared/widget/custom_app_bar.dart
@@ -26,7 +26,12 @@ class CustomAppBar extends PreferredSize {
         color: Theme.of(context).colorScheme.surface,
         child: SafeArea(
           child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 12),
+            padding: const EdgeInsets.fromLTRB(
+              10,
+              0,
+              15,
+              0,
+            ),
             child: Stack(
               alignment: Alignment.topCenter,
               children: [
@@ -50,7 +55,9 @@ class CustomAppBar extends PreferredSize {
                     title ?? '',
                     maxLines: 2,
                     textAlign: TextAlign.center,
-                    style: Theme.of(context).textTheme.headlineSmall,
+                    style: Theme.of(context).textTheme.headlineSmall!.copyWith(
+                          fontWeight: FontWeight.bold,
+                        ),
                   ),
                 ),
               ],

diff --git a/lib/app/shared/widget/custom_listtile_card.dart b/lib/app/shared/widget/custom_listtile_card.dart
@@ -8,15 +8,13 @@ class CustomListTileCard extends StatelessWidget {
     required this.title,
     required this.subTitle,
     required this.imageAssetPath,
-    this.recommended = false,
     this.onTap,
   });
 
   final String title;
   final String subTitle;
   final String imageAssetPath;
   final VoidCallback? onTap;
-  final bool recommended;
 
   @override
   Widget build(BuildContext context) {
@@ -27,8 +25,8 @@ class CustomListTileCard extends StatelessWidget {
           Radius.circular(Sizes.normalRadius),
         ),
       ),
-      contentPadding: const EdgeInsets.all(Sizes.spaceNormal),
-      tileColor: Theme.of(context).colorScheme.secondaryContainer,
+      contentPadding: const EdgeInsets.all(Sizes.spaceSmall),
+      tileColor: Theme.of(context).colorScheme.surfaceContainer,
       title: Row(
         children: [
           Expanded(
@@ -40,14 +38,6 @@ class CustomListTileCard extends StatelessWidget {
             ),
           ),
           const SizedBox(width: 10),
-          if (recommended)
-            const Icon(
-              Icons.thumb_up,
-              // size: 38,
-              color: Colors.white,
-            )
-          else
-            const SizedBox.shrink(),
         ],
       ),
       subtitle: Text(
@@ -59,7 +49,6 @@ class CustomListTileCard extends StatelessWidget {
         imageAssetPath,
         width: Sizes.icon5x,
         height: Sizes.icon5x,
-        fit: BoxFit.fitHeight,
       ),
     );
   }

diff --git a/lib/app/shared/widget/divider_for_radio_list.dart b/lib/app/shared/widget/divider_for_radio_list.dart
@@ -0,0 +1,18 @@
+import 'package:flutter/material.dart';
+
+class DividerForRadioList extends StatelessWidget {
+  const DividerForRadioList({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 8),
+      child: Divider(
+        height: 0,
+        color: Theme.of(context).colorScheme.onSurface.withOpacity(0.12),
+      ),
+    );
+  }
+}