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

Merge pull request #86 from WDI-Ideas/k25july

Browse Source 
code cleaning
This commit is contained in:
Kishan Bhuta
2024-07-31 16:08:52 +05:30
committed by GitHub
parent 84239f52ba 9bd0f3affc
commit 1f33ab55bc
134 changed files with 1732 additions and 2731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Common/controller/MainController.dart
View File

@@ -1,12 +1,10 @@
import 'package:get/get.dart';
import 'package:regroup/Main_Screens/CalenderTab/CalenderTab.dart';
import 'package:regroup/Main_Screens/Chats/View/chatsmainscreen.dart';
import 'package:regroup/Main_Screens/Community/Community.dart';
import 'package:regroup/Main_Screens/GroupTab/View/GroupTab.dart';
import 'package:regroup/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart';
import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/CalenderTab.dart';
import 'package:regroup/Feed%20Module/Main_Screens/Chats/View/chatsmainscreen.dart';
import 'package:regroup/Feed%20Module/Main_Screens/Community/Community.dart';
import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/GroupTab.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart';
class MainController extends GetxController {
var selectedIndex = 0.obs;

2
lib/Common/controller/MainScreen.dart
View File

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
import 'package:regroup/Common/controller/MainController.dart';
import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart';
import '../../Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart';
final MainController mainController = Get.put(MainController());

6
lib/Common/controller/data/network/network_api.dart
View File

@@ -16,9 +16,8 @@ class NetworkApiServices {
Dio dio = Dio();
final controllerEntryPoint = Get.put(EntryPointController());
String basicAuth = 'Basic ' +
base64.encode(
utf8.encode('RegroupUserName:71%@L%es^bUX94`J9XT*@bh,._WWM{\$%^^&&'));
String basicAuth = 'Basic ${base64.encode(
utf8.encode('RegroupUserName:71%@L%es^bUX94`J9XT*@bh,._WWM{\$%^^&&'))}';
Future<ResponseData> getApi(String url, {bool optionalpar = false}) async {
if (kDebugMode) {
@@ -27,7 +26,6 @@ class NetworkApiServices {
Response response;
SharedPreferences prefs = await SharedPreferences.getInstance();
token = prefs.getString('access-token');
print("url is $url");
log(token.toString());
try {

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

@@ -1,978 +0,0 @@
import 'dart:developer';
import 'package:flutter/material.dart';
import 'package:flutter/services.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/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart'
as timelineabilist;
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/gettimelineability.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CommonDropdown.dart';
import 'package:regroup/Utils/Common/CustomNextButton.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/dialogs.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart';
import 'package:intl/intl.dart';
import 'package:async/src/future_group.dart';
import 'package:shared_preferences/shared_preferences.dart';
class AddTimeline extends StatefulWidget {
const AddTimeline({super.key});
@override
State<AddTimeline> createState() => _AddTimelineState();
}
class _AddTimelineState extends State<AddTimeline> {
TextEditingController dateController = TextEditingController();
TextEditingController dateController2 = TextEditingController();
TextEditingController clubNameController = TextEditingController();
TextEditingController rollnameController = TextEditingController();
TextEditingController teamnameController = TextEditingController();
int id = Get.arguments["id"];
bool edited = Get.arguments["edit"];
RxBool isChecked = false.obs;
timelineabilist.TimelineAbilityListModel? abilityModel;
List<timelineabilist.Data> timeline = [];
List<String> _abilitydrop = [];
Future<void> fetchABilitylist() async {
TimelineAbilityListApi abilityLsitAPI = TimelineAbilityListApi();
ResponseData<dynamic> response = await abilityLsitAPI.getAbilitylistApi();
if (response.status == ResponseStatus.SUCCESS) {
abilityModel =
timelineabilist.TimelineAbilityListModel.fromJson(response.data!);
setState(() {
timeline = abilityModel!.data ?? []; // Store the fetched cities
_abilitydrop =
timeline.map((platform) => platform.name.toString()).toList();
});
log(timeline.toString());
} else {
print('Failed to fetch abilities');
}
}
List<int> selectedabilityid = [];
void getCatIdFromName(List<String> selectedAbilities) {
selectedabilityid.clear(); // Clear existing selections
for (var name in selectedAbilities) {
for (var i = 0; i < timeline.length; i++) {
if (name == timeline[i].name) {
selectedabilityid.add(timeline[i].id!);
break; // Assuming each name is unique, we break after finding a match
}
}
}
}
// late Future myfuture;
FutureGroup futureGroup = FutureGroup();
RxBool isloading = true.obs;
List<String> seelctedNameList = [];
@override
void initState() {
// TODO: implement initState
if (edited == true) {
// futureGroup.add(
Profilegetmethod().getEditTimeline(id).then((value) {
clubNameController.text =
edittimelineobj!.data!.timelineData!.clubName ?? "";
rollnameController.text =
edittimelineobj!.data!.timelineData!.roleName ?? "";
teamnameController.text =
edittimelineobj!.data!.timelineData!.teamName ?? "";
"";
dateController.text =
edittimelineobj!.data!.timelineData!.startDate ?? "";
dateController2.text =
edittimelineobj!.data!.timelineData!.endDate ?? "";
log(_abilityMap.length.toString());
// futureGroup.add(
fetchABilitylist().then((value) {
String abilitiesXids =
edittimelineobj!.data!.timelineData!.abilitiesXids ?? "";
abilitiesIds = abilitiesXids
.split(',')
.map((e) => int.tryParse(e.trim()) ?? 0) // Trim spaces around IDs
.toList();
selectedabilityid = abilitiesIds;
print(selectedabilityid.toList());
for (int i = 0; i < _abilitydrop.length; i++) {
_abilityMap.add({
"id": i + 1,
"name": _abilitydrop[i],
});
}
getSelectedNames(selectedabilityid).then((value) {
seelctedNameList = value;
isloading = false.obs;
});
});
// );
});
} else {
fetchABilitylist().then((value) {
isloading = false.obs;
});
}
super.initState();
}
List<int> abilitiesIds = [];
UploadData() async {
// SharedPreferences prefs = await SharedPreferences.getInstance();
utils.loader();
String abilitiesIds = selectedabilityid.join(',');
print(abilitiesIds);
Map<String, dynamic> updata = {
"club_name": clubNameController.text,
"role_name": rollnameController.text,
"team_name": teamnameController.text,
"start_date": dateController.text,
"end_date": dateController2.text,
"abilities_xids": abilitiesIds,
};
final data = await Profilepostmethod().postTimeline(updata);
if (data.status == ResponseStatus.SUCCESS) {
Get.back();
// Get.back();
// await EditProfileApi().getEditProfileIndividual().then((value) {
// Get.back();
// });
Get.toNamed(RouteName.mainscreen, arguments: 4);
print("timeline done");
return utils.showToast(data.message);
} else {
Get.back();
print("timeline not done");
return utils.showToast(data.message);
}
}
EdituploadData() async {
utils.loader();
String abilitiesIds = selectedabilityid.join(',');
print(abilitiesIds);
Map<String, dynamic> updata = {
"club_name": clubNameController.text,
"role_name": rollnameController.text,
"team_name": teamnameController.text,
"start_date": dateController.text,
"end_date": dateController2.text,
"abilities_xids": abilitiesIds,
"timeline_id": id,
};
final data = await Profilepostmethod().postEditTimeline(updata);
if (data.status == ResponseStatus.SUCCESS) {
Get.back();
print("timeline done");
// await EditProfileApi().getEditProfileIndividual().then((value) {
// Get.back();
// });
// utils.showToast(data.message);
// await Future.delayed(
// Duration(milliseconds: 500)); // Add a small delay if needed
// Get.toNamed(RouteName.mainscreen, arguments: 4);
Get.toNamed(RouteName.mainscreen, arguments: 4);
} else {
Get.back();
print("timeline not done");
return utils.showToast(data.message);
}
}
// List<Map<String, dynamic>> _abilityMap = [];
List<Map<String, dynamic>> _abilityMap = [];
List<String> listData = [];
// Function to get names from selected IDs
Future<List<String>> getSelectedNames(List<int> selectedIds) async {
List<String> selectedNames = [];
for (int id in selectedIds) {
for (Map<String, dynamic> ability in _abilityMap) {
if (ability["id"] == id) {
selectedNames.add(ability["name"]);
break;
}
}
_abilitydrop =
_abilityMap.map((ability) => ability["name"] as String).toList();
}
return selectedNames;
}
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
child: Scaffold(
// resizeToAvoidBottomInset: false,
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
titleTxt: "Add timeline",
),
body: Obx(()
// {
=>
isloading.value
? Center(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
CircularProgressIndicator(),
],
))
: edited == true
? Stack(children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage(
"assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
ListView(physics: ScrollPhysics(), children: [
Padding(
padding:
EdgeInsets.symmetric(horizontal: 16.w),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
sizedBoxHeight(20.h),
text16400white("Club name"),
sizedBoxHeight(15.h),
CustomTextFormField(
textEditingController:
clubNameController,
texttype: TextInputType.text,
hintText: 'Enter club name',
validator: (value) {
if (value!.isEmpty) {
return 'Enter your club name ';
}
return null;
},
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
FilteringTextInputFormatter.allow(
RegExp('[a-zA-Z ]'))
],
),
sizedBoxHeight(25.h),
text16400white("Role in "),
sizedBoxHeight(15.h),
CustomTextFormField(
textEditingController:
rollnameController,
texttype: TextInputType.text,
hintText: 'Enter role in the club',
validator: (value) {
if (value!.isEmpty) {
return 'Enter role in the club';
}
return null;
},
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
FilteringTextInputFormatter.allow(
RegExp('[a-zA-Z ]'))
],
),
sizedBoxHeight(25.h),
text16400white("Team name"),
sizedBoxHeight(15.h),
CustomTextFormField(
textEditingController:
teamnameController,
texttype: TextInputType.text,
hintText: 'Enter team name',
validator: (value) {
if (value!.isEmpty) {
return 'Enter your team name ';
}
return null;
},
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
FilteringTextInputFormatter.allow(
RegExp('[a-zA-ZS0-9 ]')),
],
),
sizedBoxHeight(25.h),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
text16400white("Start date "),
sizedBoxHeight(10.h),
GestureDetector(
onTap: () => datePicker(
context,
dateController),
child: AbsorbPointer(
child:
CustomTextFormField(
textEditingController:
dateController,
leadingIcon: Container(
height: 20.h,
width: 20.w,
child: Center(
child: Image.asset(
"assets/images/png/calender.png",
height: 20.h,
width: 20.w,
),
),
),
),
),
)
],
),
),
sizedBoxWidth(10.h),
Expanded(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
text16400white("End date"),
sizedBoxHeight(10.h),
GestureDetector(
onTap: () => datePicker(
context,
dateController2),
child: AbsorbPointer(
child:
CustomTextFormField(
textEditingController:
dateController2,
leadingIcon: Container(
height: 20.h,
width: 20.w,
child: Center(
child: Image.asset(
"assets/images/png/calender.png",
height: 20.h,
width: 20.w,
),
),
),
),
),
),
sizedBoxHeight(10.h),
Row(
children: [
Obx(() {
return commonGlassContainer(
border: 1,
borderradius: 2,
height: 20.h,
width: 20.w,
opacity1: 0.24,
opacity2: 0.24,
customWidget:
Transform.scale(
scale: 1.2,
child: Checkbox(
side: BorderSide(
color: Color(
0xFF434A53)),
value: isChecked
.value,
activeColor: Colors
.transparent,
checkColor:
Colors.white,
onChanged:
((value) {
// isChecked.value = value!;
isChecked
.value =
value!;
if (isChecked
.value) {
// Set end date to today's date
dateController2
.text = DateFormat(
'yyyy-MM-dd')
.format(DateTime
.now());
} else {
// Clear end date when checkbox is unchecked
dateController2
.clear();
}
}),
),
),
);
}),
sizedBoxWidth(8.w),
text10400white("Present")
],
),
],
),
)
],
),
text16400white("Ability"),
sizedBoxHeight(15.h),
// CustomDropDownCheckBoxTimeline(
// header: 'Select ability',
// title: '',
// listData: _abilitydrop,
// onItemSelected: getCatIdFromName,
// initiallySelected: abilitiesIds
// .map((id) => id.toString())
// .toList(),
// ),
CustomDropDownCheckBoxTimeline(
header: 'Select ability',
title: '',
listData: _abilitydrop,
// _abilityMap.map((ability) => ability["name"]).toList(),
onItemSelected: getCatIdFromName,
// (selectedNames) {
// // Convert selected names back to IDs if needed
// List<int> selectedIds = [];
// for (String name in selectedNames) {
// for (Map<String, dynamic> ability
// in _abilityMap) {
// if (ability["name"] == name) {
// selectedIds.add(ability["id"]);
// break;
// }
// }
// }
// // Use selectedIds as needed
// print(selectedIds);
// },
initiallySelected:
seelctedNameList, // Pass initially selected names
),
sizedBoxHeight(80.h),
Padding(
padding: EdgeInsets.symmetric(
horizontal: 20.w),
child: CustomButton(
text: "Add timeline",
onPressed: () {
if (clubNameController.text.isBlank! ||
rollnameController
.text.isBlank! ||
teamnameController
.text.isBlank! ||
dateController
.text.isBlank! ||
dateController2
.text.isBlank! ||
selectedabilityid.isEmpty) {
utils.showToast(
'Please fill all fields');
} else {
print(selectedabilityid
.toString());
EdituploadData();
}
},
),
),
]),
)
])
])
: Stack(children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage(
"assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
ListView(physics: ScrollPhysics(), children: [
Padding(
padding:
EdgeInsets.symmetric(horizontal: 16.w),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
sizedBoxHeight(20.h),
text16400white("Club name"),
sizedBoxHeight(15.h),
CustomTextFormField(
textEditingController:
clubNameController,
texttype: TextInputType.text,
hintText: 'Enter club name',
validator: (value) {
if (value!.isEmpty) {
return 'Enter your full name ';
}
return null;
},
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
FilteringTextInputFormatter.allow(
RegExp('[a-zA-Z ]'))
],
),
sizedBoxHeight(25.h),
text16400white("Role in the club"),
sizedBoxHeight(15.h),
CustomTextFormField(
textEditingController:
rollnameController,
texttype: TextInputType.text,
hintText: 'Enter role in the club',
validator: (value) {
if (value!.isEmpty) {
return 'Enter role in the club';
}
return null;
},
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
FilteringTextInputFormatter.allow(
RegExp('[a-zA-Z ]'))
],
),
sizedBoxHeight(25.h),
text16400white("Team name"),
sizedBoxHeight(15.h),
CustomTextFormField(
textEditingController:
teamnameController,
texttype: TextInputType.text,
hintText: 'Enter team name',
validator: (value) {
if (value!.isEmpty) {
return 'Enter your team name ';
}
return null;
},
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
FilteringTextInputFormatter.allow(
RegExp('[a-zA-ZS0-9 ]')),
],
),
sizedBoxHeight(25.h),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
text16400white("Start date "),
sizedBoxHeight(10.h),
GestureDetector(
onTap: () => datePicker(
context,
dateController),
child: AbsorbPointer(
child:
CustomTextFormField(
textEditingController:
dateController,
leadingIcon: Container(
height: 20.h,
width: 20.w,
child: Center(
child: Image.asset(
"assets/images/png/calender.png",
height: 20.h,
width: 20.w,
),
),
),
),
),
)
],
),
),
sizedBoxWidth(10.h),
Expanded(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
text16400white("End date"),
sizedBoxHeight(10.h),
GestureDetector(
onTap: () => datePicker(
context,
dateController2),
child: AbsorbPointer(
child:
CustomTextFormField(
textEditingController:
dateController2,
leadingIcon: Container(
height: 20.h,
width: 20.w,
child: Center(
child: Image.asset(
"assets/images/png/calender.png",
height: 20.h,
width: 20.w,
),
),
),
),
),
),
sizedBoxHeight(10.h),
Row(
children: [
Obx(() {
return commonGlassContainer(
border: 1,
borderradius: 2,
height: 20.h,
width: 20.w,
opacity1: 0.24,
opacity2: 0.24,
customWidget:
Transform.scale(
scale: 1.2,
child: Checkbox(
side: BorderSide(
color: Color(
0xFF434A53)),
value: isChecked
.value,
activeColor: Colors
.transparent,
checkColor:
Colors.white,
onChanged:
((value) {
// isChecked.value = value!;
isChecked
.value =
value!;
if (isChecked
.value) {
// Set end date to today's date
dateController2
.text = DateFormat(
'yyyy-MM-dd')
.format(DateTime
.now());
} else {
// Clear end date when checkbox is unchecked
dateController2
.clear();
}
}),
),
),
);
}),
sizedBoxWidth(8.w),
text10400white("Present")
],
),
],
),
)
],
),
text16400white("Ability"),
sizedBoxHeight(15.h),
CustomDropDownChexkBox(
header: 'Select ability',
title: '',
listData: _abilitydrop,
onItemSelected: getCatIdFromName,
initiallySelected: [], // or pass initial values if needed
),
sizedBoxHeight(80.h),
Padding(
padding: EdgeInsets.symmetric(
horizontal: 20.w),
child: CustomButton(
text: "Add timeline",
onPressed: () {
if (clubNameController.text.isBlank! ||
rollnameController
.text.isBlank! ||
teamnameController
.text.isBlank! ||
dateController
.text.isBlank! ||
dateController2
.text.isBlank! ||
selectedabilityid.isEmpty) {
utils.showToast(
'Please fill all fields');
} else {
print(selectedabilityid
.toString());
UploadData();
}
},
),
),
]),
)
])
])
// }
)),
);
}
}
class CustomDropDownCheckBoxTimeline extends StatefulWidget {
const CustomDropDownCheckBoxTimeline({
Key? key,
required this.header,
required this.title,
required this.listData,
required this.onItemSelected,
this.leadingImage,
this.showOtherOption = false,
required this.initiallySelected,
}) : super(key: key);
final String header;
final String title;
final List<String> listData;
final Function(List<String>) onItemSelected;
final Widget? leadingImage;
final bool showOtherOption;
final List<String> initiallySelected;
@override
State<CustomDropDownCheckBoxTimeline> createState() =>
_CustomDropDownCheckBoxTimelineState();
}
class _CustomDropDownCheckBoxTimelineState
extends State<CustomDropDownCheckBoxTimeline> {
RxBool onDropTap = false.obs;
RxList<String> selectedValues = <String>[].obs;
final TextEditingController _textController = TextEditingController();
@override
void initState() {
super.initState();
selectedValues
.addAll(widget.initiallySelected); // Initialize selectedValues
}
List<DropdownMenuItem<String>> _buildDropdownMenuItems() {
return widget.listData.asMap().entries.map((entry) {
int index = entry.key;
String item = entry.value;
return DropdownMenuItem<String>(
value: item,
child: InkWell(
onTap: () {
setState(() {
if (selectedValues.contains(item)) {
selectedValues.remove(item);
} else {
selectedValues.add(item);
}
_textController.clear();
widget.onItemSelected(selectedValues.toList());
});
},
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Row(
children: [
Obx(() {
return Checkbox(
value: selectedValues.contains(item),
activeColor: Colors.white,
checkColor: const Color(0xFFD90B2E),
onChanged: (bool? value) {
setState(() {
if (value == true) {
selectedValues.add(item);
} else {
selectedValues.remove(item);
}
_textController.clear();
widget.onItemSelected(selectedValues.toList());
});
},
);
}),
const SizedBox(width: 8),
Expanded(
child: Text(
item,
style: const TextStyle(
color: Colors.white,
fontSize: 16,
fontFamily: 'Helvetica',
fontWeight: FontWeight.w500,
),
maxLines: 1, // Adjust as needed
overflow: TextOverflow.ellipsis,
),
),
],
),
if (index != widget.listData.length - 1)
const Divider(thickness: 1, color: Color(0xFF434A53)),
],
),
),
);
}).toList();
}
@override
Widget build(BuildContext context) {
return Obx(
() => Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
GestureDetector(
onTap: () {
onDropTap.value = !onDropTap.value;
},
child: Container(
width: double.infinity,
// height: 50,
padding:
EdgeInsets.only(right: 22, left: 12, top: 15, bottom: 15),
decoration: BoxDecoration(
color: const Color(0xFFFFFFFF).withOpacity(0.10),
borderRadius: onDropTap.value
? const BorderRadius.vertical(
top: Radius.circular(30),
)
: const BorderRadius.all(Radius.circular(30)),
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
const Color(0xFFffffff).withOpacity(0.50),
const Color(0xFFFFFFFF).withOpacity(0.50),
],
),
border: Border.all(color: const Color(0xFF434A53)),
),
child: Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
widget.leadingImage == null
? SizedBox()
: widget.leadingImage!,
const SizedBox(width: 12),
Expanded(
child: Text(
selectedValues.isEmpty
? widget.header
: selectedValues.join(', '),
style: TextStyle(
color: Colors.white,
fontSize: 16,
fontFamily: 'Helvetica',
fontWeight: FontWeight.w400,
),
// overflow: TextOverflow.ellipsis,
),
),
// const Spacer(),
onDropTap.value
? Image.asset('assets/images/png/arrowup.png')
: Image.asset('assets/images/png/arrowdown.png'),
],
),
),
),
),
if (onDropTap.value)
Scrollbar(
child: Container(
width: double.infinity,
decoration: BoxDecoration(
color: const Color(0xFFFFFFFF).withOpacity(0.10),
borderRadius: const BorderRadius.vertical(
bottom: Radius.circular(30),
),
border: Border.all(color: const Color(0xFF434A53)),
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
const Color(0xFFffffff).withOpacity(0.50),
const Color(0xFFFFFFFF).withOpacity(0.50),
],
),
),
child: Column(
children: _buildDropdownMenuItems(),
),
),
),
],
),
);
}
}

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

@@ -5,9 +5,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
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';
@@ -20,8 +18,7 @@ import 'package:regroup/onboarding/Signup/view_model/getUserprofile.dart';
import 'package:regroup/resources/routes/route_name.dart';
import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart';
import 'package:flutter_facebook_auth/flutter_facebook_auth.dart';
import 'package:regroup/Common/global.dart' as global;
// import 'package:regroup/Common/global.dart' as global;
class LoginScreen extends StatefulWidget {
const LoginScreen({super.key});
@@ -31,7 +28,6 @@ class LoginScreen extends StatefulWidget {
}
class _LoginScreenState extends State<LoginScreen> {
AccessToken? _accessToken;
final TextEditingController _emailController = TextEditingController();
RxBool isObscured = true.obs;
final TextEditingController _passwordController = TextEditingController();
@@ -124,7 +120,6 @@ class _LoginScreenState extends State<LoginScreen> {
final LoginResult result = await FacebookAuth.instance.login();
if (result.status == LoginStatus.success) {
_accessToken = result.accessToken;
final userData = await FacebookAuth.instance.getUserData();
logger.i(userData['email']);
@@ -141,7 +136,6 @@ class _LoginScreenState extends State<LoginScreen> {
_logout() async {
await FacebookAuth.instance.logOut();
_accessToken = null;
setState(() {});
}

27
lib/Login/View/verifygoogleapple.dart
View File

@@ -10,7 +10,7 @@ import 'package:regroup/Login/ViewModel/LoginApi.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CommonDropdown.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/dialogs.dart';
import 'package:regroup/Utils/texts.dart';
@@ -52,7 +52,7 @@ class _VerifygoogleandappleState extends State<Verifygoogleandapple> {
}
}
final Map<String, int> _accountTypeMap = {
final Map<String, int> _accountTypeMap = {
'Individual': 1,
'Business': 2,
};
@@ -68,12 +68,11 @@ class _VerifygoogleandappleState extends State<Verifygoogleandapple> {
SharedPreferences prefs = await SharedPreferences.getInstance();
if (resp.status == ResponseStatus.SUCCESS) {
int accountTypeValue = _accountTypeMap[_selectedAccountType] ?? 0;
int accountTypeValue = _accountTypeMap[_selectedAccountType] ?? 0;
await prefs.setString('accountTypefromLogin',
accountTypeValue.toString());
await prefs.setString('accountTypeValue',
accountTypeValue.toString());
await prefs.setString(
'accountTypefromLogin', accountTypeValue.toString());
await prefs.setString('accountTypeValue', accountTypeValue.toString());
if (_selectedAccountType == 'Individual') {
Get.toNamed(RouteName.tellusindividualscreen);
@@ -102,9 +101,9 @@ class _VerifygoogleandappleState extends State<Verifygoogleandapple> {
backgroundColor: const Color.fromARGB(255, 18, 32, 47),
body: Stack(
children: [
const Positioned(
top: 310, right: -30, child: CommonBlurRightSecond()),
const Positioned(top: 510, left: -30, child: CommonBlurLeftBlue()),
// const Positioned(
// top: 310, right: -30, child: CommonBlurRightSecond()),
// const Positioned(top: 510, left: -30, child: CommonBlurLeftBlue()),
GlassmorphicContainer(
width: MediaQuery.of(context).size.width,
height:
@@ -122,19 +121,13 @@ class _VerifygoogleandappleState extends State<Verifygoogleandapple> {
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),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
],
),
borderGradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),

0
lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart → lib/Main_Screens/CalenderTab/AddEvent/AddEvent.dart
View File

0
lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart → lib/Main_Screens/CalenderTab/AddUsers/AddUsers.dart
View File

0
lib/Feed Module/Main_Screens/CalenderTab/Availabillity.dart → lib/Main_Screens/CalenderTab/Availabillity.dart
View File

0
lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart → lib/Main_Screens/CalenderTab/CalenderTab.dart
View File

0
lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart → lib/Main_Screens/CalenderTab/EventDetails.dart
View File

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

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

0
lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart → lib/Main_Screens/CalenderTab/SetAvailabillity.dart
View File

0
lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart → lib/Main_Screens/Chats/View/chatsmainscreen.dart
View File

0
lib/Feed Module/Main_Screens/Chats/View/groupchat.dart → lib/Main_Screens/Chats/View/groupchat.dart
View File

0
lib/Feed Module/Main_Screens/Chats/View/newchatpage.dart → lib/Main_Screens/Chats/View/newchatpage.dart
View File

0
lib/Feed Module/Main_Screens/Chats/View/newgroup.dart → lib/Main_Screens/Chats/View/newgroup.dart
View File

0
lib/Feed Module/Main_Screens/Chats/View/userchat.dart → lib/Main_Screens/Chats/View/userchat.dart
View File

2
lib/Feed Module/Main_Screens/Community/Community.dart → lib/Main_Screens/Community/Community.dart
View File

@@ -7,7 +7,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonTabBar.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/controller/MainScreen.dart';
import 'package:regroup/Feed%20Module/sidemenu/sidemenu.dart';
import 'package:regroup/sidemenu/sidemenu.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';

3
lib/Feed Module/Main_Screens/Community/CycleScreen.dart → lib/Main_Screens/Community/CycleScreen.dart
View File

@@ -5,9 +5,8 @@ import 'package:get/get.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonTabBar.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Feed%20Module/Main_Screens/Community/Community.dart';
import 'package:regroup/Main_Screens/Community/Community.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';

0
lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart → lib/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart
View File

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

0
lib/Feed Module/Main_Screens/Community/PostScreen.dart → lib/Main_Screens/Community/PostScreen.dart
View File

0
lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart → lib/Main_Screens/ExploreDesign/DetailExplore.dart
View File

0
lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart → lib/Main_Screens/ExploreDesign/ExploreScreen.dart
View File

0
lib/Feed Module/Main_Screens/ExploreDesign/SearchGroup.dart → lib/Main_Screens/ExploreDesign/SearchGroup.dart
View File

0
lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart → lib/Main_Screens/GroupTab/View/ConnectCommunity.dart
View File

0
lib/Feed Module/Main_Screens/GroupTab/View/GoupSettings.dart → lib/Main_Screens/GroupTab/View/GoupSettings.dart
View File

0
lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart → lib/Main_Screens/GroupTab/View/GroupDetail.dart
View File

0
lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart → lib/Main_Screens/GroupTab/View/GroupEvent.dart
View File

0
lib/Feed Module/Main_Screens/GroupTab/View/GroupInfo.dart → lib/Main_Screens/GroupTab/View/GroupInfo.dart
View File

0
lib/Feed Module/Main_Screens/GroupTab/View/GroupManage.dart → lib/Main_Screens/GroupTab/View/GroupManage.dart
View File

2
lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart → lib/Main_Screens/GroupTab/View/GroupTab.dart
View File

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

0
lib/Feed Module/Main_Screens/GroupTab/View/NewPost.dart → lib/Main_Screens/GroupTab/View/NewPost.dart
View File

0
lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart → lib/Main_Screens/GroupTab/View/RequestedGroups.dart
View File

0
lib/Feed Module/Main_Screens/GroupTab/View/Sessions.dart → lib/Main_Screens/GroupTab/View/Sessions.dart
View File

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

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

@@ -6,7 +6,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';
@@ -245,7 +245,8 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
SingleChildScrollView(
child:
@@ -677,8 +678,10 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
itemScale: 0.4,
itemSize: const Size(45, 45),
boxPadding: const EdgeInsets.all(8),
boxAnimationDuration: const Duration(milliseconds: 200),
itemAnimationDuration: const Duration(milliseconds: 500),
boxAnimationDuration:
const Duration(milliseconds: 200),
itemAnimationDuration:
const Duration(milliseconds: 500),
hoverDuration: const Duration(milliseconds: 700),
// toggle: false,

89
lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart → lib/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart
View File

@@ -4,7 +4,7 @@ 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';
@@ -39,57 +39,56 @@ class _SubGroupSettingState extends State<SubGroupSetting> {
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
Container(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), Column(
crossAxisAlignment: CrossAxisAlignment.start,
),
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
sizedBoxHeight(30.h),
GestureDetector(
onTap: () {
inviteBottomSheet();
},
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Row(
children: [
sizedBoxHeight(30.h),
GestureDetector(
onTap: () {
inviteBottomSheet();
},
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Row(
children: [
text18w400_FCFCFC("Group type"),
Spacer(),
Icon(
Icons.arrow_forward_ios_outlined,
color: Colors.white,
size: 18.sp,
)
],
),
),
text18w400_FCFCFC("Group type"),
Spacer(),
Icon(
Icons.arrow_forward_ios_outlined,
color: Colors.white,
size: 18.sp,
)
],
),
sizedBoxHeight(25.h),
commonDivider(),
sizedBoxHeight(25.h),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.groupmanage);
},
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Row(
children: [
text18w400_FCFCFC("Manage members"),
Spacer(),
Icon(
Icons.arrow_forward_ios_outlined,
color: Colors.white,
size: 18.sp,
)
],
),
),
),
),
sizedBoxHeight(25.h),
commonDivider(),
sizedBoxHeight(25.h),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.groupmanage);
},
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Row(
children: [
text18w400_FCFCFC("Manage members"),
Spacer(),
Icon(
Icons.arrow_forward_ios_outlined,
color: Colors.white,
size: 18.sp,
)
],
),
])
),
),
])
]));
}

49
lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart → lib/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart
View File

@@ -4,7 +4,7 @@ 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';
@@ -73,29 +73,30 @@ class _SubGroupsState extends State<SubGroups> {
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(30.h),
Expanded(
child: ListView.builder(
shrinkWrap: true,
physics: BouncingScrollPhysics(),
itemCount: subgroupData.length,
itemBuilder: (context, index) {
return subgroupCard(
ontap: () {
Get.toNamed(RouteName.groupdetail);
},
imagepath: subgroupData[index]['imagePath'],
title: subgroupData[index]['text'],
members: subgroupData[index]['members']);
},
),
)
]))
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(30.h),
Expanded(
child: ListView.builder(
shrinkWrap: true,
physics: BouncingScrollPhysics(),
itemCount: subgroupData.length,
itemBuilder: (context, index) {
return subgroupCard(
ontap: () {
Get.toNamed(RouteName.groupdetail);
},
imagepath: subgroupData[index]['imagePath'],
title: subgroupData[index]['text'],
members: subgroupData[index]['members']);
},
),
)
]))
]));
}

5
lib/Feed Module/Main_Screens/ProfileTab/Badges/Badges.dart → lib/Main_Screens/ProfileTab/Badges/Badges.dart
View File

@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.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';
@@ -54,7 +54,8 @@ class _BadgesState extends State<Badges> {
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Padding(

2
lib/Feed Module/Main_Screens/ProfileTab/Certificate/AddCertificate.dart → lib/Main_Screens/ProfileTab/Certificate/AddCertificate.dart
View File

@@ -7,7 +7,7 @@ import 'package:flutter/widgets.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart' hide MultipartFile, FormData;
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CustomNextButton.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';

4
lib/Feed Module/Main_Screens/ProfileTab/Certificate/Certificate.dart → lib/Main_Screens/ProfileTab/Certificate/Certificate.dart
View File

@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';

10
lib/Feed Module/Main_Screens/ProfileTab/Clubs/Clubs.dart → lib/Main_Screens/ProfileTab/Clubs/Clubs.dart
View File

@@ -3,7 +3,7 @@ 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';
@@ -44,13 +44,14 @@ class _ClubsState extends State<Clubs> {
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
Container(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Padding(
),
SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(children: [
sizedBoxHeight(25.h),
@@ -218,5 +219,4 @@ class _ClubsState extends State<Clubs> {
),
);
}
}

0
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart → lib/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart
View File

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

0
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart → lib/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart
View File

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

@@ -8,8 +8,8 @@ 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/View/picturecontroller/profileimagecontoller.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart';
import 'package:regroup/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart';
import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/ImageUpload.dart';
import 'package:regroup/Utils/Common/sized_box.dart';

62
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart → lib/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart
View File

@@ -9,9 +9,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/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';
import 'package:regroup/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart';
import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart';
import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart';
import 'package:regroup/Utils/Common/CommonDropdown.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
@@ -29,7 +30,7 @@ class EditProfile extends StatefulWidget {
State<EditProfile> createState() => _EditProfileState();
}
//location in normal profile individual api
class _EditProfileState extends State<EditProfile> {
TextEditingController fullNameController = TextEditingController();
@@ -72,7 +73,7 @@ class _EditProfileState extends State<EditProfile> {
RxBool isloading = true.obs;
void getCatIdFromName(List<String> selectedInterests) {
// selectedinterestid.clear();
for (var name in selectedInterests) {
for (var i = 0; i < interestlistobj!.data!.length; i++) {
if (name == interestlistobj!.data![i].name) {
@@ -130,32 +131,30 @@ class _EditProfileState extends State<EditProfile> {
: selectedinterestid;
String abilitiesIds = selectedinterestid.toString();
print("Interests String: $abilitiesIds");
if (editProfileImage.usserprofilePicPath.value.isNotEmpty) {
imageFile = await MultipartFile.fromFile(
editProfileImage.usserprofilePicPath.value,
filename: path.basename(profilePicture),
);
print(imageFile.toString());
}
updata = FormData.fromMap({
// "email_address": "priyanka14@yopmail.com",
"full_name": fullNameController.text,
"profile_image":
editProfileImage.usserprofilePicPath.isNotEmpty ? imageFile : null,
// profilePicture.isNotEmpty
// ? await convertFileToMultiPart1(profilePicture)
// : null,
// "profile_image": "ghjkk.png",
"user_name": userNameController.text,
"date_of_birth": dateController.text,
"gender": _selectedgenderType,
// "interest": "selectedSportsIds",
"interest":
// '[1,2,3,4]',
abilitiesIds,
"about": aboutController.text,
"position": positionController.text,
@@ -166,7 +165,6 @@ class _EditProfileState extends State<EditProfile> {
"address_line1": battingAvgController.text,
});
log(updata.toString());
print(imageFile.toString());
final data = await EditProfileApi().postEditProfileIndividual(updata);
if (data.status == ResponseStatus.SUCCESS) {
@@ -174,7 +172,7 @@ class _EditProfileState extends State<EditProfile> {
Get.toNamed(RouteName.mainscreen, arguments: 4);
} else {
Get.back();
// btnController.reset();
Get.snackbar(
"Error!",
data.data['message'],
@@ -185,7 +183,7 @@ class _EditProfileState extends State<EditProfile> {
snackStyle: SnackStyle.FLOATING,
snackPosition: SnackPosition.BOTTOM,
);
// _controller.isTextFieldEnabled.value = true;
}
}
@@ -224,7 +222,6 @@ class _EditProfileState extends State<EditProfile> {
if (snapshot.connectionState == ConnectionState.done &&
snapshot.hasData) {
print("Data fetched-->");
return Stack(children: [
Container(
decoration: const BoxDecoration(
@@ -252,7 +249,7 @@ class _EditProfileState extends State<EditProfile> {
.value !=
''
? Image(
// File(profilePicture),
image: FileImage(
File(
editProfileImage
@@ -314,16 +311,14 @@ class _EditProfileState extends State<EditProfile> {
context,
true,
(result) {
// var filenameresult =
// extractFileName1(result);
editProfileImage
.usserprofilePicPath
.value = result;
var filenameresult =
extractFileName1(result);
print(
"File name is $filenameresult");
profilePicture = result;
isImageAdded = true;
@@ -488,8 +483,8 @@ class _EditProfileState extends State<EditProfile> {
),
sizedBoxHeight(16.h),
//Obx(() {
//return
CustomDropDownChexkBox(
header: 'Select interest',
title: "",
@@ -500,10 +495,10 @@ class _EditProfileState extends State<EditProfile> {
width: 18.w,
height: 17.h,
),
// showOtherOption: true,
initiallySelected: listofUserInterests,
),
// }),
sizedBoxHeight(20.h),
text16400white("About"),
@@ -514,7 +509,7 @@ class _EditProfileState extends State<EditProfile> {
"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s. Lorem Ipsum has been the industry's standard",
maxlines: 3,
),
// sizedBoxHeight(20.h),
text16400white("Position"),
sizedBoxHeight(16.h),
@@ -556,7 +551,7 @@ class _EditProfileState extends State<EditProfile> {
CustomTextFormField(
textEditingController: weightController,
hintText: "Enter your weight",
inputFormatters: [
inputFormatters: [
FilteringTextInputFormatter.allow(
RegExp(r'[a-zA-Z0-9\s]')),
],
@@ -598,12 +593,11 @@ class _EditProfileState extends State<EditProfile> {
colorText: Colors.white,
);
}
// else if (profilePicture == "") {
// utils.showToast(
// 'Upload edit profile picture!');
// }
else {
print(selectedinterestid.toString());
saveEditProfileInd();
}
},

40
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart → lib/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart
View File

@@ -9,10 +9,10 @@ import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Common/controller/MainScreen.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Global.dart';
import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/dialogs.dart';
@@ -128,8 +128,6 @@ class _ProfileTabState extends State<ProfileTab> {
SharedPreferences prefs = await SharedPreferences.getInstance();
accountTypeValue = prefs.getString('accountTypeValue');
accounTypeLogin = prefs.getString('accountTypefromLogin');
print('account tupe login is $accounTypeLogin');
print('account tupe value is $accountTypeValue');
// foodItemDropdownController.selectedFooddynamic.clear();
// foodItemDropdownController.foodItemQControllerList.clear();
// foodItemDropdownController.OtherFoodIngredientList.clear();
@@ -154,7 +152,7 @@ class _ProfileTabState extends State<ProfileTab> {
int? certificationsremoveid;
RemoveTimelineUploadata() async {
removeTimelineUploadata() async {
utils.loader();
Map<String, dynamic> updata = {
"timeline_id": timelineremoveid,
@@ -162,11 +160,9 @@ class _ProfileTabState extends State<ProfileTab> {
final data = await Profilepostmethod().postRemoveTimeline(updata);
if (data.status == ResponseStatus.SUCCESS) {
Get.back();
print("block done");
return utils.showToast(data.message);
} else {
Get.back();
print("block not done");
return utils.showToast(data.message);
}
}
@@ -179,11 +175,9 @@ class _ProfileTabState extends State<ProfileTab> {
final data = await Profilepostmethod().postRemoveCertification(updata);
if (data.status == ResponseStatus.SUCCESS) {
Get.back();
print("block done");
return utils.showToast(data.message);
} else {
Get.back();
print("block not done");
return utils.showToast(data.message);
}
}
@@ -219,7 +213,6 @@ class _ProfileTabState extends State<ProfileTab> {
if (snapshot.connectionState == ConnectionState.done &&
snapshot.hasData) {
print("Data fetched-->");
return Stack(clipBehavior: Clip.none, children: [
Container(
decoration: const BoxDecoration(
@@ -235,7 +228,7 @@ class _ProfileTabState extends State<ProfileTab> {
children: [
Stack(
children: [
Container(
SizedBox(
height: 484.h,
width: double.infinity,
child: getEditProfileIndi!
@@ -367,7 +360,7 @@ class _ProfileTabState extends State<ProfileTab> {
getEditProfileIndi!.data!.about == null ||
getEditProfileIndi!
.data!.about!.isEmpty
? SizedBox()
? const SizedBox()
: text14400white(
getEditProfileIndi!.data!.about!),
sizedBoxHeight(25.h),
@@ -392,7 +385,7 @@ class _ProfileTabState extends State<ProfileTab> {
null ||
getEditProfileIndi!
.data!.location!.isEmpty
? SizedBox()
? const SizedBox()
: text14400whiteblur(
getEditProfileIndi!
.data!.location!),
@@ -590,7 +583,7 @@ class _ProfileTabState extends State<ProfileTab> {
timelineremoveid = getEditProfileIndi!.data!.timelines![index].id ?? 0;
getEditProfileIndi!.data!.timelines!.removeWhere((item) => item.id! == timelineremoveid);
// .removeAt(index);
RemoveTimelineUploadata();
removeTimelineUploadata();
});
},
child: SizedBox(
@@ -1105,7 +1098,6 @@ class _ProfileTabState extends State<ProfileTab> {
if (snapshot.connectionState == ConnectionState.done &&
snapshot.hasData) {
print("Data fetched-->");
return Stack(clipBehavior: Clip.none, children: [
Container(
decoration: const BoxDecoration(
@@ -1121,7 +1113,7 @@ class _ProfileTabState extends State<ProfileTab> {
children: [
Stack(
children: [
Container(
SizedBox(
height: 484.h,
width: double.infinity,
child: getEditProfileBus!.data!
@@ -1221,8 +1213,8 @@ class _ProfileTabState extends State<ProfileTab> {
color: Colors.white,
width: 1.0,
),
boxShadow: [
const BoxShadow(
boxShadow: const [
BoxShadow(
color:
Color(0x66000000),
offset: Offset(0, 4),
@@ -1320,7 +1312,7 @@ class _ProfileTabState extends State<ProfileTab> {
sizedBoxHeight(10.h),
getEditProfileBus!.data!.bio == null ||
getEditProfileBus!.data!.bio!.isEmpty
? SizedBox()
? const SizedBox()
: text14400white(
getEditProfileBus!.data!.bio!),
sizedBoxHeight(25.h),
@@ -1346,7 +1338,7 @@ class _ProfileTabState extends State<ProfileTab> {
null ||
getEditProfileBus!.data!
.businessOwnerName!.isEmpty
? SizedBox()
? const SizedBox()
: text14400whiteblur(
getEditProfileBus!
.data!.businessOwnerName!),
@@ -1374,7 +1366,7 @@ class _ProfileTabState extends State<ProfileTab> {
null ||
getEditProfileBus!
.data!.websiteLink!.isEmpty
? SizedBox()
? const SizedBox()
: text14400whiteblur(
getEditProfileBus!
.data!.websiteLink!),
@@ -1403,7 +1395,7 @@ class _ProfileTabState extends State<ProfileTab> {
null ||
getEditProfileBus!.data!
.businessLocation!.isEmpty
? SizedBox()
? const SizedBox()
: text14400whiteblur(
getEditProfileBus!
.data!.businessLocation!),
@@ -1434,7 +1426,7 @@ class _ProfileTabState extends State<ProfileTab> {
null ||
getEditProfileBus!
.data!.foundedon!.isEmpty
? SizedBox()
? const SizedBox()
: text14400whiteblur(
getEditProfileBus!
.data!.foundedon!),
@@ -1520,7 +1512,7 @@ class _ProfileTabState extends State<ProfileTab> {
}) {
return Row(
children: [
Container(
SizedBox(
width: 10,
height: 170.h,
child: Stack(

0
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart → lib/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart → lib/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart
View File

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

@@ -3,8 +3,8 @@
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/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart';
import 'package:regroup/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart';
import 'package:shared_preferences/shared_preferences.dart';
GetEditProfileIndi? getEditProfileIndi;

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

@@ -1,7 +1,7 @@
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/InterestModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart';
InterestModel? interestlistobj;
List<String> listofInterests = [];

14
lib/Feed Module/Main_Screens/ProfileTab/Followers/Followers.dart → lib/Main_Screens/ProfileTab/Followers/Followers.dart
View File

@@ -5,11 +5,12 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowers.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followersModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowers.dart';
import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/followersModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
@@ -18,6 +19,8 @@ import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart';
import '../view_model/profilePostmethod.dart';
class Followers extends StatefulWidget {
const Followers({super.key});
@@ -37,7 +40,6 @@ class _FollowersState extends State<Followers> {
@override
void initState() {
// TODO: implement initState
var updata = "";
if (fromMainBusProfile == 'MainBusProfile') {
Profilegetmethod()

12
lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart → lib/Main_Screens/ProfileTab/Following/Following.dart
View File

@@ -5,12 +5,12 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowers.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowing.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followingModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowing.dart';
import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/followingModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/sized_box.dart';

0
lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowers.dart → lib/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowers.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowing.dart → lib/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowing.dart
View File

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

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

130
lib/Feed Module/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart → lib/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart
View File

@@ -5,9 +5,10 @@ import 'package:get/get.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Utils/Common/ShimmerCommon.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/dialogs.dart';
@@ -56,7 +57,6 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
// return utils.showToast(data.message);
} else {
Get.back();
print("unfollow not done");
return utils.showToast(data.message);
}
}
@@ -71,11 +71,9 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
Get.back();
// Get.back();
Get.toNamed(RouteName.mainscreen, arguments: 4);
print("block done");
return utils.showToast(data.message);
} else {
Get.back();
print("block not done");
return utils.showToast(data.message);
}
}
@@ -84,17 +82,17 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
// accountTypeValue == '1' ||
body: FutureBuilder(
future: guestBusfuture,
builder: (ctx, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
return
// ShimmerCommon();
return
// ShimmerCommon();
Center(
const Center(
child: CircularProgressIndicator(
color: Colors.blue,
),
@@ -112,7 +110,6 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
if (snapshot.connectionState == ConnectionState.done &&
snapshot.hasData) {
print("Data fetched-->");
return Stack(clipBehavior: Clip.none, children: [
Container(
decoration: const BoxDecoration(
@@ -143,10 +140,10 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
).image,
fit: BoxFit.cover,
),
shape: LinearBorder(),
shape: const LinearBorder(),
),
)
: Container(
: SizedBox(
height: 484.h,
width: double.infinity,
child: Image.asset(
@@ -156,7 +153,7 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
),
Positioned.fill(
child: Container(
decoration: BoxDecoration(
decoration: const BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
@@ -232,7 +229,7 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
width: 1.0,
),
boxShadow: [
BoxShadow(
const BoxShadow(
color: Color(0x66000000),
offset: Offset(0, 4),
blurRadius: 4.0,
@@ -297,7 +294,6 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
followunfollowid =
guestGetProfileBus!.data!.id;
FollowUnfollowUploadata();
print(followunfollowid);
},
child: guestGetProfileBus!.data!
.isIamFollowingToGuestUser ==
@@ -306,7 +302,7 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
height: 40.h,
width: 170.w,
decoration: BoxDecoration(
color: Color(0xFFD90B2E),
color: const Color(0xFFD90B2E),
borderRadius:
BorderRadius.circular(30.r),
),
@@ -318,7 +314,7 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
height: 40.h,
width: 170.w,
decoration: BoxDecoration(
color: Color(0xFFD90B2E),
color: const Color(0xFFD90B2E),
borderRadius:
BorderRadius.circular(30.r),
),
@@ -351,14 +347,11 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
sizedBoxHeight(30.h),
text18w700white("About"),
sizedBoxHeight(10.h),
guestGetProfileBus!.data!.bio == null ||
guestGetProfileBus!.data!.bio!.isEmpty
?
SizedBox()
:
text14400white(
guestGetProfileBus!.data!.bio! ),
guestGetProfileBus!.data!.bio == null ||
guestGetProfileBus!.data!.bio!.isEmpty
? const SizedBox()
: text14400white(
guestGetProfileBus!.data!.bio!),
sizedBoxHeight(25.h),
Row(
children: [
@@ -377,14 +370,13 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
)),
),
sizedBoxWidth(12.w),
guestGetProfileBus!
.data!.businessOwnerName == null ||
guestGetProfileBus!
.data!.businessOwnerName!.isEmpty
?
SizedBox()
:
text14400whiteblur(guestGetProfileBus!
.data!.businessOwnerName ==
null ||
guestGetProfileBus!.data!
.businessOwnerName!.isEmpty
? const SizedBox()
: text14400whiteblur(guestGetProfileBus!
.data!.businessOwnerName!),
],
),
@@ -406,13 +398,13 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
)),
),
sizedBoxWidth(12.w),
guestGetProfileBus!.data!.websiteLink == null ||
guestGetProfileBus!.data!.websiteLink!.isEmpty
?
SizedBox()
:
text14400whiteblur(
guestGetProfileBus!.data!.websiteLink!),
guestGetProfileBus!.data!.websiteLink ==
null ||
guestGetProfileBus!
.data!.websiteLink!.isEmpty
? const SizedBox()
: text14400whiteblur(guestGetProfileBus!
.data!.websiteLink!),
],
),
sizedBoxHeight(20.h),
@@ -434,13 +426,12 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
),
sizedBoxWidth(12.w),
guestGetProfileBus!
.data!.businessLocation == null ||
guestGetProfileBus!
.data!.businessLocation!.isEmpty
?
SizedBox()
:
text14400whiteblur(guestGetProfileBus!
.data!.businessLocation ==
null ||
guestGetProfileBus!
.data!.businessLocation!.isEmpty
? const SizedBox()
: text14400whiteblur(guestGetProfileBus!
.data!.businessLocation!),
],
),
@@ -470,10 +461,9 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
null
? text14400whiteblur(
' Founded at : ${guestGetProfileBus!.data!.businessType!.createdAt}')
:
SizedBox(),
// text14400whiteblur(
// "Founded at : 2010")
: const SizedBox(),
// text14400whiteblur(
// "Founded at : 2010")
],
),
sizedBoxHeight(30.h),
@@ -529,7 +519,7 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
),
)),
),
Spacer(),
const Spacer(),
commonContainer(
width: 40.w,
height: 40.h,
@@ -704,7 +694,7 @@ Widget normalcardtile({
sizedBoxWidth(7.w),
Icon(
Icons.circle,
color: Color(0xFFFCFCFC),
color: const Color(0xFFFCFCFC),
size: 4.sp,
),
sizedBoxWidth(6.w),
@@ -713,12 +703,12 @@ Widget normalcardtile({
)
],
),
Spacer(),
const Spacer(),
PopupMenuButton(
surfaceTintColor: Color(0xFF222935),
surfaceTintColor: const Color(0xFF222935),
constraints: BoxConstraints.tightFor(width: 176.w),
offset: Offset(0, 50),
color: Color(0xFF222935),
offset: const Offset(0, 50),
color: const Color(0xFF222935),
tooltip: "",
itemBuilder: (BuildContext context) => <PopupMenuEntry>[
PopupMenuItem(
@@ -736,7 +726,7 @@ Widget normalcardtile({
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/Vector (5).png",
height: 15.h,
@@ -746,7 +736,7 @@ Widget normalcardtile({
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -762,7 +752,7 @@ Widget normalcardtile({
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/share.png",
height: 20.h,
@@ -772,7 +762,7 @@ Widget normalcardtile({
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -788,7 +778,7 @@ Widget normalcardtile({
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/f7_pin-fill (2).png",
height: 25.h,
@@ -814,7 +804,7 @@ Widget normalcardtile({
onTap: () {
Get.toNamed(RouteName.postdetailsScreen);
},
child: Container(
child: SizedBox(
height: 163.h,
width: double.infinity,
child: Image.asset(
@@ -853,7 +843,7 @@ Widget normalcardtile({
'assets/images/png/heart 2.png',
'assets/images/png/party-popper 2.png'
]),
Spacer(),
const Spacer(),
commonContainer(
width: 30.w,
height: 30.h,
@@ -936,11 +926,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),
@@ -1013,7 +1003,7 @@ Widget containertile({required String text}) {
width: 100.w,
height: 30.h,
borderRadius: BorderRadius.circular(30.r),
borderColor: Color(0xFFD90B2E),
borderColor: const Color(0xFFD90B2E),
borderwidth: 0.9,
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 10.w),

31
lib/Feed Module/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart → lib/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart
View File

@@ -7,9 +7,8 @@ import 'package:get/get.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/dialogs.dart';
import 'package:regroup/Utils/texts.dart';
@@ -217,7 +216,7 @@ class _ProfileTabIndGuestState extends State<ProfileTabIndGuest> {
).image,
fit: BoxFit.cover,
),
shape: LinearBorder(),
shape: const LinearBorder(),
),
)
: Container(
@@ -450,7 +449,7 @@ class _ProfileTabIndGuestState extends State<ProfileTabIndGuest> {
sizedBoxHeight(10.h),
guestGetProfileInd!.data!.about == null ||
guestGetProfileInd!.data!.about!.isEmpty
? SizedBox()
? const SizedBox()
: text14400white(
guestGetProfileInd!.data!.about!),
sizedBoxHeight(25.h),
@@ -471,9 +470,11 @@ class _ProfileTabIndGuestState extends State<ProfileTabIndGuest> {
)),
),
sizedBoxWidth(12.w),
guestGetProfileInd!.data!.location == null ||
guestGetProfileInd!.data!.location!.isEmpty
? SizedBox()
guestGetProfileInd!.data!.location ==
null ||
guestGetProfileInd!
.data!.location!.isEmpty
? const SizedBox()
: text14400whiteblur(guestGetProfileInd!
.data!.location!),
],
@@ -650,7 +651,7 @@ class _ProfileTabIndGuestState extends State<ProfileTabIndGuest> {
child: Container(
height: 11.h,
width: 11.w,
decoration: BoxDecoration(
decoration: const BoxDecoration(
color: Colors
.white,
shape: BoxShape
@@ -662,7 +663,7 @@ class _ProfileTabIndGuestState extends State<ProfileTabIndGuest> {
width: 1.w,
height: 170.h,
decoration:
BoxDecoration(
const BoxDecoration(
color: Colors
.white),
),
@@ -705,7 +706,7 @@ class _ProfileTabIndGuestState extends State<ProfileTabIndGuest> {
children: [
guestGetProfileInd?.data?.profilePhoto == null ||
guestGetProfileInd!.data!.profilePhoto!.isEmpty
? CircleAvatar(radius: 10.r, backgroundImage: AssetImage('assets/images/png/cimg1.png'))
? CircleAvatar(radius: 10.r, backgroundImage: const AssetImage('assets/images/png/cimg1.png'))
: CircleAvatar(radius: 10.r, backgroundImage: NetworkImage(guestGetProfileInd!.data!.profilePhoto!)),
sizedBoxWidth(
8.w),
@@ -886,7 +887,7 @@ class _ProfileTabIndGuestState extends State<ProfileTabIndGuest> {
scrollDirection: Axis.horizontal,
// padding:
// EdgeInsets.only(left: 16.w),
physics: ScrollPhysics(),
physics: const ScrollPhysics(),
itemCount: guestGetProfileInd!
.data!.certifications!.length,
itemBuilder: (context, index) {
@@ -996,7 +997,7 @@ class _ProfileTabIndGuestState extends State<ProfileTabIndGuest> {
fontSize:
9.sp,
fontWeight: FontWeight.w400,
color: Color(0xffFFFFFF).withOpacity(0.70),
color: const Color(0xffFFFFFF).withOpacity(0.70),
fontFamily: 'Helvetica'),
)
: Text(
@@ -1005,7 +1006,7 @@ class _ProfileTabIndGuestState extends State<ProfileTabIndGuest> {
fontSize:
9.sp,
fontWeight: FontWeight.w400,
color: Color(0xffFFFFFF).withOpacity(0.70),
color: const Color(0xffFFFFFF).withOpacity(0.70),
fontFamily: 'Helvetica'),
)
],
@@ -1699,7 +1700,7 @@ class _ProfileTabIndGuestState extends State<ProfileTabIndGuest> {
).image,
fit: BoxFit.cover,
),
shape: LinearBorder(),
shape: const LinearBorder(),
),
)
: Container(

9
lib/Feed Module/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart → lib/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart
View File

@@ -4,11 +4,10 @@ import 'dart:developer';
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/Guest%20User/Model/GetGuestFollowers.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowing.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GuestGetProfileDataBus.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GuestGetProfileDataIndi.dart';
import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowers.dart';
import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowing.dart';
import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GuestGetProfileDataBus.dart';
import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GuestGetProfileDataIndi.dart';
GuestGetProfileDataIndi? guestGetProfileInd;
GuestGetProfileDataBus? guestGetProfileBus;

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

0
lib/Feed Module/Main_Screens/ProfileTab/Model/certificateModel.dart → lib/Main_Screens/ProfileTab/Model/certificateModel.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Model/editTimelineModel.dart → lib/Main_Screens/ProfileTab/Model/editTimelineModel.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Model/faqModel.dart → lib/Main_Screens/ProfileTab/Model/faqModel.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Model/followersModel.dart → lib/Main_Screens/ProfileTab/Model/followersModel.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Model/followingModel.dart → lib/Main_Screens/ProfileTab/Model/followingModel.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart → lib/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Model/termsconditionsModel.dart → lib/Main_Screens/ProfileTab/Model/termsconditionsModel.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart → lib/Main_Screens/ProfileTab/Model/timelineabilityModel.dart
View File

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

@@ -8,10 +8,10 @@ import 'package:get/get.dart';
import 'package:regroup/Common/CommonTabBar.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followersModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followingModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/followersModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/followingModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
@@ -117,11 +117,9 @@ class _FollowersTabState extends State<FollowersTab> {
final data = await Profilepostmethod().postRemoveuser(updata);
if (data.status == ResponseStatus.SUCCESS) {
Get.back();
print("block done");
return utils.showToast(data.message);
} else {
Get.back();
print("block not done");
return utils.showToast(data.message);
}
}
@@ -134,11 +132,9 @@ class _FollowersTabState extends State<FollowersTab> {
final data = await Profilepostmethod().postBlockuser(updata);
if (data.status == ResponseStatus.SUCCESS) {
Get.back();
print("block done");
return utils.showToast(data.message);
} else {
Get.back();
print("block not done");
return utils.showToast(data.message);
}
}
@@ -521,7 +517,6 @@ class _FollowingTabState extends State<FollowingTab> {
final data = await Profilepostmethod().postunfollowuser(updata);
if (data.status == ResponseStatus.SUCCESS) {
Get.back();
print("unfollow done");
// setState(() {
// // Assuming followingobj is a list of items, remove the item with matching user ID
// followingobj!.data!.removeWhere((item) => item.following!.id == userid);
@@ -529,7 +524,6 @@ class _FollowingTabState extends State<FollowingTab> {
return utils.showToast(data.message);
} else {
Get.back();
print("unfollow not done");
return utils.showToast(data.message);
}
}

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

@@ -1,7 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
@@ -23,15 +24,14 @@ class _AccountSessionState extends State<AccountSession> {
@override
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
resizeToAvoidBottomInset: false,
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: const CommonAppbar(
titleTxt: "Account sessions",
),
body:
FutureBuilder(
// key: _scaffoldKey1,
resizeToAvoidBottomInset: false,
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: const CommonAppbar(
titleTxt: "Account sessions",
),
body: FutureBuilder(
future: Profilegetmethod().getAccountSessions(),
builder: (ctx, snapshot) {
if (snapshot.data == null) {
@@ -62,12 +62,10 @@ class _AccountSessionState extends State<AccountSession> {
: _buildBody(context);
},
),
);
);
}
Widget _buildNoDataBody(context) {
Widget _buildNoDataBody(context) {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
@@ -86,47 +84,45 @@ class _AccountSessionState extends State<AccountSession> {
}
Widget _buildBody(context) {
return
Stack(children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child:
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
sizedBoxHeight(25.h),
text18w400white("Last login sessions"),
sizedBoxHeight(16.h),
ListView.builder(
shrinkWrap: true,
physics: const ScrollPhysics(),
itemCount: accountsessionobj!.data!.length,
itemBuilder: (context, index) {
final city = accountsessionobj!.data![index].city;
final state = accountsessionobj!.data![index].state;
final country = accountsessionobj!.data![index].country;
return Stack(children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
sizedBoxHeight(25.h),
text18w400white("Last login sessions"),
sizedBoxHeight(16.h),
ListView.builder(
shrinkWrap: true,
physics: const ScrollPhysics(),
itemCount: accountsessionobj!.data!.length,
itemBuilder: (context, index) {
final city = accountsessionobj!.data![index].city;
final state = accountsessionobj!.data![index].state;
final country = accountsessionobj!.data![index].country;
// Combine city, state, and country
final locationTitle = '$city, $state, $country';
return sessionCard(
title: locationTitle,
devicename: accountsessionobj!.data![index].deviceName!,
ipaddress: accountsessionobj!.data![index].ipAddress!
);
},
)
]),
// Combine city, state, and country
final locationTitle = '$city, $state, $country';
return sessionCard(
title: locationTitle,
devicename: accountsessionobj!.data![index].deviceName!,
ipaddress: accountsessionobj!.data![index].ipAddress!);
},
)
]);
}
]),
)
]);
}
Widget sessionCard({required String title, required String devicename, required String ipaddress}) {
Widget sessionCard(
{required String title,
required String devicename,
required String ipaddress}) {
return Padding(
padding: const EdgeInsets.symmetric(vertical: 15),
child: commonGlassContainer(

101
lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSetting.dart → lib/Main_Screens/ProfileTab/Settings/AccountSetting.dart
View File

@@ -4,10 +4,10 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.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/dialogs.dart';
import 'package:regroup/Utils/texts.dart';
@@ -24,7 +24,7 @@ class AccountSettings extends StatefulWidget {
class _AccountSettingsState extends State<AccountSettings> {
// bool swichvalue = false;
String? accountTypeValue;
String? accountTypeValue;
String? accounTypeLogin;
@override
@@ -44,15 +44,14 @@ class _AccountSettingsState extends State<AccountSettings> {
});
}
Future<void> UploadData() async {
Future<void> UploadData() async {
print("upload data called");
SharedPreferences prefs = await SharedPreferences.getInstance();
int? accountype ;
int? accountype;
if (accountvisibility == false) {
accountype = 0;
}
else if (accountvisibility == true) {
} else if (accountvisibility == true) {
accountype = 1;
}
Map<String, dynamic> updata = {
@@ -64,24 +63,20 @@ class _AccountSettingsState extends State<AccountSettings> {
if (data.status == ResponseStatus.SUCCESS) {
String? accountype;
accountype = prefs.getString('accountTypefromLogin');
if (accountype == "1") {
EditProfileApi()
.getEditProfileIndividual();
}
else if (accountype == "2") {
EditProfileApi()
.getEditProfileBusiness();
}
accountype = prefs.getString('accountTypefromLogin');
if (accountype == "1") {
EditProfileApi().getEditProfileIndividual();
} else if (accountype == "2") {
EditProfileApi().getEditProfileBusiness();
}
return utils.showToast(data.message);
} else {
return utils.showToast(data.message);
}
}
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -112,42 +107,40 @@ else if (accountype == "2") {
),
sizedBoxHeight(20.h),
accounTypeLogin == '1'
?
? Column(
children: [
Padding(
padding: EdgeInsets.symmetric(
horizontal: 16.w, vertical: 20.h),
child: Row(children: [
Image.asset(
"assets/images/png/eyeIcon.png",
height: 21.h,
width: 21.w,
),
sizedBoxWidth(12.w),
text16w400_FCFCFC("Account visibility"),
Spacer(),
Transform.scale(
scale: 0.9,
child: CupertinoSwitch(
value: accountvisibility,
trackColor: Colors.white.withOpacity(0.4),
activeColor: Color(0xFF34C759),
onChanged: (bool value) {
setState(() {
accountvisibility = value;
UploadData();
Column(
children: [
Padding(
padding:
EdgeInsets.symmetric(horizontal: 16.w, vertical: 20.h),
child: Row(children: [
Image.asset(
"assets/images/png/eyeIcon.png",
height: 21.h,
width: 21.w,
),
sizedBoxWidth(12.w),
text16w400_FCFCFC("Account visibility"),
Spacer(),
Transform.scale(
scale: 0.9,
child: CupertinoSwitch(
value: accountvisibility,
trackColor: Colors.white.withOpacity(0.4),
activeColor: Color(0xFF34C759),
onChanged: (bool value) {
setState(() {
accountvisibility = value;
UploadData();
// swichvalue = value ?? false;
});
}))
]),
),
commonDivider(),
],
)
: SizedBox(),
// swichvalue = value ?? false;
});
}))
]),
),
commonDivider(),
],
)
: SizedBox(),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.changepassword);

21
lib/Feed Module/Main_Screens/ProfileTab/Settings/ChangePassword.dart → lib/Main_Screens/ProfileTab/Settings/ChangePassword.dart
View File

@@ -4,10 +4,10 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Common/CommonButton.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.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/dialogs.dart';
import 'package:regroup/Utils/texts.dart';
@@ -38,13 +38,11 @@ class _ChangePasswordState extends State<ChangePassword> {
Get.back();
print("Change pass up done");
Get.toNamed(RouteName.verifycode,
arguments: {
"currentpass" : currentpasscontroller.text,
"newpass" : newpasscontroller.text,
"confirmpass" : repeatpasscontroller.text
}
);
Get.toNamed(RouteName.verifycode, arguments: {
"currentpass": currentpasscontroller.text,
"newpass": newpasscontroller.text,
"confirmpass": repeatpasscontroller.text
});
return utils.showToast(data.message);
} else {
Get.back();
@@ -60,9 +58,9 @@ class _ChangePasswordState extends State<ChangePassword> {
child: Scaffold(
resizeToAvoidBottomInset: false,
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Change password",
),
body: Stack(children: [
@@ -172,7 +170,6 @@ class _ChangePasswordState extends State<ChangePassword> {
utils.showToast('Please fill all fields');
} else {
Uploadata();
}
},
)

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

@@ -3,7 +3,7 @@ import 'package:flutter/services.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/view_model/profilePostmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CommonDropdown.dart';
import 'package:regroup/Utils/Common/CustomNextButton.dart';

8
lib/Feed Module/Main_Screens/ProfileTab/Settings/DeleteAccount.dart → lib/Main_Screens/ProfileTab/Settings/DeleteAccount.dart
View File

@@ -5,10 +5,10 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Common/CommonButton.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.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/dialogs.dart';
import 'package:regroup/Utils/texts.dart';
@@ -64,9 +64,9 @@ class _DeleteAccountState extends State<DeleteAccount> {
child: Scaffold(
// key: _scaffoldKey1,
// resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "",
),
body: Stack(children: [

13
lib/Feed Module/Main_Screens/ProfileTab/Settings/FaqScreen.dart → lib/Main_Screens/ProfileTab/Settings/FaqScreen.dart
View File

@@ -2,9 +2,10 @@ 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/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.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';
@@ -64,10 +65,10 @@ class _FaqScreenState extends State<FaqScreen> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
resizeToAvoidBottomInset: false,
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "FAQ’s",
),
body: FutureBuilder(
@@ -96,8 +97,8 @@ class _FaqScreenState extends State<FaqScreen> {
);
}
}
isExpandedList =
RxList.generate(faqobj!.data!.length, (index) => index == 0);
isExpandedList =
RxList.generate(faqobj!.data!.length, (index) => index == 0);
return faqobj!.data!.isEmpty
? _buildNoDataBody(context)
: _buildBody(context);

5
lib/Feed Module/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart → lib/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart
View File

@@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.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';
@@ -80,8 +80,7 @@ class _HelpAndSupportState extends State<HelpAndSupport> {
),
),
accounTypeLogin == '1'
? Column(
children: [
? Column(children: [
commonDivider(),
GestureDetector(
onTap: () {

0
lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart → lib/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart
View File

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

5
lib/Feed Module/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart → lib/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart
View File

@@ -2,9 +2,10 @@ import 'package:flutter/material.dart';
import 'package:flutter_html/flutter_html.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.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';

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

@@ -7,12 +7,12 @@ import 'package:get/get.dart';
import 'package:regroup/Common/CommonButton.dart';
import 'package:regroup/Common/CommonDropDown.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CommonDropdown.dart';
import 'package:regroup/Utils/Common/CustomNextButton.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/dialogs.dart';
import 'package:regroup/Utils/texts.dart';
@@ -69,9 +69,9 @@ class _ReportABugState extends State<ReportABug> {
child: Scaffold(
// key: _scaffoldKey1,
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Report a bug",
),
body: Stack(children: [
@@ -82,7 +82,7 @@ class _ReportABugState extends State<ReportABug> {
fit: BoxFit.fill)),
),
SingleChildScrollView(
physics: ScrollPhysics(),
physics: const ScrollPhysics(),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Form(
@@ -104,7 +104,7 @@ class _ReportABugState extends State<ReportABug> {
),
sizedBoxHeight(15.h),
CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 25.h,
width: 15.w,
child: Center(
@@ -145,7 +145,7 @@ class _ReportABugState extends State<ReportABug> {
),
sizedBoxHeight(15.h),
CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 23.h,
width: 23.w,
child: Center(
@@ -174,7 +174,7 @@ class _ReportABugState extends State<ReportABug> {
text16400white("Email address"),
sizedBoxHeight(15.h),
CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 17.h,
width: 24.w,
child: Center(

19
lib/Feed Module/Main_Screens/ProfileTab/Settings/Settings.dart → lib/Main_Screens/ProfileTab/Settings/Settings.dart
View File

@@ -2,13 +2,12 @@ import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:glassmorphism/glassmorphism.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.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/dialogs.dart';
import 'package:regroup/Utils/texts.dart';
@@ -75,10 +74,10 @@ class _SettingsState extends State<Settings> {
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: "Settings",
),
body: Stack(children: [
@@ -124,7 +123,7 @@ class _SettingsState extends State<Settings> {
commonDivider(),
],
)
: SizedBox(),
: const SizedBox(),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.helpandsupport);
@@ -157,7 +156,7 @@ class _SettingsState extends State<Settings> {
),
commonDivider(),
accounTypeLogin == '1'
? SizedBox()
? const SizedBox()
: Column(
children: [
GestureDetector(
@@ -199,8 +198,8 @@ class _SettingsState extends State<Settings> {
),
sizedBoxWidth(12.w),
text16w400_FCFCFC(text),
Spacer(),
Icon(
const Spacer(),
const Icon(
Icons.arrow_forward_ios,
color: Colors.white,
size: 20,
@@ -253,7 +252,7 @@ class _SettingsState extends State<Settings> {
height: 40.h,
width: 130.w,
decoration: BoxDecoration(
color: Color(0xFFD90B2E),
color: const Color(0xFFD90B2E),
borderRadius: BorderRadius.circular(30.r),
),
child: Center(child: text14400white("Keep using App")),

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

@@ -2,7 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_html/flutter_html.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
@@ -18,7 +19,7 @@ class _TermsConditionState extends State<TermsCondition> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: const CommonAppbar(
@@ -28,7 +29,7 @@ class _TermsConditionState extends State<TermsCondition> {
future: Profilegetmethod().getTermsConditions(),
builder: (ctx, snapshot) {
if (snapshot.data == null) {
return Center(child: CircularProgressIndicator());
return const Center(child: CircularProgressIndicator());
}
if (snapshot.connectionState == ConnectionState.done) {
if (snapshot.hasError) {

37
lib/Feed Module/Main_Screens/ProfileTab/Settings/VerifyCode.dart → lib/Main_Screens/ProfileTab/Settings/VerifyCode.dart
View File

@@ -3,14 +3,12 @@ import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:pin_code_fields/pin_code_fields.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Global.dart';
import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CustomNextButton.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/googleOAuthService.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/dialogs.dart';
import 'package:regroup/Utils/texts.dart';
@@ -41,7 +39,6 @@ class _VerifyCodeState extends State<VerifyCode> {
final res = await Profilepostmethod().postChangepassverifyotp(updata);
if (res.status == ResponseStatus.SUCCESS) {
Get.back();
print("verification done");
Get.back();
Get.back();
@@ -49,7 +46,6 @@ class _VerifyCodeState extends State<VerifyCode> {
return utils.showToast(res.message);
} else {
Get.back();
print("change pass not done");
return utils.showToast(res.message);
}
}
@@ -64,7 +60,6 @@ class _VerifyCodeState extends State<VerifyCode> {
final data = await Profilepostmethod().postChangepassword(updata);
if (data.status == ResponseStatus.SUCCESS) {
Get.back();
print("otp done");
setState(() {
pincodeController.clear();
@@ -73,7 +68,6 @@ class _VerifyCodeState extends State<VerifyCode> {
return utils.showToast(data.message);
} else {
Get.back();
print("otp not done");
return utils.showToast(data.message);
}
}
@@ -82,7 +76,7 @@ class _VerifyCodeState extends State<VerifyCode> {
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: const Color(0xFF222935),
appBar: CommonAppbar(titleTxt: ""),
appBar: const CommonAppbar(titleTxt: ""),
resizeToAvoidBottomInset: false,
body: Stack(
children: [
@@ -124,29 +118,27 @@ class _VerifyCodeState extends State<VerifyCode> {
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: pincodeController,
onCompleted: (v) {
print("Completed");
},
onChanged: (value) {
print(value);
setState(() {
// currentText = value;
});
@@ -158,7 +150,6 @@ class _VerifyCodeState extends State<VerifyCode> {
fontFamily: 'Helvetica',
),
beforeTextPaste: (text) {
print("Allowing to paste $text");
return true;
},
appContext: context,
@@ -166,9 +157,9 @@ class _VerifyCodeState extends State<VerifyCode> {
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: 6,
@@ -179,7 +170,7 @@ class _VerifyCodeState extends State<VerifyCode> {
});
},
// disabledColor: Colors.white,
color: Color(0XFF222935).withOpacity(0.10),
color: const Color(0XFF222935).withOpacity(0.10),
),
),
// ),

4
lib/Feed Module/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart → lib/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart
View File

@@ -8,8 +8,8 @@ import 'package:get/get.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart';
import 'package:regroup/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart';
import 'package:regroup/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/sized_box.dart';

4
lib/Feed Module/Main_Screens/ProfileTab/Settings/View/Notification.dart → lib/Main_Screens/ProfileTab/Settings/View/Notification.dart
View File

@@ -4,9 +4,9 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart';
import 'package:regroup/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.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/dialogs.dart';
import 'package:regroup/Utils/texts.dart';

2
lib/Feed Module/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart → lib/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart
View File

@@ -3,7 +3,7 @@ import 'dart:async';
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/Settings/Model/FetchBlockUser.dart';
import 'package:regroup/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart';
FetchBlockedUser? fetchblockuserobj;

2
lib/Feed Module/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart → lib/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart
View File

@@ -1,7 +1,7 @@
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/Settings/Model/FetchNotification.dart';
import 'package:regroup/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart';
FetchNotification? fetchNoti;

5
lib/Feed Module/Main_Screens/ProfileTab/Share profile/ShareProfile.dart → lib/Main_Screens/ProfileTab/Share profile/ShareProfile.dart
View File

@@ -6,7 +6,7 @@ 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';
@@ -65,7 +65,8 @@ class _ShareProfileState extends State<ShareProfile> {
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Column(children: [

1002
lib/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart Normal file
View File

File diff suppressed because it is too large Load Diff

2
lib/Feed Module/Main_Screens/ProfileTab/view_model/gettimelineability.dart → lib/Main_Screens/ProfileTab/view_model/gettimelineability.dart
View File

@@ -4,7 +4,7 @@
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/Model/timelineabilityModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/timelineabilityModel.dart';
class TimelineAbilityListApi {
TimelineAbilityListApi();

18
lib/Feed Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart → lib/Main_Screens/ProfileTab/view_model/profileGetmethod.dart
View File

@@ -4,15 +4,15 @@ import 'dart:developer';
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/Model/accountSessionModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/certificateModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/editTimelineModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/faqModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followersModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followingModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/termsconditionsModel.dart';
// import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/accountSessionModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/certificateModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/editTimelineModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/faqModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/followersModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/followingModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/termsconditionsModel.dart';
// import 'package:regroup/Main_Screens/ProfileTab/Model/timelineabilityModel.dart';
FaqModel? faqobj;
PrivacypolicyModel? privacyobj;

43
lib/Feed Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart → lib/Main_Screens/ProfileTab/view_model/profilePostmethod.dart
View File

@@ -17,112 +17,82 @@ class Profilepostmethod {
utf8.encode('RegroupUserName:71%@L%es^bUX94`J9XT*@bh,._WWM{\$%^^&&'));
Future<ResponseData<dynamic>> postContactus(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postcontactus,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postReportandbug(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postreportbug,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postBlockuser(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postblock,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postunfollowuser(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postunfollow,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postRemoveuser(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postremoveuser,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postChangepassword(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postchangepassword,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postChangepassverifyotp(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postchangepassverify,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postTimeline(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.posttimeline,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postAccountvisibility(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postaccountvisibility,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postDeleteaccount(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postdeleteaccount,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
@@ -179,7 +149,6 @@ class Profilepostmethod {
return ResponseData<dynamic>("success", ResponseStatus.SUCCESS,
data: response.data);
} else if (response.statusCode == 203) {
print(response.data);
return ResponseData<dynamic>("success", ResponseStatus.PRIVATE,
data: response.data);
} else {
@@ -194,46 +163,34 @@ class Profilepostmethod {
}
Future<ResponseData<dynamic>> postEditTimeline(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postedittimeline,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postRemoveTimeline(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postremovetimeline,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postRemoveCertification(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postremovecertification,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postCertification(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postcertification,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}

15
lib/Feed Module/Notification/View/notification.dart → lib/Notifications/notification.dart
View File

@@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:glassmorphism/glassmorphism.dart';
import 'package:regroup/Utils/Common/CommonAppbar.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';
@@ -57,12 +57,13 @@ class _NotificationPageState extends State<NotificationPage> {
),
body: Stack(
children: [
// const CommonBlurLeftRed(),
const Positioned(top: 10, left: -30, child: CommonBlurLeftSecond()),
// const CommonBlurRightRed(),
// const CommonBlurLeft(),
const Positioned(top: 150, right: -30, child: CommonBlurRightSecond()),
const Positioned(top: 350, left: -30, child: CommonBlurLeftBlue()),
// // const CommonBlurLeftRed(),
// const Positioned(top: 10, left: -30, child: CommonBlurLeftSecond()),
// // const CommonBlurRightRed(),
// // const CommonBlurLeft(),
// const Positioned(
// top: 150, right: -30, child: CommonBlurRightSecond()),
// const Positioned(top: 350, left: -30, child: CommonBlurLeftBlue()),
GlassmorphicContainer(
width: MediaQuery.of(context).size.width,
height:

58
lib/onboarding/Signup/View/Business/View/step1Letusunderstandbetter.dart
View File

@@ -8,7 +8,7 @@ import 'package:glassmorphism/glassmorphism.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Utils/Common/CustomNextButton.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/dialogs.dart';
import 'package:regroup/Utils/texts.dart';
@@ -98,10 +98,10 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
Get.snackbar(
"Success!",
'success!',
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,
);
@@ -111,10 +111,10 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
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,
);
@@ -124,10 +124,10 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
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,
);
@@ -153,7 +153,7 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
Widget durationPickerDialog() {
int selectedHour = 1;
return AlertDialog(
title: Text('Select Duration'),
title: const Text('Select Duration'),
content: Container(
width: double.minPositive,
child: Container(
@@ -178,7 +178,7 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
),
actions: <Widget>[
TextButton(
child: Text('Cancel'),
child: const Text('Cancel'),
onPressed: () {
Navigator.of(context).pop();
},
@@ -190,7 +190,7 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
@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()),
@@ -274,7 +274,7 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
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),
),
),
@@ -287,7 +287,7 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
width: 15,
height: 15,
decoration: ShapeDecoration(
gradient: LinearGradient(
gradient: const LinearGradient(
begin: Alignment(0.98, -0.21),
end: Alignment(-0.98, 0.21),
colors: [
@@ -311,7 +311,7 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
Center(
child: Container(
width: 154.w,
decoration: ShapeDecoration(
decoration: const ShapeDecoration(
shape: RoundedRectangleBorder(
side: BorderSide(
width: 1,
@@ -566,8 +566,8 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
height: 115,
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.30000001192092896),
@@ -576,7 +576,7 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
],
),
shape: RoundedRectangleBorder(
side: BorderSide(
side: const BorderSide(
width: 0.50, color: Color(0xFF7E7E7E)),
borderRadius: BorderRadius.circular(10),
),
@@ -604,13 +604,13 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
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,
)
@@ -644,8 +644,8 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
height: 115,
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.30000001192092896),
@@ -654,7 +654,7 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
],
),
shape: RoundedRectangleBorder(
side: BorderSide(
side: const BorderSide(
width: 0.50,
color: Color(0xFF7E7E7E)),
borderRadius: BorderRadius.circular(10),
@@ -688,8 +688,8 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
height: 115,
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.30000001192092896),
@@ -698,7 +698,7 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
],
),
shape: RoundedRectangleBorder(
side: BorderSide(
side: const BorderSide(
width: 0.50, color: Color(0xFF7E7E7E)),
borderRadius: BorderRadius.circular(10),
),
@@ -726,13 +726,13 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
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,
)
@@ -766,8 +766,8 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
height: 115,
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.30000001192092896),
@@ -776,7 +776,7 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
],
),
shape: RoundedRectangleBorder(
side: BorderSide(
side: const BorderSide(
width: 0.50,
color: Color(0xFF7E7E7E)),
borderRadius: BorderRadius.circular(10),

312
lib/onboarding/Signup/View/Business/View/step2Selectgroup.dart
View File

@@ -1,312 +0,0 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
import 'package:glassmorphism/glassmorphism.dart';
import 'package:regroup/Utils/Common/CustomNextButton.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';
import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart';
class SelectgroupStep2 extends StatefulWidget {
const SelectgroupStep2({super.key});
@override
State<SelectgroupStep2> createState() => _SelectgroupStep2State();
}
class _SelectgroupStep2State extends State<SelectgroupStep2> {
TextEditingController searchcontroller = TextEditingController();
// StreamController<BlogsModel> blogsController = StreamController();
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: 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()),
SingleChildScrollView(
child: GlassmorphicContainer(
width: MediaQuery.of(context).size.width,
height:
// 500.h,
MediaQuery.of(context).size.height,
borderRadius: 2,
blur: 6,
alignment: Alignment.bottomLeft,
border: 2,
linearGradient: LinearGradient(
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),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
],
),
borderGradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
],
),
child: Padding(
padding:
EdgeInsets.symmetric(horizontal: 16.w, vertical: 50.h),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Align(
alignment: Alignment.topRight,
child: GestureDetector(
onTap: () {
Get.toNamed(RouteName.communitycommitscreen);
},
child: Text(
'Skip',
style: TextStyle(
color: Colors.white,
fontSize: 16.sp,
fontFamily: 'Helvetica',
fontWeight: FontWeight.w400,
decoration: TextDecoration.underline,
decorationColor: Colors.white),
),
),
),
sizedBoxHeight(30.h),
Align(
alignment: Alignment.center,
child: text16400white('Step 2 of 3')),
sizedBoxHeight(20.h),
Container(
width: 358.w,
height: 25.h,
decoration: ShapeDecoration(
shape: RoundedRectangleBorder(
side: BorderSide(
width: 1, color: Color(0xFF434A53)),
borderRadius: BorderRadius.circular(30),
),
),
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: 8.w, vertical: 2.h),
child: Row(
children: [
Container(
width: 148.w,
height: 15.h,
decoration: ShapeDecoration(
gradient: LinearGradient(
begin: Alignment(0.98, -0.21),
end: Alignment(-0.98, 0.21),
colors: [
Color(0xA5D90B2E),
Color(0x42D90B2E)
],
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(30),
),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Container(
width: 15,
height: 15,
decoration: ShapeDecoration(
gradient: LinearGradient(
begin: Alignment(0.98, -0.21),
end: Alignment(-0.98, 0.21),
colors: [
Color(0xFFD90B2E),
Color(0x60D90B2E)
],
),
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(30),
),
),
)
],
))
],
),
),
),
sizedBoxHeight(40.h),
Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
text20400white('Find your group'),
sizedBoxWidth(5.w),
Image.asset('assets/images/png/informationicon.png')
],
)),
sizedBoxHeight(10.w),
Center(
child: Container(
width: 108.w,
decoration: ShapeDecoration(
shape: RoundedRectangleBorder(
side: BorderSide(
width: 1,
strokeAlign: BorderSide.strokeAlignCenter,
color: Color(0xFF858585),
),
),
),
),
),
sizedBoxHeight(30.h),
SearchTextFormField(
textEditingController: searchcontroller,
texttype: TextInputType.text,
hintText: "Search groups",
isInputPassword: false,
suffixIcon:
// const Icon(Icons.mail_outline),
// SvgPicture.asset(
// // width: 23.w,
// // height: 23.h,
// 'assets/images/svg/search.svg',
// ),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Icon(
Icons.search,
size: 35,
color: Colors.white,
),
),
// validatorText: "Enter your full name",
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
],
),
sizedBoxHeight(30.h),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
GroupSelect(
titleString: 'Cambridge university Boat ..',
image: 'assets/images/png/groupindividual.png'),
GroupSelect(
titleString: 'Liverpool FC',
image:
'assets/images/png/groupindividual2.png'),
],
),
sizedBoxHeight(30.h),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
GroupSelect(
titleString: 'Cambridge rugby Club',
image:
'assets/images/png/groupindividual3.png'),
GroupSelect(
titleString: 'Cambridge university Boat ..',
image: 'assets/images/png/groupindividual.png'),
],
),
Spacer(flex: 1),
CustomButton(
text: "Continue",
onPressed: () {
Get.toNamed(RouteName.businessSelectcommunitystep3);
})
],
),
)),
),
],
));
}
}
class GroupSelect extends StatefulWidget {
final String titleString;
final String image;
GroupSelect({
Key? key,
required this.titleString,
required this.image,
}) : super(key: key);
@override
State<GroupSelect> createState() => _GroupSelectState();
}
class _GroupSelectState extends State<GroupSelect> {
bool _text = false;
@override
Widget build(BuildContext context) {
return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
Container(
width: 169,
height: 74,
decoration: ShapeDecoration(
image: DecorationImage(
image: AssetImage(
// "https://via.placeholder.com/169x74"
widget.image),
fit: BoxFit.fill,
),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5)),
),
),
sizedBoxHeight(15.h),
text12400white(widget.titleString),
sizedBoxHeight(15.h),
GestureDetector(
onTap: () {
setState(() {
_text = !_text;
});
},
child: Container(
width: 169,
height: 23,
decoration: ShapeDecoration(
shape: RoundedRectangleBorder(
side: BorderSide(width: 1, color: Color(0xFFFF002B)),
borderRadius: BorderRadius.circular(30),
),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
_text ? text10400white('Regrouping') : text10400white('Join')
],
),
),
),
]);
}
}

Some files were not shown because too many files have changed in this diff Show More