From edc56259db27a2b84a25fc3b21a63b93f4ce1b22 Mon Sep 17 00:00:00 2001 From: hawkbee1 Date: Mon, 24 Jun 2024 05:57:47 +0000 Subject: [PATCH] friday version --- assets/terms/mobile_cgu_en.md | 4 ++-- lib/app/shared/widget/base/background_card.dart | 2 +- lib/app/shared/widget/button/my_gradient_button.dart | 3 +-- lib/app/shared/widget/custom_app_bar.dart | 2 +- lib/app/shared/widget/numeric_keyboard.dart | 2 +- .../discover/widgets/discover_dynamic_detail.dart | 4 +++- lib/dashboard/home/home/widgets/qr_icon.dart | 4 ++-- lib/dashboard/src/widgets/bottom_bar_item.dart | 8 ++++---- lib/l10n/arb/app_en.arb | 10 +++++----- lib/pin_code/cubit/pin_code_view_cubit.dart | 2 +- lib/pin_code/widgets/pin_code_title.dart | 6 +++--- lib/pin_code/widgets/pin_code_widget.dart | 2 +- lib/splash/widgets/subtitle_text.dart | 2 +- lib/splash/widgets/title_text.dart | 7 +++++-- lib/theme/app_theme/app_theme.dart | 1 + 15 files changed, 32 insertions(+), 27 deletions(-) diff --git a/assets/terms/mobile_cgu_en.md b/assets/terms/mobile_cgu_en.md index fee726027..336725517 100644 --- 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/lib/app/shared/widget/base/background_card.dart b/lib/app/shared/widget/base/background_card.dart index 0b192a734..38b8405a8 100644 --- 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.primary, borderRadius: const BorderRadius.all(Radius.circular(15)), ), child: child, diff --git a/lib/app/shared/widget/button/my_gradient_button.dart b/lib/app/shared/widget/button/my_gradient_button.dart index 5c16b95aa..1cd3904dc 100644 --- a/lib/app/shared/widget/button/my_gradient_button.dart +++ b/lib/app/shared/widget/button/my_gradient_button.dart @@ -54,10 +54,9 @@ class MyGradientButton extends StatelessWidget { child: DecoratedBox( decoration: BoxDecoration( borderRadius: BorderRadius.circular(borderRadius), - gradient: onPressed == null ? null : gradientValue, color: onPressed == null ? Theme.of(context).colorScheme.onSurface.withOpacity(0.12) - : null, + : Theme.of(context).colorScheme.onPrimaryContainer, ), child: icon == null ? ElevatedButton( diff --git a/lib/app/shared/widget/custom_app_bar.dart b/lib/app/shared/widget/custom_app_bar.dart index 07384fda1..b1fbf9bf5 100644 --- a/lib/app/shared/widget/custom_app_bar.dart +++ b/lib/app/shared/widget/custom_app_bar.dart @@ -50,7 +50,7 @@ class CustomAppBar extends PreferredSize { title ?? '', maxLines: 2, textAlign: TextAlign.center, - style: Theme.of(context).textTheme.headlineMedium!.copyWith( + style: Theme.of(context).textTheme.headlineSmall!.copyWith( fontWeight: FontWeight.bold, ), ), diff --git a/lib/app/shared/widget/numeric_keyboard.dart b/lib/app/shared/widget/numeric_keyboard.dart index 28b9fe396..f5d8260a6 100644 --- a/lib/app/shared/widget/numeric_keyboard.dart +++ b/lib/app/shared/widget/numeric_keyboard.dart @@ -12,7 +12,7 @@ class KeyboardUIConfig { this.spacing = 4, this.digitShape = BoxShape.circle, this.keyboardRowMargin = const EdgeInsets.only(top: 15, left: 4, right: 4), - this.digitInnerMargin = const EdgeInsets.all(24), + this.digitInnerMargin = const EdgeInsets.all(20), this.keyboardSize, this.digitTextStyle, }); diff --git a/lib/dashboard/discover/widgets/discover_dynamic_detail.dart b/lib/dashboard/discover/widgets/discover_dynamic_detail.dart index 8a3bb5ea7..13e6d04ad 100644 --- a/lib/dashboard/discover/widgets/discover_dynamic_detail.dart +++ b/lib/dashboard/discover/widgets/discover_dynamic_detail.dart @@ -22,7 +22,9 @@ class DiscoverDynamicDetial extends StatelessWidget { Widget build(BuildContext context) { final textTheme = Theme.of(context).textTheme; - final titleTheme = textTheme.titleLarge!; + final titleTheme = textTheme.bodyMedium!.copyWith( + fontWeight: FontWeight.bold, + ); final valueTheme = textTheme.bodyMedium!; return Padding( diff --git a/lib/dashboard/home/home/widgets/qr_icon.dart b/lib/dashboard/home/home/widgets/qr_icon.dart index ff1c7589f..a9ddc1adb 100644 --- a/lib/dashboard/home/home/widgets/qr_icon.dart +++ b/lib/dashboard/home/home/widgets/qr_icon.dart @@ -67,7 +67,7 @@ class QRIcon extends StatelessWidget { height: 60, width: 60, decoration: BoxDecoration( - color: Theme.of(context).colorScheme.primary, + color: Theme.of(context).colorScheme.primaryFixedDim, borderRadius: BorderRadius.circular(50), ), ), @@ -76,7 +76,7 @@ class QRIcon extends StatelessWidget { width: 40, child: ImageIcon( const AssetImage(IconStrings.scan), - color: Theme.of(context).colorScheme.onPrimary, + color: Theme.of(context).colorScheme.onPrimaryFixedVariant, ), ), ], diff --git a/lib/dashboard/src/widgets/bottom_bar_item.dart b/lib/dashboard/src/widgets/bottom_bar_item.dart index 3c82738fa..2c451adb9 100644 --- a/lib/dashboard/src/widgets/bottom_bar_item.dart +++ b/lib/dashboard/src/widgets/bottom_bar_item.dart @@ -39,8 +39,8 @@ class BottomBarItem extends StatelessWidget { child: ImageIcon( AssetImage(icon), color: isSelected - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.onPrimaryContainer, + ? Theme.of(context).colorScheme.onPrimary + : Theme.of(context).colorScheme.primaryContainer, size: 20, ), ), @@ -53,8 +53,8 @@ class BottomBarItem extends StatelessWidget { fontWeight: isSelected ? FontWeight.bold : FontWeight.normal, color: isSelected - ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.onPrimaryContainer, + ? Theme.of(context).colorScheme.onPrimary + : Theme.of(context).colorScheme.primaryContainer, ), ), ], diff --git a/lib/l10n/arb/app_en.arb b/lib/l10n/arb/app_en.arb index b1ae1f5ac..c329ee331 100644 --- a/lib/l10n/arb/app_en.arb +++ b/lib/l10n/arb/app_en.arb @@ -299,16 +299,16 @@ "save": "Save", "delete": "Delete", "enterNewPinCode": "Create a PIN Code\nto protect your wallet", - "confirmYourPinCode": "Confirm your pin code", + "confirmYourPinCode": "Confirm your PIN Code", "walletAltme": "Wallet Altme", "createTitle": "Create or import a wallet", "createSubtitle": "Would you like to create a new wallet or import an existing one?", - "enterYourPinCode": "Enter your pin code", + "enterYourPinCode": "Enter your PIN Code", "changePinCode": "Change PIN Code", "tryAgain": "Try again", "credentialSelectionListEmptyError": "You do not have the requested credential to pursue.", "trustedIssuer": "This issuer is approved by EBSI.", - "yourPinCodeChangedSuccessfully": "Your pin code changed successfully", + "yourPinCodeChangedSuccessfully": "Your PIN Code changed successfully", "advantagesCards": "Advantages cards", "advantagesDiscoverCards": "Unlock exclusive rewards", "identityCards": "Identity cards", @@ -329,7 +329,7 @@ "drawerTalaoCommunityCardTextBoxMessage": "Once you have entered your private key, tap Import.\nPlease, make sure to enter the ethereum private key which contains your Talao Token.", "drawerTalaoCommunityCardSubtitle2": "Our Wallet is self-custodial. We never have access to your private keys or funds.", "drawerTalaoCommunityCardKeyError": "Please enter a valid private key", - "loginWithBiometricsMessage": "Quickly unlock your wallet without having to enter password or pin cod", + "loginWithBiometricsMessage": "Quickly unlock your wallet without having to enter password or PIN Code", "manage": "Manage", "wallet": "Wallet", "manageAccounts": "Manage blockchain accounts", @@ -934,7 +934,7 @@ "lowSecurity": "Low Security", "highSecurity": "High Security", "theRequestIsRejected": "The request is rejected.", - "userPinIsIncorrect": "User pin is incorrect", + "userPinIsIncorrect": "User PIN is incorrect", "security_level": "Security Level", "oidc4vc_settings": "OIDC4VC Settings", "userPinTitle": "User PIN Digits pre-authorized_code Flow", diff --git a/lib/pin_code/cubit/pin_code_view_cubit.dart b/lib/pin_code/cubit/pin_code_view_cubit.dart index db1d3cc9c..d94b93c78 100644 --- a/lib/pin_code/cubit/pin_code_view_cubit.dart +++ b/lib/pin_code/cubit/pin_code_view_cubit.dart @@ -173,7 +173,7 @@ class PinCodeViewCubit extends Cubit { if (digit.length == passwordDigits) { bool isValidDesc = false; bool isValidAsc = false; - // test if pin code is a serie asc or desc + // test if PIN code is a serie asc or desc for (int i = 1; i < digit.length; i++) { if (i > 0) { if (int.parse(digit[i]) != (int.parse(digit[i - 1]) + 1)) { diff --git a/lib/pin_code/widgets/pin_code_title.dart b/lib/pin_code/widgets/pin_code_title.dart index 4865686de..f54087a4c 100644 --- a/lib/pin_code/widgets/pin_code_title.dart +++ b/lib/pin_code/widgets/pin_code_title.dart @@ -20,7 +20,7 @@ class PinCodeTitle extends StatelessWidget { title, textAlign: TextAlign.center, style: allowAction - ? Theme.of(context).textTheme.titleLarge + ? Theme.of(context).textTheme.headlineSmall : Theme.of(context) .textTheme .titleLarge! @@ -31,10 +31,10 @@ class PinCodeTitle extends StatelessWidget { Text( subTitle!, style: allowAction - ? Theme.of(context).textTheme.bodyMedium + ? Theme.of(context).textTheme.bodyLarge : Theme.of(context) .textTheme - .bodyMedium! + .bodyLarge! .copyWith(color: Theme.of(context).colorScheme.error), textAlign: TextAlign.center, ), diff --git a/lib/pin_code/widgets/pin_code_widget.dart b/lib/pin_code/widgets/pin_code_widget.dart index e338e265d..c64864fa8 100644 --- a/lib/pin_code/widgets/pin_code_widget.dart +++ b/lib/pin_code/widgets/pin_code_widget.dart @@ -34,7 +34,7 @@ class PinCodeWidget extends StatefulWidget { final String? subTitle; final int passwordDigits; final bool isNewCode; - // When a specific pin is requested to get a credential + // When a specific PIN is requested to get a credential final bool isUserPin; // Cancel button and delete button will be switched based on the screen state diff --git a/lib/splash/widgets/subtitle_text.dart b/lib/splash/widgets/subtitle_text.dart index e17b4d3e4..6d2df07cc 100644 --- a/lib/splash/widgets/subtitle_text.dart +++ b/lib/splash/widgets/subtitle_text.dart @@ -23,7 +23,7 @@ class SubTitle extends StatelessWidget { child: Text( isEnterprise ? tag : l10n.splashSubtitle, textAlign: TextAlign.center, - style: Theme.of(context).textTheme.titleLarge, + style: Theme.of(context).textTheme.headlineSmall, ), ); } diff --git a/lib/splash/widgets/title_text.dart b/lib/splash/widgets/title_text.dart index 22ef88bc3..aba56c16c 100644 --- a/lib/splash/widgets/title_text.dart +++ b/lib/splash/widgets/title_text.dart @@ -22,11 +22,14 @@ class TitleText extends StatelessWidget { profileModel.profileSetting.generalOptions.splashScreenTitle ?? '${l10n.professional} ${l10n.wallet}'; - return MyText( + return Text( isEnterprise ? splashScreenTitle : '${Parameters.appName} ${l10n.wallet}', maxLines: 1, textAlign: TextAlign.center, - style: Theme.of(context).textTheme.headlineLarge, + style: Theme.of(context) + .textTheme + .headlineLarge! + .copyWith(fontWeight: FontWeight.bold), ); } } diff --git a/lib/theme/app_theme/app_theme.dart b/lib/theme/app_theme/app_theme.dart index f82fbdf42..aa19a697a 100644 --- a/lib/theme/app_theme/app_theme.dart +++ b/lib/theme/app_theme/app_theme.dart @@ -72,6 +72,7 @@ class AppTheme { colorScheme: ColorScheme.fromSeed( seedColor: seedColor, brightness: brightness, + dynamicSchemeVariant: DynamicSchemeVariant.fidelity, ), ); }