From 8113ac46444ee8e866b5e104515a8821d8ade28e Mon Sep 17 00:00:00 2001 From: priyanka Date: Fri, 26 Apr 2024 03:24:36 -0700 Subject: [PATCH 1/2] UI changes done --- assets/images/png/Group 1000004507.png | Bin 0 -> 543 bytes assets/images/png/Group 1000004508.png | Bin 0 -> 822 bytes assets/images/png/Group 1000004518.png | Bin 0 -> 377 bytes assets/images/png/Group.png | Bin 0 -> 1870 bytes assets/images/png/imgpsh_fullsize_anim.png | Bin 0 -> 385 bytes assets/images/png/inactivepast.png | Bin 0 -> 402 bytes assets/images/png/layers (1) 2.png | Bin 0 -> 3041 bytes assets/images/png/pastPerformanceactive.png | Bin 0 -> 385 bytes assets/images/png/return 1.png | Bin 0 -> 1399 bytes assets/images/svg/Group (1).svg | 3 + assets/images/svg/Group 1000004507.svg | 8 + assets/images/svg/Group 1000004508.svg | 4 + assets/images/svg/layers (1) 2.svg | 9 + assets/images/svg/past p.svg | 16 + assets/images/svg/past perfomance icon .svg | 5 + assets/images/svg/return 1.svg | 9 + lib/Utils/Common/CommonBottomNavigation.dart | 16 +- lib/Utils/text.dart | 22 ++ lib/view/MainScreen/ExploreUnseen.dart | 49 +-- lib/view/MainScreen/HomeScreen.dart | 34 ++- lib/view/MainScreen/PastPerformance.dart | 129 +++++++- lib/view/MainScreen/ShortTrade.dart | 278 +++++++++--------- lib/view/Sidemenu/ContentByte/VideosMore.dart | 61 ++-- pubspec.yaml | 1 - 24 files changed, 430 insertions(+), 214 deletions(-) create mode 100644 assets/images/png/Group 1000004507.png create mode 100644 assets/images/png/Group 1000004508.png create mode 100644 assets/images/png/Group 1000004518.png create mode 100644 assets/images/png/Group.png create mode 100644 assets/images/png/imgpsh_fullsize_anim.png create mode 100644 assets/images/png/inactivepast.png create mode 100644 assets/images/png/layers (1) 2.png create mode 100644 assets/images/png/pastPerformanceactive.png create mode 100644 assets/images/png/return 1.png create mode 100644 assets/images/svg/Group (1).svg create mode 100644 assets/images/svg/Group 1000004507.svg create mode 100644 assets/images/svg/Group 1000004508.svg create mode 100644 assets/images/svg/layers (1) 2.svg create mode 100644 assets/images/svg/past p.svg create mode 100644 assets/images/svg/past perfomance icon .svg create mode 100644 assets/images/svg/return 1.svg diff --git a/assets/images/png/Group 1000004507.png b/assets/images/png/Group 1000004507.png new file mode 100644 index 0000000000000000000000000000000000000000..161b144a56ecf339b6f9ffbfc796c471e6eed5d4 GIT binary patch literal 543 zcmeAS@N?(olHy`uVBq!ia0vp^sUXb31|&mjbk74R&H|6fVg?2sZxCi&YCCNuP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBxhG2|<^bWOF#*B}jHxAKR$&`t%?5NXv>Rr>BQS9WP@EdH?rH_WX^`{E9M* z86;UxXgIhr8gWesY~b5iymPwcv-2OXoiX6ibtscpo%^|Bujzz`^Ni1!D#Yw-=wV6` zQ9#v0KoOw`A(f^)_i3l1vp*CLXH0opEAo8y zX>p)?u$awPssC*E49WJy3jW-*UEfQ!(xT+tZce~ZzWR^*eCZ3z|5R!pt1A+&;+uM{ zsvxOK_d&>+n8)u=FW1^p!-(v2EH;rNG%L;}_oz>4ozb}&(vR)3V~fv~zPp;VGi>gE ZR>j33N7=a^R|4ac!PC{xWt~$(698W)z~cY_ literal 0 HcmV?d00001 diff --git a/assets/images/png/Group 1000004508.png b/assets/images/png/Group 1000004508.png new file mode 100644 index 0000000000000000000000000000000000000000..f300a593c473dd67e7dded59a3ee687d463465ee GIT binary patch literal 822 zcmeAS@N?(olHy`uVBq!ia0vp^u|OQj!3HE_9%x(zQk(@Ik;M!QI^H16xYTyqN}wQP zage(c!@6@aFM%AEbVpxD28NCO+2d5YIC>6n z^jzS*l{bmE>aN4h1=0pgISytGymCbo-j{T8PFnNbPIBM>x%!IYD$mRN3g@s))Ct{t zxqr9twpICu?kHO+EMiu|M@WnNx86VYG`#M1d19LHgO88w^z0v%-h5lu{<19ZrQ6d7 zFP9nQf4p;vH;Q5Y><2rSet*aHBSxX>IM)Gx!M(vt9|XI+58(ZAWx2Ee@uRN%`>xjn zG0Iub;otD`{9ct0&v)2V97z8>RcspDO`Ts%4VrttG59m*3jO73;N0_#$-g<5Z!g0F z?LFUE{F(E(_A)Kt-t&#kzd4U>FJpq}9?lA>3gH*L47=Fk)*iV0;PB#X>mMO{a z43CO*_Pl4^WBS9@>c+dJUp3|Q^B;W*`B=R?wzuldVR5-91~0N1xA5K*w^{o_;Ki-X z?#op_LO*Y{i?G;LR@aqX|3kqx*kG5`+u*J8H5Y5P@=LX?J63WX_`}$#X#IxRY9gmY%Ht{FTRkz}@nf+h+hk{(?!o>$Sf34uR>j;;7 zvA7}qbupj(5##JH7Y}UyI_qI`MS7>5R>ihD^G8!ouZ;a_7kevU&U+2NnTucF-uY_b z!M(=r{SEpbAH_esYj69*_1Nz(e?5MGNDTVDc)IPu^Fi|;f3ZEd`O16Im-8NIezpDn zDR^JThW>;ji>LhmwVk#SD9BhG zzcg}Mv~|~X%{+$m#4Y$O rBJ30t6`y`Pyp$^5aZF}i;bH!?N4&jKPt!jELyE!E)z4*}Q$iB}xiWj1 literal 0 HcmV?d00001 diff --git a/assets/images/png/Group.png b/assets/images/png/Group.png new file mode 100644 index 0000000000000000000000000000000000000000..c087ac832e1463ecc73f060816c3805af7f54965 GIT binary patch literal 1870 zcmV-U2eJ5xP)@~0drDELIAGL9O(c600d`2O+f$vv5yPfE< zSW^LCOnSm}uPf%}qIsj~u>Ht?{O@nk z`Tzfs!UiL_Ww|z@{zX&8hiTjnN0^HYsk8#*w!&=V;Wd=^%HO6D>AlXNl1&kNd3c0MIBH)BwVq8?-uBZ{j zysh!&G2UX^6cyoOZqdNVix+l_Fz%@(Oo6{5j4G}26mV`hgcY>_!n!85UHVLoV#|&& zYpuIW<6lh5784i)MYs#@sYU`{=su;Gc$vZ3N2d1Y1tr4Qfi!k_LX96Z5_ z{$#EWVbT3SH32tkQj?e$j573;2!x4Rbe85n;M|O)v%N)P7X#ifW6~%S@+PPb*9+Mg z?KVfD!LyF!eL=`S_B$#GT+ksQOV|>TS3hK)xalJj|0{qCf zNGM*hpmXq}-XJUeg@ky47R>D5bfeD;rY`K_wQtPqLF=T%f|6|M<(ia3Zs}!@>U%6m zNQj_cnEBRfo&U#M>7UH(pC~18BOhEkDnzYq=&SN^#+vtt+^*C@duBe}BzpqCLwv)` zz90coLAfq~>r&2{@63GZ+%EVbcSi-O-R1f+&cWkJ@^{%53b)9a#C@r)7@QW<#4RDBPJ|C1>F!0h~)g_WHK6j;N;_4XvfT_7Aj}Q%=arNQ^?@_DR!ht z*)j96#&o%Yw!QQCZR|wDAJh&iD1&uFqDB?8H6(3$OQOCDSJ2jioxe#&3!?5gnWieJ zWSPgFNmy!ZK|87dKihLna!QEWQAA=3%If^)z=*mwk4uu1TU2hq8F&7cIT>5sObcXN zHeQoOR4_M6Q*6+{Du83uEGn~JMXMIL|9Ak8D*LRcP*m`jp|DrcOZuVFXV-I5X`32- z6^KO89W&o&s+0;v<W4{O&wWkPxzY8JF zGENWI^cPe)BiwJS{jNPTpJ*6UDrouD-Vq5D)ml~z7sz$r>H7BIhuJ`Z)2Bm$-2ILU z{E%?dm&if|tGz7?YJ>nw9XnaUJ(}(z`7Q*w1N=GI0IIdKZ#kAaYBWq}oeN40WNvp! zjlmFgth>DdpN?_>e*dXCE4AS51C8zPJ&gdeqvG|Dg2 zast`;xILXYkhPupN82E?(k)uQgk~g=9Sygj5Dg2L8$V16PXKh?VYT`s8bi1Hdht4EYuz#l!@)Ba6;CqT=W2<$;+*L;)$Q@G~C z0=etmi`vmdK-fh*+iL3o@~F4&7ZQN*tFo$HgY^u;ZtL4t|6(VA>zagI6uYDrK=_5J z+$^0eky!MNRsR+`$&Dov?BW`!3h^-Ol!y zcDOOn(2=E@xWgGu-oFdRjl7g(fUash4qTTcM!z*R15`*pa28vmD;}Uih6C5embTgf zZlIz1k)9&mmQdh=j-K3xV*5;0!8Tg8eObG~dEL^*2u%rk2;82NefsF1QjvE)J^JUy zUpChyO$&MqZ^@nibxtoL|9GABN-srG6h%=KMNt$*QIuEw3mhjIYcu0irT_o{07*qo IM6N<$f&t`zeEwVk#SD9BhG z&TCumA6i+S~H;i|;)?s=DSw^MU*m?=9cIyWB@eci#1L!RgZ&bdln|b9xGbwH$zopr09Ut( AMgRZ+ literal 0 HcmV?d00001 diff --git a/assets/images/png/inactivepast.png b/assets/images/png/inactivepast.png new file mode 100644 index 0000000000000000000000000000000000000000..b7a7e96981c5e37ab5a1fa579f9dd2c6761c453b GIT binary patch literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^ARNrW1|)e30_=bkXMsm#F$05+HwZH>wVk#SD9BhG zYPbu9xLXsn)^j{$8&s+U;OQdf@zcY#m+>DteEiWsV6Ts>b31)c6Q?7G*me z=EBPseVMnnmB)nh{!G9B{c**S(yOa^37c`s#P?#-yyqAEBd>pz%(Yt>ymITdKY=nq zFP=z~<^sZ2@o;KtE)6eP&~Dks>Sg(SndQE37V;Lpi{iEegOI_~)z4*}Q$iB}Vv2y$ literal 0 HcmV?d00001 diff --git a/assets/images/png/layers (1) 2.png b/assets/images/png/layers (1) 2.png new file mode 100644 index 0000000000000000000000000000000000000000..964fc0c3d9bf23c892fbe1b9865bd6dbc31f2af8 GIT binary patch literal 3041 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 AMgRZ+ literal 0 HcmV?d00001 diff --git a/assets/images/png/return 1.png b/assets/images/png/return 1.png new file mode 100644 index 0000000000000000000000000000000000000000..27566fa8a283c21b546a009dc0123a539c3dced8 GIT binary patch literal 1399 zcmV--1&I2IP)@~0drDELIAGL9O(c600d`2O+f$vv5yPUUG#8jL3;I(p<#*^- zAn5f5Ok-Iy0l3E5abRNJH3D%V!XgVdyZl4O$QV25p2< zrz8Lsm~jirUxj8&gwxQs&>E-*<{XoPm?0mcd{sy&`k;5A)iCCucw&b9i?TyVXm&%( zV9LinZ!$xMB+GS^ID7}a1Y-`k9Bk>-O+sQaAKHQ+{v$32n;~BaiOp@$T9}gCSGVC( z`be@)h{Rky_2p7Vqxktg2 zx!C+^0W;gJmU6)#oOiNMNLWeN*P15rfj!I+@5khv6-?`{rE-`>{G_0Sx#xEW6ZWe*ZZ8@ zx1--kQ%2)94eED{*=xQh_ies@)WrJ~L$ie6QHOZ#5MK(K!Yf7fO~-gWD!wS2FK>FNv=w_QTG^*~fx2Iw*yJ(UyUM8h;|}pzB@+cFc~9Lr2F;KJLA`Hqh|f9+f%;u3PfMbp?tMA2 z*%jo8SlruRD(*?Hs0+{p_LN0*j>UPOi#plI)wvhO! z+uDTfLgJ%Y8h6OS5Wl=S@drU}gMM)^W28C?BQZgcyVZ@=LgIoTFRlLa^Ed-NEF>NX z@Ee-lyK~_aA#p%(+tn|%ZQGaJAtXEq?6c4g^<$BcaA>x!;7QHDtzL^Ywa!_}nYw1{ zlk5?&GJQY0&16fN?uO<<4?vGW)5IU!sNo6RfE^hBLa7Xa5%W-VLk~%2NGoEuQ0Bsn zzFIGq#t@iczq++Dv1j+n&R%F9%-CD+fKnI&Gb}H&6PhKh%TLe(m~phxL1nr9ZvU9j z%4U23b>*31M9Ua@Qlw*?4D>>;z=-v(ZzxNXWly92FRioZiv1;rT@}k=#<0&DOVMQE zOWTHEt?+k9`=Ga>PSmN}*9@afqbwWd{sG-1lZ!o&t;ziy+Em1Ziz(g25XLM-VLRuP z?GbAWw5_DE=I99YH?-At+a*E>A%qY@2qA-&5G8X^<002ovPDHLk FV1f~qmn#4O literal 0 HcmV?d00001 diff --git a/assets/images/svg/Group (1).svg b/assets/images/svg/Group (1).svg new file mode 100644 index 0000000..f281127 --- /dev/null +++ b/assets/images/svg/Group (1).svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/svg/Group 1000004507.svg b/assets/images/svg/Group 1000004507.svg new file mode 100644 index 0000000..2704b59 --- /dev/null +++ b/assets/images/svg/Group 1000004507.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/images/svg/Group 1000004508.svg b/assets/images/svg/Group 1000004508.svg new file mode 100644 index 0000000..db366c1 --- /dev/null +++ b/assets/images/svg/Group 1000004508.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/svg/layers (1) 2.svg b/assets/images/svg/layers (1) 2.svg new file mode 100644 index 0000000..6dc5693 --- /dev/null +++ b/assets/images/svg/layers (1) 2.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/images/svg/past p.svg b/assets/images/svg/past p.svg new file mode 100644 index 0000000..1028eb6 --- /dev/null +++ b/assets/images/svg/past p.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/assets/images/svg/past perfomance icon .svg b/assets/images/svg/past perfomance icon .svg new file mode 100644 index 0000000..dafe4d5 --- /dev/null +++ b/assets/images/svg/past perfomance icon .svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/images/svg/return 1.svg b/assets/images/svg/return 1.svg new file mode 100644 index 0000000..40592af --- /dev/null +++ b/assets/images/svg/return 1.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/lib/Utils/Common/CommonBottomNavigation.dart b/lib/Utils/Common/CommonBottomNavigation.dart index 4d0dd1e..7e34e99 100644 --- a/lib/Utils/Common/CommonBottomNavigation.dart +++ b/lib/Utils/Common/CommonBottomNavigation.dart @@ -75,9 +75,9 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) { shape: BoxShape.circle, boxShadow: [ BoxShadow( - color: Colors.grey.withOpacity(0.2), + color: Colors.grey.withOpacity(0.4), spreadRadius: 15, - blurRadius: 5, + blurRadius: 10, offset: Offset(0, 10), ), ], @@ -146,9 +146,9 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) { ), BottomNavigationBarItem( icon: Image.asset( - 'assets/images/png/sidemenu/past perfomance icon.png', - height: 26.h, - width: 26.w, + 'assets/images/png/inactivepast.png', + height: 24.h, + width: 24.w, ), activeIcon: Stack( children: [ @@ -175,9 +175,9 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) { bottom: 0, child: Center( child: Image.asset( - 'assets/images/png/sidemenu/activetrade.png', - height: 30.h, - width: 30.w, + 'assets/images/png/pastPerformanceactive.png', + height: 28.h, + width: 28.w, ), )) ], diff --git a/lib/Utils/text.dart b/lib/Utils/text.dart index 59b7897..668b291 100644 --- a/lib/Utils/text.dart +++ b/lib/Utils/text.dart @@ -58,6 +58,17 @@ Widget text18W500(String text) { ); } +Widget text18W500manrope(String text) { + return Text( + text, + style: TextStyle( + fontSize: 18.sp, + color: Colors.white, + fontWeight: FontWeight.w500, + fontFamily: 'Manrope'), + ); +} + Widget text18W400(String text, {TextAlign texAl = TextAlign.start, double heightV = 1.5}) { return Text( @@ -219,6 +230,17 @@ Widget text22W600(String text) { ); } +Widget text22W600manrope(String text) { + return Text( + text, + style: TextStyle( + fontSize: 22.sp, + color: Colors.white, + fontWeight: FontWeight.w600, + fontFamily: 'Manrope'), + ); +} + Widget text25W600(String text) { return Text( text, diff --git a/lib/view/MainScreen/ExploreUnseen.dart b/lib/view/MainScreen/ExploreUnseen.dart index 4bb377a..9db2068 100644 --- a/lib/view/MainScreen/ExploreUnseen.dart +++ b/lib/view/MainScreen/ExploreUnseen.dart @@ -88,32 +88,31 @@ class _ExploreUnseenState extends State { children: [ text22W600('Content Bytes'), sizedBoxHeight(8.w), - SingleChildScrollView( - scrollDirection: Axis.horizontal, - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - text16W400_DADADA('The Beauty and Power of Video'), - sizedBoxWidth(10.w), - Container( - height: 35.h, - width: 105.w, - decoration: BoxDecoration( - color: Color(0xFF3A3A3A).withOpacity(0.6), - borderRadius: BorderRadius.circular(5.r), - border: Border.all( - color: Color(0xFF3A3A3A), - )), - child: Center(child: text16W500('View More')), - ), - ], - ), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + width: 240.w, + child: text16W400_DADADA('The Beauty and Power of Video')), + Spacer(), + Container( + height: 35.h, + width: 105.w, + decoration: BoxDecoration( + color: Color(0xFF3A3A3A).withOpacity(0.6), + borderRadius: BorderRadius.circular(5.r), + border: Border.all( + color: Color(0xFF3A3A3A), + )), + child: Center(child: text16W500('View More')), + ), + ], ), sizedBoxHeight(20.h), commonGlassContainer( borderradius: 8, width: double.infinity, - height: 300.h, + height: 330.h, customWidget: Padding( padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 10.w), @@ -147,7 +146,10 @@ class _ExploreUnseenState extends State { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - text18W500('Week of 21st February 2024'), + SizedBox( + width: 250.w, + child: + text18W500('Week of 21st February 2024')), // sizedBoxHeight(10.h), text12W400_979797('20k views . 2 days ago'), ], @@ -235,7 +237,8 @@ class _ExploreUnseenState extends State { text15W600(amount) ], ), - sizedBoxWidth(50.w), + Spacer(), + // sizedBoxWidth(50.w), Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/view/MainScreen/HomeScreen.dart b/lib/view/MainScreen/HomeScreen.dart index 604e44a..af7d213 100644 --- a/lib/view/MainScreen/HomeScreen.dart +++ b/lib/view/MainScreen/HomeScreen.dart @@ -93,13 +93,13 @@ class _HomeScreenState extends State { child: Row( children: [ commoncontainer( - width: 180.w, + width: 195.w, text: 'NIFTY', amount: '22,286.95', rate: '+304.15 (+1.38%)'), sizedBoxWidth(10.w), commoncontainer( - width: 220.w, + width: 240.w, text: 'BANKNIFTY', amount: '22,286.95', rate: '+896.10 (+1.94%)'), @@ -255,9 +255,13 @@ Widget ActiveCallsTab() { sizedBoxHeight(8.w), Row( mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.start, children: [ - text16W400_DADADA('The Beauty and Power of Video'), - sizedBoxWidth(10.w), + SizedBox( + width: 240.w, + child: text16W400_DADADA('The Beauty and Power of Video')), + // sizedBoxWidth(10.w), + Spacer(), Container( height: 35.h, width: 105.w, @@ -283,7 +287,7 @@ Widget ActiveCallsTab() { commonGlassContainer( borderradius: 8, width: double.infinity, - height: 300.h, + height: 330.h, customWidget: Padding( padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 10.w), child: Column( @@ -313,6 +317,7 @@ Widget ActiveCallsTab() { ), sizedBoxHeight(20.h), Row( + crossAxisAlignment: CrossAxisAlignment.center, children: [ CircleAvatar( radius: 23.r, @@ -320,13 +325,15 @@ Widget ActiveCallsTab() { AssetImage('assets/images/png/Ellipse 1494.png'), ), sizedBoxWidth(10.w), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text18W500('Week of 21st February 2024'), - // sizedBoxHeight(10.h), - text12W400_979797('20k views . 2 days ago'), - ], + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text18W500('Week of 21st February 2024'), + // sizedBoxHeight(10.h), + text12W400_979797('20k views . 2 days ago'), + ], + ), ) ], ) @@ -452,7 +459,8 @@ Widget cardcallWidget( text15W600(amount) ], ), - sizedBoxWidth(50.w), + // sizedBoxWidth(50.w), + Spacer(), Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/view/MainScreen/PastPerformance.dart b/lib/view/MainScreen/PastPerformance.dart index 444b4f4..2cb0de0 100644 --- a/lib/view/MainScreen/PastPerformance.dart +++ b/lib/view/MainScreen/PastPerformance.dart @@ -5,6 +5,7 @@ import 'package:async/async.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; import 'package:glassmorphism/glassmorphism.dart'; import 'package:lottie/lottie.dart'; @@ -119,13 +120,55 @@ class _PastPerformanceState extends State { height: 440.h, borderradius: 8, customWidget: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Row( - children: [ - text18W400("Traders Circuit Metrics"), - text12W400("(Mar 2023 - Jan 2024)"), - ], + Padding( + padding: EdgeInsets.symmetric( + horizontal: 12.w, vertical: 16.h), + child: RichText( + text: TextSpan( + children: [ + TextSpan( + text: "Traders Circuit Metrics", + style: TextStyle( + fontSize: 20.sp, + color: Colors.white, + fontWeight: FontWeight.w600, + fontFamily: 'hiragino'), + ), + TextSpan( + text: " (Mar 2023 - Jan 2024)", + style: TextStyle( + fontSize: 14.sp, + color: Colors.white, + fontWeight: FontWeight.w300, + fontFamily: 'hiragino'), + ), + ], + ), + ), ), + // Padding( + // padding: + // const EdgeInsets.symmetric(horizontal: 12), + // child: Row( + // mainAxisAlignment: MainAxisAlignment.start, + // children: [ + // text18W400("Traders Circuit Metrics"), + // text12W400("(Mar 2023 - Jan 2024)") + // ], + // ), + // ), + Column( + children: + List.generate(metricsRowtile.length, (index) { + return matricsWidget( + iconimg: metricsRowtile[index]['iconImg']!, + textName: metricsRowtile[index] + ['textName']!, + rate: metricsRowtile[index]['rate']!); + }), + ) ], ), ), @@ -170,6 +213,80 @@ class _PastPerformanceState extends State { ); } + List> metricsRowtile = [ + { + 'iconImg': 'assets/images/png/layers (1) 2.png', + 'textName': 'Total Calls', + 'rate': '132', + }, + { + 'iconImg': 'assets/images/png/return 1.png', + 'textName': 'Exited Calls', + 'rate': '109', + }, + { + 'iconImg': 'assets/images/png/Group 1000004507.png', + 'textName': 'Success Rate', + 'rate': '70%', + }, + { + 'iconImg': 'assets/images/png/Group.png', + 'textName': 'Avg. duration/call', + 'rate': '20d', + }, + { + 'iconImg': 'assets/images/png/Group 1000004508.png', + 'textName': 'Annual Returns', + 'rate': '90%', + }, + ]; + + Widget matricsWidget( + {required String iconimg, + required String textName, + required String rate}) { + return Column( + children: [ + Divider( + color: Color(0xFF2D2D2D), + thickness: 1.h, + ), + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 5.h), + child: Row( + children: [ + Container( + width: 46.w, + height: 45.h, + decoration: BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(4.r)), + gradient: LinearGradient( + begin: Alignment.centerLeft, + end: Alignment.centerRight, + colors: [ + Color.fromRGBO(154, 0, 0, 0.38), + Color.fromRGBO(108, 0, 0, 0.31), + ], + ), + ), + child: Center( + child: Image.asset( + iconimg, + height: 26.h, + width: 26.w, + )), + ), + sizedBoxWidth(16.w), + text18W500manrope(textName), + Spacer(), + text22W600manrope(rate), + ], + ), + ) + ], + ); + } + List> cardMultibagger = [ { 'text': 'TATA MOTORS', @@ -210,7 +327,7 @@ class _PastPerformanceState extends State { }) { return commonGlassContainer( width: double.infinity, - height: 330.h, + height: 360.h, borderradius: 8, customWidget: Column( children: [ diff --git a/lib/view/MainScreen/ShortTrade.dart b/lib/view/MainScreen/ShortTrade.dart index 2728be9..42f7cdf 100644 --- a/lib/view/MainScreen/ShortTrade.dart +++ b/lib/view/MainScreen/ShortTrade.dart @@ -90,51 +90,54 @@ class _ShortTradeState extends State { Stack(children: [ Padding( padding: EdgeInsets.symmetric(horizontal: 16, vertical: 16), - child: ListView(physics: BouncingScrollPhysics(), children: [ - sizedBoxHeight(15.h), - SizedBox( - height: 60, - width: double.infinity, - // color: Colors.amber, - child: ListView.builder( - shrinkWrap: true, - scrollDirection: Axis.horizontal, - itemCount: containerTexts.length, - itemBuilder: (context, index) { - return GestureDetector( - onTap: () { - selectedIndex.value = index; - }, - child: Row( - children: [ - topContainer(containerTexts[index], index), - sizedBoxWidth(10.w) - ], + child: ListView( + physics: NeverScrollableScrollPhysics(), + children: [ + sizedBoxHeight(15.h), + SizedBox( + height: 60, + width: double.infinity, + // color: Colors.amber, + child: ListView.builder( + shrinkWrap: true, + scrollDirection: Axis.horizontal, + itemCount: containerTexts.length, + itemBuilder: (context, index) { + return GestureDetector( + onTap: () { + selectedIndex.value = index; + }, + child: Row( + children: [ + topContainer( + containerTexts[index], index), + sizedBoxWidth(10.w) + ], + ), + ); + }), + ), + sizedBoxHeight(20.h), + DefaultTabController( + length: 2, + // initialIndex: selectedIndex.value, + child: Column( + children: [ + MyTabBar(), + SizedBox( + height: 700.h, + child: TabBarView( + children: [ + ActiveCallsTab(), + ExitedCallsTab(), + ], + ), ), - ); - }), - ), - sizedBoxHeight(20.h), - DefaultTabController( - length: 2, - // initialIndex: selectedIndex.value, - child: Column( - children: [ - MyTabBar(), - SizedBox( - height: 700.h, - child: TabBarView( - children: [ - ActiveCallsTab(), - ExitedCallsTab(), - ], - ), + ], ), - ], - ), - ), - sizedBoxHeight(20.h), - ])) + ), + sizedBoxHeight(20.h), + ])) ]) ], ), @@ -187,103 +190,112 @@ class _ShortTradeState extends State { if (selectedIndex == 1 || selectedIndex == 2) _unlockbottomsheet(); }); return selectedIndex == 0 - ? Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - sizedBoxHeight(20.h), - cardSwingWidget( - text: 'Indiabulls Housing Finance Ltd', - amount: '₹ 196.50 - ₹ 197', - targetamount: '₹ 204', - stoploss: '₹ 190', - time: '4-5 Days'), - sizedBoxHeight(25.h), - text22W600('Content Bytes'), - SingleChildScrollView( - scrollDirection: Axis.horizontal, - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - text16W400_DADADA('The Beauty and Power of Video'), - sizedBoxWidth(10.w), - Container( - height: 35.h, - width: 105.w, - decoration: BoxDecoration( - color: Color(0xFF3A3A3A).withOpacity(0.6), - borderRadius: BorderRadius.circular(5.r), - border: Border.all( - color: Color(0xFF3A3A3A), - )), - child: Center( - child: InkWell( - onTap: () { - Get.toNamed(RouteName.contentbytes); - }, - child: text16W500('View More'), + ? SingleChildScrollView( + physics: AlwaysScrollableScrollPhysics(), + child: Padding( + padding: EdgeInsets.only(top: 20.h, bottom: 220.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + cardSwingWidget( + text: 'Indiabulls Housing Finance Ltd', + amount: '₹ 196.50 - ₹ 197', + targetamount: '₹ 204', + stoploss: '₹ 190', + time: '4-5 Days'), + sizedBoxHeight(25.h), + text22W600('Content Bytes'), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + width: 240.w, + child: text16W400_DADADA( + 'The Beauty and Power of Video')), + Spacer(), + Container( + height: 35.h, + width: 105.w, + decoration: BoxDecoration( + color: Color(0xFF3A3A3A).withOpacity(0.6), + borderRadius: BorderRadius.circular(5.r), + border: Border.all( + color: Color(0xFF3A3A3A), + )), + child: Center( + child: InkWell( + onTap: () { + Get.toNamed(RouteName.contentbytes); + }, + child: text16W500('View More'), + ), ), ), - ), - ], - ), - ), - sizedBoxHeight(20.h), - commonGlassContainer( - borderradius: 8, - width: double.infinity, - height: 300.h, - customWidget: Padding( - padding: - EdgeInsets.symmetric(vertical: 10.h, horizontal: 10.w), - child: Column( - children: [ - InkWell( - onTap: () { - Get.to(() => PlayerWidget(), arguments: { - "video_url": "", - }); - }, - child: Container( - height: 200.h, - width: double.infinity, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(8.r), - image: DecorationImage( - image: AssetImage( - 'assets/images/png/Rectangle 17934.png'))), - child: Center( - child: SvgPicture.asset( - 'assets/images/svg/gridicons_play.svg', - height: 56.h, - width: 56.w, + ], + ), + sizedBoxHeight(20.h), + commonGlassContainer( + borderradius: 8, + width: double.infinity, + height: 330.h, + customWidget: Padding( + padding: EdgeInsets.symmetric( + vertical: 10.h, horizontal: 10.w), + child: Column( + children: [ + InkWell( + onTap: () { + Get.to(() => PlayerWidget(), arguments: { + "video_url": "", + }); + }, + child: Container( + height: 200.h, + width: double.infinity, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8.r), + image: DecorationImage( + image: AssetImage( + 'assets/images/png/Rectangle 17934.png'))), + child: Center( + child: SvgPicture.asset( + 'assets/images/svg/gridicons_play.svg', + height: 56.h, + width: 56.w, + ), + ), ), ), - ), - ), - sizedBoxHeight(20.h), - Row( - children: [ - CircleAvatar( - radius: 23.r, - backgroundImage: AssetImage( - 'assets/images/png/Ellipse 1494.png'), - ), - sizedBoxWidth(10.w), - Column( - crossAxisAlignment: CrossAxisAlignment.start, + sizedBoxHeight(20.h), + Row( children: [ - text18W500('Week of 21st February 2024'), - // sizedBoxHeight(10.h), - text12W400_979797('20k views . 2 days ago'), + CircleAvatar( + radius: 23.r, + backgroundImage: AssetImage( + 'assets/images/png/Ellipse 1494.png'), + ), + sizedBoxWidth(10.w), + Expanded( + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + text18W500('Week of 21st February 2024'), + // sizedBoxHeight(10.h), + text12W400_979797( + '20k views . 2 days ago'), + ], + ), + ) ], ) ], - ) - ], + ), + ), ), - ), + ], ), - ], + ), ) : selectedIndex == 1 ? Column( @@ -499,7 +511,7 @@ class _ShortTradeState extends State { }) { return commonGlassContainer( width: double.infinity, - height: 380.h, + height: 400.h, borderradius: 8, customWidget: Column( children: [ @@ -657,7 +669,7 @@ class _ShortTradeState extends State { }) { return commonGlassContainer( width: double.infinity, - height: 330.h, + height: 360.h, borderradius: 8, customWidget: Column( children: [ @@ -815,7 +827,7 @@ class _ShortTradeState extends State { }) { return commonGlassContainer( width: double.infinity, - height: 255.h, + height: 260.h, borderradius: 8, customWidget: Column( children: [ diff --git a/lib/view/Sidemenu/ContentByte/VideosMore.dart b/lib/view/Sidemenu/ContentByte/VideosMore.dart index b20576a..24c8a40 100644 --- a/lib/view/Sidemenu/ContentByte/VideosMore.dart +++ b/lib/view/Sidemenu/ContentByte/VideosMore.dart @@ -164,38 +164,39 @@ class _VideosMoreState extends State { return [ PopupMenuItem( child: Column( - mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.center, children: [ - SizedBox( - height: (Get.height * - contentBytesController - .contentBytesCategoriesModel.data!.length) / - 17, - width: 150, - child: ListView.builder( - padding: EdgeInsets.zero, - shrinkWrap: true, - itemCount: contentBytesController - .contentBytesCategoriesModel.data!.length, - itemBuilder: (ctx, index) { - return InkWell( - onTap: () { - // contentBytesController.isApiCalling.value = true; - Get.back(); - contentBytesController.filterId = - contentBytesController - .contentBytesCategoriesModel - .data![index] - .id!; - log( - contentBytesController.filterId.toString(), - ); - handleSearch(searchController.text, - contentBytesController.filterId.toString()); - }, - child: itemFilter(index)); - }), + Center( + child: SizedBox( + height: (Get.height * + contentBytesController + .contentBytesCategoriesModel.data!.length) / + 17, + width: 160, + child: ListView.builder( + padding: EdgeInsets.zero, + shrinkWrap: true, + itemCount: contentBytesController + .contentBytesCategoriesModel.data!.length, + itemBuilder: (ctx, index) { + return InkWell( + onTap: () { + // contentBytesController.isApiCalling.value = true; + Get.back(); + contentBytesController.filterId = + contentBytesController + .contentBytesCategoriesModel + .data![index] + .id!; + log( + contentBytesController.filterId.toString(), + ); + handleSearch(searchController.text, + contentBytesController.filterId.toString()); + }, + child: itemFilter(index)); + }), + ), ), ], )) diff --git a/pubspec.yaml b/pubspec.yaml index 6725fb9..cdbbd7d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -49,7 +49,6 @@ dependencies: syncfusion_flutter_pdfviewer: flutter_html: ^3.0.0-beta.2 - dev_dependencies: flutter_test: sdk: flutter From 624c95eac301ba1efd67e4a7072fbf996fdeaf0a Mon Sep 17 00:00:00 2001 From: priyanka Date: Fri, 26 Apr 2024 03:32:12 -0700 Subject: [PATCH 2/2] UI changes done --- lib/view/MainScreen/ShortTrade.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/view/MainScreen/ShortTrade.dart b/lib/view/MainScreen/ShortTrade.dart index 42f7cdf..a8c60b3 100644 --- a/lib/view/MainScreen/ShortTrade.dart +++ b/lib/view/MainScreen/ShortTrade.dart @@ -193,7 +193,7 @@ class _ShortTradeState extends State { ? SingleChildScrollView( physics: AlwaysScrollableScrollPhysics(), child: Padding( - padding: EdgeInsets.only(top: 20.h, bottom: 220.h), + padding: EdgeInsets.only(top: 20.h, bottom: 210.h), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [