Merge pull request #2731 from TalaoDAO/test_integration

Test integration
TalaoDAO · Jun 20, 2024 · 254cc23 · 254cc23
2 parents 6ec1f14 + 9f044fb
commit 254cc23
Show file tree

Hide file tree

Showing 65 changed files with 2,363 additions and 543 deletions.
diff --git a/lib/app/shared/enum/status/mnemonic_status.dart b/lib/app/shared/enum/status/mnemonic_status.dart
@@ -1,4 +1,5 @@
-import 'dart:ui';
+
+import 'package:flutter/material.dart';
 
 enum MnemonicStatus {
   unselected,
@@ -17,14 +18,14 @@ extension MnemonicStatusX on MnemonicStatus {
     }
   }
 
-  Color get color {
+  Color color(BuildContext context) {
     switch (this) {
       case MnemonicStatus.unselected:
-        return const Color(0xff86809D);
+        return Theme.of(context).colorScheme.secondaryContainer;
       case MnemonicStatus.wrongSelection:
-        return const Color(0xffFF0045);
+        return Theme.of(context).colorScheme.error;
       case MnemonicStatus.selected:
-        return const Color(0xff6600FF);
+        return Theme.of(context).colorScheme.primary;
     }
   }
 }
diff --git a/lib/app/shared/widget/back_leading_button.dart b/lib/app/shared/widget/back_leading_button.dart
@@ -14,7 +14,7 @@ class BackLeadingButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final colorValue = color ?? Theme.of(context).colorScheme.onPrimary;
+    final colorValue = color ?? Theme.of(context).colorScheme.onSurface;
     return IconButton(
       padding: padding,
       onPressed: onPressed ?? () => Navigator.of(context).pop(),

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.surfaceBright,
+        color: color ?? Theme.of(context).colorScheme.secondaryContainer,
         borderRadius: const BorderRadius.all(Radius.circular(15)),
       ),
       child: child,

diff --git a/lib/app/shared/widget/custom_app_bar.dart b/lib/app/shared/widget/custom_app_bar.dart
@@ -50,7 +50,9 @@ class CustomAppBar extends PreferredSize {
                     title ?? '',
                     maxLines: 2,
                     textAlign: TextAlign.center,
-                    style: Theme.of(context).textTheme.headlineMedium,
+                    style: Theme.of(context).textTheme.headlineMedium!.copyWith(
+                          fontWeight: FontWeight.bold,
+                        ),
                   ),
                 ),
               ],

diff --git a/lib/app/shared/widget/wallet_logo.dart b/lib/app/shared/widget/wallet_logo.dart
@@ -43,25 +43,33 @@ class WalletLogo extends StatelessWidget {
     return Column(
       children: [
         Center(
-          child: SizedBox(
-            width: width,
-            height: height,
-            child: profileModel.profileType == ProfileType.enterprise
-                ? CachedImageFromNetwork(
-                    image,
-                    fit: BoxFit.contain,
-                    width: width,
-                    bgColor: Colors.transparent,
-                    height: height,
-                    errorMessage: '',
-                    showLoading: false,
-                  )
-                : Image.asset(
-                    image,
-                    fit: BoxFit.contain,
-                    width: width,
-                    height: height,
-                  ),
+          child: ColorFiltered(
+            colorFilter: ColorFilter.mode(
+              profileModel.profileType == ProfileType.enterprise
+                  ? Colors.transparent
+                  : Theme.of(context).colorScheme.primary,
+              BlendMode.srcIn,
+            ),
+            child: SizedBox(
+              width: width,
+              height: height,
+              child: profileModel.profileType == ProfileType.enterprise
+                  ? CachedImageFromNetwork(
+                      image,
+                      fit: BoxFit.contain,
+                      width: width,
+                      bgColor: Colors.transparent,
+                      height: height,
+                      errorMessage: '',
+                      showLoading: false,
+                    )
+                  : Image.asset(
+                      image,
+                      fit: BoxFit.contain,
+                      width: width,
+                      height: height,
+                    ),
+            ),
           ),
         ),
         // if (showPoweredBy &&