Merge pull request #2739 from TalaoDAO/test_integration

Test integration
TalaoDAO · Jun 25, 2024 · 48cd46a · 48cd46a
2 parents 0164ce9 + 09e00af
commit 48cd46a
Show file tree

Hide file tree

Showing 123 changed files with 757 additions and 912 deletions.
diff --git a/assets/terms/mobile_cgu_en.md b/assets/terms/mobile_cgu_en.md
@@ -79,7 +79,7 @@ When creating a wallet, we strongly recommend taking precautionary measures to p
 
 
 
-* Creating a strong and unique PIN Code, distinct from pin code used for other purposes (e.g., different from your phone PIN Code or pin code used on websites or online services), and utilizing biometric authentication if available.
+* Creating a strong and unique PIN Code, distinct from PIN Code used for other purposes (e.g., different from your phone PIN Code or PIN Code used on websites or online services), and utilizing biometric authentication if available.
 * Avoiding the storage of private keys and the Recovery Phrase in plain text online or in insecure physical locations.
 * Restricting access to your devices and wallet.
 * Taking necessary precautions against malware on your devices and networks.
@@ -259,7 +259,7 @@ User Obligations:
 
 
 * Users commit to refraining from engaging in illegal or harmful use of the service and promptly reporting errors.
-* Users are also required to select a pin code in line with policy guidelines.
+* Users are also required to select a PIN Code in line with policy guidelines.
 * Users must securely store their electronic identification means and refrain from sharing them with third parties.
 
 Prohibited actions: 

diff --git a/google_fonts/Poppins-Black.ttf b/google_fonts/Poppins-Black.ttf
diff --git a/google_fonts/Poppins-BlackItalic.ttf b/google_fonts/Poppins-BlackItalic.ttf
diff --git a/google_fonts/Poppins-Bold.ttf b/google_fonts/Poppins-Bold.ttf
diff --git a/google_fonts/Poppins-BoldItalic.ttf b/google_fonts/Poppins-BoldItalic.ttf
diff --git a/google_fonts/Poppins-ExtraBold.ttf b/google_fonts/Poppins-ExtraBold.ttf
diff --git a/google_fonts/Poppins-ExtraBoldItalic.ttf b/google_fonts/Poppins-ExtraBoldItalic.ttf
diff --git a/google_fonts/Poppins-ExtraLight.ttf b/google_fonts/Poppins-ExtraLight.ttf
diff --git a/google_fonts/Poppins-ExtraLightItalic.ttf b/google_fonts/Poppins-ExtraLightItalic.ttf
diff --git a/google_fonts/Poppins-Italic.ttf b/google_fonts/Poppins-Italic.ttf
diff --git a/google_fonts/Poppins-Light.ttf b/google_fonts/Poppins-Light.ttf
diff --git a/google_fonts/Poppins-LightItalic.ttf b/google_fonts/Poppins-LightItalic.ttf
diff --git a/google_fonts/Poppins-Medium.ttf b/google_fonts/Poppins-Medium.ttf
diff --git a/google_fonts/Poppins-MediumItalic.ttf b/google_fonts/Poppins-MediumItalic.ttf
diff --git a/google_fonts/Poppins-Regular.ttf b/google_fonts/Poppins-Regular.ttf
diff --git a/google_fonts/Poppins-SemiBold.ttf b/google_fonts/Poppins-SemiBold.ttf
diff --git a/google_fonts/Poppins-SemiBoldItalic.ttf b/google_fonts/Poppins-SemiBoldItalic.ttf
diff --git a/google_fonts/Poppins-Thin.ttf b/google_fonts/Poppins-Thin.ttf
diff --git a/google_fonts/Poppins-ThinItalic.ttf b/google_fonts/Poppins-ThinItalic.ttf
diff --git a/lib/app/shared/constants/parameters.dart b/lib/app/shared/constants/parameters.dart
@@ -1,5 +1,6 @@
 import 'package:altme/app/shared/enum/enum.dart';
 import 'package:altme/dashboard/dashboard.dart';
+import 'package:flutter/material.dart';
 
 class Parameters {
   static const int multipleCredentialsProcessDelay = 1;
@@ -95,4 +96,10 @@ class Parameters {
   static const DidKeyType didKeyTypeForDefault = DidKeyType.edDSA;
   static const DidKeyType didKeyTypeForDutch = DidKeyType.jwkP256;
   static const DidKeyType didKeyTypeForOwfBaselineProfile = DidKeyType.jwkP256;
+
+  // seed color for the app Theme
+  // Altme
+  static const Color seedColor = Color(0xff6600FF);
+  // Talao
+  // static const Color seedColor = Color(0xff1EAADC);
 }
diff --git a/lib/app/shared/widget/add_account/add_account_button.dart b/lib/app/shared/widget/add_account/add_account_button.dart
@@ -31,14 +31,14 @@ class AddAccountButton extends StatelessWidget {
                 ),
                 Text(
                   l10n.cryptoAddAccount,
-                  style: Theme.of(context).textTheme.headlineSmall,
+                  style: Theme.of(context).textTheme.titleMedium,
                 ),
               ],
             ),
             const SizedBox(height: 3),
             Text(
               l10n.createOrImportNewAccount,
-              style: Theme.of(context).textTheme.titleSmall,
+              style: Theme.of(context).textTheme.bodyMedium,
             ),
           ],
         ),

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

diff --git a/lib/app/shared/widget/button/button.dart b/lib/app/shared/widget/button/button.dart
@@ -1,3 +1,2 @@
 export 'my_elevated_button.dart';
-export 'my_gradient_button.dart';
 export 'my_outlined_button.dart';
diff --git a/lib/app/shared/widget/button/my_elevated_button.dart b/lib/app/shared/widget/button/my_elevated_button.dart
@@ -22,7 +22,7 @@ class MyElevatedButton extends StatelessWidget {
     required this.icon,
     this.backgroundColor,
     this.textColor,
-    this.borderRadius = 40,
+    this.borderRadius = 8,
     this.verticalSpacing = 15,
     this.elevation = 2,
     this.fontSize = 18,
@@ -53,14 +53,21 @@ class MyElevatedButton extends StatelessWidget {
                 onPressed: onPressed,
               ),
               onPressed: onPressed,
-              child: ElevatedButtonText(
-                text: text,
-                fontSize: fontSize,
-                textColor: textColor,
+              child: Text(
+                text.toUpperCase(),
+                style: Theme.of(context).textTheme.titleLarge!.copyWith(
+                      fontWeight: FontWeight.bold,
+                    ),
               ),
             )
           : ElevatedButton.icon(
-              icon: icon,
+              icon: ColorFiltered(
+                colorFilter: ColorFilter.mode(
+                  textColor ?? Theme.of(context).textTheme.titleLarge!.color!,
+                  BlendMode.srcIn,
+                ),
+                child: icon,
+              ),
               style: elevatedStyleFrom(
                 borderRadius: borderRadius,
                 context: context,
@@ -70,10 +77,11 @@ class MyElevatedButton extends StatelessWidget {
                 onPressed: onPressed,
               ),
               onPressed: onPressed,
-              label: ElevatedButtonText(
-                text: text,
-                fontSize: fontSize,
-                textColor: textColor,
+              label: Text(
+                text.toUpperCase(),
+                style: Theme.of(context).textTheme.titleLarge!.copyWith(
+                      fontWeight: FontWeight.bold,
+                    ),
               ),
             ),
     );
@@ -95,8 +103,8 @@ ButtonStyle elevatedStyleFrom({
     ),
     backgroundColor: WidgetStateProperty.all(
       onPressed == null
-          ? Theme.of(context).colorScheme.onSurface.withOpacity(0.12)
-          : backgroundColor ?? Theme.of(context).colorScheme.primary,
+          ? Theme.of(context).colorScheme.outline
+          : backgroundColor ?? Theme.of(context).colorScheme.secondaryContainer,
     ),
     shape: WidgetStateProperty.all(
       RoundedRectangleBorder(
@@ -106,6 +114,7 @@ ButtonStyle elevatedStyleFrom({
   );
 }
 
+// @TODO: remove if buttons OK
 class ElevatedButtonText extends StatelessWidget {
   const ElevatedButtonText({
     super.key,

diff --git a/lib/app/shared/widget/button/my_gradient_button.dart b/lib/app/shared/widget/button/my_gradient_button.dart
diff --git a/lib/app/shared/widget/button/my_outlined_button.dart b/lib/app/shared/widget/button/my_outlined_button.dart
@@ -23,7 +23,7 @@ class MyOutlinedButton extends StatelessWidget {
     this.backgroundColor,
     this.textColor,
     this.borderColor,
-    this.borderRadius = 50,
+    this.borderRadius = 8,
     this.verticalSpacing = 15,
     this.elevation = 2,
     this.fontSize = 18,
@@ -56,15 +56,28 @@ class MyOutlinedButton extends StatelessWidget {
                 onPressed: onPressed,
               ),
               onPressed: onPressed,
-              child: OutlinedButtonText(
-                text: text,
-                fontSize: fontSize,
-                textColor: textColor,
-                onPressed: onPressed,
+              child: Text(
+                text.toUpperCase(),
+                style: Theme.of(context).textTheme.titleLarge!.copyWith(
+                      fontWeight: FontWeight.bold,
+                      color: onPressed == null
+                          ? Theme.of(context)
+                              .colorScheme
+                              .onSurface
+                              .withOpacity(0.12)
+                          : textColor ??
+                              Theme.of(context).colorScheme.secondaryContainer,
+                    ),
               ),
             )
           : OutlinedButton.icon(
-              icon: icon,
+              icon: ColorFiltered(
+                colorFilter: ColorFilter.mode(
+                  textColor ?? Theme.of(context).colorScheme.secondaryContainer,
+                  BlendMode.srcIn,
+                ),
+                child: icon,
+              ),
               style: outlinedStyleFrom(
                 borderRadius: borderRadius,
                 context: context,
@@ -75,11 +88,18 @@ class MyOutlinedButton extends StatelessWidget {
                 onPressed: onPressed,
               ),
               onPressed: onPressed,
-              label: OutlinedButtonText(
-                text: text,
-                fontSize: fontSize,
-                textColor: textColor,
-                onPressed: onPressed,
+              label: Text(
+                text.toUpperCase(),
+                style: Theme.of(context).textTheme.titleLarge!.copyWith(
+                      fontWeight: FontWeight.bold,
+                      color: onPressed == null
+                          ? Theme.of(context)
+                              .colorScheme
+                              .onSurface
+                              .withOpacity(0.12)
+                          : textColor ??
+                              Theme.of(context).colorScheme.secondaryContainer,
+                    ),
               ),
             ),
     );
@@ -102,7 +122,7 @@ ButtonStyle outlinedStyleFrom({
     side: BorderSide(
       color: onPressed == null
           ? Theme.of(context).colorScheme.onSurface.withOpacity(0.12)
-          : borderColor ?? Theme.of(context).colorScheme.primary,
+          : borderColor ?? Theme.of(context).colorScheme.secondaryContainer,
       width: 2,
     ),
     shape: RoundedRectangleBorder(
@@ -132,7 +152,7 @@ class OutlinedButtonText extends StatelessWidget {
       style: TextStyle(
         color: onPressed == null
             ? Theme.of(context).colorScheme.onSurface.withOpacity(0.12)
-            : textColor ?? Theme.of(context).colorScheme.primary,
+            : textColor ?? Theme.of(context).colorScheme.secondaryContainer,
         fontSize: fontSize,
         fontWeight: FontWeight.w700,
       ),

diff --git a/lib/app/shared/widget/checkbox_item.dart b/lib/app/shared/widget/checkbox_item.dart
@@ -36,7 +36,7 @@ class CheckboxItem extends StatelessWidget {
           ),
           Text(
             text,
-            style: textStyle ?? Theme.of(context).textTheme.labelLarge,
+            style: textStyle ?? Theme.of(context).textTheme.bodyLarge,
           ),
         ],
       ),

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