kishan.bhuta/Regroup
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

minor changes done

Browse Source
This commit is contained in:
cj201199
2024-07-29 20:16:05 +05:30
parent e0759e5df7
commit 5d16e5b8b8
10 changed files with 73 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/images/png/Black33.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
assets/images/png/LightGray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
assets/images/png/LightGray22.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
assets/images/png/leave group.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

49
lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart
View File

@@ -232,7 +232,7 @@ class _GroupTabState extends State<GroupTab> {
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<GroupTab> {
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<GroupTab> {
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,
)

49
lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart
View File

@@ -144,7 +144,7 @@ class _RequestedGroupsState extends State<RequestedGroups> {
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<RequestedGroups> {
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<RequestedGroups> {
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,
)

5
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart
View File

@@ -493,7 +493,7 @@ class _ProfileTabState extends State<ProfileTab> {
children: [
SizedBox(
width: 10,
height: 170.h,
height: 200.h,
child: Stack(
clipBehavior: Clip.none,
children: [
@@ -512,7 +512,7 @@ class _ProfileTabState extends State<ProfileTab> {
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<ProfileTab> {
),
// border: 1
),
sizedBoxHeight(20.h),
],
),
),

14
lib/Feed Module/Main_Screens/ProfileTab/My Network/MyNetwork.dart
View File

@@ -350,8 +350,8 @@ class _FollowersTabState extends State<FollowersTab> {
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<FollowersTab> {
"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<FollowersTab> {
);
}
Widget _buildNoDataBody(context) {
Widget _buildNoDataBody(context) {
return Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
@@ -452,8 +452,6 @@ class _FollowersTabState extends State<FollowersTab> {
],
);
}
}
class FollowingTab extends StatefulWidget {

4
lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart
View File

@@ -294,10 +294,10 @@ class _AddTimelineState extends State<AddTimeline> {
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;
},

12
lib/Utils/texts.dart
View File

@@ -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(