diff --git a/assets/images/png/Black33.png b/assets/images/png/Black33.png new file mode 100644 index 0000000..62f1547 Binary files /dev/null and b/assets/images/png/Black33.png differ diff --git a/assets/images/png/LightGray.png b/assets/images/png/LightGray.png new file mode 100644 index 0000000..196732b Binary files /dev/null and b/assets/images/png/LightGray.png differ diff --git a/assets/images/png/LightGray22.png b/assets/images/png/LightGray22.png new file mode 100644 index 0000000..196732b Binary files /dev/null and b/assets/images/png/LightGray22.png differ diff --git a/assets/images/png/leave group.png b/assets/images/png/leave group.png new file mode 100644 index 0000000..62f1547 Binary files /dev/null and b/assets/images/png/leave group.png differ 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(