Skip to content

Commit

Permalink
friday version
Browse files Browse the repository at this point in the history
  • Loading branch information
hawkbee1 committed Jun 24, 2024
1 parent b81e1cd commit edc5625
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 27 deletions.
4 changes: 2 additions & 2 deletions assets/terms/mobile_cgu_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion lib/app/shared/widget/base/background_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions lib/app/shared/widget/button/my_gradient_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion lib/app/shared/widget/custom_app_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/app/shared/widget/numeric_keyboard.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
4 changes: 3 additions & 1 deletion lib/dashboard/discover/widgets/discover_dynamic_detail.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions lib/dashboard/home/home/widgets/qr_icon.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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),
),
),
Expand All @@ -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,
),
),
],
Expand Down
8 changes: 4 additions & 4 deletions lib/dashboard/src/widgets/bottom_bar_item.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
),
Expand All @@ -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,
),
),
],
Expand Down
10 changes: 5 additions & 5 deletions lib/l10n/arb/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion lib/pin_code/cubit/pin_code_view_cubit.dart
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ class PinCodeViewCubit extends Cubit<PinCodeViewState> {
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)) {
Expand Down
6 changes: 3 additions & 3 deletions lib/pin_code/widgets/pin_code_title.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand All @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion lib/pin_code/widgets/pin_code_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/splash/widgets/subtitle_text.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
);
}
Expand Down
7 changes: 5 additions & 2 deletions lib/splash/widgets/title_text.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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),
);
}
}
1 change: 1 addition & 0 deletions lib/theme/app_theme/app_theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ class AppTheme {
colorScheme: ColorScheme.fromSeed(
seedColor: seedColor,
brightness: brightness,
dynamicSchemeVariant: DynamicSchemeVariant.fidelity,
),
);
}
Expand Down

0 comments on commit edc5625

Please sign in to comment.