diff --git a/lib/Common/CommonBottomNavigationBar.dart b/lib/Common/CommonBottomNavigationBar.dart index 26ff719..e7e16d2 100644 --- a/lib/Common/CommonBottomNavigationBar.dart +++ b/lib/Common/CommonBottomNavigationBar.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:glassmorphism/glassmorphism.dart'; import 'package:glassmorphism_ui/glassmorphism_ui.dart'; -import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/controller/MainController.dart'; GlassContainer bottomnavigationbar(MainController _mainController) { diff --git a/lib/Common/CommonDropDown.dart b/lib/Common/CommonDropDown.dart index 58cf13c..94585d3 100644 --- a/lib/Common/CommonDropDown.dart +++ b/lib/Common/CommonDropDown.dart @@ -1,6 +1,6 @@ // ignore_for_file: prefer_const_constructors -import 'dart:ui'; + import 'package:dropdown_button2/dropdown_button2.dart'; import 'package:flutter/material.dart'; @@ -8,7 +8,6 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonWidget.dart'; -import 'package:regroup/Utils/Common/sized_box.dart'; class CommonDropdownBtn extends StatefulWidget { CommonDropdownBtn({ @@ -107,7 +106,7 @@ class _CommonDropdownBtnState extends State { Color(0xFFffffff).withOpacity(0.8), Color(0xFFFFFFFF).withOpacity(0.8), ], - stops: [ + stops: const [ 0.1, 1, ]), @@ -245,7 +244,7 @@ class _CommonDropdownradioBtnState extends State { Color(0xFFffffff).withOpacity(0.8), Color(0xFFFFFFFF).withOpacity(0.8), ], - stops: [0.1, 1], + stops: const [0.1, 1], ), borderRadius: BorderRadius.circular(30), border: Border.all( @@ -589,7 +588,7 @@ class _CommonDropdownCheckboxState extends State { Color(0xFFffffff).withOpacity(0.8), Color(0xFFFFFFFF).withOpacity(0.8), ], - stops: [0.1, 1], + stops: const [0.1, 1], ), borderRadius: BorderRadius.circular(30.r), border: Border.all( diff --git a/lib/Common/CommonGlassmorphism.dart b/lib/Common/CommonGlassmorphism.dart index 0faa4c9..1054f77 100644 --- a/lib/Common/CommonGlassmorphism.dart +++ b/lib/Common/CommonGlassmorphism.dart @@ -26,7 +26,7 @@ Widget commonGlassContainer({ begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - Color(0xFFFFFFFF).withOpacity(opacity1), + const Color(0xFFFFFFFF).withOpacity(opacity1), const Color(0xFFFFFFFF).withOpacity(opacity2), ], stops: const [ @@ -64,8 +64,8 @@ Widget commonGlassContainerblue({ begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - Color(0xFF009DAB).withOpacity(0.48), - Color(0xFF009DAB).withOpacity(0.12), + const Color(0xFF009DAB).withOpacity(0.48), + const Color(0xFF009DAB).withOpacity(0.12), ], stops: const [ 0.1, @@ -102,8 +102,8 @@ Widget commonGlassUIBlue({ begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - Color(0xFF009DAB).withOpacity(0.48), - Color(0xFF009DAB).withOpacity(0.12), + const Color(0xFF009DAB).withOpacity(0.48), + const Color(0xFF009DAB).withOpacity(0.12), ], stops: const [ 0.1, @@ -136,7 +136,7 @@ Widget commonGlassUI({ begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - Color(0xFFFFFFFF).withOpacity(opacity1), + const Color(0xFFFFFFFF).withOpacity(opacity1), const Color(0xFFFFFFFF).withOpacity(opacity2), ], stops: const [ @@ -170,7 +170,7 @@ Widget commonContainer({ begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - Color(0xFFFFFFFF).withOpacity(opacity1), + const Color(0xFFFFFFFF).withOpacity(opacity1), const Color(0xFFFFFFFF).withOpacity(opacity2), ], stops: const [ diff --git a/lib/Common/CommonTabBar.dart b/lib/Common/CommonTabBar.dart index 90b1596..8b2293b 100644 --- a/lib/Common/CommonTabBar.dart +++ b/lib/Common/CommonTabBar.dart @@ -5,16 +5,16 @@ class CommonTabBar extends StatelessWidget { // Set the desired height final List tabs; - CommonTabBar({required this.tabs,}); + const CommonTabBar({super.key, required this.tabs,}); @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, @@ -22,7 +22,7 @@ class CommonTabBar 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: tabs); } diff --git a/lib/Common/CommonWidget.dart b/lib/Common/CommonWidget.dart index afb32f8..3ad8a7e 100644 --- a/lib/Common/CommonWidget.dart +++ b/lib/Common/CommonWidget.dart @@ -1,7 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -79,13 +77,13 @@ Widget MessageTextInputField( labelStyle: const TextStyle(color: Colors.black), errorStyle: TextStyle( fontSize: 13.sp, - color: Color.fromARGB(255, 245, 130, 122), + color: const Color.fromARGB(255, 245, 130, 122), ), contentPadding: const EdgeInsets.symmetric( vertical: 12.0, horizontal: 16), //<-- Adjust the vertical padding as needed filled: true, - fillColor: Color(0xFFFFF3E4), + fillColor: const Color(0xFFFFF3E4), border: OutlineInputBorder( borderRadius: BorderRadius.circular(5), borderSide: const BorderSide(color: Color(0xFFE8C69F80), width: 1), @@ -125,7 +123,7 @@ Widget commonDivider() { return Container( height: 1.5.h, width: double.infinity, - decoration: BoxDecoration( + decoration: const BoxDecoration( gradient: LinearGradient( begin: Alignment.topLeft, end: Alignment.bottomRight, @@ -155,7 +153,7 @@ Future datePicker( onSecondary: Colors.white), textButtonTheme: TextButtonThemeData( style: TextButton.styleFrom( - foregroundColor: Color(0xFFD90B2E), + foregroundColor: const Color(0xFFD90B2E), ), )); final DateTime? picked = await showDatePicker( @@ -187,11 +185,11 @@ Future showCustomTimePicker(BuildContext context, onSurface: Colors.white, ), textTheme: Theme.of(context).textTheme.copyWith( - headline6: TextStyle(color: Colors.blue), // Change the title color + titleLarge: const TextStyle(color: Colors.blue), // Change the title color ), textButtonTheme: TextButtonThemeData( style: TextButton.styleFrom( - foregroundColor: Color(0xFFD90B2E), + foregroundColor: const Color(0xFFD90B2E), ), )); return showTimePicker( @@ -220,13 +218,13 @@ Widget stackContainers({ width: 30, decoration: BoxDecoration( shape: BoxShape.circle, - color: Color(0xFFD90B2E), - border: Border.all(color: Color(0xFF2C3742), width: 1), + color: const Color(0xFFD90B2E), + border: Border.all(color: const Color(0xFF2C3742), width: 1), ), child: Center( child: Text( number, - style: TextStyle( + style: const TextStyle( color: Colors.white, fontWeight: FontWeight.w400, fontSize: 8, @@ -249,7 +247,7 @@ Widget stackContainers({ width: 30, decoration: BoxDecoration( shape: BoxShape.circle, - border: Border.all(color: Color(0xFF2C3742), width: 1), + border: Border.all(color: const Color(0xFF2C3742), width: 1), ), child: CircleAvatar( foregroundImage: AssetImage(containerImages[index]), @@ -287,13 +285,13 @@ Widget stackContainersGroups({ width: 30, decoration: BoxDecoration( shape: BoxShape.circle, - color: Color(0xFFD90B2E), - border: Border.all(color: Color(0xFF2C3742), width: 1), + color: const Color(0xFFD90B2E), + border: Border.all(color: const Color(0xFF2C3742), width: 1), ), child: Center( child: Text( remainingCount > 0 ? '+$remainingCount' : '', - style: TextStyle( + style: const TextStyle( color: Colors.white, fontWeight: FontWeight.w400, fontSize: 8, @@ -316,7 +314,7 @@ Widget stackContainersGroups({ width: 30, decoration: BoxDecoration( shape: BoxShape.circle, - border: Border.all(color: Color(0xFF2C3742), width: 1), + border: Border.all(color: const Color(0xFF2C3742), width: 1), ), child: CircleAvatar( backgroundImage: NetworkImage(imagesToShow[index]), @@ -352,7 +350,7 @@ Widget stackContainers2({ width: 40, decoration: BoxDecoration( shape: BoxShape.circle, - border: Border.all(color: Color(0xFF2C3742), width: 1), + border: Border.all(color: const Color(0xFF2C3742), width: 1), ), child: CircleAvatar( foregroundImage: AssetImage(containerImages[index]), @@ -389,7 +387,7 @@ Widget stackReaction({ begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - Color(0xFFFFFFFF).withOpacity(0.1), + const Color(0xFFFFFFFF).withOpacity(0.1), const Color(0xFFFFFFFF).withOpacity(0.06), ], stops: const [ @@ -397,7 +395,7 @@ Widget stackReaction({ 1, ], ), - border: Border.all(color: Color(0xFF1E3A46), width: 1.71)), + border: Border.all(color: const Color(0xFF1E3A46), width: 1.71)), child: Center( child: Image.asset( containerImages[index], diff --git a/lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart b/lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart index f040e6a..ff085af 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart +++ b/lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart @@ -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 { 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 { 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 { 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 { }, 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 { 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 { 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 { 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 { 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 { 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 { 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 { ) ], ), - Spacer(), + const Spacer(), Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -390,7 +388,7 @@ class _AddEventState extends State { 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 { 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 { 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 { ), 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 { 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 { children: [ text16400white("Minutes"), sizedBoxWidth(5.w), - Icon( + const Icon( Icons.keyboard_arrow_down, color: Colors.white, ) @@ -532,7 +530,7 @@ class _AddEventState extends State { ), sizedBoxWidth(8.w), text16400white(title), - Spacer(), + const Spacer(), Image.asset( "assets/images/png/cancelicon.png", height: 20.h, diff --git a/lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart b/lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart index fb9f5e6..f8c366c 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart +++ b/lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart @@ -59,28 +59,27 @@ class _AddUsersState extends State { List 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 { ), 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 { height: 600.h, child: TabBarView( children: [ - GroupTab(), - SubgroupTab(), - FollowersTab(), + groupTab(), + subgroupTab(), + followersTab(), ], ), ), @@ -132,7 +129,7 @@ class _AddUsersState extends State { ])); } - Widget GroupTab() { + Widget groupTab() { return Column( children: [ sizedBoxHeight(30.h), @@ -141,7 +138,7 @@ class _AddUsersState extends State { 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 { text12w400_FCFCFC_blur(subtitle), ], ), - Spacer(), + const Spacer(), commonGlassContainer( border: 1, borderradius: 2, @@ -251,7 +248,7 @@ class _AddUsersState extends State { 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 { 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 { 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 { 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 { 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 { 1, ], ), - borderGradient: LinearGradient( + borderGradient: const LinearGradient( begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ @@ -415,14 +412,14 @@ class _AddUsersState extends State { )); } - Widget SubgroupTab() { - return Column( + Widget subgroupTab() { + return const Column( children: [], ); } - Widget FollowersTab() { - return Column( + Widget followersTab() { + return const Column( children: [], ); } diff --git a/lib/Feed Module/Main_Screens/CalenderTab/Availabillity.dart b/lib/Feed Module/Main_Screens/CalenderTab/Availabillity.dart index 5afe764..5bd96ca 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/Availabillity.dart +++ b/lib/Feed Module/Main_Screens/CalenderTab/Availabillity.dart @@ -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 { 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 { ), 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 { _employeeCollection = [ 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 { 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 { 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 { 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 { 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 { ), 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 { context: context, builder: (BuildContext context) { return AlertDialog( - title: Text('Event Details'), + title: const Text('Event Details'), content: Column( mainAxisSize: MainAxisSize.min, children: [ @@ -255,7 +254,7 @@ class _AvailabilityState extends State { ), actions: [ ElevatedButton( - child: Text('Close'), + child: const Text('Close'), onPressed: () { Navigator.of(context).pop(); }, diff --git a/lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart b/lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart index ff04ce0..6e67068 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart +++ b/lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart @@ -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 { 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 { ), 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 { 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 { 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 { ), ], ), - 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 { // initialIndex: selectedIndex.value, child: Column( children: [ - CommonTabBar( + const CommonTabBar( - tabs: const [ + tabs: [ Tab( text: 'My sessions', ), @@ -194,8 +192,8 @@ class _CalenderTabState extends State { child: TabBarView( children: [ - MySessionsTab(), - ComSessionTab(), + mySessionsTab(), + comSessionTab(), ], ), ), @@ -210,7 +208,7 @@ class _CalenderTabState extends State { ); } - Widget MySessionsTab() { + Widget mySessionsTab() { return SingleChildScrollView( child: Column( children: [ @@ -243,7 +241,7 @@ class _CalenderTabState extends State { ], ), ), - Spacer(), + const Spacer(), Image.asset("assets/images/png/Rectangle 45.png") ], ), @@ -258,16 +256,16 @@ class _CalenderTabState extends State { 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 { 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 { 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 { ), 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 { // 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 { 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 { 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 { ); } - Widget ComSessionTab() { + Widget comSessionTab() { return SingleChildScrollView( child: Column( children: [ @@ -560,16 +558,16 @@ class _CalenderTabState extends State { 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 { 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 { 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 { ), 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 { 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 { ], ), ]), - 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 { context: context, builder: (BuildContext context) { return AlertDialog( - title: Text('Event Details'), + title: const Text('Event Details'), content: Column( mainAxisSize: MainAxisSize.min, children: [ @@ -836,7 +834,7 @@ class _CalenderTabState extends State { ), actions: [ ElevatedButton( - child: Text('Close'), + child: const Text('Close'), onPressed: () { Navigator.of(context).pop(); }, diff --git a/lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart b/lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart index f17ed4c..6a10e56 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart +++ b/lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart @@ -26,7 +26,7 @@ class _EventDetailsState extends State { 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 { ), 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 { 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 { 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 { 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), ], ), diff --git a/lib/Feed Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart b/lib/Feed Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart index 34cb9b8..4572b80 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart +++ b/lib/Feed Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart @@ -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 { 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 { 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 { ), ], ), - 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 { 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 { 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 { 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 { 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 { 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 { 1, ], ), - borderGradient: LinearGradient( + borderGradient: const LinearGradient( begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ diff --git a/lib/Feed Module/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart b/lib/Feed Module/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart index 0bb7986..68a0fa5 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart +++ b/lib/Feed Module/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart @@ -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 { @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 { 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 { text12w400_FCFCFC_blur("Row row row your boat") ], ), - Spacer(), + const Spacer(), InkWell( onTap: () { inviteBottomSheet(); @@ -124,7 +122,7 @@ class _ResourcePoolState extends State { 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 { 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 { ), sizedBoxWidth(10.w), text16w400_FCFCFC(title), - Spacer(), + const Spacer(), commonGlassContainer( border: 1, borderradius: 2, @@ -270,7 +268,7 @@ class _ResourcePoolState extends State { 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, diff --git a/lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart b/lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart index edc83c3..1dd6be0 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart +++ b/lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart @@ -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 { 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 { 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 { border: 1) ], ), - Spacer(), + const Spacer(), Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -208,10 +206,10 @@ class _SetAvailabillityState extends State { 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)), ), diff --git a/lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart b/lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart index 4a6530b..09ea55c 100644 --- a/lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart +++ b/lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart @@ -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 { TextEditingController searchcontroller = TextEditingController(); - GlobalKey _scaffoldKey1 = GlobalKey(); + final GlobalKey _scaffoldKey1 = GlobalKey(); List chatcontents = [ { @@ -121,10 +120,10 @@ class _ChatsMainScreenState extends State { 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 { 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 { // initialIndex: selectedIndex.value, child: Column( children: [ - MyTabBar(), + const MyTabBar(), Expanded( child: TabBarView( children: [feedTab(), clubsTab(), teamsTab()], @@ -223,7 +222,7 @@ class _ChatsMainScreenState extends State { 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 { 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 { 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 { } 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 { 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 { 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 { ), 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 { 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 { ), 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 { 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 { ? 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 { : 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 { 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 { ), ], ), - Spacer(), + const Spacer(), Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, @@ -557,7 +558,7 @@ class _ChatListState extends State { 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 { ? Container( width: 18, height: 18, - decoration: ShapeDecoration( + decoration: const ShapeDecoration( color: Color(0xFFD90B2E), shape: OvalBorder(), ), @@ -573,14 +574,14 @@ class _ChatListState extends State { '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 { 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 { 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 { ), 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 { 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 { ), 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 { 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 { Text( widget.message, style: TextStyle( - color: Color(0xCCFCFCFC), + color: const Color(0xCCFCFCFC), fontSize: 12.sp, fontFamily: 'Helvetica', fontWeight: FontWeight.w400, diff --git a/lib/Feed Module/Main_Screens/Chats/View/groupchat.dart b/lib/Feed Module/Main_Screens/Chats/View/groupchat.dart index 14b240c..8cad5e0 100644 --- a/lib/Feed Module/Main_Screens/Chats/View/groupchat.dart +++ b/lib/Feed Module/Main_Screens/Chats/View/groupchat.dart @@ -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 { 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 { 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 { ), 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 { 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 { ), 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 { 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 { ), 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 { 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 { ), 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 { 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 { ), 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 { 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 { 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 { 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 { 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 { 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 { ), fit: BoxFit.fill, ), - shape: OvalBorder(), + shape: const OvalBorder(), ), ), sizedBoxWidth(2.w), @@ -423,8 +422,8 @@ class _GroupChatPageState extends State { 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 { 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 { 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 { ), fit: BoxFit.fill, ), - shape: OvalBorder(), + shape: const OvalBorder(), ), ), ], @@ -559,7 +558,7 @@ class _GroupChatPageState extends State { Align( alignment: Alignment.bottomCenter, child: Padding( - padding: EdgeInsets.only(top: 15, bottom: 15), + padding: const EdgeInsets.only(top: 15, bottom: 15), child: Row( children: [ sizedBoxWidth(16.w), @@ -578,6 +577,7 @@ class _GroupChatPageState extends State { 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 { 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 { 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, diff --git a/lib/Feed Module/Main_Screens/Chats/View/newchatpage.dart b/lib/Feed Module/Main_Screens/Chats/View/newchatpage.dart index 1e7816d..0b43fd5 100644 --- a/lib/Feed Module/Main_Screens/Chats/View/newchatpage.dart +++ b/lib/Feed Module/Main_Screens/Chats/View/newchatpage.dart @@ -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 { 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 { 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 { 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 { .withOpacity(0.30000001192092896) ], ), - shape: OvalBorder( + shape: const OvalBorder( side: BorderSide( width: 0.50, color: Color(0xFF434A53)), ), @@ -166,7 +164,7 @@ class _NewChatPageState extends State { 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 { Text( widget.message, style: TextStyle( - color: Color(0xCCFCFCFC), + color: const Color(0xCCFCFCFC), fontSize: 12.sp, fontFamily: 'Helvetica', fontWeight: FontWeight.w400, diff --git a/lib/Feed Module/Main_Screens/Chats/View/newgroup.dart b/lib/Feed Module/Main_Screens/Chats/View/newgroup.dart index a6b2d95..2626057 100644 --- a/lib/Feed Module/Main_Screens/Chats/View/newgroup.dart +++ b/lib/Feed Module/Main_Screens/Chats/View/newgroup.dart @@ -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 { 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 { // 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 { 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 { 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 { // Get.toNamed(RouteName.mainscreen); Get.offUntil( MaterialPageRoute( - builder: (context) => MainScreen()), + builder: (context) => const MainScreen()), (Route 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 { 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 { 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)), ), diff --git a/lib/Feed Module/Main_Screens/Chats/View/userchat.dart b/lib/Feed Module/Main_Screens/Chats/View/userchat.dart index 15c0059..a63d0fb 100644 --- a/lib/Feed Module/Main_Screens/Chats/View/userchat.dart +++ b/lib/Feed Module/Main_Screens/Chats/View/userchat.dart @@ -55,7 +55,7 @@ class _UserChatPageState extends State { 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 { 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 { ), 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 { 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 { ), 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 { 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 { ), 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 { 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 { ), 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 { 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 { ), 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 { 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 { 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 { 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 { 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 { 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 { .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 { 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 { Align( alignment: Alignment.bottomCenter, child: Padding( - padding: EdgeInsets.only(top: 15, bottom: 15), + padding: const EdgeInsets.only(top: 15, bottom: 15), child: Row( children: [ sizedBoxWidth(16.w), @@ -524,7 +524,7 @@ class _UserChatPageState extends State { 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 { 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, diff --git a/lib/Feed Module/Main_Screens/Community/Community.dart b/lib/Feed Module/Main_Screens/Community/Community.dart index a7ba48d..72961d5 100644 --- a/lib/Feed Module/Main_Screens/Community/Community.dart +++ b/lib/Feed Module/Main_Screens/Community/Community.dart @@ -29,7 +29,7 @@ final List titles = [ ]; class _CommunityScreenState extends State { - GlobalKey _scaffoldKey1 = GlobalKey(); + final GlobalKey _scaffoldKey1 = GlobalKey(); @override Widget build(BuildContext context) { return Scaffold( @@ -105,7 +105,7 @@ class _CommunityScreenState extends State { // 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( diff --git a/lib/Feed Module/Main_Screens/Community/CycleScreen.dart b/lib/Feed Module/Main_Screens/Community/CycleScreen.dart index 8d5eb5f..799e14e 100644 --- a/lib/Feed Module/Main_Screens/Community/CycleScreen.dart +++ b/lib/Feed Module/Main_Screens/Community/CycleScreen.dart @@ -23,7 +23,7 @@ class _CycleScreenState extends State { @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 { // initialIndex: selectedIndex.value, child: Column( children: [ - CommonTabBar(tabs: const [ + const CommonTabBar(tabs: [ Tab( text: 'Popular', ), @@ -58,8 +58,8 @@ class _CycleScreenState extends State { height: 670.h, child: TabBarView( children: [ - CyclepopularTab(), - CyclelatestTab(), + cyclepopularTab(), + cyclelatestTab(), ], ), ), @@ -70,7 +70,7 @@ class _CycleScreenState extends State { } } -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) => [ 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), diff --git a/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart b/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart index 4233d18..d028ed2 100644 --- a/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart +++ b/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart @@ -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 { 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 { children: [ CircleAvatar( radius: 20.r, - foregroundImage: AssetImage( + foregroundImage: const AssetImage( "assets/images/png/Ellipse 48.png", ), ), @@ -81,13 +80,13 @@ class _PostDetailsScreenState extends State { Align( alignment: Alignment.bottomCenter, child: Padding( - padding: EdgeInsets.only(top: 15, bottom: 15), + padding: const EdgeInsets.only(top: 15, bottom: 15), child: Row( children: [ 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 { 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) => [ @@ -186,7 +185,7 @@ class _PostDetailsScreenState extends State { 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 { ), ), ), - PopupMenuDivider(), + const PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -213,7 +212,7 @@ class _PostDetailsScreenState extends State { fontFamily: "Nunito Sans", ), ), - Spacer(), + const Spacer(), Image.asset( "assets/images/png/share.png", height: 20.h, @@ -223,7 +222,7 @@ class _PostDetailsScreenState extends State { ), ), ), - PopupMenuDivider(), + const PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -240,7 +239,7 @@ class _PostDetailsScreenState extends State { 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 { 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 { 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 { '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 { 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 { 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)), diff --git a/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart b/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart index df8db14..56c4680 100644 --- a/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart +++ b/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart @@ -67,9 +67,9 @@ class _ReactionViewState extends State { @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 { // 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 { ), ), 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 { ), ), 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 { ), ), border: 1.71), - Spacer(), + const Spacer(), text14400white("7.4K"), ]), ), @@ -294,9 +294,9 @@ class _ReactionViewState extends State { 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( diff --git a/lib/Feed Module/Main_Screens/Community/PostScreen.dart b/lib/Feed Module/Main_Screens/Community/PostScreen.dart index a4f69e2..bd8b154 100644 --- a/lib/Feed Module/Main_Screens/Community/PostScreen.dart +++ b/lib/Feed Module/Main_Screens/Community/PostScreen.dart @@ -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 { @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 { }, 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 { 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 { 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 { "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 { 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 { 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 { 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 { 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 { 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)), ), ), diff --git a/lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart b/lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart index 4ae37a2..110c852 100644 --- a/lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart +++ b/lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart @@ -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 { @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 { 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 { 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 { 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 { } Widget eventsTab() { - return Column( + return const Column( children: [], ); } Widget groupsTab() { - return Column( + return const Column( children: [], ); } Widget communitiesTab() { - return Column( + return const Column( children: [], ); } diff --git a/lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart b/lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart index 9703903..20b4b60 100644 --- a/lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart +++ b/lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart @@ -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 { GoogleMapController? _mapController; - double _zoomLevel = 18.0; + final double _zoomLevel = 18.0; // BitmapDescriptor? _customIcon1; // BitmapDescriptor? _customIcon2; @@ -46,14 +45,14 @@ class _ExploreScreenState extends State { // } Future _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 { ), markers: { Marker( - markerId: MarkerId('currentP'), + markerId: const MarkerId('currentP'), icon: BitmapDescriptor.defaultMarker, position: global.latlong!, onTap: () { @@ -95,9 +94,9 @@ class _ExploreScreenState extends State { }, ), 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 { }, 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 { 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 { 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 { 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 { 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 { 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), diff --git a/lib/Feed Module/Main_Screens/ExploreDesign/SearchGroup.dart b/lib/Feed Module/Main_Screens/ExploreDesign/SearchGroup.dart index 5a17d8e..255ab64 100644 --- a/lib/Feed Module/Main_Screens/ExploreDesign/SearchGroup.dart +++ b/lib/Feed Module/Main_Screens/ExploreDesign/SearchGroup.dart @@ -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 { @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 { Row( children: [ text18w700white("Recent"), - Spacer(), + const Spacer(), text16w400_FCFCFCblur("See all"), ], ), @@ -85,12 +85,12 @@ class _SearchGroupState extends State { 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 { border: 0.5), sizedBoxWidth(12.w), text16400white(title), - Spacer(), - Icon( + const Spacer(), + const Icon( Icons.clear, color: Colors.white, ) diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart b/lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart index 4509f77..14d0c1f 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart @@ -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 { 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 { 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 { 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 { ), ], ), - Spacer(), + const Spacer(), ], ), sizedBoxHeight(16.h), @@ -148,13 +146,13 @@ class _ConnectCommunityState extends State { ), 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")), ) diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GoupSettings.dart b/lib/Feed Module/Main_Screens/GroupTab/View/GoupSettings.dart index 6eb5044..905e038 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/GoupSettings.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/GoupSettings.dart @@ -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 { 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 { 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 { 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 { 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), diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart b/lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart index 4e43c7d..ca7f802 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart @@ -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 { ), 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 { 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) => [ PopupMenuItem( @@ -100,7 +100,7 @@ class _GroupDetailState extends State { child: text14w400white("Create post"), ), ), - PopupMenuDivider(), + const PopupMenuDivider(), PopupMenuItem( onTap: () { Get.toNamed(RouteName.sessions); @@ -128,12 +128,12 @@ class _GroupDetailState extends State { ), 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) => [ PopupMenuItem( @@ -143,7 +143,7 @@ class _GroupDetailState extends State { 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 { ), ), ), - PopupMenuDivider(), + const PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -161,7 +161,7 @@ class _GroupDetailState extends State { 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 { ), ), ), - PopupMenuDivider(), + const PopupMenuDivider(), PopupMenuItem( onTap: () { Get.toNamed(RouteName.groupinfo); @@ -181,7 +181,7 @@ class _GroupDetailState extends State { 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 { ), ), ), - PopupMenuDivider(), + const PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -199,7 +199,7 @@ class _GroupDetailState extends State { 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 { ), ), ), - PopupMenuDivider(), + const PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -217,7 +217,7 @@ class _GroupDetailState extends State { 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 { ), ), ), - PopupMenuDivider(), + const PopupMenuDivider(), PopupMenuItem( onTap: () { Get.toNamed(RouteName.groupsettings); @@ -237,7 +237,7 @@ class _GroupDetailState extends State { 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 { 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 { 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 { Row( children: [ text16w700white("Badges"), - Spacer(), + const Spacer(), GestureDetector( onTap: () { // Get.toNamed(RouteName.badges); @@ -439,8 +439,8 @@ class _GroupDetailState extends State { ], 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 { Row( children: [ text18w400white("Subgroups"), - Spacer(), + const Spacer(), GestureDetector( onTap: () { Get.toNamed(RouteName.subgroups); @@ -506,7 +506,7 @@ class _GroupDetailState extends State { "11 New Announcements Request"), ], ), - Spacer(), + const Spacer(), GestureDetector( onTap: () { // Get.toNamed(RouteName.addEvent); @@ -516,7 +516,7 @@ class _GroupDetailState extends State { 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 { // initialIndex: selectedIndex.value, child: Column( children: [ - CommonTabBar(tabs: const [ + const CommonTabBar(tabs: [ Tab( text: 'Announcement', ), @@ -637,7 +637,7 @@ class _GroupDetailState extends State { 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 { ) ], ), - 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) => [ PopupMenuItem( @@ -669,7 +669,7 @@ class _GroupDetailState extends State { 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 { ), ), ), - PopupMenuDivider(), + const PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -695,7 +695,7 @@ class _GroupDetailState extends State { fontFamily: "Nunito Sans", ), ), - Spacer(), + const Spacer(), Image.asset( "assets/images/png/share.png", height: 20.h, @@ -705,7 +705,7 @@ class _GroupDetailState extends State { ), ), ), - PopupMenuDivider(), + const PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -721,7 +721,7 @@ class _GroupDetailState extends State { 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 { 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 { '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 { 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 { 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 { 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 { 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 { 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 { context: context, builder: (BuildContext context) { return AlertDialog( - title: Text('Event Details'), + title: const Text('Event Details'), content: Column( mainAxisSize: MainAxisSize.min, children: [ @@ -1076,7 +1076,7 @@ class _GroupDetailState extends State { ), actions: [ ElevatedButton( - child: Text('Close'), + child: const Text('Close'), onPressed: () { Navigator.of(context).pop(); }, @@ -1094,7 +1094,7 @@ class _GroupDetailState extends State { context: context, builder: (BuildContext context) { return AlertDialog( - title: Text('Event Details'), + title: const Text('Event Details'), content: Column( mainAxisSize: MainAxisSize.min, children: [ @@ -1105,7 +1105,7 @@ class _GroupDetailState extends State { ), actions: [ ElevatedButton( - child: Text('Close'), + child: const Text('Close'), onPressed: () { Navigator.of(context).pop(); }, diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart b/lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart index f8e2a0f..9462d67 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart @@ -33,8 +33,8 @@ class _GroupEventState extends State { 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 { 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 { 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 { }, 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 { 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 { 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 { 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 { 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 { 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 { 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 { ) ], ), - Spacer(), + const Spacer(), Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -397,7 +397,7 @@ class _GroupEventState extends State { 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 { 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 { ), 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 { children: [ text16400white("Minutes"), sizedBoxWidth(5.w), - Icon( + const Icon( Icons.keyboard_arrow_down, color: Colors.white, ) @@ -546,7 +546,7 @@ class _GroupEventState extends State { ), sizedBoxWidth(8.w), text16400white(title), - Spacer(), + const Spacer(), Image.asset( "assets/images/png/cancelicon.png", height: 20.h, diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/Sessions.dart b/lib/Feed Module/Main_Screens/GroupTab/View/Sessions.dart index 13d2fee..93640e3 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/Sessions.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/Sessions.dart @@ -41,11 +41,11 @@ class _SessionsState extends State { 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 { // 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 { 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 { 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 { 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 { }, child: AbsorbPointer( child: CustomTextFormField( - leadingIcon: Container( + leadingIcon: SizedBox( height: 20.h, width: 20.w, child: Center( @@ -247,7 +255,8 @@ class _SessionsState extends State { 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 { 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 { 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 { width: 20.w, ), )), - suffixIcon: Container( + suffixIcon: SizedBox( height: 20.h, width: 20.h, child: Center( @@ -342,7 +354,7 @@ class _SessionsState extends State { children: [ text16400white("Minutes"), sizedBoxWidth(5.w), - Icon( + const Icon( Icons.keyboard_arrow_down, color: Colors.white, ) @@ -369,10 +381,10 @@ class _SessionsState extends State { }, 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 { width: 27, height: 27, decoration: ShapeDecoration( - color: Color(0xFF7E7E7E), + color: + const Color(0xFF7E7E7E), shape: RoundedRectangleBorder( borderRadius: @@ -407,7 +420,7 @@ class _SessionsState extends State { .circular( 5)), ), - child: Icon( + child: const Icon( Icons .delete_outline_outlined, color: Colors.white, @@ -439,9 +452,9 @@ class _SessionsState extends State { 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), diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart b/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart index 2654bfa..e2a0d0c 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart @@ -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 { 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 { 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 { 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 { "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 { @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 { 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 { ), ); } - + if (snapshot.connectionState == ConnectionState.done && snapshot.hasData) { print("Data fetched-->"); @@ -226,45 +221,9 @@ class _BusEditProfileState extends State { 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 { 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 { : 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 { 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 { 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 { 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 { 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 { 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 { 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 { sizedBoxHeight(16.h), CustomTextFormField( textEditingController: locationController, - leadingIcon: Container( + leadingIcon: SizedBox( width: 18.w, height: 17.h, child: Center( diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart b/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart index 98bbd9b..66a275f 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart @@ -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 { ); 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 { 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(); diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart b/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart index 2236705..fe9ef93 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart @@ -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'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart b/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart index f0d79f7..85524f2 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart @@ -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); + } } } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart b/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart index 95eaaf7..fc9968c 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart @@ -1,4 +1,3 @@ -import 'dart:ffi'; import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart b/lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart index 1158609..3bc37e2 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart @@ -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 toJson() { - final Map data = new Map(); - data['status'] = this.status; - data['status_code'] = this.statusCode; - data['message'] = this.message; + final Map data = {}; + 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 toJson() { - final Map data = new Map(); - 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 data = {}; + data['group_notification'] = groupNotification; + data['community_notification'] = communityNotification; + data['follower_notification'] = followerNotification; + data['new_follower_notification'] = newFollowerNotification; + data['direct_message_notification'] = directMessageNotification; return data; } } \ No newline at end of file diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart b/lib/Feed Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart index 01a0d99..96c8a2d 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart @@ -21,7 +21,7 @@ class _TermsConditionState extends State { backgroundColor: Color(0xFF222935), extendBody: true, resizeToAvoidBottomInset: false, - appBar: CommonAppbar( + appBar: const CommonAppbar( titleTxt: "Terms & Condition", ), body: FutureBuilder( diff --git a/lib/Feed Module/Notification/View/notification.dart b/lib/Feed Module/Notification/View/notification.dart index fa8fb0d..619f56b 100644 --- a/lib/Feed Module/Notification/View/notification.dart +++ b/lib/Feed Module/Notification/View/notification.dart @@ -51,18 +51,18 @@ class _NotificationPageState extends State { @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 { 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 { 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 { 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 { text12400white('3 mins ago'), ], ), - Spacer(), + const Spacer(), Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -240,7 +240,7 @@ class _NotificationlistState extends State { ], ), // sizedBoxWidth(25.w), - Spacer(), + const Spacer(), Expanded( child: Image.asset( 'assets/images/png/notifcation.png', diff --git a/lib/Login/ViewModel/LoginApi.dart b/lib/Login/ViewModel/LoginApi.dart index 41baacc..4775c25 100644 --- a/lib/Login/ViewModel/LoginApi.dart +++ b/lib/Login/ViewModel/LoginApi.dart @@ -35,6 +35,8 @@ class LoginAPI { phonenumber = loginObj.data?.userData?.phoneNumber; await prefs.setString('accountTypefromLogin', loginObj.data?.userData?.principalTypeXid.toString() ?? ""); + globalAccountType = + loginObj.data?.userData?.principalTypeXid.toString(); await prefs.setString('accountTypeValue', loginObj.data?.userData?.principalTypeXid.toString() ?? ""); print("token is ${loginObj.data!.accessToken!}"); diff --git a/lib/Utils/Common/AppleOAuthService.dart b/lib/Utils/Common/AppleOAuthService.dart index 3740a71..89fb57d 100644 --- a/lib/Utils/Common/AppleOAuthService.dart +++ b/lib/Utils/Common/AppleOAuthService.dart @@ -1,4 +1,4 @@ -import 'package:get/get.dart'; + import 'package:regroup/Login/ViewModel/LoginApi.dart'; import 'package:regroup/Utils/Common/googleOAuthService.dart'; import 'package:sign_in_with_apple/sign_in_with_apple.dart'; diff --git a/lib/Utils/Common/CommonDropdown.dart b/lib/Utils/Common/CommonDropdown.dart index e85d3d3..9e4648f 100644 --- a/lib/Utils/Common/CommonDropdown.dart +++ b/lib/Utils/Common/CommonDropdown.dart @@ -1,9 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; class CustomDropDownWidgetSignup extends StatefulWidget { @@ -258,7 +255,7 @@ class _CustomDropDownTag1State extends State { onTap: () { onDropTap.value = !onDropTap.value; }, - child: Container( + child: SizedBox( height: 20.h, width: 20, child: Center( @@ -752,7 +749,6 @@ class _CustomDropDownRadioState extends State { } } - class CustomDropDownChexkBox extends StatefulWidget { const CustomDropDownChexkBox({ Key? key, @@ -933,18 +929,15 @@ class _CustomDropDownChexkBoxState extends State { mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [ - GestureDetector( onTap: () { onDropTap.value = !onDropTap.value; }, child: Container( width: double.infinity, - height: 50, + // height: 50, padding: const EdgeInsets.only( - right: 22, - left: 12, - ), + right: 22, left: 12, top: 15, bottom: 15), decoration: BoxDecoration( color: const Color(0xFFFFFFFF).withOpacity(0.10), borderRadius: onDropTap.value @@ -982,10 +975,10 @@ class _CustomDropDownChexkBoxState extends State { fontFamily: 'Helvetica', fontWeight: FontWeight.w400, ), - overflow: TextOverflow.ellipsis, + // overflow: TextOverflow.ellipsis, ), ), - const Spacer(), + // const Spacer(), onDropTap.value ? Image.asset('assets/images/png/arrowup.png') : Image.asset('assets/images/png/arrowdown.png'), diff --git a/lib/Utils/Common/CustomTextformfield.dart b/lib/Utils/Common/CustomTextformfield.dart index 013f769..470840a 100644 --- a/lib/Utils/Common/CustomTextformfield.dart +++ b/lib/Utils/Common/CustomTextformfield.dart @@ -264,7 +264,7 @@ class _CustomTextFormField2State extends State { blur: 6, opacity: 1, borderRadius: BorderRadius.circular(10.r), - border: Border.all(color: Color(0xff434A53), width: 0.8), + border: Border.all(color: const Color(0xff434A53), width: 0.8), child: TextFormField( cursorColor: Colors.red, initialValue: widget.value, @@ -290,7 +290,7 @@ class _CustomTextFormField2State extends State { // ignore: prefer_null_aware_operators prefixIcon: - widget.leadingIcon == null ? null : widget.leadingIcon!, + widget.leadingIcon, suffixIcon: widget.isInputPassword ? GestureDetector( onTap: () => setState(() => obscureText = !obscureText), @@ -317,9 +317,7 @@ class _CustomTextFormField2State extends State { ], ), ) - : widget.suffixIcon == null - ? null - : widget.suffixIcon!, + : widget.suffixIcon, border: InputBorder.none, contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 10), diff --git a/lib/Utils/Common/ImageUpload.dart b/lib/Utils/Common/ImageUpload.dart index 94fcf99..834624d 100644 --- a/lib/Utils/Common/ImageUpload.dart +++ b/lib/Utils/Common/ImageUpload.dart @@ -15,7 +15,7 @@ class ImageUploadBottomSheet { Function(String) onImagePicked, ) { return showModalBottomSheet( - backgroundColor: Color(0XFF222935), + backgroundColor: const Color(0XFF222935), isScrollControlled: true, context: context, shape: RoundedRectangleBorder( @@ -59,7 +59,7 @@ class ImageUploadBottomSheet { children: [ CircleAvatar( radius: 27.r, - backgroundColor: Color(0xFF858585), + backgroundColor: const Color(0xFF858585), child: Icon( Icons.camera_alt_outlined, size: 30.sp, @@ -91,7 +91,7 @@ class ImageUploadBottomSheet { children: [ CircleAvatar( radius: 27.r, - backgroundColor: Color(0xFF858585), + backgroundColor: const Color(0xFF858585), child: Icon( Icons.image_outlined, size: 30.sp, @@ -122,7 +122,7 @@ class ImageUploadBottomSheet { children: [ CircleAvatar( radius: 27.r, - backgroundColor: Color(0xFF858585), + backgroundColor: const Color(0xFF858585), child: Icon( Icons.file_copy_outlined, size: 30.sp, @@ -161,7 +161,7 @@ class ImageUploadBottomSheet { children: [ CircleAvatar( radius: 27.r, - backgroundColor: Color(0xFF858585), + backgroundColor: const Color(0xFF858585), child: Icon( Icons.camera_alt_outlined, size: 30.sp, @@ -193,7 +193,7 @@ class ImageUploadBottomSheet { children: [ CircleAvatar( radius: 27.r, - backgroundColor: Color(0xFF858585), + backgroundColor: const Color(0xFF858585), child: Icon( Icons.image_outlined, size: 30.sp, diff --git a/lib/Utils/Common/NoInternet.dart b/lib/Utils/Common/NoInternet.dart index 5089ac8..7fdcf0a 100644 --- a/lib/Utils/Common/NoInternet.dart +++ b/lib/Utils/Common/NoInternet.dart @@ -2,7 +2,6 @@ import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:lottie/lottie.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; @@ -42,10 +41,10 @@ class _NoInternetState extends State { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Color(0xff222935), + backgroundColor: const Color(0xff222935), body: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), - child: Container( + child: SizedBox( width: double.infinity, height: 900.h, child: Column( @@ -59,7 +58,7 @@ class _NoInternetState extends State { // // fit: BoxFit.cover // ), sizedBoxHeight(40.h), - Text( + const Text( 'No Internet !', style: TextStyle( fontWeight: FontWeight.bold, @@ -67,7 +66,7 @@ class _NoInternetState extends State { color: Colors.white), ), sizedBoxHeight(15.h), - Text( + const Text( 'Please Check Your Internet\nConnection', textAlign: TextAlign.center, style: TextStyle( diff --git a/lib/Utils/Common/ShimmerCommon.dart b/lib/Utils/Common/ShimmerCommon.dart index 593b7d0..8c2ce55 100644 --- a/lib/Utils/Common/ShimmerCommon.dart +++ b/lib/Utils/Common/ShimmerCommon.dart @@ -7,7 +7,7 @@ class ShimmerCommon extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Color(0xFF222935), body: _buildShimmerBody()); + backgroundColor: const Color(0xFF222935), body: _buildShimmerBody()); } // Build shimmer effect for the body @@ -31,7 +31,7 @@ class ShimmerCommon extends StatelessWidget { baseColor: Colors.grey[500]!, highlightColor: Colors.grey[300]!, child: Container( - padding: EdgeInsets.all(16.0), + padding: const EdgeInsets.all(16.0), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -40,19 +40,19 @@ class ShimmerCommon extends StatelessWidget { height: 20, color: Colors.grey[500], ), - SizedBox(height: 8), + const SizedBox(height: 8), Container( width: double.infinity, height: 20, color: Colors.grey[500], ), - SizedBox(height: 8), + const SizedBox(height: 8), Container( width: double.infinity, height: 20, color: Colors.grey[500], ), - SizedBox(height: 8), + const SizedBox(height: 8), Container( width: double.infinity, height: 20, diff --git a/lib/Utils/Common/blureffect.dart b/lib/Utils/Common/blureffect.dart index 66178da..048256f 100644 --- a/lib/Utils/Common/blureffect.dart +++ b/lib/Utils/Common/blureffect.dart @@ -17,7 +17,7 @@ class CommonBlurLeftRed extends StatelessWidget { width: 200, decoration: BoxDecoration( shape: BoxShape.circle, - color: Color(0x4CD90B2E).withOpacity(0.5), + color: const Color(0x4CD90B2E).withOpacity(0.5), ), child: Container( height: 200, @@ -44,7 +44,7 @@ class CommonBlurRightRed extends StatelessWidget { width: 200, decoration: BoxDecoration( shape: BoxShape.circle, - color: Color(0x4CD90B2E).withOpacity(0.5), + color: const Color(0x4CD90B2E).withOpacity(0.5), ), child: Container( height: 200, @@ -71,7 +71,7 @@ class CommonBlurLeft extends StatelessWidget { width: 200, decoration: BoxDecoration( shape: BoxShape.circle, - color: Color(0xFF009DAB).withOpacity(0.50), + color: const Color(0xFF009DAB).withOpacity(0.50), ), child: Container( height: 200, @@ -98,7 +98,7 @@ class CommonBlurRight extends StatelessWidget { width: 200, decoration: BoxDecoration( shape: BoxShape.circle, - color: Color(0xFF009DAB).withOpacity(0.50), + color: const Color(0xFF009DAB).withOpacity(0.50), ), child: Container( height: 200, @@ -122,7 +122,7 @@ class CommonBlurLeftSecond extends StatelessWidget { width: 150, decoration: BoxDecoration( shape: BoxShape.circle, - color: Color(0x4CD90B2E).withOpacity(0.5), + color: const Color(0x4CD90B2E).withOpacity(0.5), ), child: Container( height: 200, @@ -145,7 +145,7 @@ class CommonBlurRightSecond extends StatelessWidget { width: 160, decoration: BoxDecoration( shape: BoxShape.circle, - color: Color(0x4CD90B2E).withOpacity(0.5), + color: const Color(0x4CD90B2E).withOpacity(0.5), ), child: Container( height: 200, @@ -168,7 +168,7 @@ class CommonBlurLeftBlue extends StatelessWidget { width: 180, decoration: BoxDecoration( shape: BoxShape.circle, - color: Color(0xFF009DAB).withOpacity(0.50), + color: const Color(0xFF009DAB).withOpacity(0.50), ), child: Container( height: 200, diff --git a/lib/Utils/Helper.dart b/lib/Utils/Helper.dart index 289ab7a..7424236 100644 --- a/lib/Utils/Helper.dart +++ b/lib/Utils/Helper.dart @@ -1,6 +1,5 @@ import 'dart:developer'; import 'dart:io'; -import 'dart:typed_data'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; @@ -44,7 +43,7 @@ class Helper { final Dio dio = Dio(); final appDir = await getApplicationDocumentsDirectory(); final String fileName = image.split('/').last; - ; + final File file = File('${appDir.path}/$fileName'); try { log(file.path); @@ -55,13 +54,13 @@ class Helper { await ImageGallerySaver.saveFile(file.path); ScaffoldMessenger.of(context).showSnackBar( - SnackBar( + const SnackBar( content: Text('Image downloaded and saved to gallery successfully'), ), ); } catch (e) { ScaffoldMessenger.of(context).showSnackBar( - SnackBar( + const SnackBar( content: Text('Failed to download or save image'), ), ); diff --git a/lib/Utils/texts.dart b/lib/Utils/texts.dart index 9fd534b..e9f3a99 100644 --- a/lib/Utils/texts.dart +++ b/lib/Utils/texts.dart @@ -28,7 +28,7 @@ Widget text22400FCFCFC(String text) { textAlign: TextAlign.center, style: TextStyle( fontSize: 22.sp, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), fontWeight: FontWeight.w400, fontFamily: 'Helvetica'), ); @@ -50,7 +50,7 @@ Widget text20400FCFCFC(String text) { text, style: TextStyle( fontSize: 20.sp, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), fontWeight: FontWeight.w400, fontFamily: 'Helvetica'), ); @@ -109,7 +109,7 @@ Widget text25700FCFCFC(String text) { // textAlign: TextAlign.center, style: TextStyle( fontSize: 25.sp, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), fontWeight: FontWeight.w700, fontFamily: 'Helvetica'), ); @@ -166,7 +166,7 @@ Widget text144005DFD63(String text) { // textAlign: TextAlign.center, style: TextStyle( fontSize: 14.sp, - color: Color(0xFF5DFD63), + color: const Color(0xFF5DFD63), fontWeight: FontWeight.w400, fontFamily: 'Helvetica'), ); @@ -233,7 +233,7 @@ Widget textA4856_20500(String text) { style: TextStyle( fontWeight: FontWeight.w500, fontSize: 20.sp, - color: Color(0XFF3A4856), + color: const Color(0XFF3A4856), ), ); } @@ -243,7 +243,7 @@ Widget text272424_18(String text) { text, style: TextStyle( fontSize: 18.sp, - color: Color(0XFF272424), + color: const Color(0XFF272424), ), ); } @@ -387,7 +387,7 @@ Widget text16w400_FCFCFC(String text) { text, style: TextStyle( fontSize: 16.sp, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), fontFamily: 'Helvetica', fontWeight: FontWeight.w400), ); @@ -398,7 +398,7 @@ Widget text16w400_FF0000(String text) { text, style: TextStyle( fontSize: 16.sp, - color: Color(0xFFFF0000), + color: const Color(0xFFFF0000), fontFamily: 'Helvetica', fontWeight: FontWeight.w400), ); @@ -452,7 +452,7 @@ Widget text16w700_FCFCFC(String text) { text, style: TextStyle( fontSize: 16.sp, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), fontFamily: 'Helvetica', fontWeight: FontWeight.w700), ); @@ -463,9 +463,9 @@ Widget text16w700_D90B2E(String text, {TextDecoration? decoration}) { text, style: TextStyle( decoration: decoration, - decorationColor: Color(0xFFD90B2E), + decorationColor: const Color(0xFFD90B2E), fontSize: 16.sp, - color: Color(0xFFD90B2E), + color: const Color(0xFFD90B2E), fontFamily: 'Helvetica', fontWeight: FontWeight.w700), ); @@ -476,7 +476,7 @@ Widget text16w700_FCFCFCblur(String text) { text, style: TextStyle( fontSize: 16.sp, - color: Color(0xFFFCFCFC).withOpacity(0.8), + color: const Color(0xFFFCFCFC).withOpacity(0.8), fontFamily: 'Helvetica', fontWeight: FontWeight.w700), ); @@ -487,9 +487,9 @@ Widget text16w700_FCFCFCline(String text) { text, style: TextStyle( decoration: TextDecoration.underline, - decorationColor: Color(0xFFFCFCFC), + decorationColor: const Color(0xFFFCFCFC), fontSize: 16.sp, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), fontFamily: 'Helvetica', fontWeight: FontWeight.w700), ); @@ -500,9 +500,9 @@ Widget text16w700_FCFCFCUnderline(String text) { text, style: TextStyle( decoration: TextDecoration.underline, - decorationColor: Color(0xFFFCFCFC), + decorationColor: const Color(0xFFFCFCFC), fontSize: 16.sp, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), fontFamily: 'Helvetica', fontWeight: FontWeight.w700), ); @@ -524,7 +524,7 @@ Widget text16w400_FCFCFCblur(String text) { text, style: TextStyle( fontSize: 16.sp, - color: Color(0xFFFCFCFC).withOpacity(0.8), + color: const Color(0xFFFCFCFC).withOpacity(0.8), fontFamily: 'Helvetica', fontWeight: FontWeight.w400), ); @@ -535,7 +535,7 @@ Widget text12w400_FCFCFC(String text) { text, style: TextStyle( fontSize: 12.sp, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), fontFamily: 'Helvetica', fontWeight: FontWeight.w400), ); @@ -545,7 +545,7 @@ Widget text12w400_8E8E8E(String text) { text, style: TextStyle( fontSize: 12.sp, - color: Color(0xFF8E8E8E), + color: const Color(0xFF8E8E8E), fontFamily: 'Helvetica', fontWeight: FontWeight.w400), ); @@ -556,7 +556,7 @@ Widget text12w700_FCFCFC(String text) { text, style: TextStyle( fontSize: 12.sp, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), fontFamily: 'Helvetica', fontWeight: FontWeight.w700), ); @@ -567,7 +567,7 @@ Widget text20w700_FCFCFC(String text) { text, style: TextStyle( fontSize: 20.sp, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), fontFamily: 'Helvetica', fontWeight: FontWeight.w700), ); @@ -578,7 +578,7 @@ Widget text12w400_FCFCFC_blur(String text) { text, style: TextStyle( fontSize: 12.sp, - color: Color(0xFFFCFCFC).withOpacity(0.8), + color: const Color(0xFFFCFCFC).withOpacity(0.8), fontFamily: 'Helvetica', fontWeight: FontWeight.w400), ); @@ -589,7 +589,7 @@ Widget text16w400_FCFCFC_blur(String text) { text, style: TextStyle( fontSize: 16.sp, - color: Color(0xFFFCFCFC).withOpacity(0.8), + color: const Color(0xFFFCFCFC).withOpacity(0.8), fontFamily: 'Helvetica', fontWeight: FontWeight.w400), ); @@ -600,7 +600,7 @@ Widget text10w400_FCFCFC_blur(String text) { text, style: TextStyle( fontSize: 10.sp, - color: Color(0xFFFCFCFC).withOpacity(0.8), + color: const Color(0xFFFCFCFC).withOpacity(0.8), fontFamily: 'Helvetica', fontWeight: FontWeight.w400), ); @@ -611,7 +611,7 @@ Widget text11w400_FCFCFC(String text) { text, style: TextStyle( fontSize: 11.sp, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), fontFamily: 'Helvetica', fontWeight: FontWeight.w400), ); @@ -622,7 +622,7 @@ Widget text11w400_F91D42(String text) { text, style: TextStyle( fontSize: 11.sp, - color: Color(0xFFF91D42), + color: const Color(0xFFF91D42), fontFamily: 'Helvetica', fontWeight: FontWeight.w400), ); @@ -645,7 +645,7 @@ Widget text18w400_FCFCFC(String text, {TextAlign? textAlign}) { textAlign: textAlign, style: TextStyle( fontSize: 18.sp, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), fontFamily: 'Helvetica', fontWeight: FontWeight.w400), ); @@ -656,7 +656,7 @@ Widget text18w500_FCFCFC(String text) { text, style: TextStyle( fontSize: 18.sp, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), fontFamily: 'Helvetica', fontWeight: FontWeight.w500), ); @@ -668,7 +668,7 @@ Widget text18w500Center_FCFCFC(String text) { textAlign: TextAlign.center, style: TextStyle( fontSize: 18.sp, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), fontFamily: 'Helvetica', fontWeight: FontWeight.w500), ); @@ -679,7 +679,7 @@ Widget text18w700_FCFCFC(String text) { text, style: TextStyle( fontSize: 18.sp, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), fontFamily: 'Helvetica', fontWeight: FontWeight.w700), ); @@ -691,7 +691,7 @@ Widget text14w400_FCFCFC(String text, {TextAlign? textAlign}) { textAlign: textAlign, style: TextStyle( fontSize: 14.sp, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), fontFamily: 'Helvetica', fontWeight: FontWeight.w400), ); @@ -702,7 +702,7 @@ Widget text14w400_FCFCFCblur(String text) { text, style: TextStyle( fontSize: 14.sp, - color: Color(0xFFFCFCFC).withOpacity(0.8), + color: const Color(0xFFFCFCFC).withOpacity(0.8), fontFamily: 'Helvetica', fontWeight: FontWeight.w400), ); @@ -713,7 +713,7 @@ Widget text8w400_8A8A8A(String text) { text, style: TextStyle( fontSize: 8.sp, - color: Color(0xFF8A8A8A), + color: const Color(0xFF8A8A8A), fontFamily: 'Helvetica', fontWeight: FontWeight.w400), ); diff --git a/lib/onboarding/NewPass/View/NewPass.dart b/lib/onboarding/NewPass/View/NewPass.dart index 8da2bb9..a69dd24 100644 --- a/lib/onboarding/NewPass/View/NewPass.dart +++ b/lib/onboarding/NewPass/View/NewPass.dart @@ -65,14 +65,14 @@ class _NewPasswordState extends State { Get.snackbar( "Success!", 'Password has been reset successfully!', - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.green, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); - Future.delayed(Duration(seconds: 1), () { + Future.delayed(const Duration(seconds: 1), () { Get.toNamed(RouteName.loginScreen); }); // print('success'); @@ -80,10 +80,10 @@ class _NewPasswordState extends State { Get.snackbar( "Error!", data.message, - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.red, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); @@ -95,10 +95,10 @@ class _NewPasswordState extends State { 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: [ @@ -120,7 +120,7 @@ class _NewPasswordState extends State { Container( height: 1.h, width: 250.w, - color: Color(0xFF858585), + color: const Color(0xFF858585), ), sizedBoxHeight(35.h), text16w400_FCFCFC("Create new password"), diff --git a/lib/onboarding/Signup/View/Business/View/step3SelectCommunity.dart b/lib/onboarding/Signup/View/Business/View/step3SelectCommunity.dart index 6ae2a71..9a678d8 100644 --- a/lib/onboarding/Signup/View/Business/View/step3SelectCommunity.dart +++ b/lib/onboarding/Signup/View/Business/View/step3SelectCommunity.dart @@ -26,12 +26,12 @@ class _SelectBusinessCommunityState extends State { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Color.fromARGB(255, 18, 32, 47), + backgroundColor: const Color.fromARGB(255, 18, 32, 47), body: Stack( children: [ - Positioned(top: 70, left: -30, child: CommonBlurLeftSecond()), - Positioned(top: 400, right: -30, child: CommonBlurRightSecond()), - Positioned(top: 630, left: -30, child: CommonBlurLeftBlue()), + const Positioned(top: 70, left: -30, child: CommonBlurLeftSecond()), + const Positioned(top: 400, right: -30, child: CommonBlurRightSecond()), + const Positioned(top: 630, left: -30, child: CommonBlurLeftBlue()), SingleChildScrollView( child: GlassmorphicContainer( width: MediaQuery.of(context).size.width, @@ -46,10 +46,10 @@ class _SelectBusinessCommunityState extends State { 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), @@ -63,9 +63,9 @@ class _SelectBusinessCommunityState extends State { 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: Padding( @@ -102,7 +102,7 @@ class _SelectBusinessCommunityState extends State { height: 25.h, decoration: ShapeDecoration( shape: RoundedRectangleBorder( - side: BorderSide( + side: const BorderSide( width: 1, color: Color(0xFF434A53)), borderRadius: BorderRadius.circular(30), ), @@ -116,7 +116,7 @@ class _SelectBusinessCommunityState extends State { width: 273.w, height: 15.h, decoration: ShapeDecoration( - gradient: LinearGradient( + gradient: const LinearGradient( begin: Alignment(0.98, -0.21), end: Alignment(-0.98, 0.21), colors: [ @@ -135,7 +135,7 @@ class _SelectBusinessCommunityState extends State { width: 15, height: 15, decoration: ShapeDecoration( - gradient: LinearGradient( + gradient: const LinearGradient( begin: Alignment(0.98, -0.21), end: Alignment(-0.98, 0.21), colors: [ @@ -171,7 +171,7 @@ class _SelectBusinessCommunityState extends State { Center( child: Container( width: 108.w, - decoration: ShapeDecoration( + decoration: const ShapeDecoration( shape: RoundedRectangleBorder( side: BorderSide( width: 1, @@ -197,7 +197,7 @@ class _SelectBusinessCommunityState extends State { // ), Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Icon( + child: const Icon( Icons.search, size: 35, color: Colors.white, @@ -210,7 +210,7 @@ class _SelectBusinessCommunityState extends State { ], ), sizedBoxHeight(30.h), - Row( + const Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ CommunitySelect( @@ -222,7 +222,7 @@ class _SelectBusinessCommunityState extends State { ], ), sizedBoxHeight(30.h), - Row( + const Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ CommunitySelect( @@ -234,7 +234,7 @@ class _SelectBusinessCommunityState extends State { image: 'assets/images/png/community3.png'), ], ), - Spacer(flex: 1), + const Spacer(flex: 1), CustomButton( text: "Continue", onPressed: () { @@ -253,7 +253,7 @@ class CommunitySelect extends StatefulWidget { final String titleString; final String image; - CommunitySelect({ + const CommunitySelect({ Key? key, required this.titleString, required this.image, @@ -296,7 +296,7 @@ class _CommunitySelectState extends State { height: 23, decoration: ShapeDecoration( shape: RoundedRectangleBorder( - side: BorderSide(width: 1, color: Color(0xFFFF002B)), + side: const BorderSide(width: 1, color: Color(0xFFFF002B)), borderRadius: BorderRadius.circular(30), ), ), diff --git a/lib/onboarding/Signup/View/Individual/step1Selectprofile.dart b/lib/onboarding/Signup/View/Individual/step1Selectprofile.dart index 6ec2b9b..097b0e0 100644 --- a/lib/onboarding/Signup/View/Individual/step1Selectprofile.dart +++ b/lib/onboarding/Signup/View/Individual/step1Selectprofile.dart @@ -23,12 +23,12 @@ class _SelectIndividualProfileState extends State { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Color.fromARGB(255, 18, 32, 47), + backgroundColor: const Color.fromARGB(255, 18, 32, 47), body: Stack( children: [ - Positioned(top: 70, left: -30, child: CommonBlurLeftSecond()), - Positioned(top: 310, right: -30, child: CommonBlurRightSecond()), - Positioned(top: 540, left: -30, child: CommonBlurLeftBlue()), + const Positioned(top: 70, left: -30, child: CommonBlurLeftSecond()), + const Positioned(top: 310, right: -30, child: CommonBlurRightSecond()), + const Positioned(top: 540, left: -30, child: CommonBlurLeftBlue()), GlassmorphicContainer( width: MediaQuery.of(context).size.width, height: @@ -42,10 +42,10 @@ class _SelectIndividualProfileState extends State { 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), @@ -59,9 +59,9 @@ class _SelectIndividualProfileState extends State { 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: Padding( @@ -99,7 +99,7 @@ class _SelectIndividualProfileState extends State { decoration: ShapeDecoration( shape: RoundedRectangleBorder( side: - BorderSide(width: 1, color: Color(0xFF434A53)), + const BorderSide(width: 1, color: Color(0xFF434A53)), borderRadius: BorderRadius.circular(30), ), ), @@ -112,7 +112,7 @@ class _SelectIndividualProfileState extends State { width: 15, height: 15, decoration: ShapeDecoration( - gradient: LinearGradient( + gradient: const LinearGradient( begin: Alignment(0.98, -0.21), end: Alignment(-0.98, 0.21), colors: [ @@ -135,7 +135,7 @@ class _SelectIndividualProfileState extends State { Center( child: Container( width: 154.w, - decoration: ShapeDecoration( + decoration: const ShapeDecoration( shape: RoundedRectangleBorder( side: BorderSide( width: 1, @@ -173,7 +173,7 @@ class _SelectIndividualProfileState extends State { selectedIndex: selectedIndex, index: 2, ), - Spacer(flex: 1), + const Spacer(flex: 1), CustomButton( text: "Continue", onPressed: () { @@ -194,7 +194,7 @@ class ProfileContainer extends StatefulWidget { final ValueNotifier selectedIndex; final int index; - ProfileContainer({ + const ProfileContainer({ Key? key, required this.titleString, required this.contentString, @@ -224,21 +224,21 @@ class _ProfileContainerState extends State { height: 126.h, decoration: BoxDecoration( gradient: LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), + begin: const Alignment(0.98, -0.21), + end: const Alignment(-0.98, 0.21), colors: isSelected ? [ - Color(0XFFD90B2E).withOpacity(0.80), - Color(0XFFD90B2E).withOpacity(0.77), - Color(0XFFD90B2E).withOpacity(0.66), - Color(0XFFD90B2E).withOpacity(0.18), + const Color(0XFFD90B2E).withOpacity(0.80), + const Color(0XFFD90B2E).withOpacity(0.77), + const Color(0XFFD90B2E).withOpacity(0.66), + const Color(0XFFD90B2E).withOpacity(0.18), ] : [ Colors.white.withOpacity(0.06), Colors.white.withOpacity(0.08) ], ), - border: Border.all(width: 1, color: Color(0xFF434A53)), + border: Border.all(width: 1, color: const Color(0xFF434A53)), borderRadius: BorderRadius.circular(10), ), child: Padding( diff --git a/lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart b/lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart index ccfb471..78b3bd9 100644 --- a/lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart +++ b/lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart @@ -55,7 +55,7 @@ class _SelectIndividualCommunityState extends State { }); } - Uploadata() async { + uploadata() async { utils.loader(); String selectedIndicesString = '[${_selectedIndices.join(',')}]'; print('Selected Indices: $selectedIndicesString'); @@ -83,7 +83,7 @@ class _SelectIndividualCommunityState extends State { return GestureDetector( onTap: () => FocusManager.instance.primaryFocus?.unfocus(), child: Scaffold( - backgroundColor: Color.fromARGB(255, 18, 32, 47), + backgroundColor: const Color.fromARGB(255, 18, 32, 47), body: Stack( children: [ Container( @@ -125,7 +125,7 @@ class _SelectIndividualCommunityState extends State { height: 25.h, decoration: ShapeDecoration( shape: RoundedRectangleBorder( - side: BorderSide(width: 1, color: Color(0xFF434A53)), + side: const BorderSide(width: 1, color: Color(0xFF434A53)), borderRadius: BorderRadius.circular(30), ), ), @@ -139,7 +139,7 @@ class _SelectIndividualCommunityState extends State { // width: 216.w, height: 15.h, decoration: ShapeDecoration( - gradient: LinearGradient( + gradient: const LinearGradient( begin: Alignment(0.98, -0.21), end: Alignment(-0.98, 0.21), colors: [ @@ -158,7 +158,7 @@ class _SelectIndividualCommunityState extends State { width: 15, height: 15, decoration: ShapeDecoration( - gradient: LinearGradient( + gradient: const LinearGradient( begin: Alignment(0.98, -0.21), end: Alignment(-0.98, 0.21), colors: [ @@ -194,7 +194,7 @@ class _SelectIndividualCommunityState extends State { Center( child: Container( width: 108.w, - decoration: ShapeDecoration( + decoration: const ShapeDecoration( shape: RoundedRectangleBorder( side: BorderSide( width: 1, @@ -218,7 +218,7 @@ class _SelectIndividualCommunityState extends State { // ), Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Icon( + child: const Icon( Icons.search, size: 35, color: Colors.white, @@ -244,13 +244,13 @@ class _SelectIndividualCommunityState extends State { if (snapshot.connectionState == ConnectionState.waiting) { // Display shimmer effect while waiting for data - return Center(child: CircularProgressIndicator()); + return const Center(child: CircularProgressIndicator()); } else if (snapshot.hasError) { // Handle error state return Center( child: Text( '${snapshot.error} occurred', - style: TextStyle(fontSize: 18), + style: const TextStyle(fontSize: 18), ), ); } else { @@ -259,9 +259,9 @@ class _SelectIndividualCommunityState extends State { ? _buildNoDataBody(context) : Expanded( child: GridView.builder( - physics: ScrollPhysics(), + physics: const ScrollPhysics(), gridDelegate: - SliverGridDelegateWithFixedCrossAxisCount( + const SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 2, crossAxisSpacing: 12.0, mainAxisSpacing: 12.0, @@ -304,7 +304,7 @@ class _SelectIndividualCommunityState extends State { // _selectedIndices.join(','); // print( // 'Selected Indices: [$selectedIndicesString]'); - Uploadata(); + uploadata(); } }, ), @@ -359,7 +359,7 @@ class CommunitySelect extends StatelessWidget { height: 73.h, decoration: ShapeDecoration( image: image == null || image!.isEmpty - ? DecorationImage( + ? const DecorationImage( image: AssetImage("assets/images/png/groupindividual2.png"), fit: BoxFit.fill, ) @@ -375,7 +375,7 @@ class CommunitySelect extends StatelessWidget { sizedBoxHeight(15.h), Text( titleString, - style: TextStyle( + style: const TextStyle( color: Colors.white, fontSize: 12.0, overflow: TextOverflow.ellipsis), @@ -388,7 +388,7 @@ class CommunitySelect extends StatelessWidget { height: 23, decoration: ShapeDecoration( shape: RoundedRectangleBorder( - side: BorderSide(width: 1, color: Color(0xFFFF002B)), + side: const BorderSide(width: 1, color: Color(0xFFFF002B)), borderRadius: BorderRadius.circular(30), ), ), @@ -396,9 +396,9 @@ class CommunitySelect extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ isSelected - ? Text('Regrouping', + ? const Text('Regrouping', style: TextStyle(color: Colors.white, fontSize: 10.0)) - : Text('Join', + : const Text('Join', style: TextStyle(color: Colors.white, fontSize: 10.0)) ], ), diff --git a/lib/onboarding/Signup/View/Individual/tellusindividual.dart b/lib/onboarding/Signup/View/Individual/tellusindividual.dart index a698d8a..2906dee 100644 --- a/lib/onboarding/Signup/View/Individual/tellusindividual.dart +++ b/lib/onboarding/Signup/View/Individual/tellusindividual.dart @@ -154,7 +154,7 @@ class _TellusaboutIndividualState extends State { Get.toNamed(RouteName.individualactivitystep2); } else { Get.back(); - return utils.showToast(data.message); + utils.showToast(data.message); } } diff --git a/lib/onboarding/Signup/View/signupendpage.dart b/lib/onboarding/Signup/View/signupendpage.dart index 68f0340..0fed976 100644 --- a/lib/onboarding/Signup/View/signupendpage.dart +++ b/lib/onboarding/Signup/View/signupendpage.dart @@ -1,9 +1,7 @@ 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/CustomNextButton.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'; @@ -16,11 +14,10 @@ class SignupendPage extends StatefulWidget { } class _SignupendPageState extends State { - final ScrollController _scrollController = ScrollController(); @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Color.fromARGB(255, 18, 32, 47), + backgroundColor: const Color.fromARGB(255, 18, 32, 47), body: Stack( children: [ Container( @@ -35,15 +32,15 @@ class _SignupendPageState extends State { height: 519.h, decoration: ShapeDecoration( gradient: LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), + begin: const Alignment(0.98, -0.21), + end: const Alignment(-0.98, 0.21), colors: [ Colors.white.withOpacity(0.05999999865889549), Colors.white.withOpacity(0.07999999821186066) ], ), shape: RoundedRectangleBorder( - side: BorderSide(width: 0.80, color: Color(0xFF434A53)), + side: const BorderSide(width: 0.80, color: Color(0xFF434A53)), borderRadius: BorderRadius.circular(5), ), ), @@ -63,7 +60,7 @@ class _SignupendPageState extends State { '''Congratulations, your account has been successfully created. Get ready to regroup with your community''', textAlign: TextAlign.center, style: TextStyle( - color: Color(0xCCFCFCFC), + color: const Color(0xCCFCFCFC), fontSize: 16.sp, fontFamily: 'Helvetica', fontWeight: FontWeight.w400, diff --git a/lib/onboarding/Signup/View/signupscreen.dart b/lib/onboarding/Signup/View/signupscreen.dart index bcc21c0..f7f30d0 100644 --- a/lib/onboarding/Signup/View/signupscreen.dart +++ b/lib/onboarding/Signup/View/signupscreen.dart @@ -161,10 +161,7 @@ class _SignupScreenState extends State { "accounttype": selectedCategory, 'accountypenumber': accountTypeValue }); -await prefs.setString( - 'accountTypeValue', accountTypeValue.toString() ?? ""); -await prefs.setString( - 'accountTypefromLogin', accountTypeValue.toString() ?? ""); + return utils.showToast(data.message); } else { @@ -306,7 +303,7 @@ await prefs.setString( CustomDropDownRadio( header: 'Select account type', title: '', - listData: [ + listData: const [ 'Individual', 'Business', ], diff --git a/lib/onboarding/Signup/View/verifyuser.dart b/lib/onboarding/Signup/View/verifyuser.dart index ab0e64e..b076ffa 100644 --- a/lib/onboarding/Signup/View/verifyuser.dart +++ b/lib/onboarding/Signup/View/verifyuser.dart @@ -71,10 +71,10 @@ class _VerifyuserScreenStateState extends State { Get.snackbar( "Error!", res.data['message'], - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.red, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); @@ -102,10 +102,10 @@ class _VerifyuserScreenStateState extends State { Get.snackbar( "Success!", 'OTP has been sent to your email address!', - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.green, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); @@ -127,10 +127,10 @@ class _VerifyuserScreenStateState extends State { Get.snackbar( "Error!", data.data['message'], - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.red, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); @@ -140,8 +140,8 @@ class _VerifyuserScreenStateState extends State { @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: '', ), body: Stack( @@ -184,21 +184,21 @@ class _VerifyuserScreenStateState extends State { obscureText: false, animationType: AnimationType.fade, pinTheme: PinTheme( - selectedFillColor: Color(0xFF434A53), - inactiveFillColor: Color(0xFF434A53), - inactiveColor: Color(0xFF434A53), - activeColor: Color(0xFF434A53), - selectedColor: Color(0xFF434A53), + selectedFillColor: const Color(0xFF434A53), + inactiveFillColor: const Color(0xFF434A53), + inactiveColor: const Color(0xFF434A53), + activeColor: const Color(0xFF434A53), + selectedColor: const Color(0xFF434A53), shape: PinCodeFieldShape.underline, borderRadius: BorderRadius.circular(5), fieldHeight: 70, fieldWidth: 70, activeFillColor: // Colors.white - Color(0xFF303030).withOpacity(0.4), + const Color(0xFF303030).withOpacity(0.4), // textStyle: TextStyle(color: Colors.white, fontSize: 20), // Change text color and font size ), - animationDuration: Duration(milliseconds: 300), + animationDuration: const Duration(milliseconds: 300), enableActiveFill: true, autovalidateMode: AutovalidateMode.onUserInteraction, controller: pincode, @@ -226,9 +226,9 @@ class _VerifyuserScreenStateState extends State { sizedBoxHeight(10.h), Center( child: TimerButton( - disabledTextStyle: TextStyle(color: Colors.red), - activeTextStyle: TextStyle(color: Colors.white), - disabledColor: Color(0XFF222935).withOpacity(0.10), + disabledTextStyle: const TextStyle(color: Colors.red), + activeTextStyle: const TextStyle(color: Colors.white), + disabledColor: const Color(0XFF222935).withOpacity(0.10), buttonType: ButtonType.textButton, label: "Resend OTP", timeOutInSeconds: 120, @@ -239,7 +239,7 @@ class _VerifyuserScreenStateState extends State { }); }, // disabledColor: Colors.white, - color: Color(0XFF222935).withOpacity(0.10), + color: const Color(0XFF222935).withOpacity(0.10), ), ), const Spacer( diff --git a/lib/onboarding/forgotPass/View/ForgotPass.dart b/lib/onboarding/forgotPass/View/ForgotPass.dart index 670b1e4..fe19ab8 100644 --- a/lib/onboarding/forgotPass/View/ForgotPass.dart +++ b/lib/onboarding/forgotPass/View/ForgotPass.dart @@ -44,16 +44,16 @@ class _ForgotPassState extends State { Get.snackbar( "Success!", 'OTP sent successfully!', - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.green, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); prefs.setString('email', emailController.text); prefs.setInt('principal_xid', resp.data['data']['iam_principal_xid']); - Future.delayed(Duration(seconds: 1), () { + Future.delayed(const Duration(seconds: 1), () { Get.toNamed(RouteName.forgotOtp, arguments: emailController.text); }); // print('success'); @@ -61,10 +61,10 @@ class _ForgotPassState extends State { Get.snackbar( "Error!", resp.message, - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.red, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); @@ -74,10 +74,10 @@ class _ForgotPassState extends State { Get.snackbar( "Error!", resp.data['message'], - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.red, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); @@ -89,10 +89,10 @@ class _ForgotPassState extends State { 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: [ @@ -114,14 +114,14 @@ class _ForgotPassState extends State { Container( height: 1.h, width: 250.w, - color: Color(0xFF858585), + color: const Color(0xFF858585), ), sizedBoxHeight(35.h), text16w400_FCFCFC("Email address"), sizedBoxHeight(15.h), CustomTextFormField( textEditingController: emailController, - leadingIcon: Container( + leadingIcon: SizedBox( height: 18.h, width: 23.w, child: Center( diff --git a/lib/onboarding/onboarding1.dart b/lib/onboarding/onboarding1.dart index 7c9221f..b481711 100644 --- a/lib/onboarding/onboarding1.dart +++ b/lib/onboarding/onboarding1.dart @@ -28,13 +28,13 @@ class _Onboarding1State extends State { begin: Alignment.center, end: Alignment.bottomCenter, colors: [ - Color(0xFF222935).withOpacity(0.12), - Color(0xFF222935).withOpacity(0.60), - Color(0XFF222B37), - Color(0xFF222935), + const Color(0xFF222935).withOpacity(0.12), + const Color(0xFF222935).withOpacity(0.60), + const Color(0XFF222B37), + const Color(0xFF222935), ], ), - image: DecorationImage( + image: const DecorationImage( image: AssetImage("assets/images/png/onboarding1.png"), fit: BoxFit.fill)), child: Stack(children: [ @@ -48,7 +48,7 @@ class _Onboarding1State extends State { // shape: BoxShape.circle, color: // Colors.red - Color(0xFF009DAB).withOpacity(0.50), + const Color(0xFF009DAB).withOpacity(0.50), ), ), ), @@ -56,7 +56,7 @@ class _Onboarding1State extends State { crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.start, children: [ - Spacer(), + const Spacer(), SvgPicture.asset( "assets/images/svg/onboarding2.svg", width: 104.w, @@ -83,20 +83,20 @@ class _Onboarding1State extends State { begin: Alignment.topLeft, end: Alignment.centerRight, colors: [ - Color(0xFF222935).withOpacity(0.12), - Color(0xFF222935).withOpacity(0.60), - Color(0XFF222B37).withOpacity(0.12), - Color(0xFF222935).withOpacity(0.60), + const Color(0xFF222935).withOpacity(0.12), + const Color(0xFF222935).withOpacity(0.60), + const Color(0XFF222B37).withOpacity(0.12), + const Color(0xFF222935).withOpacity(0.60), ], ), borderGradient: LinearGradient( begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - Color(0xFF222935).withOpacity(0.12), - Color(0xFF222935).withOpacity(0.60), - Color(0XFF222B37), - Color(0xFF222935), + const Color(0xFF222935).withOpacity(0.12), + const Color(0xFF222935).withOpacity(0.60), + const Color(0XFF222B37), + const Color(0xFF222935), ], ), child: Padding(