From 9d11b7fcb5e9e4ad92b8e16198e4841acc13a96f Mon Sep 17 00:00:00 2001 From: poka Date: Mon, 8 Mar 2021 01:08:26 +0100 Subject: [PATCH] Change % progress to portions --- assets/onBoarding/progress_bar/1.png | Bin 0 -> 208 bytes assets/onBoarding/progress_bar/{92.png => 10.png} | Bin assets/onBoarding/progress_bar/11.png | Bin 0 -> 1426 bytes assets/onBoarding/progress_bar/{100.png => 12.png} | Bin assets/onBoarding/progress_bar/{17.png => 2.png} | Bin assets/onBoarding/progress_bar/20.png | Bin 209 -> 0 bytes assets/onBoarding/progress_bar/25.png | Bin 209 -> 0 bytes assets/onBoarding/progress_bar/{28.png => 3.png} | Bin assets/onBoarding/progress_bar/33.png | Bin 214 -> 0 bytes assets/onBoarding/progress_bar/{42.png => 4.png} | Bin assets/onBoarding/progress_bar/{50.png => 5.png} | Bin assets/onBoarding/progress_bar/{58.png => 6.png} | Bin assets/onBoarding/progress_bar/{67.png => 7.png} | Bin assets/onBoarding/progress_bar/75.png | Bin 220 -> 0 bytes assets/onBoarding/progress_bar/8.png | Bin 208 -> 220 bytes assets/onBoarding/progress_bar/{83.png => 9.png} | Bin lib/screens/commonElements.dart | 2 +- lib/screens/onBoarding/10_stepTen.dart | 2 +- lib/screens/onBoarding/11_stepEleven.dart | 2 +- lib/screens/onBoarding/12_stepTwelve.dart | 2 +- lib/screens/onBoarding/13_stepThirteen.dart | 2 +- lib/screens/onBoarding/14_stepFourteen.dart | 2 +- lib/screens/onBoarding/15_stepFiveteen.dart | 2 +- lib/screens/onBoarding/2_stepOne.dart | 2 +- lib/screens/onBoarding/3_stepTwo.dart | 2 +- lib/screens/onBoarding/4_stepFor.dart | 2 +- lib/screens/onBoarding/5_stepFive.dart | 2 +- lib/screens/onBoarding/7_stepSeven.dart | 2 +- lib/screens/onBoarding/8_stepEight.dart | 2 +- lib/screens/onBoarding/9_stepNine.dart | 2 +- 30 files changed, 14 insertions(+), 14 deletions(-) create mode 100755 assets/onBoarding/progress_bar/1.png rename assets/onBoarding/progress_bar/{92.png => 10.png} (100%) create mode 100755 assets/onBoarding/progress_bar/11.png rename assets/onBoarding/progress_bar/{100.png => 12.png} (100%) rename assets/onBoarding/progress_bar/{17.png => 2.png} (100%) delete mode 100755 assets/onBoarding/progress_bar/20.png delete mode 100755 assets/onBoarding/progress_bar/25.png rename assets/onBoarding/progress_bar/{28.png => 3.png} (100%) delete mode 100755 assets/onBoarding/progress_bar/33.png rename assets/onBoarding/progress_bar/{42.png => 4.png} (100%) rename assets/onBoarding/progress_bar/{50.png => 5.png} (100%) rename assets/onBoarding/progress_bar/{58.png => 6.png} (100%) rename assets/onBoarding/progress_bar/{67.png => 7.png} (100%) delete mode 100755 assets/onBoarding/progress_bar/75.png rename assets/onBoarding/progress_bar/{83.png => 9.png} (100%) diff --git a/assets/onBoarding/progress_bar/1.png b/assets/onBoarding/progress_bar/1.png new file mode 100755 index 0000000000000000000000000000000000000000..9b9d514adaeacec0463d2359a34e0ad8b453ec36 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^VnEEs!3HFcC*>^wQk(@Ik;M!Q+`=Ht$S`Y;1W=H% zILO_JVcj{Imp~3nx}&cn1H;CC?mvmFKz^#Hi(^OyS0009;dQ@0+Qek%> zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3sqlHDi_h5xgPSpt#}Ld)Slji`thRq+g4FBz_xMo*D7S4$MwIP3OMX8fC3{&90^lMf1I) zVtA;t-+^O;Ey(qvH~RB@Vm~xDPgU?C88s! z9<7iU@0Eo#Ho5(T7l6>Zx#CMi6v9ZW>(Ct7AdJ{$;C=3 zUaGST&Or6-=EdD> zDJgznvTgVVeyYQ-I=)>`>>?c&xaZL{`6Rcb&3p`ejUoMLo~NuaWGCa^aOPHra_kEe z>YS|R-5Rlt>|r?sSo=guwjRA#-|50hPG??q0%PM+UT%*d+cA7Ah;|vC5;{Hn2P8uN ziq$J@^8f$=f@woTP)S2WAaHVTW@&6?004NLeUUv#!$2IxUsJ^*6$dkjIAo|!7DPoH zwF*V35Nd^19ZW9$f+h_~ii@M*T5#}VvFhOBtgC~oAP9bdxVbqgx=4xtOA0MwJUH&h zyL*qjcYx5SFx~DN2Xw=+(#eFB&8)O(FKVgxvu*B#<}RRz%xZFlb$CQiKSu( zs~yZrmQFlH9Mg1z@`bF=8s{y}dZor%_v9~(=8ctQuG1Vw5{p=Z3<)Y~D5C-gaas*h zY@}&F5#S&4{4%*za+Sfzv4ARcD4rku4}N!R7bYkCq-X-@esSH85uj%mXx3f#``C4x zCqVcaxH8)QY6F=0B)#6&Vn;y#HgIv>*3>=Vat9cEG8Ielq%cjPPypV~=$mrDz%9_b z=J(dx$LRx*p{`Olz`-FfTBPjtfOkhad;9lHtG^$=0CHa$u!mRx000JJOGiWi{{a60 z|De66lK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^Rg0|)>E7T2(pJOBUyKuJVF zR9M69*r64GFaSfrgfS5vpaU^LMb`w$dpP{v2oYbTNpi014nUGUW-AK7*I@!c7yw}a g{%hiV1YUd0J`6bun{mlXbpQYW07*qoM6N<$f|-7ayZ`_I literal 0 HcmV?d00001 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 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^=0MEG!3HGL|FZc3Db50q$YKTtZeb8+WSBKa0w~B> z9OUlAuzc%+g?z zZsGJ`E?v<0afZS%N#^~h-k!Xq9#Z{oqKm+WgXaZ5i5cAgyCa}obpqotk%=!#R<%3! z&5-4}e10cO^A`D;Utg?C7Cyni?C8kbrC?hZW&h`)tn9MwEZ2ZGGI+ZBxvX4nJa0`PlBg3pY55jfYZ5#W!|0J>k`Dvamjv*C{Z?7B_bO{h}z4*J1MfkqY)eUKl zJRJw_Z#dTW!DYc#i(8Rje}!HbeYe|huS@a^XMscKxOIQ;fAxepWl7rtz0Gz%RahHU zFRI1;P+#JcaPOe&`H#1sUEDCqA@K?4;)(r>4Ny$l&Sf=d#Wzp$Pz& C<4hX> 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 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^;XusB!3HF^Nio?0Db50q$YKTtZeb8+WSBKa0w~B> z9OUlAutq;GiWBO{?JcB`Y z4p)p*jmnheP0_2_)NkwG`f>K$pBAm}S0_ub=p@)FKJiPid7Zb2PuhXcAW~KEeaR~} zHEZ`CzGvpYcIq8SS^l@HrvKFqvBoVM7Njn46mD7l@;UpJG+Ei$2scrnwG5uFelF{r G5}E-2&_*c$ 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 GIT binary patch literal 0 HcmV?d00001 literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^M}U}(gAGW|X*0Y6q&N#aB8wRqxP?KOkzv*x37{Zj zage(c!@6@aFM%AEbVpxD28NCO+i1fR2c!yE3Gr-TCmrII^fq{Y7)59eQNFM=WHV!r*Ij7C=%0xxe`a(|^$B+ufx7Rlc z9&+Guxwt=^@#{ezwYCEn8do-WE10S5unA9y^t*H9ZTFP}eb2f}{_JD#w7bB#`B=vc zag%@NueTTRh^{=orqKIHK#`nmnw#MFrkQU)IZx@DIg!^k%i3@MdF>AFzO3vZx6**+ d@4m$_9;%U*-R#x23g`$1Pj**7mvv4FO#qX8Mpys< delta 164 zcmcb^c!5!|Gr-TCmrII^fq{Y7)59eQNQ(h68wVSZJf4)dV4|XFRjQ|pV@L(#){7ej z8x(k2AAX;4;O7^=HCr9b4{$EID3x1cqpr{i_@% 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) {