From 5d16e5b8b887130d6add5f255b4ff4519181f76a Mon Sep 17 00:00:00 2001 From: cj201199 Date: Mon, 29 Jul 2024 20:16:05 +0530 Subject: [PATCH] minor changes done --- assets/images/png/Black33.png | Bin 0 -> 2061 bytes assets/images/png/LightGray.png | Bin 0 -> 1103 bytes assets/images/png/LightGray22.png | Bin 0 -> 1103 bytes assets/images/png/leave group.png | Bin 0 -> 2061 bytes .../Main_Screens/GroupTab/View/GroupTab.dart | 49 +++++++++--------- .../GroupTab/View/RequestedGroups.dart | 49 +++++++++--------- .../EditProfile/View/ProfileTab.dart | 5 +- .../ProfileTab/My Network/MyNetwork.dart | 14 +++-- .../ProfileTab/TimeLine/AddTimeline.dart | 4 +- lib/Utils/texts.dart | 12 +++++ 10 files changed, 73 insertions(+), 60 deletions(-) create mode 100644 assets/images/png/Black33.png create mode 100644 assets/images/png/LightGray.png create mode 100644 assets/images/png/LightGray22.png create mode 100644 assets/images/png/leave group.png diff --git a/assets/images/png/Black33.png b/assets/images/png/Black33.png new file mode 100644 index 0000000000000000000000000000000000000000..62f1547b89e0c6a2daef4b8c4d61f1ac2adb0df7 GIT binary patch literal 2061 zcmV+o2=e!dP)@~0drDELIAGL9O(c600d`2O+f$vv5yPOj3DAbMci@F`M$g@Xv zBRr@ppzZNR`%|>nQ+wrfEk=sHwbwVgzP8u?;o;#;eN-4DwAY#iO^#zAepqO_8V`L% z2L2czLu^TDsZ7;gkHl9Zj1`lY5pM(6pf&D!Mq-ALp77FMPaggxgNQOu7_Yv#Sp|>lE)k{98waRc$Xm$pt|nETiS|q(M#Ib z7*a@!hBsuC5PZ)yJYIk<#x$aArmhKeJX zURe1ft~G>&BBtUe@w`CaW9D~_@DTD1n+D+_QVQA9FqM$?zD5zoa2ieuerASRC&-h- z&Xmg&+hNPq+~DW}{QDb)8h;EJgOB4KCMHhkrqg^%IjXY`w5ObE?zM#o-Pgr_GnBbjO7AO06+2-wV^)=WPevK&#ay0C!AQjGnPZWa`EUwFmB$zftEv z3>6)q-^?>4n5USw+3DRH%EpuVFNWxY7KGL7Tg8kqFpu7OXa=>K1G21dsFY_3z5-b6 zSTdUSb?y|QH5G0Iy}>Qg;|V~Y^vR)P@iJ8)FU;2_N=ds{uwlZz`(;)vVTyabLwyiX zdymXZ`0GM?{A1&7mUj@Z$z2Zgd-hC(?j6a>)QRm_OXZoDq~#@IxMYm3Q@jKHs@ajs z*dEzD=C$1e`O0Xg#t2#rM{)lqepgh-AD*&*5noC7V{Se6{2R&R zo%Drhg&Ko(c|kh`vV^jQ&+_PB4l}wx$~pvp4T@K6$Y|mATc76yw^w2v+ksm!nXj#^J+_g9=Hwwlr%ZKv8gKpnLoc{T5>n70yu@dFjjyWnT{;^Vb_l#BLj-X2 z3D!}_)SNFMr@>Uc;J&~m7xpw@5GdiFX-rQQtPut8P4r4+@XRox&d>DRH>Ee24y`aB zkDlHzmp914jRpLb9B_Nz-gD2*0x}oyPw5$E;v9qI9`6|2apUh21{FFF)#x{-EKftf zW4VuST0P4k8q*;ownkbOyJRw+B78aHOId|?vQb8x3T^TblMB46beM?!yP##NoA1Y9 zmD|K}n)aEI^(WnqPOGZRD>6a*O-<9w@b-BTx*f90T8jRz7|qNaEBH5^8lAxsr<3knUv4Qmv;nDIr z84)U>5eI2)1hP8zobQdSNRb@<)VajWwG{L-5SMAE?lt;N@z9x)MWmC*y_NN3!Dwqq z^OW0QeD0sT4vXhgI<#`Mb66fjHr zyrfC#Jks~Lk;T*Z17{V8L9^4X;AJm4)6 zM#157UT$9-`r%EwQvU{NA$>@^6zcVz^y6 z7($FUCxv!M+aj;sk{1FL4o%mW{yn#kNd&D-IBB934|BS00000NkvXXu0mjfJ?829 literal 0 HcmV?d00001 diff --git a/assets/images/png/LightGray.png b/assets/images/png/LightGray.png new file mode 100644 index 0000000000000000000000000000000000000000..196732bc39664e83ad02a919bc16a368c5d2be5e GIT binary patch literal 1103 zcmV-V1hD&wP)@~0drDELIAGL9O(c600d`2O+f$vv5yPnJ#Y82bUpj5F9Cu%4}!Xftc{cS$fiybvm>_A6hP4RbICbcOeE0exQ;5 z1bRs`r2^)+cu*h)M5AO|hAU6h4n+KHpx8kJT95z&(5A;~U|vC3nLgiJg@_SNbAE&F z>uS$uN%?-};$R&Trcs))a_&T3k#Est_Y@+AE_FWBH_%DgNkf{MZGCePVNGc+9Tyj# zLBtrruPhPEWHKl;o5%iD#u#dYz+~>}v@sw9cyMJw#Aqj8EGBcs1;qt8kRs1pyD5ol z$S==3gNR{q3p8gk_vkxBjFux#tGJ!(7Zk9(=+sZu-#MC^TRAf4PnwhS8^bJXwG{UX z?h-Ae*7!%t%Zl3HFyB<^gnXp4Vo~^9r2uO?tb86cgjaC%^x>}l9Ef@BZL+)am4yK( z$4pFaL9RA=^FnE~!;E|;#a~g3?g93@A_kVv=!nzp(B7{}z@ZA`LPgZrq2&n!^n?~I1@%bvIR`Tw5tZn$hU}w#DQQ8 z(zD2kM7%jQw}vQ}Z_*RmVw-VL`ur20thFC)$fd{Jv-^Nt&ijc>=kOYDZUkw&VY;gBOXSY84K~S(o9es_1}EF4QG21u97I)mRM&16=56lo@t;-gA4 znG`oJkFi^LrODRiXWMCH41UJb5d^6ab4{%Jo1YN9RI}- z(u}SnzIf}{R!c!RqdMK*dtUHd>wMzJLRe`=%S_6kyy!Gep#wuPR%`VzJm^vo2Oc2W zjd-JITaW<%@9~GmgD(Ejid-)EUlFks|EQG(-5tu*@W8Vn0Su`W?Q$^WC6B_}6lheH_FB`Nvpr#afh3^qE(%DVpex^l5^iEl$qGN))imGGMx7{w zZVVZD4T3+p6$-g`py3M6kXVgF+JA3;;4n`XE-N(rsTS#9LnCc?Sbo{r{|Ye?NbGXe zAT=(E6fS+*B6bAI+WExK^@WxbYZddo8SUfZ>_EwW5Av4UmV+w?2H>oCaTd3z%5Sh6 V2|~)>eRlu=002ovPDHLkV1kK}@wfm0 literal 0 HcmV?d00001 diff --git a/assets/images/png/LightGray22.png b/assets/images/png/LightGray22.png new file mode 100644 index 0000000000000000000000000000000000000000..196732bc39664e83ad02a919bc16a368c5d2be5e GIT binary patch literal 1103 zcmV-V1hD&wP)@~0drDELIAGL9O(c600d`2O+f$vv5yPnJ#Y82bUpj5F9Cu%4}!Xftc{cS$fiybvm>_A6hP4RbICbcOeE0exQ;5 z1bRs`r2^)+cu*h)M5AO|hAU6h4n+KHpx8kJT95z&(5A;~U|vC3nLgiJg@_SNbAE&F z>uS$uN%?-};$R&Trcs))a_&T3k#Est_Y@+AE_FWBH_%DgNkf{MZGCePVNGc+9Tyj# zLBtrruPhPEWHKl;o5%iD#u#dYz+~>}v@sw9cyMJw#Aqj8EGBcs1;qt8kRs1pyD5ol z$S==3gNR{q3p8gk_vkxBjFux#tGJ!(7Zk9(=+sZu-#MC^TRAf4PnwhS8^bJXwG{UX z?h-Ae*7!%t%Zl3HFyB<^gnXp4Vo~^9r2uO?tb86cgjaC%^x>}l9Ef@BZL+)am4yK( z$4pFaL9RA=^FnE~!;E|;#a~g3?g93@A_kVv=!nzp(B7{}z@ZA`LPgZrq2&n!^n?~I1@%bvIR`Tw5tZn$hU}w#DQQ8 z(zD2kM7%jQw}vQ}Z_*RmVw-VL`ur20thFC)$fd{Jv-^Nt&ijc>=kOYDZUkw&VY;gBOXSY84K~S(o9es_1}EF4QG21u97I)mRM&16=56lo@t;-gA4 znG`oJkFi^LrODRiXWMCH41UJb5d^6ab4{%Jo1YN9RI}- z(u}SnzIf}{R!c!RqdMK*dtUHd>wMzJLRe`=%S_6kyy!Gep#wuPR%`VzJm^vo2Oc2W zjd-JITaW<%@9~GmgD(Ejid-)EUlFks|EQG(-5tu*@W8Vn0Su`W?Q$^WC6B_}6lheH_FB`Nvpr#afh3^qE(%DVpex^l5^iEl$qGN))imGGMx7{w zZVVZD4T3+p6$-g`py3M6kXVgF+JA3;;4n`XE-N(rsTS#9LnCc?Sbo{r{|Ye?NbGXe zAT=(E6fS+*B6bAI+WExK^@WxbYZddo8SUfZ>_EwW5Av4UmV+w?2H>oCaTd3z%5Sh6 V2|~)>eRlu=002ovPDHLkV1kK}@wfm0 literal 0 HcmV?d00001 diff --git a/assets/images/png/leave group.png b/assets/images/png/leave group.png new file mode 100644 index 0000000000000000000000000000000000000000..62f1547b89e0c6a2daef4b8c4d61f1ac2adb0df7 GIT binary patch literal 2061 zcmV+o2=e!dP)@~0drDELIAGL9O(c600d`2O+f$vv5yPOj3DAbMci@F`M$g@Xv zBRr@ppzZNR`%|>nQ+wrfEk=sHwbwVgzP8u?;o;#;eN-4DwAY#iO^#zAepqO_8V`L% z2L2czLu^TDsZ7;gkHl9Zj1`lY5pM(6pf&D!Mq-ALp77FMPaggxgNQOu7_Yv#Sp|>lE)k{98waRc$Xm$pt|nETiS|q(M#Ib z7*a@!hBsuC5PZ)yJYIk<#x$aArmhKeJX zURe1ft~G>&BBtUe@w`CaW9D~_@DTD1n+D+_QVQA9FqM$?zD5zoa2ieuerASRC&-h- z&Xmg&+hNPq+~DW}{QDb)8h;EJgOB4KCMHhkrqg^%IjXY`w5ObE?zM#o-Pgr_GnBbjO7AO06+2-wV^)=WPevK&#ay0C!AQjGnPZWa`EUwFmB$zftEv z3>6)q-^?>4n5USw+3DRH%EpuVFNWxY7KGL7Tg8kqFpu7OXa=>K1G21dsFY_3z5-b6 zSTdUSb?y|QH5G0Iy}>Qg;|V~Y^vR)P@iJ8)FU;2_N=ds{uwlZz`(;)vVTyabLwyiX zdymXZ`0GM?{A1&7mUj@Z$z2Zgd-hC(?j6a>)QRm_OXZoDq~#@IxMYm3Q@jKHs@ajs z*dEzD=C$1e`O0Xg#t2#rM{)lqepgh-AD*&*5noC7V{Se6{2R&R zo%Drhg&Ko(c|kh`vV^jQ&+_PB4l}wx$~pvp4T@K6$Y|mATc76yw^w2v+ksm!nXj#^J+_g9=Hwwlr%ZKv8gKpnLoc{T5>n70yu@dFjjyWnT{;^Vb_l#BLj-X2 z3D!}_)SNFMr@>Uc;J&~m7xpw@5GdiFX-rQQtPut8P4r4+@XRox&d>DRH>Ee24y`aB zkDlHzmp914jRpLb9B_Nz-gD2*0x}oyPw5$E;v9qI9`6|2apUh21{FFF)#x{-EKftf zW4VuST0P4k8q*;ownkbOyJRw+B78aHOId|?vQb8x3T^TblMB46beM?!yP##NoA1Y9 zmD|K}n)aEI^(WnqPOGZRD>6a*O-<9w@b-BTx*f90T8jRz7|qNaEBH5^8lAxsr<3knUv4Qmv;nDIr z84)U>5eI2)1hP8zobQdSNRb@<)VajWwG{L-5SMAE?lt;N@z9x)MWmC*y_NN3!Dwqq z^OW0QeD0sT4vXhgI<#`Mb66fjHr zyrfC#Jks~Lk;T*Z17{V8L9^4X;AJm4)6 zM#157UT$9-`r%EwQvU{NA$>@^6zcVz^y6 z7($FUCxv!M+aj;sk{1FL4o%mW{yn#kNd&D-IBB934|BS00000NkvXXu0mjfJ?829 literal 0 HcmV?d00001 diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart b/lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart index baedb7f..48c419d 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart @@ -232,7 +232,7 @@ class _GroupTabState extends State { EdgeInsets.symmetric(horizontal: 8.w), child: Row( children: [ - text14w400_FCFCFC("Mute community"), + text14w400_FCFCFC("Mute group"), const Spacer(), Image.asset( "assets/images/png/Black (1).png", @@ -251,10 +251,29 @@ class _GroupTabState extends State { EdgeInsets.symmetric(horizontal: 8.w), child: Row( children: [ - text14w400_FCFCFC("Hide post"), + text14w400_FCFCFC("Pin group"), const Spacer(), Image.asset( - "assets/images/png/mingcute_eye-close-line.png", + "assets/images/png/f7_pin-fill (2).png", + height: 27.h, + width: 27.w, + ) + ], + ), + ), + ), + const PopupMenuDivider(), + PopupMenuItem( + onTap: () {}, + child: Padding( + padding: + EdgeInsets.symmetric(horizontal: 8.w), + child: Row( + children: [ + text14w400_FCFCFC("Make primary"), + const Spacer(), + Image.asset( + "assets/images/png/leave group.png", height: 20.h, width: 20.w, ) @@ -270,29 +289,11 @@ class _GroupTabState extends State { EdgeInsets.symmetric(horizontal: 8.w), child: Row( children: [ - text14w400_FCFCFC("Pin"), + // text14w400_FCFCFC("Leave group"), + text14w400_D90B2E("Leave group"), const Spacer(), Image.asset( - "assets/images/png/f7_pin-fill (2).png", - height: 25.h, - width: 25.w, - ) - ], - ), - ), - ), - const PopupMenuDivider(), - PopupMenuItem( - onTap: () {}, - child: Padding( - padding: - EdgeInsets.symmetric(horizontal: 8.w), - child: Row( - children: [ - text14w400_FCFCFC("Leave community"), - const Spacer(), - Image.asset( - "assets/images/png/logout 1 (traced).png", + "assets/images/png/LightGray22.png", height: 18.h, width: 18.w, ) diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart b/lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart index 5139ae5..07ba70a 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart @@ -144,7 +144,7 @@ class _RequestedGroupsState extends State { EdgeInsets.symmetric(horizontal: 8.w), child: Row( children: [ - text14w400_FCFCFC("Mute community"), + text14w400_FCFCFC("Mute group"), const Spacer(), Image.asset( "assets/images/png/Black (1).png", @@ -163,10 +163,29 @@ class _RequestedGroupsState extends State { EdgeInsets.symmetric(horizontal: 8.w), child: Row( children: [ - text14w400_FCFCFC("Hide post"), + text14w400_FCFCFC("Pin group"), const Spacer(), Image.asset( - "assets/images/png/mingcute_eye-close-line.png", + "assets/images/png/f7_pin-fill (2).png", + height: 27.h, + width: 27.w, + ) + ], + ), + ), + ), + const PopupMenuDivider(), + PopupMenuItem( + onTap: () {}, + child: Padding( + padding: + EdgeInsets.symmetric(horizontal: 8.w), + child: Row( + children: [ + text14w400_FCFCFC("Make primary"), + const Spacer(), + Image.asset( + "assets/images/png/leave group.png", height: 20.h, width: 20.w, ) @@ -182,29 +201,11 @@ class _RequestedGroupsState extends State { EdgeInsets.symmetric(horizontal: 8.w), child: Row( children: [ - text14w400_FCFCFC("Pin"), + // text14w400_FCFCFC("Leave group"), + text14w400_D90B2E("Leave group"), const Spacer(), Image.asset( - "assets/images/png/f7_pin-fill (2).png", - height: 25.h, - width: 25.w, - ) - ], - ), - ), - ), - const PopupMenuDivider(), - PopupMenuItem( - onTap: () {}, - child: Padding( - padding: - EdgeInsets.symmetric(horizontal: 8.w), - child: Row( - children: [ - text14w400_FCFCFC("Leave community"), - const Spacer(), - Image.asset( - "assets/images/png/logout 1 (traced).png", + "assets/images/png/LightGray22.png", height: 18.h, width: 18.w, ) diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart b/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart index 4e7dd92..fa48c6b 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart @@ -493,7 +493,7 @@ class _ProfileTabState extends State { children: [ SizedBox( width: 10, - height: 170.h, + height: 200.h, child: Stack( clipBehavior: Clip.none, children: [ @@ -512,7 +512,7 @@ class _ProfileTabState extends State { right: 3.w, child: Container( width: 1.w, - height: 170.h, + height: 200.h, decoration: const BoxDecoration( color: Colors @@ -738,6 +738,7 @@ class _ProfileTabState extends State { ), // border: 1 ), + sizedBoxHeight(20.h), ], ), ), diff --git a/lib/Feed Module/Main_Screens/ProfileTab/My Network/MyNetwork.dart b/lib/Feed Module/Main_Screens/ProfileTab/My Network/MyNetwork.dart index dab35fc..3a142af 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/My Network/MyNetwork.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/My Network/MyNetwork.dart @@ -350,8 +350,8 @@ class _FollowersTabState extends State { const Spacer(), Image.asset( "assets/images/png/fluent_delete-28-regular.png", - height: 15.h, - width: 15.w, + height: 20.h, + width: 20.w, ) ], ), @@ -402,9 +402,9 @@ class _FollowersTabState extends State { "Block user"), const Spacer(), Image.asset( - "assets/images/png/blockchat.png", - height: 25.h, - width: 25.w, + "assets/images/png/blocked.png", + height: 17.h, + width: 17.w, ) ], ), @@ -437,7 +437,7 @@ class _FollowersTabState extends State { ); } - Widget _buildNoDataBody(context) { + Widget _buildNoDataBody(context) { return Column( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, @@ -452,8 +452,6 @@ class _FollowersTabState extends State { ], ); } - - } class FollowingTab extends StatefulWidget { diff --git a/lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart b/lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart index 3e99e54..7342852 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart @@ -294,10 +294,10 @@ class _AddTimelineState extends State { textEditingController: rollnameController, texttype: TextInputType.text, - hintText: 'Enter role in club', + hintText: 'Enter role in the club', validator: (value) { if (value!.isEmpty) { - return 'Enter role in club'; + return 'Enter role in the club'; } return null; }, diff --git a/lib/Utils/texts.dart b/lib/Utils/texts.dart index e9f3a99..d796b52 100644 --- a/lib/Utils/texts.dart +++ b/lib/Utils/texts.dart @@ -470,6 +470,18 @@ Widget text16w700_D90B2E(String text, {TextDecoration? decoration}) { fontWeight: FontWeight.w700), ); } +Widget text14w400_D90B2E(String text, {TextDecoration? decoration}) { + return Text( + text, + style: TextStyle( + decoration: decoration, + decorationColor: const Color(0xFFD90B2E), + fontSize: 14.sp, + color: const Color(0xFFD90B2E), + fontFamily: 'Helvetica', + fontWeight: FontWeight.w400), + ); +} Widget text16w700_FCFCFCblur(String text) { return Text(