diff --git a/assets/translations/en.json b/assets/translations/en.json index ae4a329..aa33486 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -195,5 +195,6 @@ "youCannotRevokeThisIdentity": "You cannot revoke this identity while\nit is member of the blacksmiths web", "showUdAmounts": "Show amounts in UD", "ud": "{}UD", - "chooseATargetWallet": "Choose a target wallet" + "chooseATargetWallet": "Choose a target wallet", + "thisMnemonicHasBeenCopiedToClipboard": "This mnemonic has been copied to clipboard" } \ No newline at end of file diff --git a/assets/translations/es.json b/assets/translations/es.json index 13822ba..d165371 100644 --- a/assets/translations/es.json +++ b/assets/translations/es.json @@ -195,5 +195,6 @@ "youCannotRevokeThisIdentity": "No puedes revocar esta identidad mientras\nseas miembro de la red de forjadores", "showUdAmounts": "Mostrar importes en DU", "ud": "{}DU", - "chooseATargetWallet": "Elige un monedero de destino" + "chooseATargetWallet": "Elige un monedero de destino", + "thisMnemonicHasBeenCopiedToClipboard": "This mnemonic has been copied to clipboard" } diff --git a/assets/translations/fr.json b/assets/translations/fr.json index bea44df..b38e45c 100644 --- a/assets/translations/fr.json +++ b/assets/translations/fr.json @@ -196,5 +196,6 @@ "youCannotRevokeThisIdentity": "Vous ne pouvez pas révoquer cette identité tant\nqu'elle fait partie de la toile forgerons", "showUdAmounts": "Afficher les montants en DU", "ud": "{}DU", - "chooseATargetWallet": "Choisissez un portefeuille cible" + "chooseATargetWallet": "Choisissez un portefeuille cible", + "thisMnemonicHasBeenCopiedToClipboard": "Cette phrase secrète viens d'être copié dans votre presse-papier." } diff --git a/lib/providers/wallets_profiles.dart b/lib/providers/wallets_profiles.dart index 67af2c8..9d27ea1 100644 --- a/lib/providers/wallets_profiles.dart +++ b/lib/providers/wallets_profiles.dart @@ -149,3 +149,12 @@ snackCopyKey(context) { duration: const Duration(seconds: 2)); ScaffoldMessenger.of(context).showSnackBar(snackBar); } + +snackCopySeed(context) { + final snackBar = SnackBar( + padding: const EdgeInsets.all(20), + content: Text("thisMnemonicHasBeenCopiedToClipboard".tr(), + style: const TextStyle(fontSize: 17)), + duration: const Duration(seconds: 4)); + ScaffoldMessenger.of(context).showSnackBar(snackBar); +} diff --git a/lib/screens/myWallets/show_seed.dart b/lib/screens/myWallets/show_seed.dart index 68118d0..8424870 100644 --- a/lib/screens/myWallets/show_seed.dart +++ b/lib/screens/myWallets/show_seed.dart @@ -7,6 +7,7 @@ import 'package:gecko/models/wallet_data.dart'; import 'package:gecko/models/widgets_keys.dart'; import 'package:gecko/providers/my_wallets.dart'; import 'package:gecko/providers/substrate_sdk.dart'; +import 'package:gecko/providers/wallets_profiles.dart'; import 'package:gecko/screens/common_elements.dart'; import 'package:pdf/pdf.dart'; import 'package:printing/printing.dart'; @@ -83,7 +84,7 @@ class ShowSeed extends StatelessWidget { onPressed: () { Clipboard.setData( ClipboardData(text: seed.data)); - snackCopyKey(context); + snackCopySeed(context); }, child: Row(children: [ Image.asset( @@ -141,16 +142,6 @@ class ShowSeed extends StatelessWidget { )); } - snackCopyKey(context) { - const snackBar = SnackBar( - padding: EdgeInsets.all(20), - content: Text( - "Votre phrase de restauration a été copié dans votre presse-papier.", - style: TextStyle(fontSize: 16)), - duration: Duration(seconds: 2)); - ScaffoldMessenger.of(context).showSnackBar(snackBar); - } - Widget sentanceArray(BuildContext context, List mnemonic) { return Padding( padding: const EdgeInsets.symmetric(horizontal: 3), diff --git a/lib/screens/onBoarding/5.dart b/lib/screens/onBoarding/5.dart index b29d54c..9cc3a3e 100644 --- a/lib/screens/onBoarding/5.dart +++ b/lib/screens/onBoarding/5.dart @@ -3,10 +3,12 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:gecko/globals.dart'; import 'package:gecko/models/widgets_keys.dart'; import 'package:gecko/providers/generate_wallets.dart'; import 'package:gecko/providers/my_wallets.dart'; +import 'package:gecko/providers/wallets_profiles.dart'; import 'package:gecko/screens/common_elements.dart'; import 'package:gecko/screens/onBoarding/6.dart'; import 'package:printing/printing.dart'; @@ -57,20 +59,57 @@ class _ChooseChestState extends State { SizedBox(height: 35 * ratio), sentanceArray(context), SizedBox(height: 17 * ratio), - GestureDetector( - onTap: () { - Navigator.push( - context, - MaterialPageRoute(builder: (context) { - return PrintWallet( - generateWalletProvider.generatedMnemonic); - }), - ); - }, - child: Image.asset( - 'assets/printer.png', - height: 42 * ratio, - ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + // const SizedBox(height: 10), + GestureDetector( + onTap: () { + Navigator.push( + context, + MaterialPageRoute(builder: (context) { + return PrintWallet( + generateWalletProvider.generatedMnemonic); + }), + ); + }, + child: Image.asset( + 'assets/printer.png', + height: 42 * ratio, + ), + ), + + SizedBox( + height: 40, + width: 120, + child: ElevatedButton( + style: ElevatedButton.styleFrom( + foregroundColor: Colors.black, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8), + ), + backgroundColor: orangeC, + elevation: 1, // foreground + ), + onPressed: () { + Clipboard.setData(ClipboardData( + text: generateWalletProvider.generatedMnemonic)); + snackCopySeed(context); + }, + child: Row(children: [ + Image.asset( + 'assets/walletOptions/copy-white.png', + height: 25, + ), + const SizedBox(width: 7), + Text( + 'copy'.tr(), + style: TextStyle(fontSize: 15, color: Colors.grey[50]), + ) + ]), + ), + ), + ], ), const SizedBox(height: 40), Expanded( diff --git a/pubspec.yaml b/pubspec.yaml index 670d838..4f82e49 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ description: Pay with G1. # pub.dev using `pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 0.0.12+39 +version: 0.0.13+40 environment: sdk: '>=2.12.0 <3.0.0'