Hugo design

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: 

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,
             ),
           ],
         ),

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,

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';

lib/app/shared/widget/button/my_elevated_button.dart

@@ -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,

lib/app/shared/widget/button/my_outlined_button.dart

@@ -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,
       ),

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,
           ),
         ],
       ),

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,
                   ),
                 ),
               ],

lib/app/shared/widget/custom_listtile_card.dart

@@ -28,13 +28,15 @@ class CustomListTileCard extends StatelessWidget {
         ),
       ),
       contentPadding: const EdgeInsets.all(Sizes.spaceNormal),
-      tileColor: Theme.of(context).colorScheme.surface,
+      tileColor: Theme.of(context).colorScheme.secondaryContainer,
       title: Row(
         children: [
           Expanded(
-            child: MyText(
+            child: Text(
               title,
-              style: Theme.of(context).textTheme.titleMedium,
+              style: Theme.of(context).textTheme.titleMedium!.copyWith(
+                    fontWeight: FontWeight.bold,
+                  ),
             ),
           ),
           const SizedBox(width: 10),
@@ -50,7 +52,7 @@ class CustomListTileCard extends StatelessWidget {
       ),
       subtitle: Text(
         subTitle,
-        style: Theme.of(context).textTheme.labelMedium,
+        style: Theme.of(context).textTheme.bodyMedium,
       ),
       minVerticalPadding: 0,
       trailing: Image.asset(