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

Merge pull request #77 from WDI-Ideas/Development

Browse Source 
minor bug fix
This commit is contained in:
priyankahadpad
2024-07-29 16:52:54 +05:30
committed by GitHub
parent 4ee967cfd6 295b74b6e2
commit 0e21f2d37a
31 changed files with 598 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,6 @@ import 'package:regroup/Common/CommonTabBar.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';

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

@@ -5,7 +5,6 @@ import 'package:regroup/Common/CommonButton.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';

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

@@ -7,7 +7,7 @@ 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';
@@ -330,7 +330,7 @@ class _UserChatPageState extends State<UserChatPage> {
onTapDown: (details) {
_showContextMenu(context, details.globalPosition);
},
child: Container(
child: SizedBox(
width: 30,
height: 20,
child: Image.asset(
@@ -495,7 +495,7 @@ class _UserChatPageState extends State<UserChatPage> {
const Color(0xFFffffff).withOpacity(0.24),
const Color(0xFFFFFFFF).withOpacity(0.24),
],
stops: [
stops: const [
0.1,
1,
]),

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

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_reaction_button/flutter_reaction_button.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:glassmorphism_ui/glassmorphism_ui.dart';
import 'package:regroup/Common/CommonBottomNavigationBar.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonTabBar.dart';
@@ -434,7 +433,7 @@ Widget normalcardtile2({
onTap: () {
Get.toNamed(RouteName.postdetailsScreen);
},
child: Container(
child: SizedBox(
height: 163.h,
width: double.infinity,
child: Image.asset(
@@ -782,7 +781,7 @@ Widget normalcardtile({
onTap: () {
Get.toNamed(RouteName.postdetailsScreen);
},
child: Container(
child: SizedBox(
height: 163.h,
width: double.infinity,
child: Image.asset(

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

@@ -4,7 +4,6 @@ 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';

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

@@ -9,13 +9,10 @@ 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';
import 'package:intl/intl.dart';
class GroupEvent extends StatefulWidget {
@@ -433,7 +430,7 @@ class _GroupEventState extends State<GroupEvent> {
onTap: () {
// Get.toNamed(RouteName.addUsers);
},
leadingIcon: Container(
leadingIcon: SizedBox(
height: 22.h,
width: 18.w,
child: Center(
@@ -465,7 +462,7 @@ class _GroupEventState extends State<GroupEvent> {
text16400white("Location"),
sizedBoxHeight(14.h),
CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 19.h,
width: 15.w,
child: Center(

10
lib/Feed Module/Main_Screens/GroupTab/View/GroupInfo.dart
View File

@@ -5,7 +5,6 @@ import 'package:regroup/Common/CommonButton.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';
@@ -22,9 +21,9 @@ class _GroupInfoState extends State<GroupInfo> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Groups info",
),
resizeToAvoidBottomInset: false,
@@ -62,8 +61,9 @@ class _GroupInfoState extends State<GroupInfo> {
color: Colors.white,
width: 2,
),
// ignore: prefer_const_literals_to_create_immutables
boxShadow: [
BoxShadow(
const BoxShadow(
color: Color.fromRGBO(0, 0, 0, 0.25),
blurRadius: 12,
offset: Offset(0, 6),
@@ -73,7 +73,7 @@ class _GroupInfoState extends State<GroupInfo> {
child: CircleAvatar(
radius: 42.5.r,
foregroundImage:
AssetImage("assets/images/png/group111.png"),
const AssetImage("assets/images/png/group111.png"),
),
))
]),

63
lib/Feed Module/Main_Screens/GroupTab/View/GroupManage.dart
View File

@@ -7,7 +7,6 @@ import 'package:regroup/Common/CommonTabBar.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';
@@ -34,7 +33,7 @@ class _GroupManageState extends State<GroupManage> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
@@ -42,7 +41,7 @@ class _GroupManageState extends State<GroupManage> {
customActionWidget: Container(
height: 35.h,
width: 35.w,
decoration: BoxDecoration(
decoration: const BoxDecoration(
color: Color(0xFFD90B2E),
shape: BoxShape.circle,
boxShadow: [
@@ -54,7 +53,7 @@ class _GroupManageState extends State<GroupManage> {
),
],
),
child: Icon(Icons.add, color: Colors.white, weight: 2),
child: const Icon(Icons.add, color: Colors.white, weight: 2),
),
),
body: Stack(children: [
@@ -70,7 +69,7 @@ class _GroupManageState extends State<GroupManage> {
length: 4,
child: Column(
children: [
CommonTabBar(tabs: const [
const CommonTabBar(tabs: [
Tab(
text: 'Members',
),
@@ -89,9 +88,9 @@ class _GroupManageState extends State<GroupManage> {
child: TabBarView(
children: [
membersTab(),
AdminsTab(),
RequestsTab(),
InvitesTab(),
adminsTab(),
requestsTab(),
invitesTab(),
],
),
),
@@ -110,7 +109,7 @@ class _GroupManageState extends State<GroupManage> {
children: [
sizedBoxHeight(25.h),
CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 20.h,
width: 20.w,
child: Center(
@@ -129,7 +128,7 @@ class _GroupManageState extends State<GroupManage> {
SizedBox(
width: 300.w,
child: CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 17.h,
width: 17.w,
child: Center(
@@ -142,7 +141,7 @@ class _GroupManageState extends State<GroupManage> {
),
hintText: "Start date - End date",
)),
Spacer(),
const Spacer(),
commonGlassContainer(
width: 40.w,
height: 40.h,
@@ -204,7 +203,7 @@ class _GroupManageState extends State<GroupManage> {
width: 15.w,
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/Group 1000004071.png",
height: 22.h,
@@ -226,7 +225,7 @@ class _GroupManageState extends State<GroupManage> {
width: double.infinity,
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(
@@ -262,7 +261,7 @@ class _GroupManageState extends State<GroupManage> {
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("W")),
border: 0.5),
Spacer(),
const Spacer(),
Row(
children: [
Image.asset(
@@ -307,7 +306,7 @@ class _GroupManageState extends State<GroupManage> {
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("Sa")),
border: 0.5),
Spacer(),
const Spacer(),
Row(
children: [
Image.asset(
@@ -335,7 +334,7 @@ class _GroupManageState extends State<GroupManage> {
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 [
@@ -343,7 +342,7 @@ class _GroupManageState extends State<GroupManage> {
1,
],
),
borderGradient: LinearGradient(
borderGradient: const LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
@@ -367,13 +366,13 @@ class _GroupManageState extends State<GroupManage> {
));
}
Widget AdminsTab() {
return Column(
Widget adminsTab() {
return const Column(
children: [],
);
}
Widget RequestsTab() {
Widget requestsTab() {
return SingleChildScrollView(
child: Column(children: [
Padding(
@@ -382,7 +381,7 @@ class _GroupManageState extends State<GroupManage> {
children: [
sizedBoxHeight(25.h),
CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 20.h,
width: 20.w,
child: Center(
@@ -401,7 +400,7 @@ class _GroupManageState extends State<GroupManage> {
SizedBox(
width: 300.w,
child: CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 17.h,
width: 17.w,
child: Center(
@@ -414,7 +413,7 @@ class _GroupManageState extends State<GroupManage> {
),
hintText: "Start date - End date",
)),
Spacer(),
const Spacer(),
commonGlassContainer(
width: 40.w,
height: 40.h,
@@ -476,18 +475,18 @@ class _GroupManageState extends State<GroupManage> {
width: 15.w,
),
),
Spacer(),
const Spacer(),
Container(
width: 74.w,
height: 25.h,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(23.r),
color: Color(0xFFD90B2E),
color: const Color(0xFFD90B2E),
),
child: Center(child: text11w400white("Confirm")),
),
sizedBoxWidth(6.w),
Icon(
const Icon(
Icons.clear,
size: 20,
color: Colors.white,
@@ -497,7 +496,7 @@ class _GroupManageState extends State<GroupManage> {
);
}
Widget InvitesTab() {
Widget invitesTab() {
return SingleChildScrollView(
child: Column(children: [
Padding(
@@ -506,7 +505,7 @@ class _GroupManageState extends State<GroupManage> {
children: [
sizedBoxHeight(25.h),
CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 20.h,
width: 20.w,
child: Center(
@@ -525,7 +524,7 @@ class _GroupManageState extends State<GroupManage> {
SizedBox(
width: 300.w,
child: CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 17.h,
width: 17.w,
child: Center(
@@ -538,7 +537,7 @@ class _GroupManageState extends State<GroupManage> {
),
hintText: "Start date - End date",
)),
Spacer(),
const Spacer(),
commonGlassContainer(
width: 40.w,
height: 40.h,
@@ -600,13 +599,13 @@ class _GroupManageState extends State<GroupManage> {
width: 15.w,
),
),
Spacer(),
const Spacer(),
Container(
width: 74.w,
height: 25.h,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(23.r),
color: Color(0xFFD90B2E),
color: const Color(0xFFD90B2E),
),
child: Center(child: text11w400white("Invite")),
),

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

@@ -42,11 +42,11 @@ class _GroupTabState extends State<GroupTab> {
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("Groups"),
@@ -58,7 +58,7 @@ class _GroupTabState extends State<GroupTab> {
child: Container(
height: 35.h,
width: 35.w,
decoration: BoxDecoration(
decoration: const BoxDecoration(
color: Color(0xFFD90B2E),
shape: BoxShape.circle,
boxShadow: [
@@ -70,7 +70,7 @@ class _GroupTabState extends State<GroupTab> {
),
],
),
child: Icon(Icons.add, color: Colors.white, weight: 2),
child: const Icon(Icons.add, color: Colors.white, weight: 2),
),
),
sizedBoxWidth(14.w),
@@ -111,7 +111,7 @@ class _GroupTabState extends State<GroupTab> {
sizedBoxHeight(25.h),
Row(
children: [
Spacer(),
const Spacer(),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.requestedgroups);
@@ -138,7 +138,7 @@ class _GroupTabState extends State<GroupTab> {
Expanded(
child: ListView.builder(
shrinkWrap: true,
physics: BouncingScrollPhysics(),
physics: const BouncingScrollPhysics(),
itemCount: groupData.length,
itemBuilder: (context, index) {
return groupCard(
@@ -183,7 +183,7 @@ class _GroupTabState extends State<GroupTab> {
Container(
height: 65.h,
width: 65.h,
decoration: BoxDecoration(
decoration: const BoxDecoration(
shape: BoxShape.circle,
// color: Colors.amber,
),
@@ -216,12 +216,12 @@ class _GroupTabState extends State<GroupTab> {
),
],
),
Spacer(),
const Spacer(),
PopupMenuButton(
surfaceTintColor: Color(0xFF222935),
surfaceTintColor: const Color(0xFF222935),
constraints: BoxConstraints.tightFor(width: 200.w),
offset: Offset(0, 30),
color: Color(0xFF222935),
offset: const Offset(0, 30),
color: const Color(0xFF222935),
tooltip: "",
itemBuilder: (BuildContext context) =>
<PopupMenuEntry>[
@@ -233,7 +233,7 @@ class _GroupTabState extends State<GroupTab> {
child: Row(
children: [
text14w400_FCFCFC("Mute community"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/Black (1).png",
height: 18.h,
@@ -243,7 +243,7 @@ class _GroupTabState extends State<GroupTab> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -252,7 +252,7 @@ class _GroupTabState extends State<GroupTab> {
child: Row(
children: [
text14w400_FCFCFC("Hide post"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/mingcute_eye-close-line.png",
height: 20.h,
@@ -262,7 +262,7 @@ class _GroupTabState extends State<GroupTab> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -271,7 +271,7 @@ class _GroupTabState extends State<GroupTab> {
child: Row(
children: [
text14w400_FCFCFC("Pin"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/f7_pin-fill (2).png",
height: 25.h,
@@ -281,7 +281,7 @@ class _GroupTabState extends State<GroupTab> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -290,7 +290,7 @@ class _GroupTabState extends State<GroupTab> {
child: Row(
children: [
text14w400_FCFCFC("Leave community"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/logout 1 (traced).png",
height: 18.h,

33
lib/Feed Module/Main_Screens/GroupTab/View/NewPost.dart
View File

@@ -10,7 +10,6 @@ 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';
@@ -38,10 +37,10 @@ class _NewPostState extends State<NewPost> {
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: "New post",
),
body: Stack(children: [
@@ -81,10 +80,10 @@ class _NewPostState extends State<NewPost> {
},
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,
@@ -110,13 +109,13 @@ class _NewPostState extends State<NewPost> {
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 _NewPostState extends State<NewPost> {
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 _NewPostState extends State<NewPost> {
"15,123 Available tags"
],
onItemSelected: (p0) {},
leadingImage: SizedBox()),
leadingImage: const SizedBox()),
// CustomTextFormField(
// suffixIcon: Container(
// height: 20.h,
@@ -225,7 +224,7 @@ class _NewPostState extends State<NewPost> {
header: "",
title: "",
listData: [
listData: const [
'Active alliance network',
'Fitfam federation',
'The athletic town',
@@ -233,13 +232,13 @@ class _NewPostState extends State<NewPost> {
],
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()),
sizedBoxHeight(40.h),
CommonBtn(
@@ -268,12 +267,12 @@ class _NewPostState extends State<NewPost> {
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)),
),
),

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

@@ -3,7 +3,6 @@ import 'package:flutter_screenutil/flutter_screenutil.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';
@@ -37,9 +36,9 @@ class _RequestedGroupsState extends State<RequestedGroups> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Requested groups",
),
body: Stack(children: [
@@ -56,7 +55,7 @@ class _RequestedGroupsState extends State<RequestedGroups> {
sizedBoxHeight(20.h),
ListView.builder(
shrinkWrap: true,
physics: BouncingScrollPhysics(),
physics: const BouncingScrollPhysics(),
itemCount: groupData.length,
itemBuilder: (context, index) {
return groupCard(
@@ -96,7 +95,7 @@ class _RequestedGroupsState extends State<RequestedGroups> {
Container(
height: 65.h,
width: 65.h,
decoration: BoxDecoration(
decoration: const BoxDecoration(
shape: BoxShape.circle,
// color: Colors.amber,
),
@@ -129,12 +128,12 @@ class _RequestedGroupsState extends State<RequestedGroups> {
),
],
),
Spacer(),
const Spacer(),
PopupMenuButton(
surfaceTintColor: Color(0xFF222935),
surfaceTintColor: const Color(0xFF222935),
constraints: BoxConstraints.tightFor(width: 200.w),
offset: Offset(0, 30),
color: Color(0xFF222935),
offset: const Offset(0, 30),
color: const Color(0xFF222935),
tooltip: "",
itemBuilder: (BuildContext context) =>
<PopupMenuEntry>[
@@ -146,7 +145,7 @@ class _RequestedGroupsState extends State<RequestedGroups> {
child: Row(
children: [
text14w400_FCFCFC("Mute community"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/Black (1).png",
height: 18.h,
@@ -156,7 +155,7 @@ class _RequestedGroupsState extends State<RequestedGroups> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -165,7 +164,7 @@ class _RequestedGroupsState extends State<RequestedGroups> {
child: Row(
children: [
text14w400_FCFCFC("Hide post"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/mingcute_eye-close-line.png",
height: 20.h,
@@ -175,7 +174,7 @@ class _RequestedGroupsState extends State<RequestedGroups> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -184,7 +183,7 @@ class _RequestedGroupsState extends State<RequestedGroups> {
child: Row(
children: [
text14w400_FCFCFC("Pin"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/f7_pin-fill (2).png",
height: 25.h,
@@ -194,7 +193,7 @@ class _RequestedGroupsState extends State<RequestedGroups> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -203,7 +202,7 @@ class _RequestedGroupsState extends State<RequestedGroups> {
child: Row(
children: [
text14w400_FCFCFC("Leave community"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/logout 1 (traced).png",
height: 18.h,
@@ -237,13 +236,13 @@ class _RequestedGroupsState extends State<RequestedGroups> {
),
sizedBoxWidth(95.w),
text12w400_FCFCFC_blur(members),
Spacer(),
const Spacer(),
Container(
width: 127.w,
height: 30.h,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(30.r),
color: Color(0xFFD90B2E)),
color: const Color(0xFFD90B2E)),
child:
Center(child: text14w400_FCFCFC("Cancel request")),
)

13
lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart
View File

@@ -6,7 +6,6 @@ import 'package:regroup/Common/CommonButton.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Utils/Common/CommonAppbar.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/Utils/Common/CustomTextformfield.dart';
@@ -28,10 +27,10 @@ class _EditSubgroupInfoState extends State<EditSubgroupInfo> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Edit subgroup info",
),
body: Stack(children: [
@@ -64,7 +63,7 @@ class _EditSubgroupInfoState extends State<EditSubgroupInfo> {
),
)
: CircleAvatar(
backgroundImage: AssetImage(
backgroundImage: const AssetImage(
"assets/images/png/cimg3.png",
),
radius: 50.r,
@@ -89,7 +88,7 @@ class _EditSubgroupInfoState extends State<EditSubgroupInfo> {
child: Container(
height: 35.h,
width: 35.w,
decoration: BoxDecoration(
decoration: const BoxDecoration(
shape: BoxShape.circle,
color: Color(0xFFD90B2E)),
child: Center(
@@ -149,13 +148,13 @@ class _EditSubgroupInfoState extends State<EditSubgroupInfo> {
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,
))),

80
lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart
View File

@@ -42,19 +42,19 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "",
customActionWidget: Row(children: [
PopupMenuButton(
surfaceTintColor: Color(0xFF222935),
surfaceTintColor: const Color(0xFF222935),
constraints: BoxConstraints.tightFor(
width: 150.w,
),
offset: Offset(0, 40),
color: Color(0xFF222935),
offset: const Offset(0, 40),
color: const Color(0xFF222935),
tooltip: "",
itemBuilder: (BuildContext context) => <PopupMenuEntry>[
PopupMenuItem(
@@ -66,7 +66,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
child: text14w400white("Create post"),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {
Get.toNamed(RouteName.groupevent);
@@ -114,12 +114,12 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
),
sizedBoxWidth(16.w),
PopupMenuButton(
surfaceTintColor: Color(0xFF222935),
surfaceTintColor: const Color(0xFF222935),
constraints: BoxConstraints.tightFor(
width: 230.w,
),
offset: Offset(0, 40),
color: Color(0xFF222935),
offset: const Offset(0, 40),
color: const Color(0xFF222935),
tooltip: "",
itemBuilder: (BuildContext context) => <PopupMenuEntry>[
PopupMenuItem(
@@ -129,7 +129,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
child: Row(
children: [
text14w400white("Add members"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/uiw_user-add.png",
height: 15.h,
@@ -139,7 +139,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -147,7 +147,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
child: Row(
children: [
text14w400white("Share"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/share.png",
height: 20.h,
@@ -157,7 +157,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {
// Get.toNamed(RouteName.groupinfo);
@@ -167,7 +167,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
child: Row(
children: [
text14w400white("Sub -Group info"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/codicon_account.png",
height: 20.h,
@@ -177,7 +177,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -185,7 +185,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
child: Row(
children: [
text14w400white("Search"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/Frame 58575.png",
height: 18.h,
@@ -195,7 +195,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -203,7 +203,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
child: Row(
children: [
text14w400white("Mute Notification"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/Black1233.png",
height: 16.h,
@@ -213,7 +213,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {
Get.toNamed(RouteName.subgroupsetting);
@@ -223,7 +223,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
child: Row(
children: [
text14w400white("Edit sub-group settings"),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/setting2.png",
height: 18.h,
@@ -275,7 +275,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
color: Colors.white,
width: 2,
),
boxShadow: [
boxShadow: const [
BoxShadow(
color: Color.fromRGBO(0, 0, 0, 0.25),
blurRadius: 12,
@@ -286,7 +286,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
child: CircleAvatar(
radius: 42.5.r,
foregroundImage:
AssetImage("assets/images/png/group111.png"),
const AssetImage("assets/images/png/group111.png"),
),
))
]),
@@ -338,7 +338,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
// initialIndex: selectedIndex.value,
child: Column(
children: [
CommonTabBar(tabs: const [
const CommonTabBar(tabs: [
Tab(
text: 'Posts',
),
@@ -436,7 +436,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
sizedBoxWidth(7.w),
Icon(
Icons.circle,
color: Color(0xFFFCFCFC),
color: const Color(0xFFFCFCFC),
size: 4.sp,
),
sizedBoxWidth(6.w),
@@ -445,12 +445,12 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
)
],
),
Spacer(),
const Spacer(),
PopupMenuButton(
surfaceTintColor: Color(0xFF222935),
surfaceTintColor: const Color(0xFF222935),
constraints: BoxConstraints.tightFor(width: 176.w),
offset: Offset(0, 50),
color: Color(0xFF222935),
offset: const Offset(0, 50),
color: const Color(0xFF222935),
tooltip: "",
itemBuilder: (BuildContext context) => <PopupMenuEntry>[
PopupMenuItem(
@@ -468,7 +468,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/Vector (5).png",
height: 15.h,
@@ -478,7 +478,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -494,7 +494,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/share.png",
height: 20.h,
@@ -504,7 +504,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -520,7 +520,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/f7_pin-fill (2).png",
height: 25.h,
@@ -590,7 +590,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
'assets/images/png/party-popper 2.png'
]),
),
Spacer(),
const Spacer(),
commonGlassContainer(
border: 0.43,
width: 30.w,
@@ -675,11 +675,11 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
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),
@@ -756,7 +756,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
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)),
@@ -764,7 +764,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
}
Widget eventsTab() {
return Column(
return const Column(
children: [],
);
}

15
lib/Feed Module/Main_Screens/ProfileTab/Certificate/Certificate.dart
View File

@@ -1,3 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
@@ -14,7 +15,7 @@ class Certificate extends StatefulWidget {
}
class _CertificateState extends State<Certificate> {
List CertificateData = [
List certificateData = [
{
"imagePath": "assets/images/png/image 17.png",
"text": "Lorem ipsum is a dummy text",
@@ -56,9 +57,9 @@ class _CertificateState extends State<Certificate> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Certifications/Qualifications",
),
resizeToAvoidBottomInset: false,
@@ -127,7 +128,7 @@ class _CertificateState extends State<Certificate> {
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(children: [
sizedBoxHeight(25.h),
Container(
SizedBox(
height: 600.h,
child: GridView.builder(
scrollDirection: Axis.vertical,
@@ -148,7 +149,7 @@ class _CertificateState extends State<Certificate> {
certificateobj!.data![index]
.certificationImage!.isEmpty
? Image.asset(
CertificateData[index]["imagePath"],
certificateData[index]["imagePath"],
height: 100.h,
width: 105.w,
)
@@ -160,7 +161,7 @@ class _CertificateState extends State<Certificate> {
errorBuilder: (context, error, stackTrace) {
// Error handling when image fails to load
return Image.asset(
CertificateData[index]["imagePath"],
certificateData[index]["imagePath"],
fit: BoxFit.cover,
);
}),
@@ -172,7 +173,7 @@ class _CertificateState extends State<Certificate> {
null ||
certificateobj!.data![index]
.certificationName!.isEmpty
? CertificateData[index]["text"]
? certificateData[index]["text"]
: certificateobj!
.data![index].certificationName,
textAlign: TextAlign.center,

148
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart
View File

@@ -10,14 +10,14 @@ class GetEditProfileIndi {
status = json['status'];
statusCode = json['status_code'];
message = json['message'];
data = json['data'] != null ? new Data.fromJson(json['data']) : null;
data = json['data'] != null ? Data.fromJson(json['data']) : null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['status'] = this.status;
data['status_code'] = this.statusCode;
data['message'] = this.message;
final Map<String, dynamic> data = <String, dynamic>{};
data['status'] = status;
data['status_code'] = statusCode;
data['message'] = message;
if (this.data != null) {
data['data'] = this.data!.toJson();
}
@@ -83,7 +83,7 @@ class Data {
if (json['interest'] != null) {
interest = <Interest>[];
json['interest'].forEach((v) {
interest!.add(new Interest.fromJson(v));
interest!.add(Interest.fromJson(v));
});
}
about = json['about'];
@@ -93,65 +93,65 @@ class Data {
weight = json['weight'];
battingAverage = json['batting_average'];
follows =
json['follows'] != null ? new Follows.fromJson(json['follows']) : null;
json['follows'] != null ? Follows.fromJson(json['follows']) : null;
if (json['timelines'] != null) {
timelines = <Timelines>[];
json['timelines'].forEach((v) {
timelines!.add(new Timelines.fromJson(v));
timelines!.add(Timelines.fromJson(v));
});
}
accountVisibility = json['account_visibility'];
if (json['my_joined_groups'] != null) {
myJoinedGroups = <MyJoinedGroups>[];
json['my_joined_groups'].forEach((v) {
myJoinedGroups!.add(new MyJoinedGroups.fromJson(v));
myJoinedGroups!.add(MyJoinedGroups.fromJson(v));
});
}
if (json['certifications'] != null) {
certifications = <Certifications>[];
json['certifications'].forEach((v) {
certifications!.add(new Certifications.fromJson(v));
certifications!.add(Certifications.fromJson(v));
});
}
daysBeforeJoined = json['days_before_joined'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['user_name'] = this.userName;
data['location'] = this.location;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['user_name'] = userName;
data['location'] = location;
data['full_name'] = this.fullName;
data['full_name'] = fullName;
// data['profile_image'] = this.profileImage;
data['profile_photo'] = this.profilePhoto;
data['gender'] = this.gender;
data['date_of_birth'] = this.dateOfBirth;
if (this.interest != null) {
data['interest'] = this.interest!.map((v) => v.toJson()).toList();
data['profile_photo'] = profilePhoto;
data['gender'] = gender;
data['date_of_birth'] = dateOfBirth;
if (interest != null) {
data['interest'] = interest!.map((v) => v.toJson()).toList();
}
data['about'] = this.about;
data['position'] = this.position;
data['training_scores'] = this.trainingScores;
data['height'] = this.height;
data['weight'] = this.weight;
data['batting_average'] = this.battingAverage;
if (this.follows != null) {
data['follows'] = this.follows!.toJson();
data['about'] = about;
data['position'] = position;
data['training_scores'] = trainingScores;
data['height'] = height;
data['weight'] = weight;
data['batting_average'] = battingAverage;
if (follows != null) {
data['follows'] = follows!.toJson();
}
if (this.timelines != null) {
data['timelines'] = this.timelines!.map((v) => v.toJson()).toList();
if (timelines != null) {
data['timelines'] = timelines!.map((v) => v.toJson()).toList();
}
data['account_visibility'] = this.accountVisibility;
if (this.myJoinedGroups != null) {
data['account_visibility'] = accountVisibility;
if (myJoinedGroups != null) {
data['my_joined_groups'] =
this.myJoinedGroups!.map((v) => v.toJson()).toList();
myJoinedGroups!.map((v) => v.toJson()).toList();
}
if (this.certifications != null) {
if (certifications != null) {
data['certifications'] =
this.certifications!.map((v) => v.toJson()).toList();
certifications!.map((v) => v.toJson()).toList();
}
data['days_before_joined'] = this.daysBeforeJoined;
data['days_before_joined'] = daysBeforeJoined;
return data;
}
}
@@ -168,9 +168,9 @@ class Interest {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['name'] = this.name;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['name'] = name;
return data;
}
}
@@ -206,22 +206,22 @@ class Timelines {
if (json['abilities'] != null) {
abilities = <Abilities>[];
json['abilities'].forEach((v) {
abilities!.add(new Abilities.fromJson(v));
abilities!.add(Abilities.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['club_name'] = this.clubName;
data['role_name'] = this.roleName;
data['team_name'] = this.teamName;
data['start_date'] = this.startDate;
data['end_date'] = this.endDate;
data['abilities_xids'] = this.abilitiesXids;
if (this.abilities != null) {
data['abilities'] = this.abilities!.map((v) => v.toJson()).toList();
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['club_name'] = clubName;
data['role_name'] = roleName;
data['team_name'] = teamName;
data['start_date'] = startDate;
data['end_date'] = endDate;
data['abilities_xids'] = abilitiesXids;
if (abilities != null) {
data['abilities'] = abilities!.map((v) => v.toJson()).toList();
}
return data;
}
@@ -239,9 +239,9 @@ class Abilities {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['name'] = this.name;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['name'] = name;
return data;
}
}
@@ -258,9 +258,9 @@ class Follows {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['following'] = this.following;
data['followers'] = this.followers;
final Map<String, dynamic> data = <String, dynamic>{};
data['following'] = following;
data['followers'] = followers;
return data;
}
}
@@ -291,13 +291,13 @@ class Certifications {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['certification_name'] = this.certificationName;
data['certification_image'] = this.certificationImage;
data['certification_reason'] = this.certificationReason;
data['certification_date'] = this.certificationDate;
data['iam_principal_xid'] = this.iamPrincipalXid;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['certification_name'] = certificationName;
data['certification_image'] = certificationImage;
data['certification_reason'] = certificationReason;
data['certification_date'] = certificationDate;
data['iam_principal_xid'] = iamPrincipalXid;
return data;
}
}
@@ -316,17 +316,17 @@ class MyJoinedGroups {
iamPrincipalXid = json['iam_principal_xid'];
manageGroupXid = json['manage_group_xid'];
groupData = json['group_data'] != null
? new GroupData.fromJson(json['group_data'])
? GroupData.fromJson(json['group_data'])
: null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['iam_principal_xid'] = this.iamPrincipalXid;
data['manage_group_xid'] = this.manageGroupXid;
if (this.groupData != null) {
data['group_data'] = this.groupData!.toJson();
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['iam_principal_xid'] = iamPrincipalXid;
data['manage_group_xid'] = manageGroupXid;
if (groupData != null) {
data['group_data'] = groupData!.toJson();
}
return data;
}
@@ -346,10 +346,10 @@ class GroupData {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['title'] = this.title;
data['group_image'] = this.groupImage;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['title'] = title;
data['group_image'] = groupImage;
return data;
}
}

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

@@ -93,7 +93,6 @@ class _BusEditProfileState extends State<BusEditProfile> {
editProfileImage.usserprofilePicPath.value,
filename: path.basename(profilePicture),
);
}
FormData? updata;
@@ -348,7 +347,7 @@ class _BusEditProfileState extends State<BusEditProfile> {
),
),
),
hintText: "Victory gear sports emporium",
hintText: "Enter your business name",
),
sizedBoxHeight(20.h),
text16400white("Business username"),
@@ -367,7 +366,7 @@ class _BusEditProfileState extends State<BusEditProfile> {
),
),
),
hintText: "",
hintText: "Enter your business username",
),
sizedBoxHeight(20.h),
text16400white("Owner name"),
@@ -385,7 +384,7 @@ class _BusEditProfileState extends State<BusEditProfile> {
),
),
),
hintText: "",
hintText: "Enter your owner name",
),
sizedBoxHeight(20.h),
text16400white("Founded on"),
@@ -406,7 +405,7 @@ class _BusEditProfileState extends State<BusEditProfile> {
),
),
),
hintText: "",
hintText: "Select date",
textEditingController:
foundedonController,
),
@@ -429,7 +428,7 @@ class _BusEditProfileState extends State<BusEditProfile> {
),
),
),
hintText: "",
hintText: "Enter your website link",
),
sizedBoxHeight(25.h),
Row(
@@ -457,14 +456,14 @@ class _BusEditProfileState extends State<BusEditProfile> {
),
),
),
hintText: "",
hintText: "Enter your location",
),
sizedBoxHeight(20.h),
text16400white("Bio"),
sizedBoxHeight(16.h),
CustomTextFormField2(
textEditingController: bioController,
hintText: "",
hintText: "Enter your business bio",
maxlines: 3,
),
sizedBoxHeight(60.h),

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

@@ -135,7 +135,6 @@ class _EditProfileState extends State<EditProfile> {
);
print(imageFile.toString());
}
updata = FormData.fromMap({
// "email_address": "priyanka14@yopmail.com",
@@ -355,7 +354,7 @@ class _EditProfileState extends State<EditProfile> {
sizedBoxHeight(16.h),
CustomTextFormField(
textEditingController: fullNameController,
leadingIcon: Container(
leadingIcon: SizedBox(
width: 18.w,
height: 17.h,
child: Center(
@@ -366,7 +365,7 @@ class _EditProfileState extends State<EditProfile> {
),
),
),
hintText: "Edward Hackett",
hintText: "Enter your full name",
),
sizedBoxHeight(20.h),
text16400white("User name"),
@@ -384,7 +383,7 @@ class _EditProfileState extends State<EditProfile> {
),
),
),
hintText: "edward_01",
hintText: "Enter your user name",
),
sizedBoxHeight(20.h),
text16400white("Date of birth"),
@@ -405,7 +404,7 @@ class _EditProfileState extends State<EditProfile> {
),
),
),
hintText: "12-04-2024",
hintText: "Select your date of birth",
textEditingController: dateController,
),
),
@@ -457,8 +456,7 @@ class _EditProfileState extends State<EditProfile> {
),
),
),
hintText:
"Elm street london, United Kingdom",
hintText: "Enter your location",
),
sizedBoxHeight(20.h),
Row(
@@ -496,8 +494,7 @@ class _EditProfileState extends State<EditProfile> {
sizedBoxHeight(16.h),
CustomTextFormField2(
textEditingController: aboutController,
hintText:
"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s. Lorem Ipsum has been the industry's standard",
hintText: "Tell us about yourself",
maxlines: 3,
),
// sizedBoxHeight(20.h),
@@ -506,7 +503,7 @@ class _EditProfileState extends State<EditProfile> {
sizedBoxHeight(16.h),
CustomTextFormField(
textEditingController: positionController,
hintText: "Lorem Ipsum",
hintText: "Enter your position",
),
sizedBoxHeight(20.h),
text16400white("Training Scores"),
@@ -514,28 +511,28 @@ class _EditProfileState extends State<EditProfile> {
CustomTextFormField(
textEditingController:
trainingScoresController,
hintText: "50",
hintText: "Enter your training scores",
),
sizedBoxHeight(20.h),
text16400white("Height"),
sizedBoxHeight(16.h),
CustomTextFormField(
textEditingController: heightController,
hintText: "6 feet",
hintText: "Enter your height",
),
sizedBoxHeight(20.h),
text16400white("Weight"),
sizedBoxHeight(16.h),
CustomTextFormField(
textEditingController: weightController,
hintText: "70kg",
hintText: "Enter your weight",
),
sizedBoxHeight(20.h),
text16400white("Batting Average"),
sizedBoxHeight(16.h),
CustomTextFormField(
textEditingController: battingAvgController,
hintText: "372",
hintText: "Enter your batting average",
),
sizedBoxHeight(20.h),
sizedBoxHeight(60.h),

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

@@ -560,7 +560,7 @@ class _ProfileTabState extends State<ProfileTab> {
commonGlassUI(
width:
double.infinity,
height: 155.h,
height: 170.h,
borderRadius:
BorderRadius
.circular(

192
lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataBus.dart
View File

@@ -11,14 +11,14 @@ class GuestGetProfileDataBus {
status = json['status'];
statusCode = json['status_code'];
message = json['message'];
data = json['data'] != null ? new Data.fromJson(json['data']) : null;
data = json['data'] != null ? Data.fromJson(json['data']) : null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['status'] = this.status;
data['status_code'] = this.statusCode;
data['message'] = this.message;
final Map<String, dynamic> data = <String, dynamic>{};
data['status'] = status;
data['status_code'] = statusCode;
data['message'] = message;
if (this.data != null) {
data['data'] = this.data!.toJson();
}
@@ -91,44 +91,44 @@ class Data {
businessProfileImage = json['business_profile_image'];
bio = json['bio'];
follows =
json['follows'] != null ? new Follows.fromJson(json['follows']) : null;
json['follows'] != null ? Follows.fromJson(json['follows']) : null;
isIamFollowingToGuestUser = json['is_iam_following_to_guest_user'];
businessType = json['business_type'] != null
? new BusinessType.fromJson(json['business_type'])
? BusinessType.fromJson(json['business_type'])
: null;
iamPrincipalData = json['iam_principal_data'] != null
? new IamPrincipalData.fromJson(json['iam_principal_data'])
? IamPrincipalData.fromJson(json['iam_principal_data'])
: null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['iam_principal_xid'] = this.iamPrincipalXid;
data['business_type_xid'] = this.businessTypeXid;
data['business_owner_name'] = this.businessOwnerName;
data['business_name'] = this.businessName;
data['business_username'] = this.businessUsername;
data['business_location'] = this.businessLocation;
data['business_contact_number'] = this.businessContactNumber;
data['business_email'] = this.businessEmail;
data['business_handle'] = this.businessHandle;
data['website_link'] = this.websiteLink;
data['google_review_link'] = this.googleReviewLink;
data['business_logo'] = this.businessLogo;
data['tags'] = this.tags;
data['banner_image'] = this.bannerImage;
data['business_profile_image'] = this.businessProfileImage;
data['bio'] = this.bio;
if (this.follows != null) {
data['follows'] = this.follows!.toJson();
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['iam_principal_xid'] = iamPrincipalXid;
data['business_type_xid'] = businessTypeXid;
data['business_owner_name'] = businessOwnerName;
data['business_name'] = businessName;
data['business_username'] = businessUsername;
data['business_location'] = businessLocation;
data['business_contact_number'] = businessContactNumber;
data['business_email'] = businessEmail;
data['business_handle'] = businessHandle;
data['website_link'] = websiteLink;
data['google_review_link'] = googleReviewLink;
data['business_logo'] = businessLogo;
data['tags'] = tags;
data['banner_image'] = bannerImage;
data['business_profile_image'] = businessProfileImage;
data['bio'] = bio;
if (follows != null) {
data['follows'] = follows!.toJson();
}
data['is_iam_following_to_guest_user'] = this.isIamFollowingToGuestUser;
if (this.businessType != null) {
data['business_type'] = this.businessType!.toJson();
data['is_iam_following_to_guest_user'] = isIamFollowingToGuestUser;
if (businessType != null) {
data['business_type'] = businessType!.toJson();
}
if (this.iamPrincipalData != null) {
data['iam_principal_data'] = this.iamPrincipalData!.toJson();
if (iamPrincipalData != null) {
data['iam_principal_data'] = iamPrincipalData!.toJson();
}
return data;
}
@@ -146,9 +146,9 @@ class Follows {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['following'] = this.following;
data['followers'] = this.followers;
final Map<String, dynamic> data = <String, dynamic>{};
data['following'] = following;
data['followers'] = followers;
return data;
}
}
@@ -191,17 +191,17 @@ class BusinessType {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['name'] = this.name;
data['image'] = this.image;
data['description'] = this.description;
data['is_active'] = this.isActive;
data['created_by'] = this.createdBy;
data['modified_by'] = this.modifiedBy;
data['deleted_at'] = this.deletedAt;
data['created_at'] = this.createdAt;
data['updated_at'] = this.updatedAt;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['name'] = name;
data['image'] = image;
data['description'] = description;
data['is_active'] = isActive;
data['created_by'] = createdBy;
data['modified_by'] = modifiedBy;
data['deleted_at'] = deletedAt;
data['created_at'] = createdAt;
data['updated_at'] = updatedAt;
return data;
}
}
@@ -358,55 +358,55 @@ class IamPrincipalData {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['principal_type_xid'] = this.principalTypeXid;
data['principal_source_xid'] = this.principalSourceXid;
data['one_signal_player_id'] = this.oneSignalPlayerId;
data['google_id'] = this.googleId;
data['apple_id'] = this.appleId;
data['facebook_id'] = this.facebookId;
data['microsoft_id'] = this.microsoftId;
data['user_name'] = this.userName;
data['pin'] = this.pin;
data['full_name'] = this.fullName;
data['gender'] = this.gender;
data['date_of_birth'] = this.dateOfBirth;
data['phone_number'] = this.phoneNumber;
data['other_phone_number'] = this.otherPhoneNumber;
data['email_address'] = this.emailAddress;
data['address_line1'] = this.addressLine1;
data['address_line2'] = this.addressLine2;
data['city_xid'] = this.cityXid;
data['state_xid'] = this.stateXid;
data['country_xid'] = this.countryXid;
data['post_code'] = this.postCode;
data['last_login_datetime'] = this.lastLoginDatetime;
data['profile_photo'] = this.profilePhoto;
data['referral_code'] = this.referralCode;
data['description'] = this.description;
data['about'] = this.about;
data['position'] = this.position;
data['training_scores'] = this.trainingScores;
data['height'] = this.height;
data['weight'] = this.weight;
data['batting_average'] = this.battingAverage;
data['is_profile_updated'] = this.isProfileUpdated;
data['is_active'] = this.isActive;
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;
data['is_account_visibility'] = this.isAccountVisibility;
data['is_deleted'] = this.isDeleted;
data['reason'] = this.reason;
data['created_by'] = this.createdBy;
data['modified_by'] = this.modifiedBy;
data['deleted_at'] = this.deletedAt;
data['created_at'] = this.createdAt;
data['updated_at'] = this.updatedAt;
data['profile_image'] = this.profileImage;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['principal_type_xid'] = principalTypeXid;
data['principal_source_xid'] = principalSourceXid;
data['one_signal_player_id'] = oneSignalPlayerId;
data['google_id'] = googleId;
data['apple_id'] = appleId;
data['facebook_id'] = facebookId;
data['microsoft_id'] = microsoftId;
data['user_name'] = userName;
data['pin'] = pin;
data['full_name'] = fullName;
data['gender'] = gender;
data['date_of_birth'] = dateOfBirth;
data['phone_number'] = phoneNumber;
data['other_phone_number'] = otherPhoneNumber;
data['email_address'] = emailAddress;
data['address_line1'] = addressLine1;
data['address_line2'] = addressLine2;
data['city_xid'] = cityXid;
data['state_xid'] = stateXid;
data['country_xid'] = countryXid;
data['post_code'] = postCode;
data['last_login_datetime'] = lastLoginDatetime;
data['profile_photo'] = profilePhoto;
data['referral_code'] = referralCode;
data['description'] = description;
data['about'] = about;
data['position'] = position;
data['training_scores'] = trainingScores;
data['height'] = height;
data['weight'] = weight;
data['batting_average'] = battingAverage;
data['is_profile_updated'] = isProfileUpdated;
data['is_active'] = isActive;
data['group_notification'] = groupNotification;
data['community_notification'] = communityNotification;
data['follower_notification'] = followerNotification;
data['new_follower_notification'] = newFollowerNotification;
data['direct_message_notification'] = directMessageNotification;
data['is_account_visibility'] = isAccountVisibility;
data['is_deleted'] = isDeleted;
data['reason'] = reason;
data['created_by'] = createdBy;
data['modified_by'] = modifiedBy;
data['deleted_at'] = deletedAt;
data['created_at'] = createdAt;
data['updated_at'] = updatedAt;
data['profile_image'] = profileImage;
return data;
}
}

172
lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataIndi.dart
View File

@@ -11,14 +11,14 @@ class GuestGetProfileDataIndi {
status = json['status'];
statusCode = json['status_code'];
message = json['message'];
data = json['data'] != null ? new Data.fromJson(json['data']) : null;
data = json['data'] != null ? Data.fromJson(json['data']) : null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['status'] = this.status;
data['status_code'] = this.statusCode;
data['message'] = this.message;
final Map<String, dynamic> data = <String, dynamic>{};
data['status'] = status;
data['status_code'] = statusCode;
data['message'] = message;
if (this.data != null) {
data['data'] = this.data!.toJson();
}
@@ -83,7 +83,7 @@ class Data {
if (json['interest'] != null) {
interest = <Interest>[];
json['interest'].forEach((v) {
interest!.add(new Interest.fromJson(v));
interest!.add(Interest.fromJson(v));
});
}
about = json['about'];
@@ -93,18 +93,18 @@ class Data {
weight = json['weight'];
battingAverage = json['batting_average'];
follows =
json['follows'] != null ? new Follows.fromJson(json['follows']) : null;
json['follows'] != null ? Follows.fromJson(json['follows']) : null;
if (json['timelines'] != null) {
timelines = <Timelines>[];
json['timelines'].forEach((v) {
timelines!.add(new Timelines.fromJson(v));
timelines!.add(Timelines.fromJson(v));
});
}
accountVisibility = json['account_visibility'];
if (json['my_joined_groups'] != null) {
myJoinedGroups = <MyJoinedGroups>[];
json['my_joined_groups'].forEach((v) {
myJoinedGroups!.add(new MyJoinedGroups.fromJson(v));
myJoinedGroups!.add(MyJoinedGroups.fromJson(v));
});
}
// if (json['my_joined_subgroups'] != null) {
@@ -116,7 +116,7 @@ class Data {
if (json['certifications'] != null) {
certifications = <Certifications>[];
json['certifications'].forEach((v) {
certifications!.add(new Certifications.fromJson(v));
certifications!.add(Certifications.fromJson(v));
});
}
daysBeforeJoined = json['days_before_joined'];
@@ -124,43 +124,43 @@ class Data {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['user_name'] = this.userName;
data['full_name'] = this.fullName;
data['gender'] = this.gender;
data['profile_photo'] = this.profilePhoto;
data['date_of_birth'] = this.dateOfBirth;
if (this.interest != null) {
data['interest'] = this.interest!.map((v) => v.toJson()).toList();
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['user_name'] = userName;
data['full_name'] = fullName;
data['gender'] = gender;
data['profile_photo'] = profilePhoto;
data['date_of_birth'] = dateOfBirth;
if (interest != null) {
data['interest'] = interest!.map((v) => v.toJson()).toList();
}
data['about'] = this.about;
data['position'] = this.position;
data['training_scores'] = this.trainingScores;
data['height'] = this.height;
data['weight'] = this.weight;
data['batting_average'] = this.battingAverage;
if (this.follows != null) {
data['follows'] = this.follows!.toJson();
data['about'] = about;
data['position'] = position;
data['training_scores'] = trainingScores;
data['height'] = height;
data['weight'] = weight;
data['batting_average'] = battingAverage;
if (follows != null) {
data['follows'] = follows!.toJson();
}
if (this.timelines != null) {
data['timelines'] = this.timelines!.map((v) => v.toJson()).toList();
if (timelines != null) {
data['timelines'] = timelines!.map((v) => v.toJson()).toList();
}
data['account_visibility'] = this.accountVisibility;
if (this.myJoinedGroups != null) {
data['account_visibility'] = accountVisibility;
if (myJoinedGroups != null) {
data['my_joined_groups'] =
this.myJoinedGroups!.map((v) => v.toJson()).toList();
myJoinedGroups!.map((v) => v.toJson()).toList();
}
// if (this.myJoinedSubgroups != null) {
// data['my_joined_subgroups'] =
// this.myJoinedSubgroups!.map((v) => v.toJson()).toList();
// }
if (this.certifications != null) {
if (certifications != null) {
data['certifications'] =
this.certifications!.map((v) => v.toJson()).toList();
certifications!.map((v) => v.toJson()).toList();
}
data['days_before_joined'] = this.daysBeforeJoined;
data['is_iam_following_to_guest_user'] = this.isIamFollowingToGuestUser;
data['days_before_joined'] = daysBeforeJoined;
data['is_iam_following_to_guest_user'] = isIamFollowingToGuestUser;
return data;
}
}
@@ -176,9 +176,9 @@ class Interest {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['name'] = this.name;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['name'] = name;
return data;
}
}
@@ -195,9 +195,9 @@ class Follows {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['following'] = this.following;
data['followers'] = this.followers;
final Map<String, dynamic> data = <String, dynamic>{};
data['following'] = following;
data['followers'] = followers;
return data;
}
}
@@ -233,22 +233,22 @@ class Timelines {
if (json['abilities'] != null) {
abilities = <Abilities>[];
json['abilities'].forEach((v) {
abilities!.add(new Abilities.fromJson(v));
abilities!.add(Abilities.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['club_name'] = this.clubName;
data['role_name'] = this.roleName;
data['team_name'] = this.teamName;
data['start_date'] = this.startDate;
data['end_date'] = this.endDate;
data['abilities_xids'] = this.abilitiesXids;
if (this.abilities != null) {
data['abilities'] = this.abilities!.map((v) => v.toJson()).toList();
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['club_name'] = clubName;
data['role_name'] = roleName;
data['team_name'] = teamName;
data['start_date'] = startDate;
data['end_date'] = endDate;
data['abilities_xids'] = abilitiesXids;
if (abilities != null) {
data['abilities'] = abilities!.map((v) => v.toJson()).toList();
}
return data;
}
@@ -266,9 +266,9 @@ class Abilities {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['name'] = this.name;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['name'] = name;
return data;
}
}
@@ -287,17 +287,17 @@ class MyJoinedGroups {
iamPrincipalXid = json['iam_principal_xid'];
manageGroupXid = json['manage_group_xid'];
groupData = json['group_data'] != null
? new GroupData.fromJson(json['group_data'])
? GroupData.fromJson(json['group_data'])
: null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['iam_principal_xid'] = this.iamPrincipalXid;
data['manage_group_xid'] = this.manageGroupXid;
if (this.groupData != null) {
data['group_data'] = this.groupData!.toJson();
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['iam_principal_xid'] = iamPrincipalXid;
data['manage_group_xid'] = manageGroupXid;
if (groupData != null) {
data['group_data'] = groupData!.toJson();
}
return data;
}
@@ -317,10 +317,10 @@ class GroupData {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['title'] = this.title;
data['group_image'] = this.groupImage;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['title'] = title;
data['group_image'] = groupImage;
return data;
}
}
@@ -345,18 +345,18 @@ class MyJoinedSubgroups {
manageGroupXid = json['manage_group_xid'];
manageSubGroupXid = json['manage_sub_group_xid'];
subGroupData = json['sub_group_data'] != null
? new SubGroupData.fromJson(json['sub_group_data'])
? SubGroupData.fromJson(json['sub_group_data'])
: null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['iam_principal_xid'] = this.iamPrincipalXid;
data['manage_group_xid'] = this.manageGroupXid;
data['manage_sub_group_xid'] = this.manageSubGroupXid;
if (this.subGroupData != null) {
data['sub_group_data'] = this.subGroupData!.toJson();
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['iam_principal_xid'] = iamPrincipalXid;
data['manage_group_xid'] = manageGroupXid;
data['manage_sub_group_xid'] = manageSubGroupXid;
if (subGroupData != null) {
data['sub_group_data'] = subGroupData!.toJson();
}
return data;
}
@@ -376,10 +376,10 @@ class SubGroupData {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['title'] = this.title;
data['sub_group_image'] = this.subGroupImage;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['title'] = title;
data['sub_group_image'] = subGroupImage;
return data;
}
}
@@ -410,13 +410,13 @@ class Certifications {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['certification_name'] = this.certificationName;
data['certification_image'] = this.certificationImage;
data['certification_reason'] = this.certificationReason;
data['certification_date'] = this.certificationDate;
data['iam_principal_xid'] = this.iamPrincipalXid;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['certification_name'] = certificationName;
data['certification_image'] = certificationImage;
data['certification_reason'] = certificationReason;
data['certification_date'] = certificationDate;
data['iam_principal_xid'] = iamPrincipalXid;
return data;
}
}

34
lib/Feed Module/Main_Screens/ProfileTab/Model/accountSessionModel.dart
View File

@@ -14,16 +14,16 @@ class GetAccountSessionsModel {
if (json['data'] != null) {
data = <Data>[];
json['data'].forEach((v) {
data!.add(new Data.fromJson(v));
data!.add(Data.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['status'] = this.status;
data['status_code'] = this.statusCode;
data['message'] = this.message;
final Map<String, dynamic> data = <String, dynamic>{};
data['status'] = status;
data['status_code'] = statusCode;
data['message'] = message;
if (this.data != null) {
data['data'] = this.data!.map((v) => v.toJson()).toList();
}
@@ -72,18 +72,18 @@ class Data {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['device_name'] = this.deviceName;
data['ip_address'] = this.ipAddress;
data['country'] = this.country;
data['state'] = this.state;
data['city'] = this.city;
data['zip'] = this.zip;
data['isp'] = this.isp;
data['lat'] = this.lat;
data['lon'] = this.lon;
data['timezone'] = this.timezone;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['device_name'] = deviceName;
data['ip_address'] = ipAddress;
data['country'] = country;
data['state'] = state;
data['city'] = city;
data['zip'] = zip;
data['isp'] = isp;
data['lat'] = lat;
data['lon'] = lon;
data['timezone'] = timezone;
return data;
}
}

6
lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSessions.dart
View File

@@ -25,9 +25,9 @@ class _AccountSessionState extends State<AccountSession> {
return Scaffold(
// key: _scaffoldKey1,
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Account sessions",
),
body:
@@ -103,7 +103,7 @@ class _AccountSessionState extends State<AccountSession> {
sizedBoxHeight(16.h),
ListView.builder(
shrinkWrap: true,
physics: ScrollPhysics(),
physics: const ScrollPhysics(),
itemCount: accountsessionobj!.data!.length,
itemBuilder: (context, index) {
final city = accountsessionobj!.data![index].city;

14
lib/Feed Module/Main_Screens/ProfileTab/Settings/ContactUs.dart
View File

@@ -35,7 +35,7 @@ class _ContactUsState extends State<ContactUs> {
});
}
Uploadata() async {
uploadata() async {
utils.loader();
Map<String, dynamic> updata = {
"full_name": fullname.text,
@@ -62,9 +62,9 @@ class _ContactUsState extends State<ContactUs> {
onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
child: Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Contact us",
),
body: Stack(children: [
@@ -86,7 +86,7 @@ class _ContactUsState extends State<ContactUs> {
text16400white("Full name"),
sizedBoxHeight(16.h),
CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 17.h,
width: 18.w,
child: Center(
@@ -117,7 +117,7 @@ class _ContactUsState extends State<ContactUs> {
text16400white("Email address"),
sizedBoxHeight(16.h),
CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 17.h,
width: 18.w,
child: Center(
@@ -153,7 +153,7 @@ class _ContactUsState extends State<ContactUs> {
CustomDropDownRadio(
header: "",
title: "",
listData: [
listData: const [
"Feature suggestion",
"Issues with app",
"Scoreboard",
@@ -196,7 +196,7 @@ class _ContactUsState extends State<ContactUs> {
_selectedreasontocontact.isEmpty) {
utils.showToast("Please fill all fields");
} else {
Uploadata();
uploadata();
}
},
text: "Send")

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

@@ -118,7 +118,7 @@ class _ReportABugState extends State<ReportABug> {
),
validator: (value) {
if (value!.isEmpty) {
return 'Enter your decice os';
return 'Enter your device os';
}
return null;
},

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

@@ -276,7 +276,7 @@ class _AddTimelineState extends State<AddTimeline> {
hintText: 'Enter club name',
validator: (value) {
if (value!.isEmpty) {
return 'Enter your full name ';
return 'Enter your club name ';
}
return null;
},
@@ -1085,10 +1085,10 @@ class _CustomDropDownCheckBoxTimelineState
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'),

110
lib/Login/Model/LoginModel.dart
View File

@@ -10,14 +10,14 @@ class LoginModel {
status = json['status'];
statusCode = json['status_code'];
message = json['message'];
data = json['data'] != null ? new Data.fromJson(json['data']) : null;
data = json['data'] != null ? Data.fromJson(json['data']) : null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['status'] = this.status;
data['status_code'] = this.statusCode;
data['message'] = this.message;
final Map<String, dynamic> data = <String, dynamic>{};
data['status'] = status;
data['status_code'] = statusCode;
data['message'] = message;
if (this.data != null) {
data['data'] = this.data!.toJson();
}
@@ -34,15 +34,15 @@ class Data {
Data.fromJson(Map<String, dynamic> json) {
accessToken = json['access-token'];
userData = json['user_data'] != null
? new UserData.fromJson(json['user_data'])
? UserData.fromJson(json['user_data'])
: null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['access-token'] = this.accessToken;
if (this.userData != null) {
data['user_data'] = this.userData!.toJson();
final Map<String, dynamic> data = <String, dynamic>{};
data['access-token'] = accessToken;
if (userData != null) {
data['user_data'] = userData!.toJson();
}
return data;
}
@@ -188,51 +188,51 @@ class UserData {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['principal_type_xid'] = this.principalTypeXid;
data['principal_source_xid'] = this.principalSourceXid;
data['one_signal_player_id'] = this.oneSignalPlayerId;
data['google_id'] = this.googleId;
data['apple_id'] = this.appleId;
data['facebook_id'] = this.facebookId;
data['microsoft_id'] = this.microsoftId;
data['user_name'] = this.userName;
data['pin'] = this.pin;
data['full_name'] = this.fullName;
data['gender'] = this.gender;
data['date_of_birth'] = this.dateOfBirth;
data['phone_number'] = this.phoneNumber;
data['other_phone_number'] = this.otherPhoneNumber;
data['email_address'] = this.emailAddress;
data['address_line1'] = this.addressLine1;
data['address_line2'] = this.addressLine2;
data['city_xid'] = this.cityXid;
data['state_xid'] = this.stateXid;
data['country_xid'] = this.countryXid;
data['post_code'] = this.postCode;
data['last_login_datetime'] = this.lastLoginDatetime;
data['profile_photo'] = this.profilePhoto;
data['referral_code'] = this.referralCode;
data['description'] = this.description;
data['about'] = this.about;
data['position'] = this.position;
data['training_scores'] = this.trainingScores;
data['height'] = this.height;
data['weight'] = this.weight;
data['batting_average'] = this.battingAverage;
data['is_profile_updated'] = this.isProfileUpdated;
data['is_active'] = this.isActive;
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;
data['created_by'] = this.createdBy;
data['modified_by'] = this.modifiedBy;
data['deleted_at'] = this.deletedAt;
data['created_at'] = this.createdAt;
data['updated_at'] = this.updatedAt;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['principal_type_xid'] = principalTypeXid;
data['principal_source_xid'] = principalSourceXid;
data['one_signal_player_id'] = oneSignalPlayerId;
data['google_id'] = googleId;
data['apple_id'] = appleId;
data['facebook_id'] = facebookId;
data['microsoft_id'] = microsoftId;
data['user_name'] = userName;
data['pin'] = pin;
data['full_name'] = fullName;
data['gender'] = gender;
data['date_of_birth'] = dateOfBirth;
data['phone_number'] = phoneNumber;
data['other_phone_number'] = otherPhoneNumber;
data['email_address'] = emailAddress;
data['address_line1'] = addressLine1;
data['address_line2'] = addressLine2;
data['city_xid'] = cityXid;
data['state_xid'] = stateXid;
data['country_xid'] = countryXid;
data['post_code'] = postCode;
data['last_login_datetime'] = lastLoginDatetime;
data['profile_photo'] = profilePhoto;
data['referral_code'] = referralCode;
data['description'] = description;
data['about'] = about;
data['position'] = position;
data['training_scores'] = trainingScores;
data['height'] = height;
data['weight'] = weight;
data['batting_average'] = battingAverage;
data['is_profile_updated'] = isProfileUpdated;
data['is_active'] = isActive;
data['group_notification'] = groupNotification;
data['community_notification'] = communityNotification;
data['follower_notification'] = followerNotification;
data['new_follower_notification'] = newFollowerNotification;
data['direct_message_notification'] = directMessageNotification;
data['created_by'] = createdBy;
data['modified_by'] = modifiedBy;
data['deleted_at'] = deletedAt;
data['created_at'] = createdAt;
data['updated_at'] = updatedAt;
return data;
}
}

2
lib/Login/View/loginscreen.dart
View File

@@ -7,6 +7,7 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
import 'package:logger/web.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart';
import 'package:regroup/Login/ViewModel/LoginApi.dart';
import 'package:regroup/Utils/Common/AppleOAuthService.dart';
import 'package:regroup/Utils/Common/CustomNextButton.dart';
@@ -38,6 +39,7 @@ class _LoginScreenState extends State<LoginScreen> {
@override
void initState() {
InterestListApi().getinterestlistApi();
super.initState();
}

13
lib/Utils/Common/CustomTextformfield.dart
View File

@@ -97,7 +97,7 @@ class _CustomTextFormFieldState extends State<CustomTextFormField> {
blur: 6,
opacity: 1,
borderRadius: BorderRadius.circular(30.r),
border: Border.all(color: Color(0xff434A53), width: 0.8),
border: Border.all(color: const Color(0xff434A53), width: 0.8),
child: TextFormField(
style: TextStyle(
fontSize: 16.sp, color: Colors.white, fontFamily: 'Helvetica'),
@@ -116,7 +116,7 @@ class _CustomTextFormFieldState extends State<CustomTextFormField> {
constraints: const BoxConstraints(minHeight: 50),
hintStyle: TextStyle(
fontSize: 16.sp,
color: Colors.white,
color: const Color.fromARGB(255, 130, 128, 128),
fontWeight: FontWeight.w400,
fontFamily: 'Helvetica'),
prefixIcon: widget.leadingIcon == null
@@ -284,13 +284,12 @@ class _CustomTextFormField2State extends State<CustomTextFormField2> {
hintStyle: TextStyle(
fontSize: 16.sp,
color: Colors.white,
color: const Color.fromARGB(255, 130, 128, 128),
fontWeight: FontWeight.w400,
fontFamily: 'hiragino'),
// ignore: prefer_null_aware_operators
prefixIcon:
widget.leadingIcon,
prefixIcon: widget.leadingIcon,
suffixIcon: widget.isInputPassword
? GestureDetector(
onTap: () => setState(() => obscureText = !obscureText),
@@ -464,7 +463,7 @@ class _CustomtextFormFieldPasswordState
decoration: InputDecoration(
hintStyle: TextStyle(
fontSize: 16.sp,
color: Colors.white,
color: const Color.fromARGB(255, 130, 128, 128),
fontWeight: FontWeight.w400,
fontFamily: 'Helvetica'),
labelStyle: const TextStyle(color: Colors.white),
@@ -640,7 +639,7 @@ class _SearchTextFormFieldState extends State<SearchTextFormField> {
constraints: const BoxConstraints(minHeight: 50),
hintStyle: TextStyle(
fontSize: 16.sp,
color: Colors.white,
color: const Color.fromARGB(255, 130, 128, 128),
fontWeight: FontWeight.w400,
fontFamily: 'Helvetica'),
prefixIcon:

120
lib/onboarding/Signup/Model/GetUserdetailsModel.dart
View File

@@ -14,10 +14,10 @@ class GetuserdetailsModel {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['status'] = this.status;
data['status_code'] = this.statusCode;
data['message'] = this.message;
final Map<String, dynamic> data = <String, dynamic>{};
data['status'] = status;
data['status_code'] = statusCode;
data['message'] = message;
if (this.data != null) {
data['data'] = this.data!.toJson();
}
@@ -52,15 +52,15 @@ class Data {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.userData != null) {
data['userData'] = this.userData!.toJson();
if (userData != null) {
data['userData'] = userData!.toJson();
}
if (this.userCommunity != null) {
if (userCommunity != null) {
data['userCommunity'] =
this.userCommunity!.map((v) => v.toJson()).toList();
userCommunity!.map((v) => v.toJson()).toList();
}
if (this.userGroups != null) {
data['userGroups'] = this.userGroups!.map((v) => v.toJson()).toList();
if (userGroups != null) {
data['userGroups'] = userGroups!.map((v) => v.toJson()).toList();
}
return data;
}
@@ -129,24 +129,24 @@ class UserData {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['principal_type_xid'] = this.principalTypeXid;
data['google_id'] = this.googleId;
data['apple_id'] = this.appleId;
data['user_name'] = this.userName;
data['full_name'] = this.fullName;
data['gender'] = this.gender;
data['date_of_birth'] = this.dateOfBirth;
data['phone_number'] = this.phoneNumber;
data['email_address'] = this.emailAddress;
data['address_line1'] = this.addressLine1;
data['address_line2'] = this.addressLine2;
data['post_code'] = this.postCode;
data['last_login_datetime'] = this.lastLoginDatetime;
data['profile_photo'] = this.profilePhoto;
data['is_profile_updated'] = this.isProfileUpdated;
data['is_active'] = this.isActive;
data['created_at'] = this.createdAt;
data['id'] = id;
data['principal_type_xid'] = principalTypeXid;
data['google_id'] = googleId;
data['apple_id'] = appleId;
data['user_name'] = userName;
data['full_name'] = fullName;
data['gender'] = gender;
data['date_of_birth'] = dateOfBirth;
data['phone_number'] = phoneNumber;
data['email_address'] = emailAddress;
data['address_line1'] = addressLine1;
data['address_line2'] = addressLine2;
data['post_code'] = postCode;
data['last_login_datetime'] = lastLoginDatetime;
data['profile_photo'] = profilePhoto;
data['is_profile_updated'] = isProfileUpdated;
data['is_active'] = isActive;
data['created_at'] = createdAt;
return data;
}
}
@@ -180,13 +180,13 @@ class UserCommunity {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['iam_principal_xid'] = this.iamPrincipalXid;
data['manage_community_xid'] = this.manageCommunityXid;
data['joined_at'] = this.joinedAt;
data['is_active'] = this.isActive;
if (this.communityData != null) {
data['community_data'] = this.communityData!.toJson();
data['id'] = id;
data['iam_principal_xid'] = iamPrincipalXid;
data['manage_community_xid'] = manageCommunityXid;
data['joined_at'] = joinedAt;
data['is_active'] = isActive;
if (communityData != null) {
data['community_data'] = communityData!.toJson();
}
return data;
}
@@ -231,16 +231,16 @@ class CommunityData {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['community_profile_photo'] = this.communityProfilePhoto;
data['community_banner_image'] = this.communityBannerImage;
data['community_name'] = this.communityName;
data['community_location'] = this.communityLocation;
data['community_description'] = this.communityDescription;
data['community_type_xid'] = this.communityTypeXid;
data['activity_xid'] = this.activityXid;
data['is_active'] = this.isActive;
data['created_at'] = this.createdAt;
data['id'] = id;
data['community_profile_photo'] = communityProfilePhoto;
data['community_banner_image'] = communityBannerImage;
data['community_name'] = communityName;
data['community_location'] = communityLocation;
data['community_description'] = communityDescription;
data['community_type_xid'] = communityTypeXid;
data['activity_xid'] = activityXid;
data['is_active'] = isActive;
data['created_at'] = createdAt;
return data;
}
}
@@ -271,12 +271,12 @@ class UserGroups {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['iam_principal_xid'] = this.iamPrincipalXid;
data['manage_group_xid'] = this.manageGroupXid;
data['created_at'] = this.createdAt;
if (this.groupData != null) {
data['group_data'] = this.groupData!.toJson();
data['id'] = id;
data['iam_principal_xid'] = iamPrincipalXid;
data['manage_group_xid'] = manageGroupXid;
data['created_at'] = createdAt;
if (groupData != null) {
data['group_data'] = groupData!.toJson();
}
return data;
}
@@ -318,15 +318,15 @@ class GroupData {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['manage_group_type_xid'] = this.manageGroupTypeXid;
data['title'] = this.title;
data['background_image'] = this.backgroundImage;
data['group_image'] = this.groupImage;
data['link'] = this.link;
data['description'] = this.description;
data['is_active'] = this.isActive;
data['created_at'] = this.createdAt;
data['id'] = id;
data['manage_group_type_xid'] = manageGroupTypeXid;
data['title'] = title;
data['background_image'] = backgroundImage;
data['group_image'] = groupImage;
data['link'] = link;
data['description'] = description;
data['is_active'] = isActive;
data['created_at'] = createdAt;
return data;
}
}

28
lib/onboarding/Signup/Model/Onboarding/Individual/CommunitiesModel.dart
View File

@@ -13,16 +13,16 @@ class GetcommunitiesModel {
if (json['data'] != null) {
data = <Data>[];
json['data'].forEach((v) {
data!.add(new Data.fromJson(v));
data!.add(Data.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['status'] = this.status;
data['status_code'] = this.statusCode;
data['message'] = this.message;
final Map<String, dynamic> data = <String, dynamic>{};
data['status'] = status;
data['status_code'] = statusCode;
data['message'] = message;
if (this.data != null) {
data['data'] = this.data!.map((v) => v.toJson()).toList();
}
@@ -62,15 +62,15 @@ class Data {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['community_profile_photo'] = this.communityProfilePhoto;
data['community_banner_image'] = this.communityBannerImage;
data['community_name'] = this.communityName;
data['community_location'] = this.communityLocation;
data['community_description'] = this.communityDescription;
data['community_type_xid'] = this.communityTypeXid;
data['activity_xid'] = this.activityXid;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['community_profile_photo'] = communityProfilePhoto;
data['community_banner_image'] = communityBannerImage;
data['community_name'] = communityName;
data['community_location'] = communityLocation;
data['community_description'] = communityDescription;
data['community_type_xid'] = communityTypeXid;
data['activity_xid'] = activityXid;
return data;
}
}

7
lib/onboarding/Signup/View/signupscreen.dart
View File

@@ -7,6 +7,7 @@ import 'package:flutter_facebook_auth/flutter_facebook_auth.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart';
import 'package:regroup/Login/ViewModel/LoginApi.dart';
import 'package:regroup/Utils/Common/AppleOAuthService.dart';
import 'package:regroup/Utils/Common/CommonDropdown.dart';
@@ -171,6 +172,12 @@ class _SignupScreenState extends State<SignupScreen> {
}
}
@override
void initState() {
InterestListApi().getinterestlistApi();
super.initState();
}
@override
Widget build(BuildContext context) {
return GestureDetector(