diff --git a/android/app/src/main/ic_launcher-playstore.png b/android/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..bb34e78 Binary files /dev/null and b/android/app/src/main/ic_launcher-playstore.png differ diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index f5b3c15..4297642 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -492,4 +492,4 @@ /* End XCConfigurationList section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; -} +} \ No newline at end of file diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index d08d914..a65cade 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index 6cb6241..c081abb 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index 3e54e80..bdb5fed 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index a544812..9708740 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index db4c932..3b4e54e 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index 4005a0d..0506604 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 852aa31..7168d21 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index 3e54e80..bdb5fed 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index b6fb505..475acee 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index aad11e2..9ed9156 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index aad11e2..9ed9156 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index afc4220..3f1ee21 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index 3c6974e..f32e892 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index 7740bbd..f6dd010 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index 2b683d0..97d30a6 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/lib/screens/myWallets/confirm_wallet_storage.dart b/lib/screens/myWallets/confirm_wallet_storage.dart index cfd292b..801ab1c 100644 --- a/lib/screens/myWallets/confirm_wallet_storage.dart +++ b/lib/screens/myWallets/confirm_wallet_storage.dart @@ -55,7 +55,7 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier { }), title: const SizedBox( height: 22, - child: Text('Enregistrer ce trousseau'), + child: Text('Enregistrer ce coffre'), )), body: Center( child: Column(children: [ diff --git a/lib/screens/myWallets/generate_wallets.dart b/lib/screens/myWallets/generate_wallets.dart index bdea975..c7abdad 100644 --- a/lib/screens/myWallets/generate_wallets.dart +++ b/lib/screens/myWallets/generate_wallets.dart @@ -48,7 +48,7 @@ class GenerateFastChestScreen extends StatelessWidget { }), title: const SizedBox( height: 22, - child: Text('Générer un trousseau'), + child: Text('Générer un coffre'), )), floatingActionButton: SizedBox( height: 80.0, @@ -144,7 +144,7 @@ class GenerateFastChestScreen extends StatelessWidget { ); } : null, - child: const Text('Enregistrer ce trousseau', + child: const Text('Enregistrer ce coffre', style: TextStyle(fontSize: 20))), const SizedBox(height: 20), GestureDetector( @@ -219,7 +219,7 @@ class PrintWallet extends StatelessWidget { Navigator.pop(context); }), toolbarHeight: 60 * ratio, - title: const Text('Imprimer ce trousseau')), + title: const Text('Imprimer ce coffre')), body: PdfPreview( build: (format) => _generateWalletProvider.printWallet(sentence), ), diff --git a/lib/screens/onBoarding/1.dart b/lib/screens/onBoarding/1.dart index 9bd7cc5..e0e7c72 100644 --- a/lib/screens/onBoarding/1.dart +++ b/lib/screens/onBoarding/1.dart @@ -27,7 +27,7 @@ class OnboardingStepOne extends StatelessWidget { common.onboardingProgressBar( context, 'Nouveau portefeuilles', progress), common.bubbleSpeak( - "Il semblerait que vous n’ayez pas encore de trousseau.\n\nUn trousseau vous permet de gérer un ou plusieurs portefeuilles.", + "Il semblerait que vous n’ayez pas encore de coffre.\n\nUn coffre vous permet de gérer un ou plusieurs portefeuilles.", textKey: const Key('step1')), const SizedBox(height: 90), Image.asset( @@ -53,7 +53,7 @@ class OnboardingStepOne extends StatelessWidget { FaderTransition( page: OnboardingStepTwo(), isFast: true)); }, - child: const Text('Créer mon trousseau', + child: const Text('Créer mon coffre', style: TextStyle(fontSize: 20))), ))), const SizedBox(height: 80), diff --git a/lib/screens/onBoarding/10.dart b/lib/screens/onBoarding/10.dart index 4f4aff0..a130190 100644 --- a/lib/screens/onBoarding/10.dart +++ b/lib/screens/onBoarding/10.dart @@ -25,7 +25,7 @@ class OnboardingStepTwelve extends StatelessWidget { common.onboardingProgressBar( context, 'Ma phrase de restauration', progress), common.bubbleSpeak( - "Si un jour vous changez de téléphone, votre code secret sera différent, mais il vous suffira de me redonner votre phrase de restauration pour recréer votre trousseau.", + "Si un jour vous changez de téléphone, votre code secret sera différent, mais il vous suffira de me redonner votre phrase de restauration pour recréer votre coffre.", textKey: const Key('step10'), ), const SizedBox(height: 10), diff --git a/lib/screens/onBoarding/13_congratulations.dart b/lib/screens/onBoarding/13_congratulations.dart index f7189c7..31b68dd 100644 --- a/lib/screens/onBoarding/13_congratulations.dart +++ b/lib/screens/onBoarding/13_congratulations.dart @@ -25,7 +25,7 @@ class OnboardingStepFiveteen extends StatelessWidget { common.onboardingProgressBar( context, 'Ma phrase de restauration', progress), common.bubbleSpeak( - "Top !\n\nVotre trousseau de clef et votre portefeuille ont été créés avec un immense succès.\n\nFélicitations !", + "Top !\n\nVotre coffre de clef et votre portefeuille ont été créés avec un immense succès.\n\nFélicitations !", textKey: const Key('step13'), ), SizedBox(height: isTall ? 20 : 10), diff --git a/lib/screens/onBoarding/2.dart b/lib/screens/onBoarding/2.dart index 04c3495..ab5bf13 100644 --- a/lib/screens/onBoarding/2.dart +++ b/lib/screens/onBoarding/2.dart @@ -28,7 +28,7 @@ class OnboardingStepTwo extends StatelessWidget { common.onboardingProgressBar( context, 'Nouveau portefeuilles', progress), common.bubbleSpeak( - "Un trousseau est créé à partir d’une phrase de restauration.", + "Un coffre est créé à partir d’une phrase de restauration.", textKey: const Key('step2'), ), const SizedBox(height: 70), diff --git a/lib/screens/onBoarding/3.dart b/lib/screens/onBoarding/3.dart index 41b9ec3..7f331ca 100644 --- a/lib/screens/onBoarding/3.dart +++ b/lib/screens/onBoarding/3.dart @@ -25,7 +25,7 @@ class OnboardingStepFor extends StatelessWidget { common.onboardingProgressBar( context, 'Ma phrase de restauration', progress), common.bubbleSpeak( - "Si un jour vous changez de téléphone, il vous suffira de me redonner votre phrase de restauration pour recréer votre trousseau.", + "Si un jour vous changez de téléphone, il vous suffira de me redonner votre phrase de restauration pour recréer votre coffre.", textKey: const Key('step3'), ), SizedBox(height: isTall ? 15 : 0), diff --git a/lib/screens/onBoarding/4.dart b/lib/screens/onBoarding/4.dart index a064231..8311000 100644 --- a/lib/screens/onBoarding/4.dart +++ b/lib/screens/onBoarding/4.dart @@ -25,7 +25,7 @@ class OnboardingStepFive extends StatelessWidget { common.onboardingProgressBar( context, 'Ma phrase de restauration', progress), common.bubbleSpeak( - "Par contre, attention :\n\nDans une blockchain, il n’y a pas de procédure de récupération de trousseau.\n\nSi vous perdez votre phrase de restauration, je ne pourrai pas vous la communiquer, et vous ne pourrez donc plus jamais accéder à votre compte.", + "Par contre, attention :\n\nDans une blockchain, il n’y a pas de procédure de récupération de coffre.\n\nSi vous perdez votre phrase de restauration, je ne pourrai pas vous la communiquer, et vous ne pourrez donc plus jamais accéder à votre compte.", textKey: const Key('step4'), ), SizedBox(height: isTall ? 30 : 10), diff --git a/lib/screens/onBoarding/7.dart b/lib/screens/onBoarding/7.dart index a64482a..c7182a0 100644 --- a/lib/screens/onBoarding/7.dart +++ b/lib/screens/onBoarding/7.dart @@ -221,7 +221,7 @@ class PrintWallet extends StatelessWidget { Navigator.pop(context); }), toolbarHeight: 60 * ratio, - title: const Text('Imprimer ce trousseau')), + title: const Text('Imprimer ce coffre')), body: PdfPreview( build: (format) => _generateWalletProvider.printWallet(sentence), ), diff --git a/lib/screens/onBoarding/9.dart b/lib/screens/onBoarding/9.dart index bf0d938..cbde004 100644 --- a/lib/screens/onBoarding/9.dart +++ b/lib/screens/onBoarding/9.dart @@ -33,7 +33,7 @@ class OnboardingStepEleven extends StatelessWidget { style: TextStyle(fontWeight: FontWeight.bold)), const TextSpan( text: - " \n\nVotre code secret chiffre votre trousseau de clefs, ce qui le rend inutilisable par d’autres, par exemple si vous perdez votre téléphone ou si on vous le vole."), + " \n\nVotre code secret chiffre votre coffre de clefs, ce qui le rend inutilisable par d’autres, par exemple si vous perdez votre téléphone ou si on vous le vole."), ], textKey: const Key('step9'), ), diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart index 34b2c48..4f4c60a 100644 --- a/lib/screens/settings.dart +++ b/lib/screens/settings.dart @@ -30,7 +30,6 @@ class SettingsScreen extends StatelessWidget { @override Widget build(BuildContext context) { SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); - SubstrateSdk _sub = Provider.of(context, listen: false); const double buttonHigh = 50; const double buttonWidth = 240; @@ -96,7 +95,7 @@ class SettingsScreen extends StatelessWidget { }), ), child: const Text( - "Générer un trousseau", + "Générer un coffre", style: TextStyle(fontSize: fontSize), ), ), diff --git a/lib/screens/substrate_sandbox.dart b/lib/screens/substrate_sandbox.dart index f0e8f6e..ac8ecde 100644 --- a/lib/screens/substrate_sandbox.dart +++ b/lib/screens/substrate_sandbox.dart @@ -42,7 +42,7 @@ class SubstrateSandBox extends StatelessWidget { 'Noeud "${_sub.sdk.api.connectedNode!.name}", bloc N°${_sub.blocNumber}'), const SizedBox(height: 20), Row(children: [ - const Text('Liste des trousseaux:'), + const Text('Liste des coffres:'), const Spacer(), InkWell( child: Image.asset( @@ -100,7 +100,7 @@ class SubstrateSandBox extends StatelessWidget { ]); }), const SizedBox(height: 20), - const Text('Mot de passe du trousseau:'), + const Text('Mot de passe du coffre:'), TextField( controller: _sub.keystorePassword, obscureText: true, @@ -127,7 +127,7 @@ class SubstrateSandBox extends StatelessWidget { context, res != '' ? 'Portefeuille importé' - : 'Le format de trousseau est invalide'); + : 'Le format de coffre est invalide'); } : null, child: const Text( diff --git a/pubspec.lock b/pubspec.lock index f8d9947..c069f08 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -368,6 +368,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "5.4.3+7" + flutter_launcher_icons_maker: + dependency: "direct dev" + description: + name: flutter_launcher_icons_maker + url: "https://pub.dartlang.org" + source: hosted + version: "0.10.2" flutter_lints: dependency: "direct main" description: @@ -567,13 +574,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.0" - icons_launcher: - dependency: "direct dev" - description: - name: icons_launcher - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.8" image: dependency: transitive description: @@ -1306,13 +1306,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.3.0" - universal_io: - dependency: transitive - description: - name: universal_io - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.4" unorm_dart: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 87fb2af..586d403 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -80,14 +80,8 @@ dependencies: url: https://github.com/poka-IT/sdk.git ref: fixAndroidActivityVersion -flutter_icons: - android: true - ios: true - image_path: "assets/icon/gecko_flat.png" - remove_alpha_ios: true - dev_dependencies: - icons_launcher: ^1.1.3 + flutter_launcher_icons_maker: ^0.10.2 build_runner: ^2.1.2 flutter_test: sdk: flutter @@ -95,6 +89,12 @@ dev_dependencies: integration_test: sdk: flutter +flutter_icons: + android: true + ios: true + image_path: "assets/icon/gecko_flat.png" + remove_alpha_ios: true + # The following section is specific to Flutter. flutter: uses-material-design: true diff --git a/scripts/build-apk.sh b/scripts/build-apk.sh index 3313821..755a9ba 100755 --- a/scripts/build-apk.sh +++ b/scripts/build-apk.sh @@ -22,7 +22,9 @@ else # flutter build apk --release --build-name $VERSION --build-number $BUILD fi -if [[ -d $HOME/Téléchargements ]]; then +if [[ -d $HOME/Nextcloud/Gecko-APK ]]; then + DL="$HOME/Nextcloud/Gecko-APK" +elif [[ -d $HOME/Téléchargements ]]; then DL="$HOME/Téléchargements" elif [[ -d $HOME/Downloads ]]; then DL="$HOME/Downloads" diff --git a/scripts/generateIcon.sh b/scripts/generateIcon.sh index b43b47e..518e86f 100755 --- a/scripts/generateIcon.sh +++ b/scripts/generateIcon.sh @@ -1,5 +1,5 @@ #!/bin/bash -flutter pub run flutter_launcher_icons:main +flutter pub run flutter_launcher_icons_maker:main exit 0 diff --git a/test_driver/app_test.dart b/test_driver/app_test.dart index ce2e990..40ba8d5 100644 --- a/test_driver/app_test.dart +++ b/test_driver/app_test.dart @@ -216,7 +216,7 @@ void main() { test('OnBoarding - Generate secret code and confirm it', ( {timeout = Timeout.none}) async { expect(await getText('step9'), - "Super !\n\nJe vais maintenant créer votre code secret. \n\nVotre code secret chiffre votre trousseau de clefs, ce qui le rend inutilisable par d’autres, par exemple si vous perdez votre téléphone ou si on vous le vole."); + "Super !\n\nJe vais maintenant créer votre code secret. \n\nVotre code secret chiffre votre coffre de clefs, ce qui le rend inutilisable par d’autres, par exemple si vous perdez votre téléphone ou si on vous le vole."); await sleep(800); await tapOn('goStep10'); await sleep(50); @@ -248,7 +248,7 @@ void main() { await driver!.enterText(pinCode!); expect(await getText('step13'), - "Top !\n\nVotre trousseau de clef et votre portefeuille ont été créés avec un immense succès.\n\nFélicitations !"); + "Top !\n\nVotre coffre et votre portefeuille ont été créés avec un immense succès.\n\nFélicitations !"); }); test('My wallets - Rename first derivation', (