diff --git a/assets/onBoarding/progress_bar/1.png b/assets/onBoarding/progress_bar/1.png new file mode 100755 index 0000000000000000000000000000000000000000..9b9d514adaeacec0463d2359a34e0ad8b453ec36 Binary files /dev/null and b/assets/onBoarding/progress_bar/1.png differ diff --git a/assets/onBoarding/progress_bar/92.png b/assets/onBoarding/progress_bar/10.png similarity index 100% rename from assets/onBoarding/progress_bar/92.png rename to assets/onBoarding/progress_bar/10.png diff --git a/assets/onBoarding/progress_bar/11.png b/assets/onBoarding/progress_bar/11.png new file mode 100755 index 0000000000000000000000000000000000000000..961f4c33e49cdc60947443509b45279bf8f1a064 Binary files /dev/null and b/assets/onBoarding/progress_bar/11.png differ diff --git a/assets/onBoarding/progress_bar/100.png b/assets/onBoarding/progress_bar/12.png similarity index 100% rename from assets/onBoarding/progress_bar/100.png rename to assets/onBoarding/progress_bar/12.png diff --git a/assets/onBoarding/progress_bar/17.png b/assets/onBoarding/progress_bar/2.png similarity index 100% rename from assets/onBoarding/progress_bar/17.png rename to assets/onBoarding/progress_bar/2.png diff --git a/assets/onBoarding/progress_bar/20.png b/assets/onBoarding/progress_bar/20.png deleted file mode 100755 index 5fd955033ce2340f710601e990213dde8b519e4f..0000000000000000000000000000000000000000 Binary files a/assets/onBoarding/progress_bar/20.png and /dev/null differ diff --git a/assets/onBoarding/progress_bar/25.png b/assets/onBoarding/progress_bar/25.png deleted file mode 100755 index a62776bc28d893069bfb40859fac656a6a12e2ea..0000000000000000000000000000000000000000 Binary files a/assets/onBoarding/progress_bar/25.png and /dev/null differ diff --git a/assets/onBoarding/progress_bar/28.png b/assets/onBoarding/progress_bar/3.png similarity index 100% rename from assets/onBoarding/progress_bar/28.png rename to assets/onBoarding/progress_bar/3.png diff --git a/assets/onBoarding/progress_bar/33.png b/assets/onBoarding/progress_bar/33.png deleted file mode 100755 index 25844a12b46fcc80a259bdff2b48b452b48e09b8..0000000000000000000000000000000000000000 Binary files a/assets/onBoarding/progress_bar/33.png and /dev/null differ diff --git a/assets/onBoarding/progress_bar/42.png b/assets/onBoarding/progress_bar/4.png similarity index 100% rename from assets/onBoarding/progress_bar/42.png rename to assets/onBoarding/progress_bar/4.png diff --git a/assets/onBoarding/progress_bar/50.png b/assets/onBoarding/progress_bar/5.png similarity index 100% rename from assets/onBoarding/progress_bar/50.png rename to assets/onBoarding/progress_bar/5.png diff --git a/assets/onBoarding/progress_bar/58.png b/assets/onBoarding/progress_bar/6.png similarity index 100% rename from assets/onBoarding/progress_bar/58.png rename to assets/onBoarding/progress_bar/6.png diff --git a/assets/onBoarding/progress_bar/67.png b/assets/onBoarding/progress_bar/7.png similarity index 100% rename from assets/onBoarding/progress_bar/67.png rename to assets/onBoarding/progress_bar/7.png diff --git a/assets/onBoarding/progress_bar/75.png b/assets/onBoarding/progress_bar/75.png deleted file mode 100755 index fb40c23c9943edc61e5de8e313b5b12c826e2735..0000000000000000000000000000000000000000 Binary files a/assets/onBoarding/progress_bar/75.png and /dev/null differ diff --git a/assets/onBoarding/progress_bar/8.png b/assets/onBoarding/progress_bar/8.png index 9b9d514adaeacec0463d2359a34e0ad8b453ec36..fb40c23c9943edc61e5de8e313b5b12c826e2735 100755 Binary files a/assets/onBoarding/progress_bar/8.png and b/assets/onBoarding/progress_bar/8.png differ diff --git a/assets/onBoarding/progress_bar/83.png b/assets/onBoarding/progress_bar/9.png similarity index 100% rename from assets/onBoarding/progress_bar/83.png rename to assets/onBoarding/progress_bar/9.png diff --git a/lib/screens/commonElements.dart b/lib/screens/commonElements.dart index 911916899ffba826e8f32c9df03b5bc3621af512..cb3ecd4012ce8a5d937cfa64c48f9a07a6dc63f4 100644 --- a/lib/screens/commonElements.dart +++ b/lib/screens/commonElements.dart @@ -74,7 +74,7 @@ class CommonElements { Positioned( top: 70, right: 90, - child: Text('$progress%', + child: Text(progress == 12 ? '11/11' : '$progress/11', style: TextStyle(fontSize: 12, color: Colors.black)), ), ]); diff --git a/lib/screens/onBoarding/10_stepTen.dart b/lib/screens/onBoarding/10_stepTen.dart index cd13575f38f051a3b0a33d05f883ca238518e31d..9df37abd98dd11c15a5a7e1b516a6063abfcfea5 100644 --- a/lib/screens/onBoarding/10_stepTen.dart +++ b/lib/screens/onBoarding/10_stepTen.dart @@ -23,7 +23,7 @@ class OnboardingStepTen extends StatelessWidget { TextEditingController wordController = TextEditingController(); TextEditingController _mnemonicController = TextEditingController(); - final int progress = 58; + final int progress = 7; @override Widget build(BuildContext context) { diff --git a/lib/screens/onBoarding/11_stepEleven.dart b/lib/screens/onBoarding/11_stepEleven.dart index 893975b9f17d027bb9630f934797e2fad102cd9a..c18680611839bc48d6f9f5fd9c140a5d1c6ad4ea 100644 --- a/lib/screens/onBoarding/11_stepEleven.dart +++ b/lib/screens/onBoarding/11_stepEleven.dart @@ -7,7 +7,7 @@ import 'package:gecko/screens/onBoarding/12_stepTwelve.dart'; // ignore: must_be_immutable class OnboardingStepEleven extends StatelessWidget { TextEditingController tplController = TextEditingController(); - final int progress = 67; + final int progress = 8; @override Widget build(BuildContext context) { diff --git a/lib/screens/onBoarding/12_stepTwelve.dart b/lib/screens/onBoarding/12_stepTwelve.dart index b9663ddd41d51db5c7be4389f8a0d66c2299691a..a841e4ff356626e1c9daa92e7bb57f39acd43a4c 100644 --- a/lib/screens/onBoarding/12_stepTwelve.dart +++ b/lib/screens/onBoarding/12_stepTwelve.dart @@ -7,7 +7,7 @@ import 'package:gecko/screens/onBoarding/13_stepThirteen.dart'; // ignore: must_be_immutable class OnboardingStepTwelve extends StatelessWidget { TextEditingController tplController = TextEditingController(); - final int progress = 75; + final int progress = 9; @override Widget build(BuildContext context) { diff --git a/lib/screens/onBoarding/13_stepThirteen.dart b/lib/screens/onBoarding/13_stepThirteen.dart index 2d5c73fed020db26e8ff3e8852b35954ba0abba6..04c5eaeb8258172f6e2a0e1bb22c7cbb99f4ec3b 100644 --- a/lib/screens/onBoarding/13_stepThirteen.dart +++ b/lib/screens/onBoarding/13_stepThirteen.dart @@ -10,7 +10,7 @@ import 'package:provider/provider.dart'; // ignore: must_be_immutable class OnboardingStepThirteen extends StatelessWidget { NewWallet generatedWallet; - final int progress = 83; + final int progress = 10; @override Widget build(BuildContext context) { diff --git a/lib/screens/onBoarding/14_stepFourteen.dart b/lib/screens/onBoarding/14_stepFourteen.dart index 6f846cdbaf0841ef308c93902ad694b997b2629e..3f1b0867e5215b9d7083d5ee8d97dc6dcfc3d4ca 100644 --- a/lib/screens/onBoarding/14_stepFourteen.dart +++ b/lib/screens/onBoarding/14_stepFourteen.dart @@ -20,7 +20,7 @@ class OnboardingStepFourteen extends StatelessWidget { }) : super(key: validationKey); NewWallet generatedWallet; - final int progress = 92; + final int progress = 11; final formKey = GlobalKey<FormState>(); var pinColor = Color(0xFFA4B600); bool hasError = false; diff --git a/lib/screens/onBoarding/15_stepFiveteen.dart b/lib/screens/onBoarding/15_stepFiveteen.dart index cca287bb9dcb5da625794f408f9723c4214beabe..4893e13323387447ed834e6ddf17b35cc999124c 100644 --- a/lib/screens/onBoarding/15_stepFiveteen.dart +++ b/lib/screens/onBoarding/15_stepFiveteen.dart @@ -7,7 +7,7 @@ import 'package:gecko/screens/myWallets/walletsHome.dart'; // ignore: must_be_immutable class OnboardingStepFiveteen extends StatelessWidget { TextEditingController tplController = TextEditingController(); - final int progress = 28; + final int progress = 12; @override Widget build(BuildContext context) { diff --git a/lib/screens/onBoarding/2_stepOne.dart b/lib/screens/onBoarding/2_stepOne.dart index 873aba0a5d7e075ffa956c5248d63cf70b71731a..190e40fa53d0ac36731ee4a976d7ab9938015c94 100644 --- a/lib/screens/onBoarding/2_stepOne.dart +++ b/lib/screens/onBoarding/2_stepOne.dart @@ -8,7 +8,7 @@ import 'package:gecko/screens/onBoarding/3_stepTwo.dart'; // ignore: must_be_immutable class OnboardingStepOne extends StatelessWidget { TextEditingController tplController = TextEditingController(); - final int progress = 8; + final int progress = 1; @override Widget build(BuildContext context) { diff --git a/lib/screens/onBoarding/3_stepTwo.dart b/lib/screens/onBoarding/3_stepTwo.dart index 7f17867e9354bdbc12ff19c65903f34aed1c0ed4..b523c07db41c74e5fb067b63ff5d4afcb95addc4 100644 --- a/lib/screens/onBoarding/3_stepTwo.dart +++ b/lib/screens/onBoarding/3_stepTwo.dart @@ -9,7 +9,7 @@ import 'package:gecko/screens/onBoarding/4_stepFor.dart'; // ignore: must_be_immutable class OnboardingStepTwo extends StatelessWidget { TextEditingController tplController = TextEditingController(); - final int progress = 17; + final int progress = 2; @override Widget build(BuildContext context) { diff --git a/lib/screens/onBoarding/4_stepFor.dart b/lib/screens/onBoarding/4_stepFor.dart index 4c98aaf9cae6f0b65ee194d6d35938beecfe1d3a..8df36eee9f4964725d95220db487023af3bb88eb 100644 --- a/lib/screens/onBoarding/4_stepFor.dart +++ b/lib/screens/onBoarding/4_stepFor.dart @@ -7,7 +7,7 @@ import 'package:gecko/screens/onBoarding/5_stepFive.dart'; // ignore: must_be_immutable class OnboardingStepFor extends StatelessWidget { TextEditingController tplController = TextEditingController(); - final int progress = 20; + final int progress = 3; @override Widget build(BuildContext context) { diff --git a/lib/screens/onBoarding/5_stepFive.dart b/lib/screens/onBoarding/5_stepFive.dart index 42cd6ccc14244e21cc90b974d37b45ea20f6d3c1..4a9f289c71fbf7aaaa1b8d9a7f907ea716706421 100644 --- a/lib/screens/onBoarding/5_stepFive.dart +++ b/lib/screens/onBoarding/5_stepFive.dart @@ -7,7 +7,7 @@ import 'package:gecko/screens/onBoarding/7_stepSeven.dart'; // ignore: must_be_immutable class OnboardingStepFive extends StatelessWidget { TextEditingController tplController = TextEditingController(); - final int progress = 25; + final int progress = 4; @override Widget build(BuildContext context) { diff --git a/lib/screens/onBoarding/7_stepSeven.dart b/lib/screens/onBoarding/7_stepSeven.dart index 9b653783561e4b4d0cca4b57183d4e4735921c30..b98dc82a5a2408a2d53d34df08bb93a0f3de50e0 100644 --- a/lib/screens/onBoarding/7_stepSeven.dart +++ b/lib/screens/onBoarding/7_stepSeven.dart @@ -7,7 +7,7 @@ import 'package:gecko/screens/onBoarding/8_stepEight.dart'; // ignore: must_be_immutable class OnboardingStepSeven extends StatelessWidget { TextEditingController tplController = TextEditingController(); - final int progress = 33; + final int progress = 5; @override Widget build(BuildContext context) { diff --git a/lib/screens/onBoarding/8_stepEight.dart b/lib/screens/onBoarding/8_stepEight.dart index c64f44e574939c01c330c9a6ac7c1e14bf2ea952..685d934d1459e11f3461d6b97d07651b2948cec2 100644 --- a/lib/screens/onBoarding/8_stepEight.dart +++ b/lib/screens/onBoarding/8_stepEight.dart @@ -8,7 +8,7 @@ import 'package:gecko/screens/onBoarding/9_stepNine.dart'; // ignore: must_be_immutable class OnboardingStepEight extends StatelessWidget { TextEditingController tplController = TextEditingController(); - final int progress = 42; + final int progress = 6; @override Widget build(BuildContext context) { diff --git a/lib/screens/onBoarding/9_stepNine.dart b/lib/screens/onBoarding/9_stepNine.dart index 5d7f35d6490734d6f2b22fc99e4774ad752e3364..baf95102237ace304f0e02e9c1d1135c39deff2f 100644 --- a/lib/screens/onBoarding/9_stepNine.dart +++ b/lib/screens/onBoarding/9_stepNine.dart @@ -10,7 +10,7 @@ import 'package:provider/provider.dart'; // ignore: must_be_immutable class OnboardingStepNine extends StatelessWidget { TextEditingController tplController = TextEditingController(); - final int progress = 50; + final int progress = 6; @override Widget build(BuildContext context) {