diff --git a/assets/onBoarding/progress_bar/1.png b/assets/onBoarding/progress_bar/1.png new file mode 100755 index 0000000..9b9d514 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 0000000..961f4c3 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 5fd9550..0000000 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 a62776b..0000000 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 25844a1..0000000 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 fb40c23..0000000 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 9b9d514..fb40c23 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 9119168..cb3ecd4 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 cd13575..9df37ab 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 893975b..c186806 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 b9663dd..a841e4f 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 2d5c73f..04c5eae 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 6f846cd..3f1b086 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(); var pinColor = Color(0xFFA4B600); bool hasError = false; diff --git a/lib/screens/onBoarding/15_stepFiveteen.dart b/lib/screens/onBoarding/15_stepFiveteen.dart index cca287b..4893e13 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 873aba0..190e40f 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 7f17867..b523c07 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 4c98aaf..8df36ee 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 42cd6cc..4a9f289 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 9b65378..b98dc82 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 c64f44e..685d934 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 5d7f35d..baf9510 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) {