WIP: Bad icon
After Width: | Height: | Size: 50 KiB |
|
@ -492,4 +492,4 @@
|
||||||
/* End XCConfigurationList section */
|
/* End XCConfigurationList section */
|
||||||
};
|
};
|
||||||
rootObject = 97C146E61CF9000F007C117D /* Project object */;
|
rootObject = 97C146E61CF9000F007C117D /* Project object */;
|
||||||
}
|
}
|
Before Width: | Height: | Size: 148 KiB After Width: | Height: | Size: 176 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 6.8 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 9.7 KiB |
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 9.7 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 14 KiB |
|
@ -55,7 +55,7 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier {
|
||||||
}),
|
}),
|
||||||
title: const SizedBox(
|
title: const SizedBox(
|
||||||
height: 22,
|
height: 22,
|
||||||
child: Text('Enregistrer ce trousseau'),
|
child: Text('Enregistrer ce coffre'),
|
||||||
)),
|
)),
|
||||||
body: Center(
|
body: Center(
|
||||||
child: Column(children: <Widget>[
|
child: Column(children: <Widget>[
|
||||||
|
|
|
@ -48,7 +48,7 @@ class GenerateFastChestScreen extends StatelessWidget {
|
||||||
}),
|
}),
|
||||||
title: const SizedBox(
|
title: const SizedBox(
|
||||||
height: 22,
|
height: 22,
|
||||||
child: Text('Générer un trousseau'),
|
child: Text('Générer un coffre'),
|
||||||
)),
|
)),
|
||||||
floatingActionButton: SizedBox(
|
floatingActionButton: SizedBox(
|
||||||
height: 80.0,
|
height: 80.0,
|
||||||
|
@ -144,7 +144,7 @@ class GenerateFastChestScreen extends StatelessWidget {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
: null,
|
: null,
|
||||||
child: const Text('Enregistrer ce trousseau',
|
child: const Text('Enregistrer ce coffre',
|
||||||
style: TextStyle(fontSize: 20))),
|
style: TextStyle(fontSize: 20))),
|
||||||
const SizedBox(height: 20),
|
const SizedBox(height: 20),
|
||||||
GestureDetector(
|
GestureDetector(
|
||||||
|
@ -219,7 +219,7 @@ class PrintWallet extends StatelessWidget {
|
||||||
Navigator.pop(context);
|
Navigator.pop(context);
|
||||||
}),
|
}),
|
||||||
toolbarHeight: 60 * ratio,
|
toolbarHeight: 60 * ratio,
|
||||||
title: const Text('Imprimer ce trousseau')),
|
title: const Text('Imprimer ce coffre')),
|
||||||
body: PdfPreview(
|
body: PdfPreview(
|
||||||
build: (format) => _generateWalletProvider.printWallet(sentence),
|
build: (format) => _generateWalletProvider.printWallet(sentence),
|
||||||
),
|
),
|
||||||
|
|
|
@ -27,7 +27,7 @@ class OnboardingStepOne extends StatelessWidget {
|
||||||
common.onboardingProgressBar(
|
common.onboardingProgressBar(
|
||||||
context, 'Nouveau portefeuilles', progress),
|
context, 'Nouveau portefeuilles', progress),
|
||||||
common.bubbleSpeak(
|
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')),
|
textKey: const Key('step1')),
|
||||||
const SizedBox(height: 90),
|
const SizedBox(height: 90),
|
||||||
Image.asset(
|
Image.asset(
|
||||||
|
@ -53,7 +53,7 @@ class OnboardingStepOne extends StatelessWidget {
|
||||||
FaderTransition(
|
FaderTransition(
|
||||||
page: OnboardingStepTwo(), isFast: true));
|
page: OnboardingStepTwo(), isFast: true));
|
||||||
},
|
},
|
||||||
child: const Text('Créer mon trousseau',
|
child: const Text('Créer mon coffre',
|
||||||
style: TextStyle(fontSize: 20))),
|
style: TextStyle(fontSize: 20))),
|
||||||
))),
|
))),
|
||||||
const SizedBox(height: 80),
|
const SizedBox(height: 80),
|
||||||
|
|
|
@ -25,7 +25,7 @@ class OnboardingStepTwelve extends StatelessWidget {
|
||||||
common.onboardingProgressBar(
|
common.onboardingProgressBar(
|
||||||
context, 'Ma phrase de restauration', progress),
|
context, 'Ma phrase de restauration', progress),
|
||||||
common.bubbleSpeak(
|
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'),
|
textKey: const Key('step10'),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 10),
|
const SizedBox(height: 10),
|
||||||
|
|
|
@ -25,7 +25,7 @@ class OnboardingStepFiveteen extends StatelessWidget {
|
||||||
common.onboardingProgressBar(
|
common.onboardingProgressBar(
|
||||||
context, 'Ma phrase de restauration', progress),
|
context, 'Ma phrase de restauration', progress),
|
||||||
common.bubbleSpeak(
|
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'),
|
textKey: const Key('step13'),
|
||||||
),
|
),
|
||||||
SizedBox(height: isTall ? 20 : 10),
|
SizedBox(height: isTall ? 20 : 10),
|
||||||
|
|
|
@ -28,7 +28,7 @@ class OnboardingStepTwo extends StatelessWidget {
|
||||||
common.onboardingProgressBar(
|
common.onboardingProgressBar(
|
||||||
context, 'Nouveau portefeuilles', progress),
|
context, 'Nouveau portefeuilles', progress),
|
||||||
common.bubbleSpeak(
|
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'),
|
textKey: const Key('step2'),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 70),
|
const SizedBox(height: 70),
|
||||||
|
|
|
@ -25,7 +25,7 @@ class OnboardingStepFor extends StatelessWidget {
|
||||||
common.onboardingProgressBar(
|
common.onboardingProgressBar(
|
||||||
context, 'Ma phrase de restauration', progress),
|
context, 'Ma phrase de restauration', progress),
|
||||||
common.bubbleSpeak(
|
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'),
|
textKey: const Key('step3'),
|
||||||
),
|
),
|
||||||
SizedBox(height: isTall ? 15 : 0),
|
SizedBox(height: isTall ? 15 : 0),
|
||||||
|
|
|
@ -25,7 +25,7 @@ class OnboardingStepFive extends StatelessWidget {
|
||||||
common.onboardingProgressBar(
|
common.onboardingProgressBar(
|
||||||
context, 'Ma phrase de restauration', progress),
|
context, 'Ma phrase de restauration', progress),
|
||||||
common.bubbleSpeak(
|
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'),
|
textKey: const Key('step4'),
|
||||||
),
|
),
|
||||||
SizedBox(height: isTall ? 30 : 10),
|
SizedBox(height: isTall ? 30 : 10),
|
||||||
|
|
|
@ -221,7 +221,7 @@ class PrintWallet extends StatelessWidget {
|
||||||
Navigator.pop(context);
|
Navigator.pop(context);
|
||||||
}),
|
}),
|
||||||
toolbarHeight: 60 * ratio,
|
toolbarHeight: 60 * ratio,
|
||||||
title: const Text('Imprimer ce trousseau')),
|
title: const Text('Imprimer ce coffre')),
|
||||||
body: PdfPreview(
|
body: PdfPreview(
|
||||||
build: (format) => _generateWalletProvider.printWallet(sentence),
|
build: (format) => _generateWalletProvider.printWallet(sentence),
|
||||||
),
|
),
|
||||||
|
|
|
@ -33,7 +33,7 @@ class OnboardingStepEleven extends StatelessWidget {
|
||||||
style: TextStyle(fontWeight: FontWeight.bold)),
|
style: TextStyle(fontWeight: FontWeight.bold)),
|
||||||
const TextSpan(
|
const TextSpan(
|
||||||
text:
|
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'),
|
textKey: const Key('step9'),
|
||||||
),
|
),
|
||||||
|
|
|
@ -30,7 +30,6 @@ class SettingsScreen extends StatelessWidget {
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
|
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
|
||||||
SubstrateSdk _sub = Provider.of<SubstrateSdk>(context, listen: false);
|
|
||||||
|
|
||||||
const double buttonHigh = 50;
|
const double buttonHigh = 50;
|
||||||
const double buttonWidth = 240;
|
const double buttonWidth = 240;
|
||||||
|
@ -96,7 +95,7 @@ class SettingsScreen extends StatelessWidget {
|
||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
child: const Text(
|
child: const Text(
|
||||||
"Générer un trousseau",
|
"Générer un coffre",
|
||||||
style: TextStyle(fontSize: fontSize),
|
style: TextStyle(fontSize: fontSize),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
|
@ -42,7 +42,7 @@ class SubstrateSandBox extends StatelessWidget {
|
||||||
'Noeud "${_sub.sdk.api.connectedNode!.name}", bloc N°${_sub.blocNumber}'),
|
'Noeud "${_sub.sdk.api.connectedNode!.name}", bloc N°${_sub.blocNumber}'),
|
||||||
const SizedBox(height: 20),
|
const SizedBox(height: 20),
|
||||||
Row(children: [
|
Row(children: [
|
||||||
const Text('Liste des trousseaux:'),
|
const Text('Liste des coffres:'),
|
||||||
const Spacer(),
|
const Spacer(),
|
||||||
InkWell(
|
InkWell(
|
||||||
child: Image.asset(
|
child: Image.asset(
|
||||||
|
@ -100,7 +100,7 @@ class SubstrateSandBox extends StatelessWidget {
|
||||||
]);
|
]);
|
||||||
}),
|
}),
|
||||||
const SizedBox(height: 20),
|
const SizedBox(height: 20),
|
||||||
const Text('Mot de passe du trousseau:'),
|
const Text('Mot de passe du coffre:'),
|
||||||
TextField(
|
TextField(
|
||||||
controller: _sub.keystorePassword,
|
controller: _sub.keystorePassword,
|
||||||
obscureText: true,
|
obscureText: true,
|
||||||
|
@ -127,7 +127,7 @@ class SubstrateSandBox extends StatelessWidget {
|
||||||
context,
|
context,
|
||||||
res != ''
|
res != ''
|
||||||
? 'Portefeuille importé'
|
? 'Portefeuille importé'
|
||||||
: 'Le format de trousseau est invalide');
|
: 'Le format de coffre est invalide');
|
||||||
}
|
}
|
||||||
: null,
|
: null,
|
||||||
child: const Text(
|
child: const Text(
|
||||||
|
|
21
pubspec.lock
|
@ -368,6 +368,13 @@ packages:
|
||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "5.4.3+7"
|
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:
|
flutter_lints:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
|
@ -567,13 +574,6 @@ packages:
|
||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.0.0"
|
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:
|
image:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
@ -1306,13 +1306,6 @@ packages:
|
||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.3.0"
|
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:
|
unorm_dart:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
|
|
14
pubspec.yaml
|
@ -80,14 +80,8 @@ dependencies:
|
||||||
url: https://github.com/poka-IT/sdk.git
|
url: https://github.com/poka-IT/sdk.git
|
||||||
ref: fixAndroidActivityVersion
|
ref: fixAndroidActivityVersion
|
||||||
|
|
||||||
flutter_icons:
|
|
||||||
android: true
|
|
||||||
ios: true
|
|
||||||
image_path: "assets/icon/gecko_flat.png"
|
|
||||||
remove_alpha_ios: true
|
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
icons_launcher: ^1.1.3
|
flutter_launcher_icons_maker: ^0.10.2
|
||||||
build_runner: ^2.1.2
|
build_runner: ^2.1.2
|
||||||
flutter_test:
|
flutter_test:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
|
@ -95,6 +89,12 @@ dev_dependencies:
|
||||||
integration_test:
|
integration_test:
|
||||||
sdk: flutter
|
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.
|
# The following section is specific to Flutter.
|
||||||
flutter:
|
flutter:
|
||||||
uses-material-design: true
|
uses-material-design: true
|
||||||
|
|
|
@ -22,7 +22,9 @@ else
|
||||||
# flutter build apk --release --build-name $VERSION --build-number $BUILD
|
# flutter build apk --release --build-name $VERSION --build-number $BUILD
|
||||||
fi
|
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"
|
DL="$HOME/Téléchargements"
|
||||||
elif [[ -d $HOME/Downloads ]]; then
|
elif [[ -d $HOME/Downloads ]]; then
|
||||||
DL="$HOME/Downloads"
|
DL="$HOME/Downloads"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
flutter pub run flutter_launcher_icons:main
|
flutter pub run flutter_launcher_icons_maker:main
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
|
@ -216,7 +216,7 @@ void main() {
|
||||||
test('OnBoarding - Generate secret code and confirm it', (
|
test('OnBoarding - Generate secret code and confirm it', (
|
||||||
{timeout = Timeout.none}) async {
|
{timeout = Timeout.none}) async {
|
||||||
expect(await getText('step9'),
|
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 sleep(800);
|
||||||
await tapOn('goStep10');
|
await tapOn('goStep10');
|
||||||
await sleep(50);
|
await sleep(50);
|
||||||
|
@ -248,7 +248,7 @@ void main() {
|
||||||
await driver!.enterText(pinCode!);
|
await driver!.enterText(pinCode!);
|
||||||
|
|
||||||
expect(await getText('step13'),
|
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', (
|
test('My wallets - Rename first derivation', (
|
||||||
|
|