From ef9e7b30f192ce8d965c9e9cc2192a63ef208847 Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Sun, 7 Jan 2024 17:11:45 +0100
Subject: [PATCH] enh: adapat text sizes
---
assets/translations/en.json | 3 ++-
assets/translations/es.json | 3 ++-
assets/translations/fr.json | 3 ++-
lib/providers/wallet_options.dart | 4 ++--
lib/screens/myWallets/restore_chest.dart | 2 +-
lib/screens/myWallets/wallet_options.dart | 2 +-
lib/screens/myWallets/wallets_home.dart | 2 +-
lib/screens/onBoarding/10.dart | 2 +-
lib/screens/transaction_in_progress.dart | 2 +-
lib/widgets/buttons/chest_options_buttons.dart | 2 +-
lib/widgets/commons/common_elements.dart | 4 ++--
lib/widgets/history_view.dart | 14 +++++++-------
lib/widgets/payment_popup.dart | 2 +-
lib/widgets/transaction_in_progress_tile.dart | 2 +-
14 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/assets/translations/en.json b/assets/translations/en.json
index eba7a5b9..3ee0948b 100644
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -234,5 +234,6 @@
"addressNotBelongToMnemonic": "The address you provided does not belong to this recovery sentence",
"enterYourNewMnemonic": "Enter your new recovery sentence",
"enterYourNewAddress": "Enter your new address {}",
- "youCanMigrateThisIdentity": "You can migrate this identity !"
+ "youCanMigrateThisIdentity": "You can migrate this identity !",
+ "identityMigrated": "Identity migrated"
}
\ No newline at end of file
diff --git a/assets/translations/es.json b/assets/translations/es.json
index bb7fadd3..e1ca23e3 100644
--- a/assets/translations/es.json
+++ b/assets/translations/es.json
@@ -235,5 +235,6 @@
"addressNotBelongToMnemonic": "The address you provided does not belong to this recovery sentence",
"enterYourNewMnemonic": "Enter your new recovery sentence",
"enterYourNewAddress": "Enter your new address {}",
- "youCanMigrateThisIdentity": "You can migrate this identity !"
+ "youCanMigrateThisIdentity": "You can migrate this identity !",
+ "identityMigrated": "Identity migrated"
}
\ No newline at end of file
diff --git a/assets/translations/fr.json b/assets/translations/fr.json
index 018b1163..ffa277e4 100644
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@@ -234,5 +234,6 @@
"addressNotBelongToMnemonic": "L'adresse que vous avez fournit n'appartient pas à cette phrase de restauration",
"enterYourNewMnemonic": "Entrez votre nouvelle phrase de restauration",
"enterYourNewAddress": "Entrez votre nouvelle adresse {}",
- "youCanMigrateThisIdentity": "Vous pouvez migrer vers cette identité !"
+ "youCanMigrateThisIdentity": "Vous pouvez migrer vers cette identité !",
+ "identityMigrated": "Identité migré"
}
\ No newline at end of file
diff --git a/lib/providers/wallet_options.dart b/lib/providers/wallet_options.dart
index 14f1dd42..de848867 100644
--- a/lib/providers/wallet_options.dart
+++ b/lib/providers/wallet_options.dart
@@ -169,7 +169,7 @@ class WalletOptionsProvider with ChangeNotifier {
title: Text(
'confirmYourIdentity'.tr(),
textAlign: TextAlign.center,
- style: const TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
+ style: const TextStyle(fontSize: 17, fontWeight: FontWeight.w500),
),
content: SizedBox(
height: 100,
@@ -194,7 +194,7 @@ class WalletOptionsProvider with ChangeNotifier {
textAlign: TextAlign.center,
autofocus: true,
controller: idtyName,
- style: const TextStyle(fontSize: 19),
+ style: const TextStyle(fontSize: 17),
),
const SizedBox(height: 10),
Consumer<WalletOptionsProvider>(builder: (context, wOptions, _) {
diff --git a/lib/screens/myWallets/restore_chest.dart b/lib/screens/myWallets/restore_chest.dart
index 83974f21..3f5740f1 100644
--- a/lib/screens/myWallets/restore_chest.dart
+++ b/lib/screens/myWallets/restore_chest.dart
@@ -108,7 +108,7 @@ class RestoreChest extends StatelessWidget {
child: Text(
'restoreThisChest'.tr(),
style: scaledTextStyle(
- fontSize: 20,
+ fontSize: 19,
fontWeight: FontWeight.w600,
color: Colors.white),
),
diff --git a/lib/screens/myWallets/wallet_options.dart b/lib/screens/myWallets/wallet_options.dart
index 48435582..4308caa9 100644
--- a/lib/screens/myWallets/wallet_options.dart
+++ b/lib/screens/myWallets/wallet_options.dart
@@ -86,7 +86,7 @@ class WalletOptions extends StatelessWidget {
? duniterIndexer
.walletNameIndexer[walletOptions.address.text]!
: wallet.name!,
- style: scaledTextStyle(fontSize: 20),
+ style: scaledTextStyle(fontSize: 18),
);
}),
actions: [
diff --git a/lib/screens/myWallets/wallets_home.dart b/lib/screens/myWallets/wallets_home.dart
index e5b8d69c..09e59c5e 100644
--- a/lib/screens/myWallets/wallets_home.dart
+++ b/lib/screens/myWallets/wallets_home.dart
@@ -160,7 +160,7 @@ class _WalletsHomeState extends State<WalletsHome> {
'explainDraggableWallet'.tr(),
textAlign: TextAlign.center,
style: scaledTextStyle(
- fontSize: 20, fontWeight: FontWeight.w500),
+ fontSize: 17, fontWeight: FontWeight.w500),
),
],
))
diff --git a/lib/screens/onBoarding/10.dart b/lib/screens/onBoarding/10.dart
index 75724c70..18925b15 100644
--- a/lib/screens/onBoarding/10.dart
+++ b/lib/screens/onBoarding/10.dart
@@ -83,7 +83,7 @@ class OnboardingStepTen extends StatelessWidget {
Text(
"youHaveToBeConnectedToValidateChest".tr(),
style: scaledTextStyle(
- fontSize: 20,
+ fontSize: 17,
color: Colors.redAccent,
fontWeight: FontWeight.w500,
),
diff --git a/lib/screens/transaction_in_progress.dart b/lib/screens/transaction_in_progress.dart
index f5d557fa..4a4ce88c 100644
--- a/lib/screens/transaction_in_progress.dart
+++ b/lib/screens/transaction_in_progress.dart
@@ -194,7 +194,7 @@ class _TransactionInProgressState extends State<TransactionInProgress> {
child: Text(
'close'.tr(),
style: scaledTextStyle(
- fontSize: 20, fontWeight: FontWeight.w600),
+ fontSize: 19, fontWeight: FontWeight.w600),
),
),
),
diff --git a/lib/widgets/buttons/chest_options_buttons.dart b/lib/widgets/buttons/chest_options_buttons.dart
index 4c31bdde..7c9a8c13 100644
--- a/lib/widgets/buttons/chest_options_buttons.dart
+++ b/lib/widgets/buttons/chest_options_buttons.dart
@@ -79,7 +79,7 @@ class ChestOptionsButtons extends StatelessWidget {
],
),
),
- ScaledSizedBox(height: 20),
+ // ScaledSizedBox(height: 20),
// InkWell(
// key: keyChangeChest,
// onTap: () {
diff --git a/lib/widgets/commons/common_elements.dart b/lib/widgets/commons/common_elements.dart
index 53164a8a..e25d8071 100644
--- a/lib/widgets/commons/common_elements.dart
+++ b/lib/widgets/commons/common_elements.dart
@@ -112,7 +112,7 @@ Future<bool?> confirmPopupCertification(BuildContext context, String question1,
child: Text(
"yes".tr(),
style: scaledTextStyle(
- fontSize: 20,
+ fontSize: 19,
color: const Color(0xffD80000),
),
),
@@ -124,7 +124,7 @@ Future<bool?> confirmPopupCertification(BuildContext context, String question1,
TextButton(
child: Text(
"no".tr(),
- style: scaledTextStyle(fontSize: 20),
+ style: scaledTextStyle(fontSize: 19),
),
onPressed: () {
Navigator.pop(context, false);
diff --git a/lib/widgets/history_view.dart b/lib/widgets/history_view.dart
index 8a3ae3d9..df966fbe 100644
--- a/lib/widgets/history_view.dart
+++ b/lib/widgets/history_view.dart
@@ -34,7 +34,7 @@ class HistoryView extends StatelessWidget {
ScaledSizedBox(height: 50),
Text(
"noTransactionToDisplay".tr(),
- style: scaledTextStyle(fontSize: 18),
+ style: scaledTextStyle(fontSize: 17),
)
])
: Column(children: <Widget>[
@@ -59,17 +59,17 @@ class HistoryView extends StatelessWidget {
children: [
Image(
image: const AssetImage('assets/party.png'),
- height: scaleSize(32)),
+ height: scaleSize(31)),
Text(
'blockchainStart'.tr(),
style: scaledTextStyle(
- fontSize: 20,
+ fontSize: 19,
color: Colors.blueAccent,
fontWeight: FontWeight.w500),
),
Image(
image: const AssetImage('assets/party.png'),
- height: scaleSize(32)),
+ height: scaleSize(31)),
],
),
),
@@ -82,7 +82,7 @@ class HistoryView extends StatelessWidget {
child: Text(
answer['dateDelimiter'],
style: scaledTextStyle(
- fontSize: 20,
+ fontSize: 19,
color: orangeC,
fontWeight: FontWeight.w300),
),
@@ -128,9 +128,9 @@ class HistoryView extends StatelessWidget {
),
Column(children: [
Text(
- 'Identité migré:'.tr(),
+ 'identityMigrated:'.tr(),
style: scaledTextStyle(
- fontSize: 20,
+ fontSize: 19,
color: Colors.green[700],
fontWeight: FontWeight.w500),
),
diff --git a/lib/widgets/payment_popup.dart b/lib/widgets/payment_popup.dart
index 5b0e43d3..268d8a91 100644
--- a/lib/widgets/payment_popup.dart
+++ b/lib/widgets/payment_popup.dart
@@ -136,7 +136,7 @@ void paymentPopup(BuildContext context, String toAddress, String? username) {
Text(
'executeATransfer'.tr(),
style: scaledTextStyle(
- fontSize: 20, fontWeight: FontWeight.w700),
+ fontSize: 19, fontWeight: FontWeight.w700),
),
IconButton(
key: keyPopButton,
diff --git a/lib/widgets/transaction_in_progress_tile.dart b/lib/widgets/transaction_in_progress_tile.dart
index 6e467df8..461f823b 100644
--- a/lib/widgets/transaction_in_progress_tile.dart
+++ b/lib/widgets/transaction_in_progress_tile.dart
@@ -108,7 +108,7 @@ class _TransactionInProgressTuleState extends State<TransactionInProgressTule> {
Text(
'Transaction en cours',
style: scaledTextStyle(
- fontSize: 20,
+ fontSize: 19,
color: Colors.blueAccent,
fontWeight: FontWeight.w400),
),
--
GitLab