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

minor bug fix

Browse Source
This commit is contained in:
cj201199
2024-07-29 15:20:19 +05:30
parent 00b2e87126
commit 02405fc097
59 changed files with 831 additions and 925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart
View File

@@ -9,10 +9,8 @@ import 'package:regroup/Common/CommonDropDown.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CustomNextButton.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/ImageUpload.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
@@ -33,8 +31,8 @@ class _AddEventState extends State<AddEvent> {
TextEditingController dateController = TextEditingController();
TextEditingController dateController2 = TextEditingController();
TimeOfDay? starttime = TimeOfDay(hour: 15, minute: 0);
TimeOfDay? endtime = TimeOfDay(hour: 15, minute: 0);
TimeOfDay? starttime = const TimeOfDay(hour: 15, minute: 0);
TimeOfDay? endtime = const TimeOfDay(hour: 15, minute: 0);
String formatTimeOfDay(TimeOfDay time) {
final now = DateTime.now();
@@ -48,10 +46,10 @@ class _AddEventState extends State<AddEvent> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "",
),
body: Stack(children: [
@@ -69,7 +67,7 @@ class _AddEventState extends State<AddEvent> {
text16400white("Event Title"),
sizedBoxHeight(14.h),
CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 22.h,
width: 18.w,
child: Center(
@@ -101,10 +99,10 @@ class _AddEventState extends State<AddEvent> {
},
child: DottedBorder(
strokeWidth: 1,
dashPattern: [7, 4],
dashPattern: const [7, 4],
borderType: BorderType.RRect,
radius: Radius.circular(14.r),
color: Color(0xFF434A53),
color: const Color(0xFF434A53),
child: commonGlassContainer(
border: 0,
width: double.infinity,
@@ -130,12 +128,12 @@ class _AddEventState extends State<AddEvent> {
width: 27,
height: 27,
decoration: ShapeDecoration(
color: Color(0xFF7E7E7E),
color: const Color(0xFF7E7E7E),
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(5)),
),
child: Icon(
child: const Icon(
Icons.delete_outline_outlined,
color: Colors.white,
))),
@@ -190,7 +188,7 @@ class _AddEventState extends State<AddEvent> {
text12w400_FCFCFC_blur("10 kb")
],
),
Spacer(),
const Spacer(),
Image.asset(
'assets/images/png/cancelicon.png',
height: 20.h,
@@ -205,8 +203,8 @@ class _AddEventState extends State<AddEvent> {
sizedBoxHeight(14.h),
CommonDropdownBtn(
hint: 'Race',
items: [],
leadingImage: Container(
items: const ['', ''],
leadingImage: SizedBox(
height: 22.h,
width: 18.w,
child: Center(
@@ -221,8 +219,8 @@ class _AddEventState extends State<AddEvent> {
sizedBoxHeight(14.h),
CommonDropdownBtn(
hint: 'Cycling',
items: [],
leadingImage: Container(
items: const [],
leadingImage: SizedBox(
height: 22.h,
width: 18.w,
child: Center(
@@ -250,7 +248,7 @@ class _AddEventState extends State<AddEvent> {
child: CustomTextFormField(
textEditingController: dateController,
hintText: "1-4-2024",
leadingIcon: Container(
leadingIcon: SizedBox(
height: 20.h,
width: 20.w,
child: Center(
@@ -281,7 +279,7 @@ class _AddEventState extends State<AddEvent> {
child: CustomTextFormField(
textEditingController: dateController2,
hintText: "4-4-2024",
leadingIcon: Container(
leadingIcon: SizedBox(
height: 20.h,
width: 20.w,
child: Center(
@@ -336,7 +334,7 @@ class _AddEventState extends State<AddEvent> {
)
],
),
Spacer(),
const Spacer(),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -390,7 +388,7 @@ class _AddEventState extends State<AddEvent> {
customWidget: Transform.scale(
scale: 1.4,
child: Checkbox(
side: BorderSide(color: Color(0xFF434A53)),
side: const BorderSide(color: Color(0xFF434A53)),
value: isChecked.value,
activeColor: Colors.transparent,
checkColor: Colors.white,
@@ -410,8 +408,8 @@ class _AddEventState extends State<AddEvent> {
sizedBoxHeight(14.h),
CommonDropdownBtn(
hint: '',
items: [],
leadingImage: Container(
items: const [],
leadingImage: SizedBox(
height: 22.h,
width: 28.w,
child: Center(
@@ -426,7 +424,7 @@ class _AddEventState extends State<AddEvent> {
onTap: () {
Get.toNamed(RouteName.addUsers);
},
leadingIcon: Container(
leadingIcon: SizedBox(
height: 22.h,
width: 18.w,
child: Center(
@@ -440,7 +438,7 @@ class _AddEventState extends State<AddEvent> {
),
hintText: "",
suffixIcon:
Icon(Icons.arrow_forward, color: Color(0xFFFFFFFF)),
const Icon(Icons.arrow_forward, color: Color(0xFFFFFFFF)),
),
sizedBoxHeight(20.h),
containerWidget(
@@ -458,7 +456,7 @@ class _AddEventState extends State<AddEvent> {
text16400white("Location"),
sizedBoxHeight(14.h),
CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 19.h,
width: 15.w,
child: Center(
@@ -495,7 +493,7 @@ class _AddEventState extends State<AddEvent> {
children: [
text16400white("Minutes"),
sizedBoxWidth(5.w),
Icon(
const Icon(
Icons.keyboard_arrow_down,
color: Colors.white,
)
@@ -532,7 +530,7 @@ class _AddEventState extends State<AddEvent> {
),
sizedBoxWidth(8.w),
text16400white(title),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/cancelicon.png",
height: 20.h,

53
lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart
View File

@@ -59,28 +59,27 @@ class _AddUsersState extends State<AddUsers> {
List<bool> isCheckedList = [false, false, false, false, false, false, false];
@override
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Add users",
),
body: Stack(children: [
Container(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
),
SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(10.h),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
@@ -101,12 +100,10 @@ class _AddUsersState extends State<AddUsers> {
),
sizedBoxHeight(16.h),
DefaultTabController(
length: 3,
// initialIndex: selectedIndex.value,
child: Column(children: [
CommonTabBar(
tabs: const [
const CommonTabBar(tabs: [
Tab(
text: 'Group',
),
@@ -121,9 +118,9 @@ class _AddUsersState extends State<AddUsers> {
height: 600.h,
child: TabBarView(
children: [
GroupTab(),
SubgroupTab(),
FollowersTab(),
groupTab(),
subgroupTab(),
followersTab(),
],
),
),
@@ -132,7 +129,7 @@ class _AddUsersState extends State<AddUsers> {
]));
}
Widget GroupTab() {
Widget groupTab() {
return Column(
children: [
sizedBoxHeight(30.h),
@@ -141,7 +138,7 @@ class _AddUsersState extends State<AddUsers> {
child: Row(
children: [
text18w700_FCFCFC("Group members"),
Spacer(),
const Spacer(),
commonGlassContainer(
width: 35.w,
height: 35.h,
@@ -240,7 +237,7 @@ class _AddUsersState extends State<AddUsers> {
text12w400_FCFCFC_blur(subtitle),
],
),
Spacer(),
const Spacer(),
commonGlassContainer(
border: 1,
borderradius: 2,
@@ -251,7 +248,7 @@ class _AddUsersState extends State<AddUsers> {
customWidget: Transform.scale(
scale: 1.4,
child: Checkbox(
side: BorderSide(color: Color(0xFF434A53)),
side: const BorderSide(color: Color(0xFF434A53)),
value: isChecked,
activeColor: Colors.transparent,
checkColor: Colors.white,
@@ -274,7 +271,7 @@ class _AddUsersState extends State<AddUsers> {
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.r),
color: Color(0xFF222935)),
color: const Color(0xFF222935)),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 20.h),
child: Column(
@@ -310,7 +307,7 @@ class _AddUsersState extends State<AddUsers> {
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("W")),
border: 0.5),
Spacer(),
const Spacer(),
Row(
children: [
Image.asset(
@@ -355,7 +352,7 @@ class _AddUsersState extends State<AddUsers> {
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("Sa")),
border: 0.5),
Spacer(),
const Spacer(),
Row(
children: [
Image.asset(
@@ -383,7 +380,7 @@ class _AddUsersState extends State<AddUsers> {
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
Color(0xFFD90B2E).withOpacity(0.18),
const Color(0xFFD90B2E).withOpacity(0.18),
const Color(0xFFD90B2E).withOpacity(0.4),
],
stops: const [
@@ -391,7 +388,7 @@ class _AddUsersState extends State<AddUsers> {
1,
],
),
borderGradient: LinearGradient(
borderGradient: const LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
@@ -415,14 +412,14 @@ class _AddUsersState extends State<AddUsers> {
));
}
Widget SubgroupTab() {
return Column(
Widget subgroupTab() {
return const Column(
children: [],
);
}
Widget FollowersTab() {
return Column(
Widget followersTab() {
return const Column(
children: [],
);
}

51
lib/Feed Module/Main_Screens/CalenderTab/Availabillity.dart
View File

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:syncfusion_flutter_calendar/calendar.dart';
class Availability extends StatefulWidget {
@@ -29,13 +28,13 @@ class _AvailabilityState extends State<Availability> {
endTime: DateTime(2024, 6, 26, 10, 30),
subject: 'Development Meeting',
resourceIds: [4],
color: Color(0XFFFC571D)),
color: const Color(0XFFFC571D)),
Appointment(
startTime: DateTime(2024, 6, 26, 18, 0),
endTime: DateTime(2024, 6, 26, 18, 30),
subject: 'GeneralMeeting',
resourceIds: [2],
color: Color(0xFF8B1FA9)),
color: const Color(0xFF8B1FA9)),
Appointment(
startTime: DateTime(2024, 6, 28, 9, 0),
endTime: DateTime(2024, 6, 28, 10, 30),
@@ -50,13 +49,13 @@ class _AvailabilityState extends State<Availability> {
),
Appointment(
startTime: DateTime.now(),
endTime: DateTime.now().add(Duration(hours: 3)),
endTime: DateTime.now().add(const Duration(hours: 3)),
subject: 'Match day',
resourceIds: [3],
),
Appointment(
startTime: DateTime.now(),
endTime: DateTime.now().add(Duration(hours: 3)),
endTime: DateTime.now().add(const Duration(hours: 3)),
subject: 'Muharram/Ashura',
resourceIds: [3],
),
@@ -64,37 +63,37 @@ class _AvailabilityState extends State<Availability> {
_employeeCollection = <CalendarResource>[
CalendarResource(
id: 1,
image: AssetImage("assets/images/png/cimg1.png"),
image: const AssetImage("assets/images/png/cimg1.png"),
displayName: 'Kaylly Vaccaro',
color: Colors.transparent,
),
CalendarResource(
id: 2,
image: AssetImage("assets/images/png/cimg2.png"),
image: const AssetImage("assets/images/png/cimg2.png"),
displayName: 'Ryan Dorwart',
color: Colors.transparent,
),
CalendarResource(
id: 3,
image: AssetImage("assets/images/png/cimg3.png"),
image: const AssetImage("assets/images/png/cimg3.png"),
displayName: 'Ahmad Rhiel',
color: Colors.transparent,
),
CalendarResource(
id: 4,
image: AssetImage("assets/images/png/cimg3.png"),
image: const AssetImage("assets/images/png/cimg3.png"),
displayName: 'Ahmad Rhiel',
color: Colors.transparent,
),
CalendarResource(
id: 5,
image: AssetImage("assets/images/png/Ellipse 52.png"),
image: const AssetImage("assets/images/png/Ellipse 52.png"),
displayName: 'Ahmad Rhiel',
color: Colors.transparent,
),
CalendarResource(
id: 6,
image: AssetImage("assets/images/png/Ellipse 48.png"),
image: const AssetImage("assets/images/png/Ellipse 48.png"),
displayName: 'Ahmad Rhiel',
color: Colors.transparent,
),
@@ -105,10 +104,10 @@ class _AvailabilityState extends State<Availability> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Availability",
),
body: Stack(children: [
@@ -129,16 +128,16 @@ class _AvailabilityState extends State<Availability> {
border: 0,
customWidget: SfCalendar(
view: CalendarView.timelineMonth,
appointmentTextStyle: TextStyle(color: Colors.white),
headerStyle: CalendarHeaderStyle(
appointmentTextStyle: const TextStyle(color: Colors.white),
headerStyle: const CalendarHeaderStyle(
textStyle: TextStyle(
color: Colors.blue,
)),
// blackoutDatesTextStyle: TextStyle(color: Colors.white),
weekNumberStyle: WeekNumberStyle(
weekNumberStyle: const WeekNumberStyle(
textStyle: TextStyle(color: Colors.white)),
viewHeaderStyle: ViewHeaderStyle(
viewHeaderStyle: const ViewHeaderStyle(
// backgroundColor: Colors.amber,
dateTextStyle: TextStyle(color: Colors.white),
dayTextStyle: TextStyle(
@@ -150,18 +149,18 @@ class _AvailabilityState extends State<Availability> {
backgroundColor: Colors.transparent,
// firstDayOfWeek: 3,
cellBorderColor: Colors.white,
todayHighlightColor: Color(0xFFD90B2E),
todayHighlightColor: const Color(0xFFD90B2E),
todayTextStyle: const TextStyle(color: Colors.white),
controller: _calendarController,
showNavigationArrow: true,
allowViewNavigation: true,
showDatePickerButton: true,
monthViewSettings: MonthViewSettings(
monthViewSettings: const MonthViewSettings(
navigationDirection:
MonthNavigationDirection.horizontal,
),
allowDragAndDrop: true,
allowedViews: [
allowedViews: const [
// CalendarView.month,
// CalendarView.day,
// CalendarView.schedule,
@@ -175,7 +174,7 @@ class _AvailabilityState extends State<Availability> {
onTap: calendarTapped,
timeSlotViewSettings: TimeSlotViewSettings(
// minimumAppointmentDuration: Duration(hours: 5),
timeTextStyle: TextStyle(
timeTextStyle: const TextStyle(
color: Colors.white,
),
timelineAppointmentHeight: 60.h,
@@ -186,20 +185,20 @@ class _AvailabilityState extends State<Availability> {
),
monthCellBuilder: (context, details) {
return Container(
decoration: BoxDecoration(
decoration: const BoxDecoration(
color: Colors.transparent,
),
child: Center(
child: Text(
details.date.day.toString(),
style: TextStyle(
style: const TextStyle(
color:
Colors.white), // Set text color to white
),
),
);
},
resourceViewSettings: ResourceViewSettings(
resourceViewSettings: const ResourceViewSettings(
displayNameTextStyle:
TextStyle(color: Colors.white, fontSize: 10),
showAvatar: true,
@@ -244,7 +243,7 @@ class _AvailabilityState extends State<Availability> {
context: context,
builder: (BuildContext context) {
return AlertDialog(
title: Text('Event Details'),
title: const Text('Event Details'),
content: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
@@ -255,7 +254,7 @@ class _AvailabilityState extends State<Availability> {
),
actions: <Widget>[
ElevatedButton(
child: Text('Close'),
child: const Text('Close'),
onPressed: () {
Navigator.of(context).pop();
},

92
lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart
View File

@@ -7,8 +7,6 @@ import 'package:regroup/Common/CommonBottomNavigationBar.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonTabBar.dart';
import 'package:regroup/Common/controller/MainScreen.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
@@ -72,12 +70,12 @@ class _CalenderTabState extends State<CalenderTab> {
startTime: DateTime(2024, 6, 26, 9, 0),
endTime: DateTime(2024, 6, 26, 10, 30),
subject: 'Development Meeting',
color: Color(0XFFFC571D)),
color: const Color(0XFFFC571D)),
Appointment(
startTime: DateTime(2024, 6, 26, 18, 0),
endTime: DateTime(2024, 6, 26, 18, 30),
subject: 'GeneralMeeting',
color: Color(0xFF8B1FA9)),
color: const Color(0xFF8B1FA9)),
Appointment(
startTime: DateTime(2024, 6, 28, 9, 0),
endTime: DateTime(2024, 6, 28, 10, 30),
@@ -90,12 +88,12 @@ class _CalenderTabState extends State<CalenderTab> {
),
Appointment(
startTime: DateTime.now(),
endTime: DateTime.now().add(Duration(hours: 3)),
endTime: DateTime.now().add(const Duration(hours: 3)),
subject: 'Match day',
),
Appointment(
startTime: DateTime.now(),
endTime: DateTime.now().add(Duration(hours: 3)),
endTime: DateTime.now().add(const Duration(hours: 3)),
subject: 'Muharram/Ashura',
),
];
@@ -107,11 +105,11 @@ class _CalenderTabState extends State<CalenderTab> {
return Scaffold(
resizeToAvoidBottomInset: false,
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: AppBar(
scrolledUnderElevation: 0.0,
backgroundColor: Color(0xff222935),
backgroundColor: const Color(0xff222935),
elevation: 0,
automaticallyImplyLeading: false,
title: text20700white("Sessions"),
@@ -123,7 +121,7 @@ class _CalenderTabState extends State<CalenderTab> {
child: Container(
height: 35.h,
width: 35.w,
decoration: BoxDecoration(
decoration: const BoxDecoration(
color: Color(0xFFD90B2E),
shape: BoxShape.circle,
boxShadow: [
@@ -135,7 +133,7 @@ class _CalenderTabState extends State<CalenderTab> {
),
],
),
child: Icon(Icons.add, color: Colors.white, weight: 2),
child: const Icon(Icons.add, color: Colors.white, weight: 2),
),
),
sizedBoxWidth(14.w),
@@ -179,10 +177,10 @@ class _CalenderTabState extends State<CalenderTab> {
// initialIndex: selectedIndex.value,
child: Column(
children: [
CommonTabBar(
const CommonTabBar(
tabs: const [
tabs: [
Tab(
text: 'My sessions',
),
@@ -194,8 +192,8 @@ class _CalenderTabState extends State<CalenderTab> {
child: TabBarView(
children: [
MySessionsTab(),
ComSessionTab(),
mySessionsTab(),
comSessionTab(),
],
),
),
@@ -210,7 +208,7 @@ class _CalenderTabState extends State<CalenderTab> {
);
}
Widget MySessionsTab() {
Widget mySessionsTab() {
return SingleChildScrollView(
child: Column(
children: [
@@ -243,7 +241,7 @@ class _CalenderTabState extends State<CalenderTab> {
],
),
),
Spacer(),
const Spacer(),
Image.asset("assets/images/png/Rectangle 45.png")
],
),
@@ -258,16 +256,16 @@ class _CalenderTabState extends State<CalenderTab> {
border: 0,
customWidget: SfCalendar(
view: CalendarView.month,
appointmentTextStyle: TextStyle(color: Colors.white),
headerStyle: CalendarHeaderStyle(
appointmentTextStyle: const TextStyle(color: Colors.white),
headerStyle: const CalendarHeaderStyle(
textStyle: TextStyle(
color: Color(0xFFD90B2E),
)),
// blackoutDatesTextStyle: TextStyle(color: Colors.white),
weekNumberStyle: WeekNumberStyle(
weekNumberStyle: const WeekNumberStyle(
textStyle: TextStyle(color: Colors.white)),
viewHeaderStyle: ViewHeaderStyle(
viewHeaderStyle: const ViewHeaderStyle(
// backgroundColor: Colors.amber,
dateTextStyle: TextStyle(color: Colors.white),
dayTextStyle: TextStyle(
@@ -279,17 +277,17 @@ class _CalenderTabState extends State<CalenderTab> {
backgroundColor: Colors.transparent,
// firstDayOfWeek: 3,
cellBorderColor: Colors.white,
todayHighlightColor: Color(0xFFD90B2E),
todayHighlightColor: const Color(0xFFD90B2E),
todayTextStyle: const TextStyle(color: Colors.white),
controller: _sessionCalController,
showNavigationArrow: true,
allowViewNavigation: true,
allowDragAndDrop: true,
showDatePickerButton: true,
monthViewSettings: MonthViewSettings(
monthViewSettings: const MonthViewSettings(
navigationDirection: MonthNavigationDirection.horizontal,
),
allowedViews: [
allowedViews: const [
CalendarView.month,
// CalendarView.day,
CalendarView.schedule,
@@ -300,7 +298,7 @@ class _CalenderTabState extends State<CalenderTab> {
onTap: calendarTapped,
timeSlotViewSettings: TimeSlotViewSettings(
// minimumAppointmentDuration: Duration(hours: 5),
timeTextStyle: TextStyle(
timeTextStyle: const TextStyle(
color: Colors.white,
),
timelineAppointmentHeight: 60.h,
@@ -311,19 +309,19 @@ class _CalenderTabState extends State<CalenderTab> {
),
monthCellBuilder: (context, details) {
return Container(
decoration: BoxDecoration(
decoration: const BoxDecoration(
color: Colors.transparent,
),
child: Center(
child: Text(
details.date.day.toString(),
style: TextStyle(
style: const TextStyle(
color: Colors.white), // Set text color to white
),
),
);
},
resourceViewSettings: ResourceViewSettings(
resourceViewSettings: const ResourceViewSettings(
displayNameTextStyle:
TextStyle(color: Colors.white, fontSize: 10),
showAvatar: true,
@@ -331,7 +329,7 @@ class _CalenderTabState extends State<CalenderTab> {
// scheduleViewSettings: ScheduleViewSettings(
// appointmentTextStyle: TextStyle(color: Colors.red)),
scheduleViewSettings: ScheduleViewSettings(
scheduleViewSettings: const ScheduleViewSettings(
placeholderTextStyle: TextStyle(color: Colors.white),
dayHeaderSettings: DayHeaderSettings(
dateTextStyle: TextStyle(color: Colors.white),
@@ -372,7 +370,7 @@ class _CalenderTabState extends State<CalenderTab> {
height: 25.h,
decoration: BoxDecoration(
border: Border.all(
color: Color(0xFFD90B2E),
color: const Color(0xFFD90B2E),
),
borderRadius: BorderRadius.circular(15.r)),
child: Padding(
@@ -532,7 +530,7 @@ class _CalenderTabState extends State<CalenderTab> {
CircleAvatar(
radius: 12.r,
backgroundImage:
AssetImage("assets/images/png/Ellipse 52.png"),
const AssetImage("assets/images/png/Ellipse 52.png"),
),
sizedBoxWidth(8.w),
text14w400_FCFCFC("Ryan dorwat"),
@@ -546,7 +544,7 @@ class _CalenderTabState extends State<CalenderTab> {
);
}
Widget ComSessionTab() {
Widget comSessionTab() {
return SingleChildScrollView(
child: Column(
children: [
@@ -560,16 +558,16 @@ class _CalenderTabState extends State<CalenderTab> {
border: 0,
customWidget: SfCalendar(
view: CalendarView.month,
appointmentTextStyle: TextStyle(color: Colors.white),
headerStyle: CalendarHeaderStyle(
appointmentTextStyle: const TextStyle(color: Colors.white),
headerStyle: const CalendarHeaderStyle(
textStyle: TextStyle(
color: Color(0xFFD90B2E),
)),
// blackoutDatesTextStyle: TextStyle(color: Colors.white),
weekNumberStyle: WeekNumberStyle(
weekNumberStyle: const WeekNumberStyle(
textStyle: TextStyle(color: Colors.white)),
viewHeaderStyle: ViewHeaderStyle(
viewHeaderStyle: const ViewHeaderStyle(
// backgroundColor: Colors.amber,
dateTextStyle: TextStyle(color: Colors.white),
dayTextStyle: TextStyle(
@@ -581,17 +579,17 @@ class _CalenderTabState extends State<CalenderTab> {
backgroundColor: Colors.transparent,
// firstDayOfWeek: 3,
cellBorderColor: Colors.white,
todayHighlightColor: Color(0xFFD90B2E),
todayHighlightColor: const Color(0xFFD90B2E),
todayTextStyle: const TextStyle(color: Colors.white),
controller: _comCalController,
showNavigationArrow: true,
allowViewNavigation: true,
allowDragAndDrop: true,
showDatePickerButton: true,
monthViewSettings: MonthViewSettings(
monthViewSettings: const MonthViewSettings(
navigationDirection: MonthNavigationDirection.horizontal,
),
allowedViews: [
allowedViews: const [
CalendarView.month,
// CalendarView.day,
CalendarView.schedule,
@@ -602,7 +600,7 @@ class _CalenderTabState extends State<CalenderTab> {
onTap: calendarTapped,
timeSlotViewSettings: TimeSlotViewSettings(
// minimumAppointmentDuration: Duration(hours: 5),
timeTextStyle: TextStyle(
timeTextStyle: const TextStyle(
color: Colors.white,
),
timelineAppointmentHeight: 60.h,
@@ -613,19 +611,19 @@ class _CalenderTabState extends State<CalenderTab> {
),
monthCellBuilder: (context, details) {
return Container(
decoration: BoxDecoration(
decoration: const BoxDecoration(
color: Colors.transparent,
),
child: Center(
child: Text(
details.date.day.toString(),
style: TextStyle(
style: const TextStyle(
color: Colors.white), // Set text color to white
),
),
);
},
resourceViewSettings: ResourceViewSettings(
resourceViewSettings: const ResourceViewSettings(
displayNameTextStyle:
TextStyle(color: Colors.white, fontSize: 10),
showAvatar: true,
@@ -780,7 +778,7 @@ class _CalenderTabState extends State<CalenderTab> {
sizedBoxWidth(16.w),
CircleAvatar(
radius: 12.r,
backgroundImage: AssetImage(
backgroundImage: const AssetImage(
"assets/images/png/Ellipse 52.png"),
),
sizedBoxWidth(8.w),
@@ -788,12 +786,12 @@ class _CalenderTabState extends State<CalenderTab> {
],
),
]),
Spacer(),
const Spacer(),
Container(
height: 138.h,
width: 143.w,
decoration: BoxDecoration(
color: Color(0xFFD90B2E),
color: const Color(0xFFD90B2E),
borderRadius: BorderRadius.only(
bottomRight: Radius.circular(10.r),
),
@@ -825,7 +823,7 @@ class _CalenderTabState extends State<CalenderTab> {
context: context,
builder: (BuildContext context) {
return AlertDialog(
title: Text('Event Details'),
title: const Text('Event Details'),
content: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
@@ -836,7 +834,7 @@ class _CalenderTabState extends State<CalenderTab> {
),
actions: <Widget>[
ElevatedButton(
child: Text('Close'),
child: const Text('Close'),
onPressed: () {
Navigator.of(context).pop();
},

10
lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart
View File

@@ -26,7 +26,7 @@ class _EventDetailsState extends State<EventDetails> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
@@ -306,7 +306,7 @@ class _EventDetailsState extends State<EventDetails> {
),
sizedBoxWidth(10.w),
text16w400_white("Send message to invites"),
Spacer(),
const Spacer(),
commonGlassContainer(
width: 98.w,
height: 30.h,
@@ -327,7 +327,7 @@ class _EventDetailsState extends State<EventDetails> {
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
CircleAvatar(
const CircleAvatar(
radius: 33.5,
backgroundImage:
AssetImage("assets/images/png/cimg1.png"),
@@ -345,7 +345,7 @@ class _EventDetailsState extends State<EventDetails> {
children: [
CircleAvatar(
radius: 12.5.r,
backgroundImage: AssetImage(
backgroundImage: const AssetImage(
"assets/images/png/img322.png"),
),
sizedBoxWidth(8.w),
@@ -374,7 +374,7 @@ class _EventDetailsState extends State<EventDetails> {
Image.asset("assets/images/png/Red.png", height: 22.h, width: 16.w),
sizedBoxWidth(10.w),
SizedBox(width: 250.w, child: text16w400_white(text)),
Spacer(),
const Spacer(),
text16400white(count),
],
),

21
lib/Feed Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart
View File

@@ -6,7 +6,6 @@ import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
@@ -60,7 +59,7 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
@@ -72,7 +71,7 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
child: Container(
height: 35.h,
width: 35.w,
decoration: BoxDecoration(
decoration: const BoxDecoration(
color: Color(0xFFD90B2E),
shape: BoxShape.circle,
boxShadow: [
@@ -84,7 +83,7 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
),
],
),
child: Icon(Icons.add, color: Colors.white, weight: 2),
child: const Icon(Icons.add, color: Colors.white, weight: 2),
),
),
),
@@ -180,13 +179,13 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
text12w400_FCFCFC_blur(subtitle),
],
),
Spacer(),
const Spacer(),
Container(
height: 25.h,
width: 72.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(5.r),
border: Border.all(color: Color(0xFFFF002B), width: 1.w)),
border: Border.all(color: const Color(0xFFFF002B), width: 1.w)),
child: Center(child: text10400white("Attending")),
),
sizedBoxWidth(8.w),
@@ -235,7 +234,7 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.r),
color: Color(0xFF222935)),
color: const Color(0xFF222935)),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 20.h),
child: Column(
@@ -271,7 +270,7 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("W")),
border: 0.5),
Spacer(),
const Spacer(),
Row(
children: [
Image.asset(
@@ -316,7 +315,7 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("Sa")),
border: 0.5),
Spacer(),
const Spacer(),
Row(
children: [
Image.asset(
@@ -344,7 +343,7 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
Color(0xFFD90B2E).withOpacity(0.18),
const Color(0xFFD90B2E).withOpacity(0.18),
const Color(0xFFD90B2E).withOpacity(0.4),
],
stops: const [
@@ -352,7 +351,7 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
1,
],
),
borderGradient: LinearGradient(
borderGradient: const LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [

18
lib/Feed Module/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart
View File

@@ -5,10 +5,8 @@ import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
class ResourcePool extends StatefulWidget {
const ResourcePool({super.key});
@@ -42,9 +40,9 @@ class _ResourcePoolState extends State<ResourcePool> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Resource pool",
),
resizeToAvoidBottomInset: false,
@@ -103,7 +101,7 @@ class _ResourcePoolState extends State<ResourcePool> {
children: [
CircleAvatar(
backgroundImage:
AssetImage("assets/images/png/Ellipse 52.png"),
const AssetImage("assets/images/png/Ellipse 52.png"),
radius: 25.r,
),
sizedBoxWidth(8.w),
@@ -115,7 +113,7 @@ class _ResourcePoolState extends State<ResourcePool> {
text12w400_FCFCFC_blur("Row row row your boat")
],
),
Spacer(),
const Spacer(),
InkWell(
onTap: () {
inviteBottomSheet();
@@ -124,7 +122,7 @@ class _ResourcePoolState extends State<ResourcePool> {
height: 30.h,
width: 95.w,
decoration: BoxDecoration(
color: Color(0xFFD90B2E),
color: const Color(0xFFD90B2E),
borderRadius: BorderRadius.circular(30.r)),
child: Center(child: text14400white("Invite")),
),
@@ -192,7 +190,7 @@ class _ResourcePoolState extends State<ResourcePool> {
topLeft: Radius.circular(30.r),
topRight: Radius.circular(30.r),
),
color: Color(0xFF222935),
color: const Color(0xFF222935),
),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
@@ -259,7 +257,7 @@ class _ResourcePoolState extends State<ResourcePool> {
),
sizedBoxWidth(10.w),
text16w400_FCFCFC(title),
Spacer(),
const Spacer(),
commonGlassContainer(
border: 1,
borderradius: 2,
@@ -270,7 +268,7 @@ class _ResourcePoolState extends State<ResourcePool> {
customWidget: Transform.scale(
scale: 1.4,
child: Checkbox(
side: BorderSide(color: Color(0xFF434A53)),
side: const BorderSide(color: Color(0xFF434A53)),
value: isChecked,
activeColor: Colors.transparent,
checkColor: Colors.white,

26
lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart
View File

@@ -2,12 +2,10 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:glassmorphism/glassmorphism.dart';
import 'package:regroup/Common/CommonButton.dart';
import 'package:regroup/Common/CommonDropDown.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
@@ -35,10 +33,10 @@ class _SetAvailabillityState extends State<SetAvailabillity> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Set availability",
),
body: Stack(children: [
@@ -57,30 +55,30 @@ class _SetAvailabillityState extends State<SetAvailabillity> {
sizedBoxHeight(10.h),
text16400white("Select event type"),
sizedBoxHeight(15.h),
CommonDropdownBtn(hint: "", items: []),
CommonDropdownBtn(hint: "", items: const ['']),
sizedBoxHeight(18.h),
text16400white("Select sport"),
sizedBoxHeight(15.h),
CommonDropdownBtn(hint: "", items: []),
CommonDropdownBtn(hint: "", items: const ['']),
sizedBoxHeight(18.h),
text16400white("Select role "),
sizedBoxHeight(15.h),
CommonDropdownBtn(hint: "", items: []),
CommonDropdownBtn(hint: "", items: const ['']),
sizedBoxHeight(18.h),
text16400white("Space selection"),
sizedBoxHeight(15.h),
CommonDropdownBtn(hint: "", items: []),
CommonDropdownBtn(hint: "", items: const ['']),
sizedBoxHeight(18.h),
Row(
children: [
text16w400_white("Availability"),
Spacer(),
const Spacer(),
Transform.scale(
scaleY: 1,
child: CupertinoSwitch(
value: swichvalue,
trackColor: Colors.white.withOpacity(0.4),
activeColor: Color(0xFF3192D8),
activeColor: const Color(0xFF3192D8),
onChanged: (bool? value) {
setState(() {
swichvalue = value ?? false;
@@ -159,7 +157,7 @@ class _SetAvailabillityState extends State<SetAvailabillity> {
border: 1)
],
),
Spacer(),
const Spacer(),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -208,10 +206,10 @@ class _SetAvailabillityState extends State<SetAvailabillity> {
decoration: BoxDecoration(
shape: BoxShape.circle,
color: selectedContainerIndices.contains(index)
? Color(0xFFD90B2E).withOpacity(0.4)
: Color(0xFFFFFFFF).withOpacity(0.2),
? const Color(0xFFD90B2E).withOpacity(0.4)
: const Color(0xFFFFFFFF).withOpacity(0.2),
border: selectedContainerIndices.contains(index)
? Border.all(color: Color(0xFFD90B2E), width: 1)
? Border.all(color: const Color(0xFFD90B2E), width: 1)
: null),
child: Center(child: text16w400_FCFCFC(text)),
),

69
lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart
View File

@@ -4,7 +4,6 @@ import 'package:get/get.dart';
import 'package:regroup/Common/CommonBottomNavigationBar.dart';
import 'package:regroup/Common/controller/MainScreen.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
@@ -19,7 +18,7 @@ class ChatsMainScreen extends StatefulWidget {
class _ChatsMainScreenState extends State<ChatsMainScreen> {
TextEditingController searchcontroller = TextEditingController();
GlobalKey<ScaffoldState> _scaffoldKey1 = GlobalKey<ScaffoldState>();
final GlobalKey<ScaffoldState> _scaffoldKey1 = GlobalKey<ScaffoldState>();
List chatcontents = [
{
@@ -121,10 +120,10 @@ class _ChatsMainScreenState extends State<ChatsMainScreen> {
child: Scaffold(
resizeToAvoidBottomInset: false,
key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
appBar: AppBar(
scrolledUnderElevation: 0.0,
backgroundColor: Color(0xff222935),
backgroundColor: const Color(0xff222935),
elevation: 0,
automaticallyImplyLeading: false,
titleSpacing: 0,
@@ -174,7 +173,7 @@ class _ChatsMainScreenState extends State<ChatsMainScreen> {
hintText: "Search chats",
leadingIcon: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Icon(
child: const Icon(
Icons.search,
size: 35,
color: Colors.white,
@@ -196,7 +195,7 @@ class _ChatsMainScreenState extends State<ChatsMainScreen> {
// initialIndex: selectedIndex.value,
child: Column(
children: [
MyTabBar(),
const MyTabBar(),
Expanded(
child: TabBarView(
children: [feedTab(), clubsTab(), teamsTab()],
@@ -223,7 +222,7 @@ class _ChatsMainScreenState extends State<ChatsMainScreen> {
separatorBuilder: (context, index) {
return Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
);
},
itemCount: chatcontents.length,
@@ -263,7 +262,7 @@ class _ChatsMainScreenState extends State<ChatsMainScreen> {
separatorBuilder: (context, index) {
return Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
);
},
itemCount: clubcontents.length,
@@ -298,7 +297,7 @@ class _ChatsMainScreenState extends State<ChatsMainScreen> {
separatorBuilder: (context, index) {
return Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
);
},
itemCount: teamcontents.length,
@@ -326,15 +325,17 @@ class _ChatsMainScreenState extends State<ChatsMainScreen> {
}
class MyTabBar extends StatelessWidget {
const MyTabBar({super.key});
// Set the desired height
@override
Widget build(BuildContext context) {
return TabBar(
dividerColor: Color(0xFFFFFFFF).withOpacity(0.07),
dividerColor: const Color(0xFFFFFFFF).withOpacity(0.07),
labelStyle: TextStyle(
fontSize: 14.sp,
color: Color(0xFFFCFCFC),
color: const Color(0xFFFCFCFC),
fontWeight: FontWeight.w400,
fontFamily: 'Helvetica'),
indicatorSize: TabBarIndicatorSize.tab,
@@ -342,7 +343,7 @@ class MyTabBar extends StatelessWidget {
// labelColor: Colors.white,
indicatorWeight: 2.h,
dividerHeight: 2.h,
unselectedLabelColor: Color(0xFFFCFCFC),
unselectedLabelColor: const Color(0xFFFCFCFC),
overlayColor: MaterialStateProperty.all(const Color(0xFFD90B2E)),
tabs: const [
Tab(
@@ -386,7 +387,7 @@ class ChatList extends StatefulWidget {
class _ChatListState extends State<ChatList> {
void _showContextMenu(BuildContext context, Offset offset) {
showMenu(
color: Color(0XFf222935),
color: const Color(0XFf222935),
context: context,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(30.r)),
position:
@@ -398,7 +399,7 @@ class _ChatListState extends State<ChatList> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Mute chat", style: TextStyle(color: Colors.white)),
const Text("Mute chat", style: TextStyle(color: Colors.white)),
Image.asset(
'assets/images/png/mute.png',
width: 19.w,
@@ -408,7 +409,7 @@ class _ChatListState extends State<ChatList> {
),
Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
)
]),
),
@@ -419,7 +420,7 @@ class _ChatListState extends State<ChatList> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Pin chat", style: TextStyle(color: Colors.white)),
const Text("Pin chat", style: TextStyle(color: Colors.white)),
Image.asset(
'assets/images/png/pin.png',
width: 19.w,
@@ -429,7 +430,7 @@ class _ChatListState extends State<ChatList> {
),
Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
)
],
),
@@ -439,7 +440,7 @@ class _ChatListState extends State<ChatList> {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Delete chat", style: TextStyle(color: Colors.red)),
const Text("Delete chat", style: TextStyle(color: Colors.red)),
// Icon(Icons.delete, color: Colors.red),
Image.asset(
'assets/images/png/deletetred.png',
@@ -503,7 +504,7 @@ class _ChatListState extends State<ChatList> {
? Container(
width: 10.w,
height: 10.h,
decoration: ShapeDecoration(
decoration: const ShapeDecoration(
color: Color(0xFF32D74B),
shape: OvalBorder(),
),
@@ -511,7 +512,7 @@ class _ChatListState extends State<ChatList> {
: Container(
width: 10.w,
height: 10.h,
decoration: ShapeDecoration(
decoration: const ShapeDecoration(
color: Color(0xFFFF453A),
shape: OvalBorder(),
)),
@@ -535,7 +536,7 @@ class _ChatListState extends State<ChatList> {
child: Text(
widget.message,
style: TextStyle(
color: Color(0xCCFCFCFC),
color: const Color(0xCCFCFCFC),
fontSize: 12.sp,
fontFamily: 'Helvetica',
fontWeight: FontWeight.w400,
@@ -546,7 +547,7 @@ class _ChatListState extends State<ChatList> {
),
],
),
Spacer(),
const Spacer(),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
@@ -557,7 +558,7 @@ class _ChatListState extends State<ChatList> {
children: [
widget.ispinned == true
? Image.asset('assets/images/png/pin.png')
: SizedBox(
: const SizedBox(
width: 25,
),
sizedBoxWidth(3.w),
@@ -565,7 +566,7 @@ class _ChatListState extends State<ChatList> {
? Container(
width: 18,
height: 18,
decoration: ShapeDecoration(
decoration: const ShapeDecoration(
color: Color(0xFFD90B2E),
shape: OvalBorder(),
),
@@ -573,14 +574,14 @@ class _ChatListState extends State<ChatList> {
'1',
textAlign: TextAlign.center,
style: TextStyle(
color: Color(0xFFFCFCFC),
color: const Color(0xFFFCFCFC),
fontSize: 12.sp,
fontFamily: 'Helvetica',
fontWeight: FontWeight.w400,
),
),
)
: SizedBox()
: const SizedBox()
],
)
],
@@ -598,7 +599,7 @@ class SecondChatList extends StatefulWidget {
final String message;
final bool isMessageRead;
SecondChatList({
const SecondChatList({
Key? key,
required this.name,
required this.imageurl,
@@ -613,7 +614,7 @@ class SecondChatList extends StatefulWidget {
class _SecondChatListState extends State<SecondChatList> {
void _showContextMenu(BuildContext context, Offset offset) {
showMenu(
color: Color(0XFf222935),
color: const Color(0XFf222935),
context: context,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(30.r)),
position:
@@ -625,7 +626,7 @@ class _SecondChatListState extends State<SecondChatList> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Mute chat", style: TextStyle(color: Colors.white)),
const Text("Mute chat", style: TextStyle(color: Colors.white)),
Image.asset(
'assets/images/png/mute.png',
width: 19.w,
@@ -635,7 +636,7 @@ class _SecondChatListState extends State<SecondChatList> {
),
Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
)
]),
),
@@ -646,7 +647,7 @@ class _SecondChatListState extends State<SecondChatList> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Pin chat", style: TextStyle(color: Colors.white)),
const Text("Pin chat", style: TextStyle(color: Colors.white)),
Image.asset(
'assets/images/png/pin.png',
width: 19.w,
@@ -656,7 +657,7 @@ class _SecondChatListState extends State<SecondChatList> {
),
Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
)
],
),
@@ -666,7 +667,7 @@ class _SecondChatListState extends State<SecondChatList> {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Delete chat", style: TextStyle(color: Colors.red)),
const Text("Delete chat", style: TextStyle(color: Colors.red)),
// Icon(Icons.delete, color: Colors.red),
Image.asset(
'assets/images/png/deletetred.png',
@@ -750,7 +751,7 @@ class _SecondChatListState extends State<SecondChatList> {
Text(
widget.message,
style: TextStyle(
color: Color(0xCCFCFCFC),
color: const Color(0xCCFCFCFC),
fontSize: 12.sp,
fontFamily: 'Helvetica',
fontWeight: FontWeight.w400,

66
lib/Feed Module/Main_Screens/Chats/View/groupchat.dart
View File

@@ -7,7 +7,6 @@ import 'package:glassmorphism/glassmorphism.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Utils/Common/ImageUpload.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart';
@@ -54,7 +53,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
void _showContextMenu(BuildContext context, Offset offset) {
showMenu(
color: Color(0XFf222935),
color: const Color(0XFf222935),
context: context,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(30.r)),
position:
@@ -67,7 +66,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Mute chat", style: TextStyle(color: Colors.white)),
const Text("Mute chat", style: TextStyle(color: Colors.white)),
Image.asset(
'assets/images/png/mute.png',
width: 19.w,
@@ -77,7 +76,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
),
Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
)
]),
),
@@ -88,7 +87,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Pin chat", style: TextStyle(color: Colors.white)),
const Text("Pin chat", style: TextStyle(color: Colors.white)),
Image.asset(
'assets/images/png/pin.png',
width: 19.w,
@@ -98,7 +97,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
),
Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
)
],
),
@@ -107,7 +106,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
value: 1,
child: Column(
children: [
Row(
const Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Search", style: TextStyle(color: Colors.white)),
@@ -120,7 +119,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
),
Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
)
],
),
@@ -132,7 +131,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Profile", style: TextStyle(color: Colors.white)),
const Text("Profile", style: TextStyle(color: Colors.white)),
Image.asset(
'assets/images/png/profile.png',
width: 19.w,
@@ -142,7 +141,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
),
Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
)
],
),
@@ -154,7 +153,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Block chat", style: TextStyle(color: Colors.white)),
const Text("Block chat", style: TextStyle(color: Colors.white)),
Image.asset(
'assets/images/png/blockchat.png',
width: 19.w,
@@ -164,7 +163,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
),
Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
)
],
),
@@ -176,7 +175,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Delete chat", style: TextStyle(color: Colors.red)),
const Text("Delete chat", style: TextStyle(color: Colors.red)),
// Icon(Icons.delete, color: Colors.red),
Image.asset(
'assets/images/png/deletetred.png',
@@ -246,11 +245,11 @@ class _GroupChatPageState extends State<GroupChatPage> {
Get.focusScope?.unfocus();
},
child: Scaffold(
backgroundColor: Color.fromARGB(255, 18, 32, 47),
backgroundColor: const Color.fromARGB(255, 18, 32, 47),
appBar: AppBar(
elevation: 0,
automaticallyImplyLeading: false,
backgroundColor: Color(0xFF222935).withOpacity(0.50),
backgroundColor: const Color(0xFF222935).withOpacity(0.50),
flexibleSpace: SafeArea(
child: Container(
// height: 90.h,
@@ -292,7 +291,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
height: 40.h,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(25.h),
image: DecorationImage(
image: const DecorationImage(
image:
AssetImage("assets/images/png/groupchat.png"),
fit: BoxFit.cover)),
@@ -325,7 +324,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
Text(
"Ryan, Jaxson, Dulce, Nolan ",
style: TextStyle(
color: Color(0xffFCFCFC).withOpacity(0.80),
color: const Color(0xffFCFCFC).withOpacity(0.80),
fontSize: 12.sp,
fontWeight: FontWeight.w400),
),
@@ -369,18 +368,18 @@ class _GroupChatPageState extends State<GroupChatPage> {
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
],
),
borderGradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
],
),
child: Stack(
@@ -415,7 +414,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
),
fit: BoxFit.fill,
),
shape: OvalBorder(),
shape: const OvalBorder(),
),
),
sizedBoxWidth(2.w),
@@ -423,8 +422,8 @@ class _GroupChatPageState extends State<GroupChatPage> {
child: Container(
decoration: ShapeDecoration(
gradient: LinearGradient(
begin: Alignment(1.00, -0.03),
end: Alignment(-1, 0.03),
begin: const Alignment(1.00, -0.03),
end: const Alignment(-1, 0.03),
colors: [
Colors.white.withOpacity(
0.05999999865889549),
@@ -432,7 +431,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
0.07999999821186066)
],
),
shape: RoundedRectangleBorder(
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(20),
topRight: Radius.circular(20),
@@ -489,7 +488,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
children: [
Flexible(
child: Container(
decoration: ShapeDecoration(
decoration: const ShapeDecoration(
gradient: LinearGradient(
begin: Alignment(1.00, 0.05),
end: Alignment(-1, -0.05),
@@ -545,7 +544,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
),
fit: BoxFit.fill,
),
shape: OvalBorder(),
shape: const OvalBorder(),
),
),
],
@@ -559,7 +558,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
Align(
alignment: Alignment.bottomCenter,
child: Padding(
padding: EdgeInsets.only(top: 15, bottom: 15),
padding: const EdgeInsets.only(top: 15, bottom: 15),
child: Row(
children: <Widget>[
sizedBoxWidth(16.w),
@@ -578,6 +577,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
const Color(0xFFffffff).withOpacity(0.24),
const Color(0xFFFFFFFF).withOpacity(0.24),
],
// ignore: prefer_const_literals_to_create_immutables
stops: [
0.1,
1,
@@ -611,7 +611,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
border: InputBorder.none,
hintStyle: TextStyle(
fontSize: 14.sp,
color: Color(0XFFFCFCFC)
color: const Color(0XFFFCFCFC)
.withOpacity(0.80),
fontWeight: FontWeight.w400,
fontFamily: 'Helvetica'),
@@ -640,12 +640,12 @@ class _GroupChatPageState extends State<GroupChatPage> {
height: 30.h,
decoration: BoxDecoration(
color:
Color(0xFFD90B2E),
const Color(0xFFD90B2E),
borderRadius:
BorderRadius
.circular(
30.r)),
child: Center(
child: const Center(
child: Icon(
Icons.send_outlined,
color: Colors.white,

22
lib/Feed Module/Main_Screens/Chats/View/newchatpage.dart
View File

@@ -1,10 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:glassmorphism/glassmorphism.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
@@ -74,9 +72,9 @@ class _NewChatPageState extends State<NewChatPage> {
onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
child: Scaffold(
// backgroundColor: Color(0xFF222935),
backgroundColor: Color.fromARGB(255, 18, 32, 47),
backgroundColor: const Color.fromARGB(255, 18, 32, 47),
appBar: CommonAppbar(titleTxt: 'New chat'),
appBar: const CommonAppbar(titleTxt: 'New chat'),
body: Stack(children: [
Container(
decoration: const BoxDecoration(
@@ -96,7 +94,7 @@ class _NewChatPageState extends State<NewChatPage> {
hintText: "Search people",
leadingIcon: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Icon(
child: const Icon(
Icons.search,
size: 35,
color: Colors.white,
@@ -127,13 +125,13 @@ class _NewChatPageState extends State<NewChatPage> {
width: 50,
height: 50,
decoration: ShapeDecoration(
image: DecorationImage(
image: const DecorationImage(
image: AssetImage(
'assets/images/png/chatgroup.png'),
),
gradient: LinearGradient(
begin: Alignment(0.71, -0.70),
end: Alignment(-0.71, 0.7),
begin: const Alignment(0.71, -0.70),
end: const Alignment(-0.71, 0.7),
colors: [
Colors.white
.withOpacity(0.30000001192092896),
@@ -141,7 +139,7 @@ class _NewChatPageState extends State<NewChatPage> {
.withOpacity(0.30000001192092896)
],
),
shape: OvalBorder(
shape: const OvalBorder(
side: BorderSide(
width: 0.50, color: Color(0xFF434A53)),
),
@@ -166,7 +164,7 @@ class _NewChatPageState extends State<NewChatPage> {
separatorBuilder: (context, index) {
return Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
);
},
itemCount: chatcontents.length,
@@ -199,7 +197,7 @@ class SecondChatList extends StatefulWidget {
final String imageurl;
final String message;
SecondChatList({
const SecondChatList({
Key? key,
required this.name,
required this.imageurl,
@@ -250,7 +248,7 @@ class _SecondChatListState extends State<SecondChatList> {
Text(
widget.message,
style: TextStyle(
color: Color(0xCCFCFCFC),
color: const Color(0xCCFCFCFC),
fontSize: 12.sp,
fontFamily: 'Helvetica',
fontWeight: FontWeight.w400,

28
lib/Feed Module/Main_Screens/Chats/View/newgroup.dart
View File

@@ -3,13 +3,13 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:glassmorphism/glassmorphism.dart';
import 'package:regroup/Common/controller/MainScreen.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CustomNextButton.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/ImageUpload.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart';
@@ -80,8 +80,8 @@ class _NewGroupPageState extends State<NewGroupPage> {
return GestureDetector(
onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
child: Scaffold(
backgroundColor: Color.fromARGB(255, 18, 32, 47),
appBar: CommonAppbar(titleTxt: 'New group'),
backgroundColor: const Color.fromARGB(255, 18, 32, 47),
appBar: const CommonAppbar(titleTxt: 'New group'),
body: Stack(
children: [
Container(
@@ -121,14 +121,14 @@ class _NewGroupPageState extends State<NewGroupPage> {
// image: AssetImage('assets/images/png/camera1.png'),
// ),
gradient: LinearGradient(
begin: Alignment(0.71, -0.70),
end: Alignment(-0.71, 0.7),
begin: const Alignment(0.71, -0.70),
end: const Alignment(-0.71, 0.7),
colors: [
Colors.white.withOpacity(0.30000001192092896),
Colors.white.withOpacity(0.30000001192092896)
],
),
shape: OvalBorder(
shape: const OvalBorder(
side: BorderSide(
width: 0.50, color: Color(0xFF434A53)),
),
@@ -189,7 +189,7 @@ class _NewGroupPageState extends State<NewGroupPage> {
hintText: "Search people",
leadingIcon: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Icon(
child: const Icon(
Icons.search,
size: 35,
color: Colors.white,
@@ -207,7 +207,7 @@ class _NewGroupPageState extends State<NewGroupPage> {
separatorBuilder: (context, index) {
return Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
);
},
itemCount: chatcontents.length,
@@ -234,7 +234,7 @@ class _NewGroupPageState extends State<NewGroupPage> {
// Get.toNamed(RouteName.mainscreen);
Get.offUntil(
MaterialPageRoute(
builder: (context) => MainScreen()),
builder: (context) => const MainScreen()),
(Route<dynamic> route) => false);
}),
),
@@ -254,7 +254,7 @@ class GroupsList extends StatefulWidget {
final String imageurl;
final String message;
GroupsList({
const GroupsList({
Key? key,
required this.name,
required this.imageurl,
@@ -308,7 +308,7 @@ class _GroupsListState extends State<GroupsList> {
Text(
widget.message,
style: TextStyle(
color: Color(0xCCFCFCFC),
color: const Color(0xCCFCFCFC),
fontSize: 12.sp,
fontFamily: 'Helvetica',
fontWeight: FontWeight.w400,
@@ -323,8 +323,8 @@ class _GroupsListState extends State<GroupsList> {
Checkbox(
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
side: BorderSide(
color: Color(0xFF434A53).withOpacity(0.72), width: 1.5.w),
activeColor: Color(0xFF434A53).withOpacity(0.72),
color: const Color(0xFF434A53).withOpacity(0.72), width: 1.5.w),
activeColor: const Color(0xFF434A53).withOpacity(0.72),
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(0.0)),
),

48
lib/Feed Module/Main_Screens/Chats/View/userchat.dart
View File

@@ -55,7 +55,7 @@ class _UserChatPageState extends State<UserChatPage> {
void _showContextMenu(BuildContext context, Offset offset) {
showMenu(
color: Color(0XFf222935),
color: const Color(0XFf222935),
context: context,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(30.r)),
position:
@@ -68,7 +68,7 @@ class _UserChatPageState extends State<UserChatPage> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Mute chat", style: TextStyle(color: Colors.white)),
const Text("Mute chat", style: TextStyle(color: Colors.white)),
Image.asset(
'assets/images/png/mute.png',
width: 19.w,
@@ -78,7 +78,7 @@ class _UserChatPageState extends State<UserChatPage> {
),
Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
)
]),
),
@@ -89,7 +89,7 @@ class _UserChatPageState extends State<UserChatPage> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Pin chat", style: TextStyle(color: Colors.white)),
const Text("Pin chat", style: TextStyle(color: Colors.white)),
Image.asset(
'assets/images/png/pin.png',
width: 19.w,
@@ -99,7 +99,7 @@ class _UserChatPageState extends State<UserChatPage> {
),
Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
)
],
),
@@ -108,7 +108,7 @@ class _UserChatPageState extends State<UserChatPage> {
value: 1,
child: Column(
children: [
Row(
const Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Search", style: TextStyle(color: Colors.white)),
@@ -121,7 +121,7 @@ class _UserChatPageState extends State<UserChatPage> {
),
Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
)
],
),
@@ -133,7 +133,7 @@ class _UserChatPageState extends State<UserChatPage> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Profile", style: TextStyle(color: Colors.white)),
const Text("Profile", style: TextStyle(color: Colors.white)),
Image.asset(
'assets/images/png/profile.png',
width: 19.w,
@@ -143,7 +143,7 @@ class _UserChatPageState extends State<UserChatPage> {
),
Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
)
],
),
@@ -155,7 +155,7 @@ class _UserChatPageState extends State<UserChatPage> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Block chat", style: TextStyle(color: Colors.white)),
const Text("Block chat", style: TextStyle(color: Colors.white)),
Image.asset(
'assets/images/png/blockchat.png',
width: 19.w,
@@ -165,7 +165,7 @@ class _UserChatPageState extends State<UserChatPage> {
),
Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
)
],
),
@@ -177,7 +177,7 @@ class _UserChatPageState extends State<UserChatPage> {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Delete chat", style: TextStyle(color: Colors.red)),
const Text("Delete chat", style: TextStyle(color: Colors.red)),
// Icon(Icons.delete, color: Colors.red),
Image.asset(
'assets/images/png/deletetred.png',
@@ -247,11 +247,11 @@ class _UserChatPageState extends State<UserChatPage> {
Get.focusScope?.unfocus();
},
child: Scaffold(
backgroundColor: Color.fromARGB(255, 18, 32, 47),
backgroundColor: const Color.fromARGB(255, 18, 32, 47),
appBar: AppBar(
elevation: 0,
automaticallyImplyLeading: false,
backgroundColor: Color(0xFF222935).withOpacity(0.50),
backgroundColor: const Color(0xFF222935).withOpacity(0.50),
flexibleSpace: SafeArea(
child: Container(
// height: 90.h,
@@ -293,7 +293,7 @@ class _UserChatPageState extends State<UserChatPage> {
height: 40.h,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(25.h),
image: DecorationImage(
image: const DecorationImage(
image:
AssetImage("assets/images/png/Ellipse 52.png"),
fit: BoxFit.fill)),
@@ -319,7 +319,7 @@ class _UserChatPageState extends State<UserChatPage> {
Text(
"Ryan_01",
style: TextStyle(
color: Color(0xffFCFCFC).withOpacity(0.80),
color: const Color(0xffFCFCFC).withOpacity(0.80),
fontSize: 12.sp,
fontWeight: FontWeight.w400),
),
@@ -371,8 +371,8 @@ class _UserChatPageState extends State<UserChatPage> {
child: Container(
decoration: ShapeDecoration(
gradient: LinearGradient(
begin: Alignment(1.00, -0.03),
end: Alignment(-1, 0.03),
begin: const Alignment(1.00, -0.03),
end: const Alignment(-1, 0.03),
colors: [
Colors.white
.withOpacity(0.05999999865889549),
@@ -380,7 +380,7 @@ class _UserChatPageState extends State<UserChatPage> {
.withOpacity(0.07999999821186066)
],
),
shape: RoundedRectangleBorder(
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(20),
topRight: Radius.circular(20),
@@ -428,7 +428,7 @@ class _UserChatPageState extends State<UserChatPage> {
children: [
Flexible(
child: Container(
decoration: ShapeDecoration(
decoration: const ShapeDecoration(
gradient: LinearGradient(
begin: Alignment(1.00, 0.05),
end: Alignment(-1, -0.05),
@@ -476,7 +476,7 @@ class _UserChatPageState extends State<UserChatPage> {
Align(
alignment: Alignment.bottomCenter,
child: Padding(
padding: EdgeInsets.only(top: 15, bottom: 15),
padding: const EdgeInsets.only(top: 15, bottom: 15),
child: Row(
children: <Widget>[
sizedBoxWidth(16.w),
@@ -524,7 +524,7 @@ class _UserChatPageState extends State<UserChatPage> {
border: InputBorder.none,
hintStyle: TextStyle(
fontSize: 14.sp,
color: Color(0XFFFCFCFC).withOpacity(0.80),
color: const Color(0XFFFCFCFC).withOpacity(0.80),
fontWeight: FontWeight.w400,
fontFamily: 'Helvetica'),
hintText: "Type your message",
@@ -548,10 +548,10 @@ class _UserChatPageState extends State<UserChatPage> {
width: 45.w,
height: 30.h,
decoration: BoxDecoration(
color: Color(0xFFD90B2E),
color: const Color(0xFFD90B2E),
borderRadius:
BorderRadius.circular(30.r)),
child: Center(
child: const Center(
child: Icon(
Icons.send_outlined,
color: Colors.white,

16
lib/Feed Module/Main_Screens/Community/Community.dart
View File

@@ -29,7 +29,7 @@ final List<String> titles = [
];
class _CommunityScreenState extends State<CommunityScreen> {
GlobalKey<ScaffoldState> _scaffoldKey1 = GlobalKey<ScaffoldState>();
final GlobalKey<ScaffoldState> _scaffoldKey1 = GlobalKey<ScaffoldState>();
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -105,7 +105,7 @@ class _CommunityScreenState extends State<CommunityScreen> {
// initialIndex: selectedIndex.value,
child: Column(
children: [
CommonTabBar(tabs: const [
const CommonTabBar(tabs: [
Tab(
text: 'Feed',
),
@@ -483,7 +483,7 @@ Widget normalcardtile2({
commonContainer(
width: 30.w,
height: 30.h,
borderColor: Color(0xFF434A53),
borderColor: const Color(0xFF434A53),
borderwidth: 0.43,
opacity1: 0.2,
opacity2: 0.2,
@@ -502,7 +502,7 @@ Widget normalcardtile2({
commonContainer(
width: 30.w,
height: 30.h,
borderColor: Color(0xFF434A53),
borderColor: const Color(0xFF434A53),
borderwidth: 0.43,
opacity1: 0.2,
opacity2: 0.2,
@@ -1136,7 +1136,7 @@ Widget announcecardtile({
onTap: () {
// Get.toNamed(RouteName.postdetailsScreen);
},
child: Container(
child: SizedBox(
height: 163.h,
width: double.infinity,
child: Image.asset(
@@ -1185,7 +1185,7 @@ Widget announcecardtile({
commonContainer(
width: 30.w,
height: 30.h,
borderColor: Color(0xFF434A53),
borderColor: const Color(0xFF434A53),
borderwidth: 0.43,
opacity1: 0.2,
opacity2: 0.2,
@@ -1204,7 +1204,7 @@ Widget announcecardtile({
commonContainer(
width: 30.w,
height: 30.h,
borderColor: Color(0xFF434A53),
borderColor: const Color(0xFF434A53),
borderwidth: 0.43,
opacity1: 0.2,
opacity2: 0.2,
@@ -1367,7 +1367,7 @@ Widget containertile2({required String text}) {
width: 130.w,
height: 30.h,
borderRadius: BorderRadius.circular(30.r),
borderColor: Color(0xFFD90B2E),
borderColor: const Color(0xFFD90B2E),
opacity1: 0.04,
opacity2: 0.05,
customWidget: Padding(

46
lib/Feed Module/Main_Screens/Community/CycleScreen.dart
View File

@@ -23,7 +23,7 @@ class _CycleScreenState extends State<CycleScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
@@ -46,7 +46,7 @@ class _CycleScreenState extends State<CycleScreen> {
// initialIndex: selectedIndex.value,
child: Column(
children: [
CommonTabBar(tabs: const [
const CommonTabBar(tabs: [
Tab(
text: 'Popular',
),
@@ -58,8 +58,8 @@ class _CycleScreenState extends State<CycleScreen> {
height: 670.h,
child: TabBarView(
children: [
CyclepopularTab(),
CyclelatestTab(),
cyclepopularTab(),
cyclelatestTab(),
],
),
),
@@ -70,7 +70,7 @@ class _CycleScreenState extends State<CycleScreen> {
}
}
Widget CyclepopularTab() {
Widget cyclepopularTab() {
return SingleChildScrollView(
child: Column(children: [
sizedBoxHeight(20.h),
@@ -101,7 +101,7 @@ Widget CyclepopularTab() {
);
}
Widget CyclelatestTab() {
Widget cyclelatestTab() {
return SingleChildScrollView(
child: Column(children: [
sizedBoxHeight(20.h),
@@ -172,7 +172,7 @@ Widget normalcardtile({
sizedBoxWidth(7.w),
Icon(
Icons.circle,
color: Color(0xFFFCFCFC),
color: const Color(0xFFFCFCFC),
size: 4.sp,
),
sizedBoxWidth(6.w),
@@ -181,12 +181,12 @@ Widget normalcardtile({
)
],
),
Spacer(),
const Spacer(),
PopupMenuButton(
surfaceTintColor: Color(0xFF222935),
surfaceTintColor: const Color(0xFF222935),
constraints: BoxConstraints.tightFor(width: 176.w),
offset: Offset(0, 50),
color: Color(0xFF222935),
offset: const Offset(0, 50),
color: const Color(0xFF222935),
tooltip: "",
itemBuilder: (BuildContext context) => <PopupMenuEntry>[
PopupMenuItem(
@@ -204,7 +204,7 @@ Widget normalcardtile({
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/Vector (5).png",
height: 15.h,
@@ -214,7 +214,7 @@ Widget normalcardtile({
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -230,7 +230,7 @@ Widget normalcardtile({
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/share.png",
height: 20.h,
@@ -240,7 +240,7 @@ Widget normalcardtile({
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -256,7 +256,7 @@ Widget normalcardtile({
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/f7_pin-fill (2).png",
height: 25.h,
@@ -282,7 +282,7 @@ Widget normalcardtile({
onTap: () {
Get.toNamed(RouteName.postdetailsScreen);
},
child: Container(
child: SizedBox(
height: 163.h,
width: double.infinity,
child: Image.asset(
@@ -326,7 +326,7 @@ Widget normalcardtile({
'assets/images/png/party-popper 2.png'
]),
),
Spacer(),
const Spacer(),
commonGlassContainer(
border: 0.43,
width: 30.w,
@@ -411,11 +411,11 @@ Widget normalcardtile({
boxRadius: 30,
itemsSpacing: 8,
itemScale: 0.4,
itemSize: Size(45, 45),
boxPadding: EdgeInsets.all(8),
boxAnimationDuration: Duration(milliseconds: 200),
itemAnimationDuration: Duration(milliseconds: 500),
hoverDuration: Duration(milliseconds: 700),
itemSize: const Size(45, 45),
boxPadding: const EdgeInsets.all(8),
boxAnimationDuration: const Duration(milliseconds: 200),
itemAnimationDuration: const Duration(milliseconds: 500),
hoverDuration: const Duration(milliseconds: 700),
// toggle: false,
child: _buildReactionsIcon(mainImage.value),

49
lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart
View File

@@ -6,7 +6,6 @@ import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
@@ -23,9 +22,9 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
Widget build(BuildContext context) {
return Scaffold(
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Post",
),
body: Stack(children: [
@@ -59,7 +58,7 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
children: [
CircleAvatar(
radius: 20.r,
foregroundImage: AssetImage(
foregroundImage: const AssetImage(
"assets/images/png/Ellipse 48.png",
),
),
@@ -81,13 +80,13 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
Align(
alignment: Alignment.bottomCenter,
child: Padding(
padding: EdgeInsets.only(top: 15, bottom: 15),
padding: const EdgeInsets.only(top: 15, bottom: 15),
child: Row(
children: <Widget>[
Expanded(
child: CustomTextFormField(
hintText: "Add comment",
suffixIcon: Container(
suffixIcon: SizedBox(
height: 20.h,
width: 25.w,
child: Center(
@@ -151,22 +150,22 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
Row(
children: [
text16w400_FCFCFC(title),
Spacer(),
const Spacer(),
commonGlassContainer(
width: 72.w,
height: 26.h,
borderradius: 5.r,
borderColor: Color(0xFFD90B2E),
borderColor: const Color(0xFFD90B2E),
customWidget:
Center(child: text14400white("Follow")),
border: 1),
sizedBoxWidth(6.w),
PopupMenuButton(
surfaceTintColor: Color(0xFF222935),
surfaceTintColor: const Color(0xFF222935),
constraints:
BoxConstraints.tightFor(width: 176.w),
offset: Offset(0, 50),
color: Color(0xFF222935),
offset: const Offset(0, 50),
color: const Color(0xFF222935),
tooltip: "",
itemBuilder: (BuildContext context) =>
<PopupMenuEntry>[
@@ -186,7 +185,7 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/Vector (5).png",
height: 15.h,
@@ -196,7 +195,7 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -213,7 +212,7 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/share.png",
height: 20.h,
@@ -223,7 +222,7 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -240,7 +239,7 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/f7_pin-fill (2).png",
height: 25.h,
@@ -272,7 +271,7 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
sizedBoxWidth(7.w),
Icon(
Icons.circle,
color: Color(0xFFFCFCFC),
color: const Color(0xFFFCFCFC),
size: 4.sp,
),
sizedBoxWidth(6.w),
@@ -290,7 +289,7 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
onTap: () {
Get.toNamed(RouteName.postdetailsScreen);
},
child: Container(
child: SizedBox(
height: 163.h,
width: double.infinity,
child: Image.asset(
@@ -329,7 +328,7 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
'assets/images/png/heart 2.png',
'assets/images/png/party-popper 2.png'
]),
Spacer(),
const Spacer(),
commonGlassContainer(
border: 0.9,
width: 30.w,
@@ -414,13 +413,13 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
boxRadius: 30,
itemsSpacing: 8,
itemScale: 0.4,
itemSize: Size(45, 45),
boxPadding: EdgeInsets.all(8),
itemSize: const Size(45, 45),
boxPadding: const EdgeInsets.all(8),
boxAnimationDuration:
Duration(milliseconds: 200),
const Duration(milliseconds: 200),
itemAnimationDuration:
Duration(milliseconds: 500),
hoverDuration: Duration(milliseconds: 700),
const Duration(milliseconds: 500),
hoverDuration: const Duration(milliseconds: 700),
// toggle: false,
child: _buildReactionsIcon(mainImage.value),
@@ -458,7 +457,7 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
width: 100.w,
height: 30.h,
borderradius: 30.r,
borderColor: Color(0xFFD90B2E),
borderColor: const Color(0xFFD90B2E),
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 10.w),
child: Center(child: text14w400_FCFCFC(text)),

22
lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart
View File

@@ -67,9 +67,9 @@ class _ReactionViewState extends State<ReactionView> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Post",
),
resizeToAvoidBottomInset: false,
@@ -89,13 +89,13 @@ class _ReactionViewState extends State<ReactionView> {
// initialIndex: selectedIndex.value,
child: Column(children: [
CommonTabBar(tabs: [
Tab(
const Tab(
text: 'All',
),
Tab(
child: Row(children: [
commonGlassContainer(
borderColor: Color(0xFF1E3A46),
borderColor: const Color(0xFF1E3A46),
opacity1: 0.05,
opacity2: 0.06,
width: 30.w,
@@ -109,14 +109,14 @@ class _ReactionViewState extends State<ReactionView> {
),
),
border: 1.71),
Spacer(),
const Spacer(),
text14400white("110K"),
]),
),
Tab(
child: Row(children: [
commonGlassContainer(
borderColor: Color(0xFF1E3A46),
borderColor: const Color(0xFF1E3A46),
opacity1: 0.05,
opacity2: 0.06,
width: 30.w,
@@ -130,14 +130,14 @@ class _ReactionViewState extends State<ReactionView> {
),
),
border: 1.71),
Spacer(),
const Spacer(),
text14400white("9.7K"),
]),
),
Tab(
child: Row(children: [
commonGlassContainer(
borderColor: Color(0xFF1E3A46),
borderColor: const Color(0xFF1E3A46),
opacity1: 0.05,
opacity2: 0.06,
width: 30.w,
@@ -151,7 +151,7 @@ class _ReactionViewState extends State<ReactionView> {
),
),
border: 1.71),
Spacer(),
const Spacer(),
text14400white("7.4K"),
]),
),
@@ -294,9 +294,9 @@ class _ReactionViewState extends State<ReactionView> {
width: 22.w,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: Color(0xFF1E3A46),
color: const Color(0xFF1E3A46),
border: Border.all(
color: Color(0xFFFCFCFC).withOpacity(0.18),
color: const Color(0xFFFCFCFC).withOpacity(0.18),
width: 0.6)),
child: Center(
child: Image.asset(

45
lib/Feed Module/Main_Screens/Community/PostScreen.dart
View File

@@ -3,17 +3,16 @@ import 'dart:io';
import 'package:dotted_border/dotted_border.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_reaction_button/flutter_reaction_button.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Common/CommonButton.dart';
import 'package:regroup/Common/CommonDropDown.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CommonDropdown.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/ImageUpload.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
@@ -42,10 +41,10 @@ class _PostScreenState extends State<PostScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Create a post",
),
body: Stack(children: [
@@ -88,10 +87,10 @@ class _PostScreenState extends State<PostScreen> {
},
child: DottedBorder(
strokeWidth: 1,
dashPattern: [7, 4],
dashPattern: const [7, 4],
borderType: BorderType.RRect,
radius: Radius.circular(14.r),
color: Color(0xFF434A53),
color: const Color(0xFF434A53),
child: commonGlassUI(
width: double.infinity,
height: 130.h,
@@ -117,13 +116,13 @@ class _PostScreenState extends State<PostScreen> {
width: 27,
height: 27,
decoration: ShapeDecoration(
color: Color(0xFF7E7E7E),
color: const Color(0xFF7E7E7E),
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(
5)),
),
child: Icon(
child: const Icon(
Icons.delete_outline_outlined,
color: Colors.white,
))),
@@ -155,14 +154,14 @@ class _PostScreenState extends State<PostScreen> {
CustomDropDownTag1(
header: "Enter tags",
title: "Enter tags",
listData: [
listData: const [
"#Race",
"#Swimming",
"#Cycle",
"#Swimming",
"#Race"
],
rowData: [
rowData: const [
"23,233 Recently use tags",
"15,123 Recently use tags",
"15,123 Recently use tags",
@@ -170,7 +169,7 @@ class _PostScreenState extends State<PostScreen> {
"15,123 Available tags"
],
onItemSelected: (p0) {},
leadingImage: SizedBox()),
leadingImage: const SizedBox()),
// CustomTextFormField(
// suffixIcon: Container(
// height: 20.h,
@@ -224,9 +223,9 @@ class _PostScreenState extends State<PostScreen> {
CustomDropDownRadio(
header: "",
title: "",
listData: ['Individual', 'Anonymous'],
listData: const ['Individual', 'Anonymous'],
onItemSelected: (p0) {},
leadingImage: SizedBox()),
leadingImage: const SizedBox()),
// CommonDropdownradioBtn(
// hint: '', items: ['Individual', 'Anonymous']),
@@ -236,20 +235,20 @@ class _PostScreenState extends State<PostScreen> {
CustomDropDownCheckBox(
header: "",
title: "",
listData: [
listData: const [
'Active alliance network',
'Fitfam federation',
'The athletic town',
'Football fever'
],
onItemSelected: (p0) {},
images: [
images: const [
'assets/images/png/Rectangle 65.png',
'assets/images/png/Rectangle 66.png',
'assets/images/png/Rectangle 60.png',
'assets/images/png/Rectangle 68.png'
],
leadingImage: SizedBox()),
leadingImage: const SizedBox()),
// CommonDropdownCheckbox(
// hint: '',
// items: [
@@ -284,7 +283,7 @@ class _PostScreenState extends State<PostScreen> {
Get.bottomSheet(Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14.r),
color: Color(0xFF222935)),
color: const Color(0xFF222935)),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 30.w),
child: Column(mainAxisSize: MainAxisSize.min, children: [
@@ -306,7 +305,7 @@ class _PostScreenState extends State<PostScreen> {
height: 35.h,
width: 216.w,
decoration: BoxDecoration(
border: Border.all(color: Color(0xFF434A53), width: 1),
border: Border.all(color: const Color(0xFF434A53), width: 1),
gradient: const LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
@@ -341,12 +340,12 @@ class _PostScreenState extends State<PostScreen> {
height: 35,
decoration: BoxDecoration(
color: selectedContainerIndices.contains(index)
? Color(0xFFD90B2E).withOpacity(0.4)
: Color(0xFFFFFFFF).withOpacity(0.2),
? const Color(0xFFD90B2E).withOpacity(0.4)
: const Color(0xFFFFFFFF).withOpacity(0.2),
borderRadius: BorderRadius.circular(30),
border: Border.all(color: Color(0xFFD90B2E), width: 1)),
border: Border.all(color: const Color(0xFFD90B2E), width: 1)),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 20),
padding: const EdgeInsets.symmetric(horizontal: 20),
child: Center(child: text14w400_FCFCFC(text)),
),
),

17
lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart
View File

@@ -5,7 +5,6 @@ import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonTabBar.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/controller/CommonTextFormField.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
@@ -20,7 +19,7 @@ class _DetailExploreState extends State<DetailExplore> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
body: SafeArea(
@@ -46,13 +45,13 @@ class _DetailExploreState extends State<DetailExplore> {
width: 40.w,
height: 40.h,
borderradius: 100,
customWidget: Center(
customWidget: const Center(
child: Icon(
Icons.arrow_back,
color: Colors.white,
)),
border: 1,
borderColor: Color(0xFF55434F)),
borderColor: const Color(0xFF55434F)),
),
sizedBoxWidth(12.w),
Expanded(
@@ -80,7 +79,7 @@ class _DetailExploreState extends State<DetailExplore> {
length: 4,
// initialIndex: selectedIndex.value,
child: Column(children: [
CommonTabBar(tabs: const [
const CommonTabBar(tabs: [
Tab(
text: 'All',
),
@@ -164,7 +163,7 @@ class _DetailExploreState extends State<DetailExplore> {
height: 30.h,
width: 30.w,
decoration: BoxDecoration(
border: Border.all(color: Color(0xFF434A53), width: 0.5.w),
border: Border.all(color: const Color(0xFF434A53), width: 0.5.w),
shape: BoxShape.circle,
),
child: Center(child: Image.asset(imagePath, fit: BoxFit.fill)),
@@ -177,19 +176,19 @@ class _DetailExploreState extends State<DetailExplore> {
}
Widget eventsTab() {
return Column(
return const Column(
children: [],
);
}
Widget groupsTab() {
return Column(
return const Column(
children: [],
);
}
Widget communitiesTab() {
return Column(
return const Column(
children: [],
);
}

27
lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart
View File

@@ -5,7 +5,6 @@ import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/Common/global.dart' as global;
@@ -20,7 +19,7 @@ class ExploreScreen extends StatefulWidget {
class _ExploreScreenState extends State<ExploreScreen> {
GoogleMapController? _mapController;
double _zoomLevel = 18.0;
final double _zoomLevel = 18.0;
// BitmapDescriptor? _customIcon1;
// BitmapDescriptor? _customIcon2;
@@ -46,14 +45,14 @@ class _ExploreScreenState extends State<ExploreScreen> {
// }
Future<void> _showInitialBottomSheet() async {
await Future.delayed(Duration(milliseconds: 400));
await Future.delayed(const Duration(milliseconds: 400));
exploreBottomSheet();
}
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
// appBar: CommonAppbar(
// titleTxt: "",
@@ -87,7 +86,7 @@ class _ExploreScreenState extends State<ExploreScreen> {
),
markers: {
Marker(
markerId: MarkerId('currentP'),
markerId: const MarkerId('currentP'),
icon: BitmapDescriptor.defaultMarker,
position: global.latlong!,
onTap: () {
@@ -95,9 +94,9 @@ class _ExploreScreenState extends State<ExploreScreen> {
},
),
Marker(
markerId: MarkerId('currentP'),
markerId: const MarkerId('currentP'),
icon: BitmapDescriptor.defaultMarker,
position: LatLng(19.155001, 72.84998),
position: const LatLng(19.155001, 72.84998),
onTap: () {
exploreBottomSheet2();
},
@@ -114,7 +113,7 @@ class _ExploreScreenState extends State<ExploreScreen> {
},
child: AbsorbPointer(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16),
padding: const EdgeInsets.symmetric(horizontal: 16),
child: CustomTextFormField(
leadingIcon: SizedBox(
height: 23,
@@ -144,7 +143,7 @@ class _ExploreScreenState extends State<ExploreScreen> {
topLeft: Radius.circular(10.r),
topRight: Radius.circular(10.r),
),
color: Color(0xFF222935),
color: const Color(0xFF222935),
),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
@@ -173,7 +172,7 @@ class _ExploreScreenState extends State<ExploreScreen> {
child: Container(
height: 85.h,
width: 85.w,
decoration: BoxDecoration(
decoration: const BoxDecoration(
shape: BoxShape.circle,
),
child: Image.asset("assets/images/png/Ellipse 37.png",
@@ -206,7 +205,7 @@ class _ExploreScreenState extends State<ExploreScreen> {
border: 0.5),
sizedBoxWidth(10.w),
text16400white("10 subgroups "),
Spacer(),
const Spacer(),
commonGlassContainer(
width: 30.w,
height: 30.h,
@@ -233,12 +232,12 @@ class _ExploreScreenState extends State<ExploreScreen> {
borderradius: 30.r,
customWidget: Center(child: text14w400_FCFCFC("Message")),
border: 1),
Spacer(),
const Spacer(),
Container(
width: 170.w,
height: 35.h,
decoration: BoxDecoration(
color: Color(0xFFD90B2E),
color: const Color(0xFFD90B2E),
borderRadius: BorderRadius.circular(30.r)),
child: Center(child: text14400white("Visit group")),
),
@@ -277,7 +276,7 @@ class _ExploreScreenState extends State<ExploreScreen> {
topLeft: Radius.circular(10.r),
topRight: Radius.circular(10.r),
),
color: Color(0xFF222935),
color: const Color(0xFF222935),
),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),

18
lib/Feed Module/Main_Screens/ExploreDesign/SearchGroup.dart
View File

@@ -4,8 +4,8 @@ import 'package:get/get.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/controller/CommonTextFormField.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
@@ -21,7 +21,7 @@ class _SearchGroupState extends State<SearchGroup> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
body: SafeArea(
child: Stack(children: [
@@ -64,7 +64,7 @@ class _SearchGroupState extends State<SearchGroup> {
Row(
children: [
text18w700white("Recent"),
Spacer(),
const Spacer(),
text16w400_FCFCFCblur("See all"),
],
),
@@ -85,12 +85,12 @@ class _SearchGroupState extends State<SearchGroup> {
CircleAvatar(
radius: 15.r,
backgroundImage:
AssetImage("assets/images/png/cimg3.png"),
const AssetImage("assets/images/png/cimg3.png"),
),
sizedBoxWidth(12.w),
text16400white("Kartikey gautam"),
Spacer(),
Icon(
const Spacer(),
const Icon(
Icons.clear,
color: Colors.white,
)
@@ -139,8 +139,8 @@ class _SearchGroupState extends State<SearchGroup> {
border: 0.5),
sizedBoxWidth(12.w),
text16400white(title),
Spacer(),
Icon(
const Spacer(),
const Icon(
Icons.clear,
color: Colors.white,
)

18
lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart
View File

@@ -1,13 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
class ConnectCommunity extends StatefulWidget {
const ConnectCommunity({super.key});
@@ -34,10 +32,10 @@ class _ConnectCommunityState extends State<ConnectCommunity> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Connect with communities",
),
body: Stack(children: [
@@ -54,7 +52,7 @@ class _ConnectCommunityState extends State<ConnectCommunity> {
Expanded(
child: ListView.builder(
shrinkWrap: true,
physics: BouncingScrollPhysics(),
physics: const BouncingScrollPhysics(),
itemCount: communityData.length,
itemBuilder: (context, index) {
return communityCard(
@@ -95,7 +93,7 @@ class _ConnectCommunityState extends State<ConnectCommunity> {
Container(
height: 65.h,
width: 65.h,
decoration: BoxDecoration(
decoration: const BoxDecoration(
shape: BoxShape.circle,
// color: Colors.amber,
),
@@ -128,7 +126,7 @@ class _ConnectCommunityState extends State<ConnectCommunity> {
),
],
),
Spacer(),
const Spacer(),
],
),
sizedBoxHeight(16.h),
@@ -148,13 +146,13 @@ class _ConnectCommunityState extends State<ConnectCommunity> {
),
sizedBoxWidth(95.w),
text12w400_FCFCFC_blur(members),
Spacer(),
const Spacer(),
Container(
height: 30.h,
width: 123.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(30.r),
color: Color(0xFFD90B2E)),
color: const Color(0xFFD90B2E)),
child: Center(
child: text14w400_FCFCFC("Request to join")),
)

12
lib/Feed Module/Main_Screens/GroupTab/View/GoupSettings.dart
View File

@@ -1,10 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
@@ -35,10 +33,10 @@ class _GroupSettingsState extends State<GroupSettings> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Group settings",
),
body: Stack(children: [
@@ -60,7 +58,7 @@ class _GroupSettingsState extends State<GroupSettings> {
child: Row(
children: [
text18w400_FCFCFC("Group type"),
Spacer(),
const Spacer(),
Icon(
Icons.arrow_forward_ios_outlined,
color: Colors.white,
@@ -82,7 +80,7 @@ class _GroupSettingsState extends State<GroupSettings> {
child: Row(
children: [
text18w400_FCFCFC("Manage members"),
Spacer(),
const Spacer(),
Icon(
Icons.arrow_forward_ios_outlined,
color: Colors.white,
@@ -106,7 +104,7 @@ class _GroupSettingsState extends State<GroupSettings> {
topLeft: Radius.circular(30.r),
topRight: Radius.circular(30.r),
),
color: Color(0xFF222935),
color: const Color(0xFF222935),
),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),

126
lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart
View File

@@ -7,7 +7,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonTabBar.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
@@ -60,13 +60,13 @@ class _GroupDetailState extends State<GroupDetail> {
),
Appointment(
startTime: DateTime.now(),
endTime: DateTime.now().add(Duration(hours: 3)),
endTime: DateTime.now().add(const Duration(hours: 3)),
subject: 'Match day',
// color: Colors.red,
),
Appointment(
startTime: DateTime.now(),
endTime: DateTime.now().add(Duration(hours: 3)),
endTime: DateTime.now().add(const Duration(hours: 3)),
subject: 'Muharram/Ashura',
// color: Colors.red,
),
@@ -77,18 +77,18 @@ class _GroupDetailState extends State<GroupDetail> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
titleTxt: "",
customActionWidget: Row(children: [
PopupMenuButton(
surfaceTintColor: Color(0xFF222935),
surfaceTintColor: const Color(0xFF222935),
constraints: BoxConstraints.tightFor(
width: 150.w,
),
offset: Offset(0, 40),
color: Color(0xFF222935),
offset: const Offset(0, 40),
color: const Color(0xFF222935),
tooltip: "",
itemBuilder: (BuildContext context) => <PopupMenuEntry>[
PopupMenuItem(
@@ -100,7 +100,7 @@ class _GroupDetailState extends State<GroupDetail> {
child: text14w400white("Create post"),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {
Get.toNamed(RouteName.sessions);
@@ -128,12 +128,12 @@ class _GroupDetailState extends State<GroupDetail> {
),
sizedBoxWidth(16.w),
PopupMenuButton(
surfaceTintColor: Color(0xFF222935),
surfaceTintColor: const Color(0xFF222935),
constraints: BoxConstraints.tightFor(
width: 210.w,
),
offset: Offset(0, 40),
color: Color(0xFF222935),
offset: const Offset(0, 40),
color: const Color(0xFF222935),
tooltip: "",
itemBuilder: (BuildContext context) => <PopupMenuEntry>[
PopupMenuItem(
@@ -143,7 +143,7 @@ class _GroupDetailState extends State<GroupDetail> {
child: Row(
children: [
text14w400white("Add members"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/uiw_user-add.png",
height: 15.h,
@@ -153,7 +153,7 @@ class _GroupDetailState extends State<GroupDetail> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -161,7 +161,7 @@ class _GroupDetailState extends State<GroupDetail> {
child: Row(
children: [
text14w400white("Share"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/share.png",
height: 20.h,
@@ -171,7 +171,7 @@ class _GroupDetailState extends State<GroupDetail> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {
Get.toNamed(RouteName.groupinfo);
@@ -181,7 +181,7 @@ class _GroupDetailState extends State<GroupDetail> {
child: Row(
children: [
text14w400white("Group info"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/Vector1a.png",
height: 20.h,
@@ -191,7 +191,7 @@ class _GroupDetailState extends State<GroupDetail> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -199,7 +199,7 @@ class _GroupDetailState extends State<GroupDetail> {
child: Row(
children: [
text14w400white("Search"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/Frame 58575.png",
height: 18.h,
@@ -209,7 +209,7 @@ class _GroupDetailState extends State<GroupDetail> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -217,7 +217,7 @@ class _GroupDetailState extends State<GroupDetail> {
child: Row(
children: [
text14w400white("Mute Notification"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/Black1233.png",
height: 16.h,
@@ -227,7 +227,7 @@ class _GroupDetailState extends State<GroupDetail> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {
Get.toNamed(RouteName.groupsettings);
@@ -237,7 +237,7 @@ class _GroupDetailState extends State<GroupDetail> {
child: Row(
children: [
text14w400white("Edit group settings"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/setting2.png",
height: 18.h,
@@ -290,7 +290,7 @@ class _GroupDetailState extends State<GroupDetail> {
color: Colors.white,
width: 2,
),
boxShadow: [
boxShadow: const [
BoxShadow(
color: Color.fromRGBO(0, 0, 0, 0.25),
blurRadius: 12,
@@ -301,7 +301,7 @@ class _GroupDetailState extends State<GroupDetail> {
child: CircleAvatar(
radius: 42.5.r,
foregroundImage:
AssetImage("assets/images/png/group111.png"),
const AssetImage("assets/images/png/group111.png"),
),
))
]),
@@ -382,7 +382,7 @@ class _GroupDetailState extends State<GroupDetail> {
Row(
children: [
text16w700white("Badges"),
Spacer(),
const Spacer(),
GestureDetector(
onTap: () {
// Get.toNamed(RouteName.badges);
@@ -439,8 +439,8 @@ class _GroupDetailState extends State<GroupDetail> {
], number: "+2"),
sizedBoxWidth(100.w),
text16400white("7 members"),
Spacer(),
Icon(
const Spacer(),
const Icon(
Icons.arrow_forward,
color: Colors.white,
)
@@ -452,7 +452,7 @@ class _GroupDetailState extends State<GroupDetail> {
Row(
children: [
text18w400white("Subgroups"),
Spacer(),
const Spacer(),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.subgroups);
@@ -506,7 +506,7 @@ class _GroupDetailState extends State<GroupDetail> {
"11 New Announcements Request"),
],
),
Spacer(),
const Spacer(),
GestureDetector(
onTap: () {
// Get.toNamed(RouteName.addEvent);
@@ -516,7 +516,7 @@ class _GroupDetailState extends State<GroupDetail> {
width: 43.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(30.r),
color: Color(0xFFD90B2E),
color: const Color(0xFFD90B2E),
),
child: Center(child: text12400white("11")),
),
@@ -533,7 +533,7 @@ class _GroupDetailState extends State<GroupDetail> {
// initialIndex: selectedIndex.value,
child: Column(
children: [
CommonTabBar(tabs: const [
const CommonTabBar(tabs: [
Tab(
text: 'Announcement',
),
@@ -637,7 +637,7 @@ class _GroupDetailState extends State<GroupDetail> {
sizedBoxWidth(7.w),
Icon(
Icons.circle,
color: Color(0xFFFCFCFC),
color: const Color(0xFFFCFCFC),
size: 4.sp,
),
sizedBoxWidth(6.w),
@@ -646,12 +646,12 @@ class _GroupDetailState extends State<GroupDetail> {
)
],
),
Spacer(),
const Spacer(),
PopupMenuButton(
surfaceTintColor: Color(0xFF222935),
surfaceTintColor: const Color(0xFF222935),
constraints: BoxConstraints.tightFor(width: 176.w),
offset: Offset(0, 50),
color: Color(0xFF222935),
offset: const Offset(0, 50),
color: const Color(0xFF222935),
tooltip: "",
itemBuilder: (BuildContext context) => <PopupMenuEntry>[
PopupMenuItem(
@@ -669,7 +669,7 @@ class _GroupDetailState extends State<GroupDetail> {
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/Vector (5).png",
height: 15.h,
@@ -679,7 +679,7 @@ class _GroupDetailState extends State<GroupDetail> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -695,7 +695,7 @@ class _GroupDetailState extends State<GroupDetail> {
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/share.png",
height: 20.h,
@@ -705,7 +705,7 @@ class _GroupDetailState extends State<GroupDetail> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -721,7 +721,7 @@ class _GroupDetailState extends State<GroupDetail> {
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/f7_pin-fill (2).png",
height: 25.h,
@@ -747,7 +747,7 @@ class _GroupDetailState extends State<GroupDetail> {
onTap: () {
// Get.toNamed(RouteName.postdetailsScreen);
},
child: Container(
child: SizedBox(
height: 163.h,
width: double.infinity,
child: Image.asset(
@@ -791,7 +791,7 @@ class _GroupDetailState extends State<GroupDetail> {
'assets/images/png/party-popper 2.png'
]),
),
Spacer(),
const Spacer(),
commonContainer(
width: 30.w,
height: 30.h,
@@ -876,11 +876,11 @@ class _GroupDetailState extends State<GroupDetail> {
boxRadius: 30,
itemsSpacing: 8,
itemScale: 0.4,
itemSize: Size(45, 45),
boxPadding: EdgeInsets.all(8),
boxAnimationDuration: Duration(milliseconds: 200),
itemAnimationDuration: Duration(milliseconds: 500),
hoverDuration: Duration(milliseconds: 700),
itemSize: const Size(45, 45),
boxPadding: const EdgeInsets.all(8),
boxAnimationDuration: const Duration(milliseconds: 200),
itemAnimationDuration: const Duration(milliseconds: 500),
hoverDuration: const Duration(milliseconds: 700),
// toggle: false,
child: _buildReactionsIcon(mainImage.value),
@@ -957,7 +957,7 @@ class _GroupDetailState extends State<GroupDetail> {
height: 30.h,
borderRadius: BorderRadius.circular(30.r),
borderwidth: 1,
borderColor: Color(0xFFD90B2E),
borderColor: const Color(0xFFD90B2E),
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 10.w),
child: Center(child: text14w400_FCFCFC(text)),
@@ -974,16 +974,16 @@ class _GroupDetailState extends State<GroupDetail> {
borderRadius: BorderRadius.circular(1),
customWidget: SfCalendar(
view: CalendarView.day,
appointmentTextStyle: TextStyle(color: Colors.white),
headerStyle: CalendarHeaderStyle(
appointmentTextStyle: const TextStyle(color: Colors.white),
headerStyle: const CalendarHeaderStyle(
textStyle: TextStyle(
color: Color(0xFFD90B2E),
)),
// blackoutDatesTextStyle: TextStyle(color: Colors.white),
weekNumberStyle:
WeekNumberStyle(textStyle: TextStyle(color: Colors.white)),
viewHeaderStyle: ViewHeaderStyle(
const WeekNumberStyle(textStyle: TextStyle(color: Colors.white)),
viewHeaderStyle: const ViewHeaderStyle(
// backgroundColor: Colors.amber,
dateTextStyle: TextStyle(color: Colors.white),
dayTextStyle: TextStyle(color: Color(0xFFD90B2E)),
@@ -993,18 +993,18 @@ class _GroupDetailState extends State<GroupDetail> {
backgroundColor: Colors.transparent,
firstDayOfWeek: 1,
cellBorderColor: Colors.white,
todayHighlightColor: Color(0xFFD90B2E),
todayHighlightColor: const Color(0xFFD90B2E),
todayTextStyle: const TextStyle(color: Colors.white),
controller: _calendarController,
showNavigationArrow: true,
allowViewNavigation: true,
showDatePickerButton: true,
monthViewSettings: MonthViewSettings(
monthViewSettings: const MonthViewSettings(
// agendaStyle: AgendaStyle(
// dateTextStyle: TextStyle(color: Colors.amber),
// ),
),
allowedViews: [
allowedViews: const [
CalendarView.month,
CalendarView.day,
CalendarView.schedule,
@@ -1013,20 +1013,20 @@ class _GroupDetailState extends State<GroupDetail> {
showCurrentTimeIndicator: true,
dataSource: MeetingDataSource(_appointments!),
onTap: calendarTapped,
timeSlotViewSettings: TimeSlotViewSettings(
timeSlotViewSettings: const TimeSlotViewSettings(
timeTextStyle: TextStyle(
color: Colors.white,
),
),
monthCellBuilder: (context, details) {
return Container(
decoration: BoxDecoration(
decoration: const BoxDecoration(
color: Colors.transparent,
),
child: Center(
child: Text(
details.date.day.toString(),
style: TextStyle(
style: const TextStyle(
color: Colors.white), // Set text color to white
),
),
@@ -1065,7 +1065,7 @@ class _GroupDetailState extends State<GroupDetail> {
context: context,
builder: (BuildContext context) {
return AlertDialog(
title: Text('Event Details'),
title: const Text('Event Details'),
content: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
@@ -1076,7 +1076,7 @@ class _GroupDetailState extends State<GroupDetail> {
),
actions: <Widget>[
ElevatedButton(
child: Text('Close'),
child: const Text('Close'),
onPressed: () {
Navigator.of(context).pop();
},
@@ -1094,7 +1094,7 @@ class _GroupDetailState extends State<GroupDetail> {
context: context,
builder: (BuildContext context) {
return AlertDialog(
title: Text('Event Details'),
title: const Text('Event Details'),
content: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
@@ -1105,7 +1105,7 @@ class _GroupDetailState extends State<GroupDetail> {
),
actions: <Widget>[
ElevatedButton(
child: Text('Close'),
child: const Text('Close'),
onPressed: () {
Navigator.of(context).pop();
},

46
lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart
View File

@@ -33,8 +33,8 @@ class _GroupEventState extends State<GroupEvent> {
TextEditingController dateController = TextEditingController();
TextEditingController dateController2 = TextEditingController();
TimeOfDay? starttime = TimeOfDay(hour: 15, minute: 0);
TimeOfDay? endtime = TimeOfDay(hour: 15, minute: 0);
TimeOfDay? starttime = const TimeOfDay(hour: 15, minute: 0);
TimeOfDay? endtime = const TimeOfDay(hour: 15, minute: 0);
String formatTimeOfDay(TimeOfDay time) {
final now = DateTime.now();
@@ -49,9 +49,9 @@ class _GroupEventState extends State<GroupEvent> {
return Scaffold(
// key: _scaffoldKey1,
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "",
),
body: Stack(children: [
@@ -69,7 +69,7 @@ class _GroupEventState extends State<GroupEvent> {
text16400white("Event Title"),
sizedBoxHeight(14.h),
CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 22.h,
width: 18.w,
child: Center(
@@ -108,10 +108,10 @@ class _GroupEventState extends State<GroupEvent> {
},
child: DottedBorder(
strokeWidth: 1,
dashPattern: [7, 4],
dashPattern: const [7, 4],
borderType: BorderType.RRect,
radius: Radius.circular(14.r),
color: Color(0xFF434A53),
color: const Color(0xFF434A53),
child: commonGlassContainer(
border: 0,
width: double.infinity,
@@ -137,12 +137,12 @@ class _GroupEventState extends State<GroupEvent> {
width: 27,
height: 27,
decoration: ShapeDecoration(
color: Color(0xFF7E7E7E),
color: const Color(0xFF7E7E7E),
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(5)),
),
child: Icon(
child: const Icon(
Icons.delete_outline_outlined,
color: Colors.white,
))),
@@ -197,7 +197,7 @@ class _GroupEventState extends State<GroupEvent> {
text12w400_FCFCFC_blur("10 kb")
],
),
Spacer(),
const Spacer(),
Image.asset(
'assets/images/png/cancelicon.png',
height: 20.h,
@@ -212,8 +212,8 @@ class _GroupEventState extends State<GroupEvent> {
sizedBoxHeight(14.h),
CommonDropdownBtn(
hint: '',
items: [],
leadingImage: Container(
items: const [],
leadingImage: SizedBox(
height: 22.h,
width: 18.w,
child: Center(
@@ -228,8 +228,8 @@ class _GroupEventState extends State<GroupEvent> {
sizedBoxHeight(14.h),
CommonDropdownBtn(
hint: '',
items: [],
leadingImage: Container(
items: const [],
leadingImage: SizedBox(
height: 22.h,
width: 18.w,
child: Center(
@@ -257,7 +257,7 @@ class _GroupEventState extends State<GroupEvent> {
child: CustomTextFormField(
textEditingController: dateController,
hintText: "",
leadingIcon: Container(
leadingIcon: SizedBox(
height: 20.h,
width: 20.w,
child: Center(
@@ -288,7 +288,7 @@ class _GroupEventState extends State<GroupEvent> {
child: CustomTextFormField(
textEditingController: dateController2,
hintText: "",
leadingIcon: Container(
leadingIcon: SizedBox(
height: 20.h,
width: 20.w,
child: Center(
@@ -343,7 +343,7 @@ class _GroupEventState extends State<GroupEvent> {
)
],
),
Spacer(),
const Spacer(),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -397,7 +397,7 @@ class _GroupEventState extends State<GroupEvent> {
customWidget: Transform.scale(
scale: 1.4,
child: Checkbox(
side: BorderSide(color: Color(0xFF434A53)),
side: const BorderSide(color: Color(0xFF434A53)),
value: isChecked.value,
activeColor: Colors.transparent,
checkColor: Colors.white,
@@ -417,8 +417,8 @@ class _GroupEventState extends State<GroupEvent> {
sizedBoxHeight(14.h),
CommonDropdownBtn(
hint: '',
items: [],
leadingImage: Container(
items: const [],
leadingImage: SizedBox(
height: 22.h,
width: 28.w,
child: Center(
@@ -447,7 +447,7 @@ class _GroupEventState extends State<GroupEvent> {
),
hintText: "",
suffixIcon:
Icon(Icons.arrow_forward, color: Color(0xFFFFFFFF)),
const Icon(Icons.arrow_forward, color: Color(0xFFFFFFFF)),
),
// sizedBoxHeight(20.h),
// containerWidget(
@@ -509,7 +509,7 @@ class _GroupEventState extends State<GroupEvent> {
children: [
text16400white("Minutes"),
sizedBoxWidth(5.w),
Icon(
const Icon(
Icons.keyboard_arrow_down,
color: Colors.white,
)
@@ -546,7 +546,7 @@ class _GroupEventState extends State<GroupEvent> {
),
sizedBoxWidth(8.w),
text16400white(title),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/cancelicon.png",
height: 20.h,

67
lib/Feed Module/Main_Screens/GroupTab/View/Sessions.dart
View File

@@ -41,11 +41,11 @@ class _SessionsState extends State<Sessions> {
onSurface: Colors.white,
),
textTheme: Theme.of(context).textTheme.copyWith(
headline6: TextStyle(color: Colors.blue),
titleLarge: const TextStyle(color: Colors.blue),
),
textButtonTheme: TextButtonThemeData(
style: TextButton.styleFrom(
foregroundColor: Color(0xFFD90B2E),
foregroundColor: const Color(0xFFD90B2E),
),
));
return showTimePicker(
@@ -71,11 +71,11 @@ class _SessionsState extends State<Sessions> {
// onSecondary: Colors.red,
),
textTheme: Theme.of(context).textTheme.copyWith(
headline6: TextStyle(color: Colors.blue),
titleLarge: const TextStyle(color: Colors.blue),
),
textButtonTheme: TextButtonThemeData(
style: TextButton.styleFrom(
foregroundColor: Color(0xFFD90B2E),
foregroundColor: const Color(0xFFD90B2E),
),
),
);
@@ -130,9 +130,9 @@ class _SessionsState extends State<Sessions> {
return Scaffold(
// key: _scaffoldKey1,
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Sessions",
),
body: Stack(children: [
@@ -153,7 +153,7 @@ class _SessionsState extends State<Sessions> {
sizedBoxHeight(25.h),
CustomTextFormField(
hintText: "",
leadingIcon: Container(
leadingIcon: SizedBox(
height: 20.h,
width: 20.w,
child: Center(
@@ -195,20 +195,28 @@ class _SessionsState extends State<Sessions> {
CustomDropDownRadio(
header: "",
title: "",
listData: ["hhh"],
listData: const ["hhh"],
onItemSelected: (p0) {},
leadingImage: Image.asset(
"assets/images/png/Vector (5)12.png")),
"assets/images/png/Vector (5)12.png",
height: 20.h,
width: 20.w,
)),
sizedBoxHeight(25.h),
text16w400_FCFCFC('Sport'),
sizedBoxHeight(25.h),
CustomDropDownRadio(
header: "",
title: "",
listData: ["hhh"],
listData: const ["hhh"],
onItemSelected: (p0) {},
leadingImage: Image.asset(
"assets/images/png/Vector (4).png")),
leadingImage: Center(
child: Image.asset(
"assets/images/png/Vector (4).png",
height: 20.h,
width: 20.w,
),
)),
sizedBoxHeight(25.h),
text16w400_FCFCFC('Starts'),
sizedBoxHeight(25.h),
@@ -218,7 +226,7 @@ class _SessionsState extends State<Sessions> {
},
child: AbsorbPointer(
child: CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 20.h,
width: 20.w,
child: Center(
@@ -247,7 +255,8 @@ class _SessionsState extends State<Sessions> {
customWidget: Transform.scale(
scale: 1.4,
child: Checkbox(
side: BorderSide(color: Color(0xFF434A53)),
side: const BorderSide(
color: Color(0xFF434A53)),
value: isChecked.value,
activeColor: Colors.transparent,
checkColor: Colors.white,
@@ -267,7 +276,7 @@ class _SessionsState extends State<Sessions> {
sizedBoxHeight(20.h),
CustomTextFormField(
hintText: "",
leadingIcon: Container(
leadingIcon: SizedBox(
height: 20.h,
width: 20.w,
child: Center(
@@ -285,16 +294,19 @@ class _SessionsState extends State<Sessions> {
CustomDropDownRadio(
header: "",
title: "",
listData: ["hryy"],
listData: const ["hryy"],
onItemSelected: (p0) {},
leadingImage:
Image.asset("assets/images/png/Black.png")),
leadingImage: Image.asset(
"assets/images/png/Black.png",
height: 20.h,
width: 20.w,
)),
sizedBoxHeight(25.h),
text16w400_FCFCFC("Add Users"),
sizedBoxHeight(25.h),
CustomTextFormField(
hintText: "",
leadingIcon: Container(
leadingIcon: SizedBox(
height: 20.h,
width: 20.w,
child: Center(
@@ -304,7 +316,7 @@ class _SessionsState extends State<Sessions> {
width: 20.w,
),
)),
suffixIcon: Container(
suffixIcon: SizedBox(
height: 20.h,
width: 20.h,
child: Center(
@@ -342,7 +354,7 @@ class _SessionsState extends State<Sessions> {
children: [
text16400white("Minutes"),
sizedBoxWidth(5.w),
Icon(
const Icon(
Icons.keyboard_arrow_down,
color: Colors.white,
)
@@ -369,10 +381,10 @@ class _SessionsState extends State<Sessions> {
},
child: DottedBorder(
strokeWidth: 1,
dashPattern: [7, 4],
dashPattern: const [7, 4],
borderType: BorderType.RRect,
radius: Radius.circular(14.r),
color: Color(0xFF434A53),
color: const Color(0xFF434A53),
child: commonGlassContainer(
border: 0,
width: double.infinity,
@@ -399,7 +411,8 @@ class _SessionsState extends State<Sessions> {
width: 27,
height: 27,
decoration: ShapeDecoration(
color: Color(0xFF7E7E7E),
color:
const Color(0xFF7E7E7E),
shape:
RoundedRectangleBorder(
borderRadius:
@@ -407,7 +420,7 @@ class _SessionsState extends State<Sessions> {
.circular(
5)),
),
child: Icon(
child: const Icon(
Icons
.delete_outline_outlined,
color: Colors.white,
@@ -439,9 +452,9 @@ class _SessionsState extends State<Sessions> {
CustomDropDownRadio(
header: "More options",
title: "",
listData: [""],
listData: const [""],
onItemSelected: (p0) {},
leadingImage: SizedBox()),
leadingImage: const SizedBox()),
sizedBoxHeight(30.h),
CommonBtn(text: "Create event"),
sizedBoxHeight(50.h),

127
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart
View File

@@ -7,14 +7,10 @@ import 'package:get/get.dart' hide MultipartFile, FormData;
import 'package:regroup/Common/CommonButton.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Common/controller/profileimagecontroller.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CommonDropdown.dart';
import 'package:regroup/Utils/Common/ImageUpload.dart';
import 'package:regroup/Utils/Common/ShimmerCommon.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/dialogs.dart';
import 'package:regroup/Utils/texts.dart';
@@ -79,8 +75,7 @@ class _BusEditProfileState extends State<BusEditProfile> {
locationController.text = getEditProfileBus!.data!.businessLocation ??
'Elm street london, United Kingdom';
bioController.text =
getEditProfileBus!.data!.bio ?? "";
bioController.text = getEditProfileBus!.data!.bio ?? "";
// _selectedgenderType = getEditProfileIndi!.data!.gender ?? '';
// _selectedsportType = getEditProfileIndi!.data!.interest!.join(', ') ?? '';
@@ -93,12 +88,12 @@ class _BusEditProfileState extends State<BusEditProfile> {
void saveEditProfileBus() async {
var imageFile;
if (editProfileImage.usserprofilePicPath.value.isNotEmpty) {
if (editProfileImage.usserprofilePicPath.value.isNotEmpty) {
imageFile = await MultipartFile.fromFile(
editProfileImage.usserprofilePicPath.value,
filename: path.basename(profilePicture),
);
print(imageFile.toString());
}
FormData? updata;
@@ -116,10 +111,10 @@ class _BusEditProfileState extends State<BusEditProfile> {
backgroundColor: Colors.red,
colorText: Colors.white,
);
}
}
// else if (profilePicture == "") {
// utils.showToast('Upload edit profile picture!');
// }
// }
else {
utils.loader();
updata = FormData.fromMap({
@@ -130,8 +125,8 @@ class _BusEditProfileState extends State<BusEditProfile> {
"website_link": websiteLinkController.text,
"business_location": locationController.text,
"bio": bioController.text,
"business_profile":
editProfileImage.usserprofilePicPath.isNotEmpty ? imageFile : null,
"business_profile":
editProfileImage.usserprofilePicPath.isNotEmpty ? imageFile : null,
// await convertFileToMultiPart(profilePicture),
});
@@ -177,7 +172,7 @@ class _BusEditProfileState extends State<BusEditProfile> {
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
child: Scaffold(
// key: _scaffoldKey1,
backgroundColor: const Color(0xFF222935),
@@ -191,14 +186,14 @@ class _BusEditProfileState extends State<BusEditProfile> {
if (snapshot.connectionState == ConnectionState.waiting) {
return
// const ShimmerCommon();
Center(
const Center(
child: CircularProgressIndicator(
color: Colors.blue,
),
);
}
if (snapshot.hasError) {
return Center(
child: Text(
@@ -207,7 +202,7 @@ class _BusEditProfileState extends State<BusEditProfile> {
),
);
}
if (snapshot.connectionState == ConnectionState.done &&
snapshot.hasData) {
print("Data fetched-->");
@@ -226,45 +221,9 @@ class _BusEditProfileState extends State<BusEditProfile> {
sizedBoxHeight(25.h),
Stack(
children: [
// profilePicture != "" && isImageAdded
// ? ClipOval(
// child: SizedBox.fromSize(
// size: Size.fromRadius(50.r),
// child: Image.file(
// File(profilePicture),
// // filePath[0]!,
// fit: BoxFit.cover,
// width: double.infinity,
// ),
// ),
// )
// : getEditProfileBus!.data!.businessLogo !=
// null
// ? Container(
// width: 100.w,
// height: 100.h,
// decoration: ShapeDecoration(
// image: DecorationImage(
// image: Image(
// image: NetworkImage(
// getEditProfileBus!.data!
// .businessLogo ??
// ''),
// ).image,
// fit: BoxFit.cover,
// ),
// shape: const OvalBorder(),
// ),
// )
// : CircleAvatar(
// backgroundImage: const AssetImage(
// "assets/images/png/Ellipse 37 (1).png",
// ),
// radius: 50.r,
// ),
Obx(
() => editProfileImage.usserprofilePicPath.value !=
Obx(
() => editProfileImage
.usserprofilePicPath.value !=
''
? ClipOval(
child: SizedBox.fromSize(
@@ -285,8 +244,10 @@ class _BusEditProfileState extends State<BusEditProfile> {
fit: BoxFit.cover,
width: double.infinity,
errorBuilder:
(BuildContext context,
Object exception,
(BuildContext
context,
Object
exception,
StackTrace?
stackTrace) {
return CircleAvatar(
@@ -303,19 +264,20 @@ class _BusEditProfileState extends State<BusEditProfile> {
: ClipOval(
child: SizedBox.fromSize(
size: Size.fromRadius(60.r),
child:
getEditProfileBus!.data!
.businessProfileImage
!=
child: getEditProfileBus!.data!
.businessProfileImage !=
null
? ClipOval(
child: SizedBox.fromSize(
child:
SizedBox.fromSize(
size: Size.fromRadius(
25.r),
child: CircleAvatar(
backgroundImage: NetworkImage(
getEditProfileBus!.data!
.businessProfileImage!),
backgroundImage:
NetworkImage(
getEditProfileBus!
.data!
.businessProfileImage!),
radius: 25.r,
),
),
@@ -333,14 +295,15 @@ class _BusEditProfileState extends State<BusEditProfile> {
context,
true,
(result) {
editProfileImage
.usserprofilePicPath.value = result;
editProfileImage
.usserprofilePicPath
.value = result;
var filenameresult =
extractFileName(result);
print(
"File name is $filenameresult");
"File name is $filenameresult");
profilePicture = result;
isImageAdded = true;
setState(() {});
@@ -374,7 +337,7 @@ class _BusEditProfileState extends State<BusEditProfile> {
sizedBoxHeight(16.h),
CustomTextFormField(
textEditingController: busNameController,
leadingIcon: Container(
leadingIcon: SizedBox(
width: 18.w,
height: 17.h,
child: Center(
@@ -391,8 +354,9 @@ class _BusEditProfileState extends State<BusEditProfile> {
text16400white("Business username"),
sizedBoxHeight(16.h),
CustomTextFormField(
textEditingController: busUserNameController,
leadingIcon: Container(
textEditingController:
busUserNameController,
leadingIcon: SizedBox(
width: 18.w,
height: 17.h,
child: Center(
@@ -410,7 +374,7 @@ class _BusEditProfileState extends State<BusEditProfile> {
sizedBoxHeight(16.h),
CustomTextFormField(
textEditingController: ownerNameController,
leadingIcon: Container(
leadingIcon: SizedBox(
width: 18.w,
height: 17.h,
child: Center(
@@ -427,11 +391,11 @@ class _BusEditProfileState extends State<BusEditProfile> {
text16400white("Founded on"),
sizedBoxHeight(16.h),
GestureDetector(
onTap: () =>
datePicker(context, foundedonController),
onTap: () => datePicker(
context, foundedonController),
child: AbsorbPointer(
child: CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
width: 18.0,
height: 17.0,
child: Center(
@@ -452,8 +416,9 @@ class _BusEditProfileState extends State<BusEditProfile> {
text16400white("Website link"),
sizedBoxHeight(16.h),
CustomTextFormField(
textEditingController: websiteLinkController,
leadingIcon: Container(
textEditingController:
websiteLinkController,
leadingIcon: SizedBox(
width: 18.w,
height: 17.h,
child: Center(
@@ -481,7 +446,7 @@ class _BusEditProfileState extends State<BusEditProfile> {
sizedBoxHeight(16.h),
CustomTextFormField(
textEditingController: locationController,
leadingIcon: Container(
leadingIcon: SizedBox(
width: 18.w,
height: 17.h,
child: Center(

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

@@ -8,8 +8,6 @@ import 'package:get/get.dart' hide MultipartFile, FormData;
import 'package:regroup/Common/CommonButton.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart'
as interestlist;
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart';
@@ -18,7 +16,6 @@ import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/ImageUpload.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/Helper.dart';
import 'package:regroup/Utils/dialogs.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:path/path.dart' as path;
@@ -138,22 +135,7 @@ class _EditProfileState extends State<EditProfile> {
);
print(imageFile.toString());
}
// else {
// if (getEditProfileIndi?.data?.profilePhoto == null) {
// //
// imageFile = await Helper.assetImageToMultipartFile(
// "assets/images/png/cimg3.png", "profile");
// } else {
// imageFile = await Helper.networkImageToMultipartFile(
// getEditProfileIndi!.data!.profilePhoto!,
// );
// Utils.networkImageToMultipartFile(
// "${ApiUrls.baseImageUrl}/${profileController.profileInfoModel.value.data!.profilePhoto}",
// );
// }
// }
updata = FormData.fromMap({
// "email_address": "priyanka14@yopmail.com",
@@ -186,18 +168,6 @@ class _EditProfileState extends State<EditProfile> {
final data = await EditProfileApi().postEditProfileIndividual(updata);
if (data.status == ResponseStatus.SUCCESS) {
Get.back();
// await global.setname();
// Get.snackbar(
// "Success!",
// 'success!',
// duration: const Duration(seconds: 2),
// colorText: Colors.white,
// backgroundColor: Colors.green,
// margin: const EdgeInsets.all(8),
// snackStyle: SnackStyle.FLOATING,
// snackPosition: SnackPosition.BOTTOM,
// );
Get.toNamed(RouteName.mainscreen, arguments: 4);
} else {
Get.back();

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

@@ -12,7 +12,6 @@ import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewMo
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Global.dart';
import 'package:regroup/Utils/Common/ShimmerCommon.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/dialogs.dart';

14
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart
View File

@@ -1,14 +1,10 @@
import 'dart:developer';
import 'package:get/get.dart';
import 'package:regroup/Common/api_urls.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Common/controller/data/network/network_api.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart'
as interestlist;
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart';
import 'package:shared_preferences/shared_preferences.dart';
GetEditProfileIndi? getEditProfileIndi;
@@ -55,7 +51,13 @@ class EditProfileApi {
getUserIntersetFromResponse() {
for (var interests in getEditProfileIndi!.data!.interest!) {
listofUserInterests.add(interests.name ?? "null");
String interestName = interests.name ?? "null";
int index = listofUserInterests.indexOf(interestName);
if (index != -1) {
listofUserInterests[index] = interestName;
} else {
listofUserInterests.add(interestName);
}
}
}

1
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart
View File

@@ -1,4 +1,3 @@
import 'dart:ffi';
import 'package:regroup/Common/api_urls.dart';
import 'package:regroup/Common/base_manager.dart';

22
lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart
View File

@@ -10,14 +10,14 @@ class FetchNotification {
status = json['status'];
statusCode = json['status_code'];
message = json['message'];
data = json['data'] != null ? new Data.fromJson(json['data']) : null;
data = json['data'] != null ? Data.fromJson(json['data']) : null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['status'] = this.status;
data['status_code'] = this.statusCode;
data['message'] = this.message;
final Map<String, dynamic> data = <String, dynamic>{};
data['status'] = status;
data['status_code'] = statusCode;
data['message'] = message;
if (this.data != null) {
data['data'] = this.data!.toJson();
}
@@ -48,12 +48,12 @@ class Data {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['group_notification'] = this.groupNotification;
data['community_notification'] = this.communityNotification;
data['follower_notification'] = this.followerNotification;
data['new_follower_notification'] = this.newFollowerNotification;
data['direct_message_notification'] = this.directMessageNotification;
final Map<String, dynamic> data = <String, dynamic>{};
data['group_notification'] = groupNotification;
data['community_notification'] = communityNotification;
data['follower_notification'] = followerNotification;
data['new_follower_notification'] = newFollowerNotification;
data['direct_message_notification'] = directMessageNotification;
return data;
}
}

2
lib/Feed Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart
View File

@@ -21,7 +21,7 @@ class _TermsConditionState extends State<TermsCondition> {
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Terms & Condition",
),
body: FutureBuilder(

30
lib/Feed Module/Notification/View/notification.dart
View File

@@ -51,18 +51,18 @@ class _NotificationPageState extends State<NotificationPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color.fromARGB(255, 18, 32, 47),
appBar: CommonAppbar(
backgroundColor: const Color.fromARGB(255, 18, 32, 47),
appBar: const CommonAppbar(
titleTxt: 'Notifications',
),
body: Stack(
children: [
// const CommonBlurLeftRed(),
Positioned(top: 10, left: -30, child: CommonBlurLeftSecond()),
const Positioned(top: 10, left: -30, child: CommonBlurLeftSecond()),
// const CommonBlurRightRed(),
// const CommonBlurLeft(),
Positioned(top: 150, right: -30, child: CommonBlurRightSecond()),
Positioned(top: 350, left: -30, child: CommonBlurLeftBlue()),
const Positioned(top: 150, right: -30, child: CommonBlurRightSecond()),
const Positioned(top: 350, left: -30, child: CommonBlurLeftBlue()),
GlassmorphicContainer(
width: MediaQuery.of(context).size.width,
height:
@@ -76,10 +76,10 @@ class _NotificationPageState extends State<NotificationPage> {
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
@@ -93,9 +93,9 @@ class _NotificationPageState extends State<NotificationPage> {
colors: [
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
],
),
child: Column(
@@ -104,7 +104,7 @@ class _NotificationPageState extends State<NotificationPage> {
separatorBuilder: (context, index) {
return Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
color: const Color(0xffFFFFFF).withOpacity(0.72),
);
},
itemCount: notificationcontents.length,
@@ -135,7 +135,7 @@ class Notificationlist extends StatefulWidget {
final bool followrequest;
// const Notificationlist({super.key});
Notificationlist({
const Notificationlist({
Key? key,
required this.imageurl,
required this.msgrequest,
@@ -207,7 +207,7 @@ class _NotificationlistState extends State<Notificationlist> {
text12400white('3 mins ago'),
],
),
Spacer(),
const Spacer(),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
@@ -240,7 +240,7 @@ class _NotificationlistState extends State<Notificationlist> {
],
),
// sizedBoxWidth(25.w),
Spacer(),
const Spacer(),
Expanded(
child: Image.asset(
'assets/images/png/notifcation.png',