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

Merge pull request #87 from WDI-Ideas/Development

Browse Source 
changes all glassmorphism with glassUi
This commit is contained in:
priyankahadpad
2024-08-01 13:45:15 +05:30
committed by GitHub
parent 1f33ab55bc 26e997447c
commit 67bd9b0a6a
73 changed files with 3380 additions and 1194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/images/png/Connected world-amico 1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 131 KiB

BIN
assets/images/png/Group 1000004385.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 78 KiB

BIN
assets/images/png/Group 1000004420.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
assets/images/png/Organizing projects-pana 1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 118 KiB

BIN
assets/images/png/correct 1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
assets/images/png/x-circle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

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

@@ -0,0 +1,978 @@
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/Main_Screens/ProfileTab/Model/timelineabilityModel.dart' as timelineabilist;
import 'package:regroup/Main_Screens/ProfileTab/view_model/gettimelineability.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/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 commonGlassUI(
borderwidth: 1,
borderRadius: BorderRadius.circular(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 commonGlassUI(
borderwidth: 1,
borderRadius: BorderRadius.circular( 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(),
),
),
),
],
),
);
}
}

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

@@ -101,39 +101,54 @@ class _VerifygoogleandappleState extends State<Verifygoogleandapple> {
backgroundColor: const Color.fromARGB(255, 18, 32, 47),
body: Stack(
children: [
// const Positioned(
// Positioned(
// top: 310, right: -30, child: CommonBlurRightSecond()),
// const Positioned(top: 510, left: -30, child: CommonBlurLeftBlue()),
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: [
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
],
),
borderGradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
const Color(0XFF222935).withOpacity(0.60),
// 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: [
// const Color(0XFF222935).withOpacity(0.60),
// const Color(0XFF222935).withOpacity(0.60),
// const Color(0XFF222935).withOpacity(0.60),
// const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
],
),
child: Padding(
// // 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),
// ],
// ),
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,
@@ -227,10 +242,8 @@ class _VerifygoogleandappleState extends State<Verifygoogleandapple> {
],
),
),
)
],
),
),
);
] )
));
}
}

48
lib/Main_Screens/CalenderTab/AddEvent/AddEvent.dart
View File

@@ -103,11 +103,11 @@ class _AddEventState extends State<AddEvent> {
borderType: BorderType.RRect,
radius: Radius.circular(14.r),
color: const Color(0xFF434A53),
child: commonGlassContainer(
border: 0,
child: commonGlassUI(
// border: 0,
width: double.infinity,
height: 130.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: bannerPath.isNotEmpty && isbannerAdded
? Stack(children: [
Image.file(
@@ -160,10 +160,10 @@ class _AddEventState extends State<AddEvent> {
),
),
sizedBoxHeight(20.h),
commonGlassContainer(
commonGlassUI(
width: double.infinity,
height: 60.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Center(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 12.w),
@@ -197,7 +197,7 @@ class _AddEventState extends State<AddEvent> {
]),
),
),
border: 1),
borderwidth: 1),
sizedBoxHeight(20.h),
text16400white("Type of event"),
sizedBoxHeight(14.h),
@@ -313,10 +313,10 @@ class _AddEventState extends State<AddEvent> {
});
}
},
child: commonGlassContainer(
child: commonGlassUI(
width: 174.w,
height: 50.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular( 30.r),
customWidget: Center(
child: Row(children: [
sizedBoxWidth(16.w),
@@ -330,7 +330,7 @@ class _AddEventState extends State<AddEvent> {
formatTimeOfDay(starttime!)),
]),
),
border: 1),
borderwidth: 1),
)
],
),
@@ -351,10 +351,10 @@ class _AddEventState extends State<AddEvent> {
});
}
},
child: commonGlassContainer(
child: commonGlassUI(
width: 174.w,
height: 50.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular( 30.r),
customWidget: Center(
child: Row(children: [
sizedBoxWidth(16.w),
@@ -368,7 +368,7 @@ class _AddEventState extends State<AddEvent> {
formatTimeOfDay(endtime!)),
]),
),
border: 1),
borderwidth: 1),
)
],
),
@@ -378,9 +378,9 @@ class _AddEventState extends State<AddEvent> {
Row(
children: [
Obx(() {
return commonGlassContainer(
border: 1,
borderradius: 2,
return commonGlassUI(
borderwidth: 1,
borderRadius: BorderRadius.circular( 2),
height: 23.h,
width: 23.w,
opacity1: 0.24,
@@ -474,19 +474,19 @@ class _AddEventState extends State<AddEvent> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
commonGlassContainer(
commonGlassUI(
height: 50.h,
width: 127.w,
borderradius: 30.r,
border: 1,
borderRadius: BorderRadius.circular( 30.r),
borderwidth: 1,
customWidget: Center(
child: text16400white("2"),
)),
commonGlassContainer(
commonGlassUI(
height: 50.h,
width: 215.w,
borderradius: 30.r,
border: 1,
borderRadius: BorderRadius.circular( 30.r),
borderwidth: 1,
customWidget: Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
@@ -515,10 +515,10 @@ class _AddEventState extends State<AddEvent> {
required String imagePath,
required String title,
}) {
return commonGlassContainer(
return commonGlassUI(
width: double.infinity,
height: 50.h,
borderradius: 30,
borderRadius: BorderRadius.circular(30),
customWidget: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Center(
@@ -540,6 +540,6 @@ class _AddEventState extends State<AddEvent> {
),
),
),
border: 1);
borderwidth: 1);
}
}

54
lib/Main_Screens/CalenderTab/AddUsers/AddUsers.dart
View File

@@ -138,10 +138,10 @@ class _AddUsersState extends State<AddUsers> {
children: [
text18w700_FCFCFC("Group members"),
const Spacer(),
commonGlassContainer(
commonGlassUI(
width: 35.w,
height: 35.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
"assets/images/png/Vector (5)22.png",
@@ -149,12 +149,12 @@ class _AddUsersState extends State<AddUsers> {
width: 12.w,
),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(14.w),
commonGlassContainer(
commonGlassUI(
width: 35.w,
height: 35.h,
borderradius: 100,
borderRadius: BorderRadius.circular(100),
customWidget: Center(
child: Image.asset(
"assets/images/png/bi_filter.png",
@@ -162,7 +162,7 @@ class _AddUsersState extends State<AddUsers> {
width: 18.w,
),
),
border: 0.5)
borderwidth: 0.5)
],
),
),
@@ -237,9 +237,9 @@ class _AddUsersState extends State<AddUsers> {
],
),
const Spacer(),
commonGlassContainer(
border: 1,
borderradius: 2,
commonGlassUI(
borderwidth: 1,
borderRadius: BorderRadius.circular( 2),
height: 23.h,
width: 23.w,
opacity1: 0.24,
@@ -280,32 +280,32 @@ class _AddUsersState extends State<AddUsers> {
sizedBoxHeight(16.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("M")),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(15.w),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("Tu")),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(15.w),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("W")),
border: 0.5),
borderwidth: 0.5),
const Spacer(),
Row(
children: [
@@ -325,32 +325,32 @@ class _AddUsersState extends State<AddUsers> {
sizedBoxHeight(20.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular(100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("Th")),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(15.w),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("F")),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(15.w),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("Sa")),
border: 0.5),
borderwidth: 0.5),
const Spacer(),
Row(
children: [

9
lib/Main_Screens/CalenderTab/Availabillity.dart
View File

@@ -121,14 +121,15 @@ class _AvailabilityState extends State<Availability> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
commonGlassContainer(
commonGlassUI(
width: double.infinity,
height: 670.h,
borderradius: 1,
border: 0,
borderRadius: BorderRadius.circular(1),
// border: 0,
customWidget: SfCalendar(
view: CalendarView.timelineMonth,
appointmentTextStyle: const TextStyle(color: Colors.white),
appointmentTextStyle:
const TextStyle(color: Colors.white),
headerStyle: const CalendarHeaderStyle(
textStyle: TextStyle(
color: Colors.blue,

43
lib/Main_Screens/CalenderTab/CalenderTab.dart
View File

@@ -177,10 +177,7 @@ class _CalenderTabState extends State<CalenderTab> {
// initialIndex: selectedIndex.value,
child: Column(
children: [
const CommonTabBar(
tabs: [
const CommonTabBar(tabs: [
Tab(
text: 'My sessions',
),
@@ -190,7 +187,6 @@ class _CalenderTabState extends State<CalenderTab> {
]),
Expanded(
child: TabBarView(
children: [
mySessionsTab(),
comSessionTab(),
@@ -215,10 +211,11 @@ class _CalenderTabState extends State<CalenderTab> {
sizedBoxHeight(20.h),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: commonGlassContainer(
child: commonGlassUI(
width: double.infinity,
height: 136.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular(10.r) ,
borderwidth: 1,
customWidget: Row(
children: [
Padding(
@@ -245,15 +242,15 @@ class _CalenderTabState extends State<CalenderTab> {
Image.asset("assets/images/png/Rectangle 45.png")
],
),
border: 1),
),
),
sizedBoxHeight(25.h),
Stack(children: [
commonGlassContainer(
commonGlassUI(
width: double.infinity,
height: 500.h,
borderradius: 1,
border: 0,
borderRadius: BorderRadius.circular(1),
// borderw: 0,
customWidget: SfCalendar(
view: CalendarView.month,
appointmentTextStyle: const TextStyle(color: Colors.white),
@@ -456,10 +453,11 @@ class _CalenderTabState extends State<CalenderTab> {
onTap: () {
Get.toNamed(RouteName.eventDetails);
},
child: commonGlassContainer(
child: commonGlassUI(
width: double.infinity,
height: 300.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
borderwidth: 1.w,
customWidget: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -529,15 +527,15 @@ class _CalenderTabState extends State<CalenderTab> {
sizedBoxWidth(16.w),
CircleAvatar(
radius: 12.r,
backgroundImage:
const AssetImage("assets/images/png/Ellipse 52.png"),
backgroundImage: const AssetImage(
"assets/images/png/Ellipse 52.png"),
),
sizedBoxWidth(8.w),
text14w400_FCFCFC("Ryan dorwat"),
],
)
]),
border: 1),
),
)
],
),
@@ -551,11 +549,11 @@ class _CalenderTabState extends State<CalenderTab> {
sizedBoxHeight(25.h),
Stack(children: [
commonGlassContainer(
commonGlassUI(
width: double.infinity,
height: 530.h,
borderradius: 1,
border: 0,
borderRadius: BorderRadius.circular(1),
// border: 0,
customWidget: SfCalendar(
view: CalendarView.month,
appointmentTextStyle: const TextStyle(color: Colors.white),
@@ -730,10 +728,11 @@ class _CalenderTabState extends State<CalenderTab> {
children: [
text18w700_FCFCFC(title),
sizedBoxHeight(25.h),
commonGlassContainer(
commonGlassUI(
width: double.infinity,
height: 290.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
borderwidth: 1,
customWidget: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -810,7 +809,7 @@ class _CalenderTabState extends State<CalenderTab> {
),
],
),
border: 1)
)
],
),
);

130
lib/Main_Screens/CalenderTab/EventDetails.dart
View File

@@ -36,41 +36,44 @@ class _EventDetailsState extends State<EventDetails> {
onTap: () {
Get.toNamed(RouteName.addEvent);
},
child: commonGlassContainer(
width: 40.w,
height: 40.h,
borderradius: 100,
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(
child: Image.asset("assets/images/png/Vector536.png",
height: 17.h, width: 17.w),
),
border: 0.5),
),
sizedBoxWidth(12.w),
commonGlassContainer(
child: commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular(100),
opacity1: 0.24,
opacity2: 0.24,
borderwidth: 0.5,
customWidget: Center(
child: Image.asset("assets/images/png/Vector522.png",
child: Image.asset("assets/images/png/Vector536.png",
height: 17.h, width: 17.w),
),
border: 0.5),
),
),
sizedBoxWidth(12.w),
commonGlassUI(
width: 40.w,
height: 40.h,
borderRadius: BorderRadius.circular(100),
opacity1: 0.24,
opacity2: 0.24,
borderwidth: 0.5,
customWidget: Center(
child: Image.asset("assets/images/png/Vector522.png",
height: 17.h, width: 17.w),
),
),
],
),
),
body: Stack(children: [
Container(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Column(
),
SingleChildScrollView(
child: Column(
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
@@ -97,20 +100,21 @@ class _EventDetailsState extends State<EventDetails> {
sizedBoxHeight(22.h),
Row(
children: [
commonGlassContainer(
width: 35.w,
height: 35.h,
borderradius: 100,
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(
child: Image.asset(
"assets/images/png/calender.png",
height: 17.h,
width: 17.w,
),
commonGlassUI(
width: 35.w,
height: 35.h,
borderRadius: BorderRadius.circular(100),
opacity1: 0.24,
opacity2: 0.24,
borderwidth: 0.5,
customWidget: Center(
child: Image.asset(
"assets/images/png/calender.png",
height: 17.h,
width: 17.w,
),
border: 0.5),
),
),
sizedBoxWidth(10.w),
text16400white("20th April 2024 - 21st April 2024"),
],
@@ -118,10 +122,10 @@ class _EventDetailsState extends State<EventDetails> {
sizedBoxHeight(16.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 35.w,
height: 35.h,
borderradius: 100,
borderRadius: BorderRadius.circular(100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(
@@ -131,7 +135,7 @@ class _EventDetailsState extends State<EventDetails> {
width: 17.w,
),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(10.w),
text16400white("3 hours"),
],
@@ -139,10 +143,10 @@ class _EventDetailsState extends State<EventDetails> {
sizedBoxHeight(16.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 35.w,
height: 35.h,
borderradius: 100,
borderRadius: BorderRadius.circular(100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(
@@ -152,7 +156,7 @@ class _EventDetailsState extends State<EventDetails> {
width: 17.w,
),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(10.w),
text16400white("Elm street london, United Kingdom"),
],
@@ -171,26 +175,26 @@ class _EventDetailsState extends State<EventDetails> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
commonGlassContainer(
commonGlassUI(
width: 87.w,
height: 40.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular(30.r),
customWidget:
Center(child: text16w400_white("Yes")),
border: 1),
commonGlassContainer(
borderwidth: 1),
commonGlassUI(
width: 87.w,
height: 40.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular(30.r),
customWidget: Center(child: text16w400_white("No")),
border: 1),
commonGlassContainer(
borderwidth: 1),
commonGlassUI(
width: 154.w,
height: 40.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular(30.r),
customWidget: Center(
child: text16w400_white("Not yet decided")),
border: 1),
borderwidth: 1),
],
),
sizedBoxHeight(20.h),
@@ -206,13 +210,13 @@ class _EventDetailsState extends State<EventDetails> {
sizedBoxHeight(16.h),
text18w700white("Are you attending this event ?"),
sizedBoxHeight(20.h),
commonGlassContainer(
commonGlassUI(
width: 221.w,
height: 40.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular(30.r),
customWidget:
Center(child: text16w400_white("Request to join")),
border: 1),
borderwidth: 1),
sizedBoxHeight(20.h),
commonDivider(),
],
@@ -240,10 +244,10 @@ class _EventDetailsState extends State<EventDetails> {
sizedBoxHeight(20.h),
Visibility(
visible: adminView,
child: commonGlassContainer(
child: commonGlassUI(
width: double.infinity,
height: 251.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular(10.r),
customWidget: Padding(
padding: const EdgeInsets.symmetric(vertical: 20),
child: Column(
@@ -265,15 +269,15 @@ class _EventDetailsState extends State<EventDetails> {
],
),
),
border: 1),
borderwidth: 1),
),
sizedBoxHeight(30.h),
Visibility(
visible: memberView,
child: commonGlassContainer(
child: commonGlassUI(
width: double.infinity,
height: 65.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular(10.r),
customWidget: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
@@ -293,7 +297,7 @@ class _EventDetailsState extends State<EventDetails> {
text18w400white("90 Attending")
],
),
border: 1)),
borderwidth: 1)),
text18w700white("Messages"),
sizedBoxHeight(20.h),
Row(
@@ -306,20 +310,20 @@ class _EventDetailsState extends State<EventDetails> {
sizedBoxWidth(10.w),
text16w400_white("Send message to invites"),
const Spacer(),
commonGlassContainer(
commonGlassUI(
width: 98.w,
height: 30.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular( 30.r),
customWidget:
Center(child: text14400white("Select")),
border: 1)
borderwidth: 1)
],
),
sizedBoxHeight(25.h),
commonGlassContainer(
commonGlassUI(
width: double.infinity,
height: 240.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 80.w),
child: Column(
@@ -353,7 +357,7 @@ class _EventDetailsState extends State<EventDetails> {
)
]),
),
border: 1),
borderwidth: 1),
sizedBoxHeight(50.h),
CommonBtn(text: "Join the event"),
sizedBoxHeight(40.h),

50
lib/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart
View File

@@ -189,12 +189,12 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
child: Center(child: text10400white("Attending")),
),
sizedBoxWidth(8.w),
commonGlassContainer(
commonGlassUI(
width: 25.w,
height: 25.h,
opacity1: 0.24,
opacity2: 0.24,
borderradius: 100.r,
borderRadius: BorderRadius.circular(100.r),
customWidget: Center(
child: Image.asset(
"assets/images/png/alarm 1 (traced).png",
@@ -202,14 +202,14 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
width: 13.w,
),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(8.w),
commonGlassContainer(
commonGlassUI(
width: 25.w,
height: 25.h,
opacity1: 0.24,
opacity2: 0.24,
borderradius: 100.r,
borderRadius: BorderRadius.circular( 100.r),
customWidget: Center(
child: Image.asset(
"assets/images/png/fluent_delete-28-regular.png",
@@ -217,7 +217,7 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
width: 13.w,
),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(12.w)
],
),
@@ -244,32 +244,32 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
sizedBoxHeight(16.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular(100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("M")),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(15.w),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("Tu")),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(15.w),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("W")),
border: 0.5),
borderwidth: 0.5),
const Spacer(),
Row(
children: [
@@ -289,32 +289,32 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
sizedBoxHeight(20.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("Th")),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(15.w),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular(100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("F")),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(15.w),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("Sa")),
border: 0.5),
borderwidth: 0.5),
const Spacer(),
Row(
children: [
@@ -374,4 +374,6 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
),
));
}
}

12
lib/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart
View File

@@ -89,10 +89,10 @@ class _ResourcePoolState extends State<ResourcePool> {
}
Widget resourceCard() {
return commonGlassContainer(
return commonGlassUI(
width: double.infinity,
height: 216.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16),
child:
@@ -177,7 +177,7 @@ class _ResourcePoolState extends State<ResourcePool> {
),
]),
),
border: 1);
borderwidth: 1);
}
void inviteBottomSheet() {
@@ -258,9 +258,9 @@ class _ResourcePoolState extends State<ResourcePool> {
sizedBoxWidth(10.w),
text16w400_FCFCFC(title),
const Spacer(),
commonGlassContainer(
border: 1,
borderradius: 2,
commonGlassUI(
borderwidth: 1,
borderRadius: BorderRadius.circular( 2),
height: 23.h,
width: 23.w,
opacity1: 0.24,

12
lib/Main_Screens/CalenderTab/SetAvailabillity.dart
View File

@@ -138,10 +138,10 @@ class _SetAvailabillityState extends State<SetAvailabillity> {
children: [
text16400white("Start time"),
sizedBoxHeight(14.h),
commonGlassContainer(
commonGlassUI(
width: 174.w,
height: 50.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular(30.r),
customWidget: Center(
child: Row(children: [
sizedBoxWidth(16.w),
@@ -154,7 +154,7 @@ class _SetAvailabillityState extends State<SetAvailabillity> {
text16w400_white("3:00 pm")
]),
),
border: 1)
borderwidth: 1)
],
),
const Spacer(),
@@ -163,10 +163,10 @@ class _SetAvailabillityState extends State<SetAvailabillity> {
children: [
text16400white("End time"),
sizedBoxHeight(14.h),
commonGlassContainer(
commonGlassUI(
width: 174.w,
height: 50.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular( 30.r),
customWidget: Center(
child: Row(children: [
sizedBoxWidth(16.w),
@@ -179,7 +179,7 @@ class _SetAvailabillityState extends State<SetAvailabillity> {
text16w400_white("5:00 pm")
]),
),
border: 1)
borderwidth: 1)
],
),
],

6
lib/Main_Screens/Chats/View/groupchat.dart
View File

@@ -264,13 +264,13 @@ class _GroupChatPageState extends State<GroupChatPage> {
child: Row(
children: [
sizedBoxWidth(10.w),
commonGlassContainer(
border: 0.9,
commonGlassUI(
borderwidth: 0.9,
width: 40.w,
height: 40.h,
opacity1: 0.24,
opacity2: 0.24,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
'assets/images/png/appbararrowbutton.png')

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

@@ -266,13 +266,13 @@ class _UserChatPageState extends State<UserChatPage> {
child: Row(
children: [
sizedBoxWidth(10.w),
commonGlassContainer(
border: 0.9,
commonGlassUI(
borderwidth: 0.9,
width: 40.w,
height: 40.h,
opacity1: 0.24,
opacity2: 0.24,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
'assets/images/png/appbararrowbutton.png')

29
lib/Main_Screens/Community/Community.dart
View File

@@ -86,7 +86,10 @@ class _CommunityScreenState extends State<CommunityScreen> {
sizedBoxWidth(16.w),
],
),
body: Stack(clipBehavior: Clip.none, children: [
body:
Stack(clipBehavior: Clip.none, children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
@@ -636,11 +639,11 @@ Widget normalcardtile({
}
}
return commonGlassContainer(
return commonGlassUI(
width: double.infinity,
height: 570.h,
border: 0,
borderradius: 1,
borderwidth: 0,
borderRadius: BorderRadius.circular( 1),
customWidget: Column(
children: [
sizedBoxHeight(25.h),
@@ -827,13 +830,13 @@ Widget normalcardtile({
]),
),
const Spacer(),
commonGlassContainer(
border: 0.43,
commonGlassUI(
borderwidth: 0.43,
width: 30.w,
height: 30.h,
opacity1: 0.05,
opacity2: 0.06,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
'assets/images/png/Frame 1000004088.png',
@@ -845,11 +848,11 @@ Widget normalcardtile({
sizedBoxWidth(12.w),
text14w400_FCFCFC('20'),
sizedBoxWidth(20.w),
commonGlassContainer(
border: 0.43,
commonGlassUI(
borderwidth: 0.43,
width: 30.w,
height: 30.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.05,
opacity2: 0.06,
customWidget: Center(
@@ -1349,11 +1352,11 @@ Widget _buildReactionsIcon(String assetPath) {
}
Widget containertile({required String text}) {
return commonGlassContainer(
border: 1,
return commonGlassUI(
borderwidth: 1,
width: 130.w,
height: 30.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular( 30.r),
borderColor: const Color(0xFFD90B2E),
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 10.w),

18
lib/Main_Screens/Community/CycleScreen.dart
View File

@@ -136,11 +136,11 @@ Widget normalcardtile({
}
}
return commonGlassContainer(
return commonGlassUI(
width: double.infinity,
height: 570.h,
border: 0,
borderradius: 1,
borderwidth: 0,
borderRadius: BorderRadius.circular( 1),
customWidget: Column(
children: [
sizedBoxHeight(25.h),
@@ -326,13 +326,13 @@ Widget normalcardtile({
]),
),
const Spacer(),
commonGlassContainer(
border: 0.43,
commonGlassUI(
borderwidth: 0.43,
width: 30.w,
height: 30.h,
opacity1: 0.05,
opacity2: 0.06,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
'assets/images/png/Frame 1000004088.png',
@@ -344,11 +344,11 @@ Widget normalcardtile({
sizedBoxWidth(12.w),
text14w400_FCFCFC('20'),
sizedBoxWidth(20.w),
commonGlassContainer(
border: 0.43,
commonGlassUI(
borderwidth: 0.43,
width: 30.w,
height: 30.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.05,
opacity2: 0.06,
customWidget: Center(

30
lib/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart
View File

@@ -125,11 +125,11 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
}
}
return commonGlassContainer(
return commonGlassUI(
width: double.infinity,
height: 570.h,
border: 0,
borderradius: 0,
borderwidth: 0,
borderRadius: BorderRadius.circular(0),
customWidget: Column(
children: [
sizedBoxHeight(25.h),
@@ -151,14 +151,14 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
children: [
text16w400_FCFCFC(title),
const Spacer(),
commonGlassContainer(
commonGlassUI(
width: 72.w,
height: 26.h,
borderradius: 5.r,
borderRadius: BorderRadius.circular(5.r),
borderColor: const Color(0xFFD90B2E),
customWidget:
Center(child: text14400white("Follow")),
border: 1),
borderwidth: 1),
sizedBoxWidth(6.w),
PopupMenuButton(
surfaceTintColor: const Color(0xFF222935),
@@ -329,11 +329,11 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
'assets/images/png/party-popper 2.png'
]),
const Spacer(),
commonGlassContainer(
border: 0.9,
commonGlassUI(
borderwidth: 0.9,
width: 30.w,
height: 30.h,
borderradius: 100,
borderRadius: BorderRadius.circular(100),
customWidget: Center(
child: Image.asset(
'assets/images/png/Frame 1000004088.png',
@@ -345,11 +345,11 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
sizedBoxWidth(12.w),
text14w400_FCFCFC('20'),
sizedBoxWidth(20.w),
commonGlassContainer(
border: 0.9,
commonGlassUI(
borderwidth: 0.9,
width: 30.w,
height: 30.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
'assets/images/png/Vector (1).png',
@@ -452,11 +452,11 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
}
Widget containertile({required String text}) {
return commonGlassContainer(
border: 0.9,
return commonGlassUI(
borderwidth: 0.9,
width: 100.w,
height: 30.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular( 30.r),
borderColor: const Color(0xFFD90B2E),
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 10.w),

18
lib/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart
View File

@@ -93,13 +93,13 @@ class _ReactionViewState extends State<ReactionView> {
),
Tab(
child: Row(children: [
commonGlassContainer(
commonGlassUI(
borderColor: const Color(0xFF1E3A46),
opacity1: 0.05,
opacity2: 0.06,
width: 30.w,
height: 30.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
"assets/images/png/f7_hand-thumbsup.png",
@@ -107,20 +107,20 @@ class _ReactionViewState extends State<ReactionView> {
width: 17.w,
),
),
border: 1.71),
borderwidth: 1.71),
const Spacer(),
text14400white("110K"),
]),
),
Tab(
child: Row(children: [
commonGlassContainer(
commonGlassUI(
borderColor: const Color(0xFF1E3A46),
opacity1: 0.05,
opacity2: 0.06,
width: 30.w,
height: 30.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
"assets/images/png/heart 2.png",
@@ -128,20 +128,20 @@ class _ReactionViewState extends State<ReactionView> {
width: 17.w,
),
),
border: 1.71),
borderwidth: 1.71),
const Spacer(),
text14400white("9.7K"),
]),
),
Tab(
child: Row(children: [
commonGlassContainer(
commonGlassUI(
borderColor: const Color(0xFF1E3A46),
opacity1: 0.05,
opacity2: 0.06,
width: 30.w,
height: 30.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
"assets/images/png/party-popper 2.png",
@@ -149,7 +149,7 @@ class _ReactionViewState extends State<ReactionView> {
width: 17.w,
),
),
border: 1.71),
borderwidth: 1.71),
const Spacer(),
text14400white("7.4K"),
]),

6
lib/Main_Screens/ExploreDesign/DetailExplore.dart
View File

@@ -41,16 +41,16 @@ class _DetailExploreState extends State<DetailExplore> {
onTap: () {
Get.back();
},
child: commonGlassContainer(
child: commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: const Center(
child: Icon(
Icons.arrow_back,
color: Colors.white,
)),
border: 1,
borderwidth: 1,
borderColor: const Color(0xFF55434F)),
),
sizedBoxWidth(12.w),

18
lib/Main_Screens/ExploreDesign/ExploreScreen.dart
View File

@@ -191,10 +191,10 @@ class _ExploreScreenState extends State<ExploreScreen> {
sizedBoxHeight(25.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 30.w,
height: 30.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
"assets/images/png/community 1 (traced).png",
@@ -202,21 +202,21 @@ class _ExploreScreenState extends State<ExploreScreen> {
width: 18.w,
),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(10.w),
text16400white("10 subgroups "),
const Spacer(),
commonGlassContainer(
commonGlassUI(
width: 30.w,
height: 30.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
"assets/images/png/ph_users-light.png",
height: 18.h,
width: 18.w,
)),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(10.w),
text16400white("7 members"),
],
@@ -224,14 +224,14 @@ class _ExploreScreenState extends State<ExploreScreen> {
sizedBoxHeight(30.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 170.w,
height: 35.h,
opacity1: 0.05,
opacity2: 0.07,
borderradius: 30.r,
borderRadius: BorderRadius.circular( 30.r),
customWidget: Center(child: text14w400_FCFCFC("Message")),
border: 1),
borderwidth: 1),
const Spacer(),
Container(
width: 170.w,

6
lib/Main_Screens/ExploreDesign/SearchGroup.dart
View File

@@ -125,10 +125,10 @@ class _SearchGroupState extends State<SearchGroup> {
Widget rowTile({required String imagePath, required String title}) {
return Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 30.w,
height: 30.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
imagePath,
@@ -136,7 +136,7 @@ class _SearchGroupState extends State<SearchGroup> {
width: 16.w,
),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(12.w),
text16400white(title),
const Spacer(),

6
lib/Main_Screens/GroupTab/View/ConnectCommunity.dart
View File

@@ -78,11 +78,11 @@ class _ConnectCommunityState extends State<ConnectCommunity> {
padding: EdgeInsets.only(bottom: 25.h),
child: GestureDetector(
onTap: ontap,
child: commonGlassContainer(
border: 0.9,
child: commonGlassUI(
borderwidth: 0.9,
width: double.infinity,
height: 162.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 16.h),
child: Column(

24
lib/Main_Screens/GroupTab/View/GroupDetail.dart
View File

@@ -111,12 +111,12 @@ class _GroupDetailState extends State<GroupDetail> {
),
),
],
child: commonGlassContainer(
child: commonGlassUI(
opacity1: 0.24,
opacity2: 0.24,
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
"assets/images/png/Vector536.png",
@@ -124,7 +124,7 @@ class _GroupDetailState extends State<GroupDetail> {
width: 17.w,
),
),
border: 0.5),
borderwidth: 0.5),
),
sizedBoxWidth(16.w),
PopupMenuButton(
@@ -370,10 +370,10 @@ class _GroupDetailState extends State<GroupDetail> {
],
),
sizedBoxHeight(25.h),
commonGlassContainer(
commonGlassUI(
width: double.infinity,
height: 135.h,
borderradius: 10,
borderRadius: BorderRadius.circular( 10),
customWidget: Padding(
padding: EdgeInsets.symmetric(
vertical: 12.h, horizontal: 16.w),
@@ -420,12 +420,12 @@ class _GroupDetailState extends State<GroupDetail> {
],
),
),
border: 1),
borderwidth: 1),
sizedBoxHeight(20.h),
commonGlassContainer(
commonGlassUI(
width: double.infinity,
height: 51.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Padding(
padding: EdgeInsets.only(right: 16.w),
child: Center(
@@ -447,7 +447,7 @@ class _GroupDetailState extends State<GroupDetail> {
]),
),
),
border: 1),
borderwidth: 1),
sizedBoxHeight(20.h),
Row(
children: [
@@ -484,10 +484,10 @@ class _GroupDetailState extends State<GroupDetail> {
),
),
sizedBoxHeight(25.h),
commonGlassContainer(
commonGlassUI(
width: double.infinity,
height: 51.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 12.w),
child: Row(children: [
@@ -523,7 +523,7 @@ class _GroupDetailState extends State<GroupDetail> {
)
]),
),
border: 1),
borderwidth: 1),
sizedBoxHeight(25.h),
],
),

48
lib/Main_Screens/GroupTab/View/GroupEvent.dart
View File

@@ -109,11 +109,11 @@ class _GroupEventState extends State<GroupEvent> {
borderType: BorderType.RRect,
radius: Radius.circular(14.r),
color: const Color(0xFF434A53),
child: commonGlassContainer(
border: 0,
child: commonGlassUI(
borderwidth: 0,
width: double.infinity,
height: 130.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: bannerPath.isNotEmpty && isbannerAdded
? Stack(children: [
Image.file(
@@ -166,10 +166,10 @@ class _GroupEventState extends State<GroupEvent> {
),
),
sizedBoxHeight(20.h),
commonGlassContainer(
commonGlassUI(
width: double.infinity,
height: 60.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Center(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 12.w),
@@ -203,7 +203,7 @@ class _GroupEventState extends State<GroupEvent> {
]),
),
),
border: 1),
borderwidth: 1),
sizedBoxHeight(20.h),
text16400white("Type of event"),
sizedBoxHeight(14.h),
@@ -319,10 +319,10 @@ class _GroupEventState extends State<GroupEvent> {
});
}
},
child: commonGlassContainer(
child: commonGlassUI(
width: 174.w,
height: 50.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular( 30.r),
customWidget: Center(
child: Row(children: [
sizedBoxWidth(16.w),
@@ -336,7 +336,7 @@ class _GroupEventState extends State<GroupEvent> {
formatTimeOfDay(starttime!)),
]),
),
border: 1),
borderwidth: 1),
)
],
),
@@ -357,10 +357,10 @@ class _GroupEventState extends State<GroupEvent> {
});
}
},
child: commonGlassContainer(
child: commonGlassUI(
width: 174.w,
height: 50.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular( 30.r),
customWidget: Center(
child: Row(children: [
sizedBoxWidth(16.w),
@@ -374,7 +374,7 @@ class _GroupEventState extends State<GroupEvent> {
formatTimeOfDay(endtime!)),
]),
),
border: 1),
borderwidth: 1),
)
],
),
@@ -384,9 +384,9 @@ class _GroupEventState extends State<GroupEvent> {
Row(
children: [
Obx(() {
return commonGlassContainer(
border: 1,
borderradius: 2,
return commonGlassUI(
borderwidth: 1,
borderRadius: BorderRadius.circular( 2),
height: 23.h,
width: 23.w,
opacity1: 0.24,
@@ -487,19 +487,19 @@ class _GroupEventState extends State<GroupEvent> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
commonGlassContainer(
commonGlassUI(
height: 50.h,
width: 127.w,
borderradius: 30.r,
border: 1,
borderRadius: BorderRadius.circular( 30.r),
borderwidth: 1,
customWidget: Center(
child: text16400white("2"),
)),
commonGlassContainer(
commonGlassUI(
height: 50.h,
width: 215.w,
borderradius: 30.r,
border: 1,
borderRadius: BorderRadius.circular( 30.r),
borderwidth: 1,
customWidget: Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
@@ -528,10 +528,10 @@ class _GroupEventState extends State<GroupEvent> {
required String imagePath,
required String title,
}) {
return commonGlassContainer(
return commonGlassUI(
width: double.infinity,
height: 50.h,
borderradius: 30,
borderRadius: BorderRadius.circular( 30),
customWidget: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Center(
@@ -553,6 +553,6 @@ class _GroupEventState extends State<GroupEvent> {
),
),
),
border: 1);
borderwidth: 1);
}
}

12
lib/Main_Screens/GroupTab/View/GroupInfo.dart
View File

@@ -94,12 +94,12 @@ class _GroupInfoState extends State<GroupInfo> {
sizedBoxHeight(30.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 35.w,
height: 35.h,
opacity1: 0.24,
opacity2: 0.24,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
"assets/images/png/Group 58645.png",
@@ -107,7 +107,7 @@ class _GroupInfoState extends State<GroupInfo> {
width: 13.w,
),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(12.w),
text16400white("Elm street london, United Kingdom")
],
@@ -115,12 +115,12 @@ class _GroupInfoState extends State<GroupInfo> {
sizedBoxHeight(30.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 35.w,
height: 35.h,
opacity1: 0.24,
opacity2: 0.24,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
"assets/images/png/Vector2a.png",
@@ -128,7 +128,7 @@ class _GroupInfoState extends State<GroupInfo> {
width: 20.w,
),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(12.w),
text16400white("www.exampledummywebsite.com")
],

54
lib/Main_Screens/GroupTab/View/GroupManage.dart
View File

@@ -142,10 +142,10 @@ class _GroupManageState extends State<GroupManage> {
hintText: "Start date - End date",
)),
const Spacer(),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(
@@ -155,7 +155,7 @@ class _GroupManageState extends State<GroupManage> {
width: 23.w,
),
),
border: 0.5)
borderwidth: 0.5)
],
),
],
@@ -235,32 +235,32 @@ class _GroupManageState extends State<GroupManage> {
sizedBoxHeight(16.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("M")),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(15.w),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("Tu")),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(15.w),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("W")),
border: 0.5),
borderwidth: 0.5),
const Spacer(),
Row(
children: [
@@ -280,32 +280,32 @@ class _GroupManageState extends State<GroupManage> {
sizedBoxHeight(20.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("Th")),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(15.w),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("F")),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(15.w),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("Sa")),
border: 0.5),
borderwidth: 0.5),
const Spacer(),
Row(
children: [
@@ -414,10 +414,10 @@ class _GroupManageState extends State<GroupManage> {
hintText: "Start date - End date",
)),
const Spacer(),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(
@@ -427,7 +427,7 @@ class _GroupManageState extends State<GroupManage> {
width: 23.w,
),
),
border: 0.5)
borderwidth: 0.5)
],
),
],
@@ -538,10 +538,10 @@ class _GroupManageState extends State<GroupManage> {
hintText: "Start date - End date",
)),
const Spacer(),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(
@@ -551,7 +551,7 @@ class _GroupManageState extends State<GroupManage> {
width: 23.w,
),
),
border: 0.5)
borderwidth: 0.5)
],
),
],

59
lib/Main_Screens/GroupTab/View/GroupTab.dart
View File

@@ -232,8 +232,8 @@ class _GroupTabState extends State<GroupTab> {
EdgeInsets.symmetric(horizontal: 8.w),
child: Row(
children: [
text14w400_FCFCFC("Mute group"),
const Spacer(),
text14w400_FCFCFC("Mute community"),
Spacer(),
Image.asset(
"assets/images/png/Black (1).png",
height: 18.h,
@@ -243,7 +243,7 @@ class _GroupTabState extends State<GroupTab> {
),
),
),
const PopupMenuDivider(),
PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -251,29 +251,10 @@ class _GroupTabState extends State<GroupTab> {
EdgeInsets.symmetric(horizontal: 8.w),
child: Row(
children: [
text14w400_FCFCFC("Pin group"),
const Spacer(),
text14w400_FCFCFC("Hide post"),
Spacer(),
Image.asset(
"assets/images/png/f7_pin-fill (2).png",
height: 27.h,
width: 27.w,
)
],
),
),
),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
padding:
EdgeInsets.symmetric(horizontal: 8.w),
child: Row(
children: [
text14w400_FCFCFC("Make primary"),
const Spacer(),
Image.asset(
"assets/images/png/leave group.png",
"assets/images/png/mingcute_eye-close-line.png",
height: 20.h,
width: 20.w,
)
@@ -281,7 +262,7 @@ class _GroupTabState extends State<GroupTab> {
),
),
),
const PopupMenuDivider(),
PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -289,11 +270,29 @@ class _GroupTabState extends State<GroupTab> {
EdgeInsets.symmetric(horizontal: 8.w),
child: Row(
children: [
// text14w400_FCFCFC("Leave group"),
text14w400_D90B2E("Leave group"),
const Spacer(),
text14w400_FCFCFC("Pin"),
Spacer(),
Image.asset(
"assets/images/png/LightGray22.png",
"assets/images/png/f7_pin-fill (2).png",
height: 25.h,
width: 25.w,
)
],
),
),
),
PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
padding:
EdgeInsets.symmetric(horizontal: 8.w),
child: Row(
children: [
text14w400_FCFCFC("Leave community"),
Spacer(),
Image.asset(
"assets/images/png/logout 1 (traced).png",
height: 18.h,
width: 18.w,
)

6
lib/Main_Screens/GroupTab/View/NewPost.dart
View File

@@ -84,11 +84,11 @@ class _NewPostState extends State<NewPost> {
borderType: BorderType.RRect,
radius: Radius.circular(14.r),
color: const Color(0xFF434A53),
child: commonGlassContainer(
border: 0,
child: commonGlassUI(
borderwidth: 0,
width: double.infinity,
height: 130.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: bannerPath.isNotEmpty && isbannerAdded
? Stack(children: [
Image.file(

59
lib/Main_Screens/GroupTab/View/RequestedGroups.dart
View File

@@ -144,8 +144,8 @@ class _RequestedGroupsState extends State<RequestedGroups> {
EdgeInsets.symmetric(horizontal: 8.w),
child: Row(
children: [
text14w400_FCFCFC("Mute group"),
const Spacer(),
text14w400_FCFCFC("Mute community"),
Spacer(),
Image.asset(
"assets/images/png/Black (1).png",
height: 18.h,
@@ -155,7 +155,7 @@ class _RequestedGroupsState extends State<RequestedGroups> {
),
),
),
const PopupMenuDivider(),
PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -163,29 +163,10 @@ class _RequestedGroupsState extends State<RequestedGroups> {
EdgeInsets.symmetric(horizontal: 8.w),
child: Row(
children: [
text14w400_FCFCFC("Pin group"),
const Spacer(),
text14w400_FCFCFC("Hide post"),
Spacer(),
Image.asset(
"assets/images/png/f7_pin-fill (2).png",
height: 27.h,
width: 27.w,
)
],
),
),
),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
padding:
EdgeInsets.symmetric(horizontal: 8.w),
child: Row(
children: [
text14w400_FCFCFC("Make primary"),
const Spacer(),
Image.asset(
"assets/images/png/leave group.png",
"assets/images/png/mingcute_eye-close-line.png",
height: 20.h,
width: 20.w,
)
@@ -193,7 +174,7 @@ class _RequestedGroupsState extends State<RequestedGroups> {
),
),
),
const PopupMenuDivider(),
PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -201,11 +182,29 @@ class _RequestedGroupsState extends State<RequestedGroups> {
EdgeInsets.symmetric(horizontal: 8.w),
child: Row(
children: [
// text14w400_FCFCFC("Leave group"),
text14w400_D90B2E("Leave group"),
const Spacer(),
text14w400_FCFCFC("Pin"),
Spacer(),
Image.asset(
"assets/images/png/LightGray22.png",
"assets/images/png/f7_pin-fill (2).png",
height: 25.h,
width: 25.w,
)
],
),
),
),
PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
padding:
EdgeInsets.symmetric(horizontal: 8.w),
child: Row(
children: [
text14w400_FCFCFC("Leave community"),
Spacer(),
Image.asset(
"assets/images/png/logout 1 (traced).png",
height: 18.h,
width: 18.w,
)

24
lib/Main_Screens/GroupTab/View/Sessions.dart
View File

@@ -245,9 +245,9 @@ class _SessionsState extends State<Sessions> {
Row(
children: [
Obx(() {
return commonGlassContainer(
border: 1,
borderradius: 2,
return commonGlassUI(
borderwidth: 1,
borderRadius: BorderRadius.circular( 2),
height: 23.h,
width: 23.w,
opacity1: 0.24,
@@ -334,19 +334,19 @@ class _SessionsState extends State<Sessions> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
commonGlassContainer(
commonGlassUI(
height: 50.h,
width: 127.w,
borderradius: 30.r,
border: 1,
borderRadius: BorderRadius.circular( 30.r),
borderwidth: 1,
customWidget: Center(
child: text16400white("2"),
)),
commonGlassContainer(
commonGlassUI(
height: 50.h,
width: 215.w,
borderradius: 30.r,
border: 1,
borderRadius: BorderRadius.circular( 30.r),
borderwidth: 1,
customWidget: Center(
child: Row(
mainAxisAlignment:
@@ -385,11 +385,11 @@ class _SessionsState extends State<Sessions> {
borderType: BorderType.RRect,
radius: Radius.circular(14.r),
color: const Color(0xFF434A53),
child: commonGlassContainer(
border: 0,
child: commonGlassUI(
borderwidth: 0,
width: double.infinity,
height: 130.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: bannerPath.isNotEmpty &&
isbannerAdded
? Stack(children: [

6
lib/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart
View File

@@ -123,11 +123,11 @@ class _EditSubgroupInfoState extends State<EditSubgroupInfo> {
},
);
},
child: commonGlassContainer(
border: 0.9,
child: commonGlassUI(
borderwidth: 0.9,
width: double.infinity,
height: 150.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular(10.r),
customWidget: bannerPath.isNotEmpty && isbannerAdded
? Stack(children: [
Image.file(

48
lib/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart
View File

@@ -77,12 +77,12 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
),
),
],
child: commonGlassContainer(
child: commonGlassUI(
opacity1: 0.24,
opacity2: 0.24,
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
"assets/images/png/Vector536.png",
@@ -90,19 +90,19 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
width: 17.w,
),
),
border: 0.5),
borderwidth: 0.5),
),
sizedBoxWidth(16.w),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.editsubgroupinfo);
},
child: commonGlassContainer(
child: commonGlassUI(
opacity1: 0.24,
opacity2: 0.24,
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
"assets/images/png/codicon_account.png",
@@ -110,7 +110,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
width: 20.w,
),
),
border: 0.5),
borderwidth: 0.5),
),
sizedBoxWidth(16.w),
PopupMenuButton(
@@ -301,31 +301,31 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
sizedBoxHeight(16.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 35.w,
height: 35.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(
child: Image.asset("assets/images/png/Black.png",
height: 20.h, width: 20.w),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(7.w),
text16w400_FCFCFCblur("The athlectic town"),
sizedBoxWidth(20.w),
commonGlassContainer(
commonGlassUI(
width: 35.w,
height: 35.h,
opacity1: 0.24,
opacity2: 0.24,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset("assets/images/png/img12.png",
height: 20.h, width: 20.w),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(7.w),
text16w400_FCFCFCblur("Public"),
],
@@ -402,11 +402,11 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
}
}
return commonGlassContainer(
return commonGlassUI(
width: double.infinity,
height: 570.h,
border: 0,
borderradius: 1,
borderwidth: 0,
borderRadius: BorderRadius.circular( 1),
customWidget: Column(
children: [
sizedBoxHeight(25.h),
@@ -592,13 +592,13 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
]),
),
const Spacer(),
commonGlassContainer(
border: 0.43,
commonGlassUI(
borderwidth: 0.43,
width: 30.w,
height: 30.h,
opacity1: 0.05,
opacity2: 0.06,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
'assets/images/png/Frame 1000004088.png',
@@ -610,11 +610,11 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
sizedBoxWidth(12.w),
text14w400_FCFCFC('20'),
sizedBoxWidth(20.w),
commonGlassContainer(
border: 0.43,
commonGlassUI(
borderwidth: 0.43,
width: 30.w,
height: 30.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.05,
opacity2: 0.06,
customWidget: Center(
@@ -754,11 +754,11 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
}
Widget containertile({required String text}) {
return commonGlassContainer(
border: 1,
return commonGlassUI(
borderwidth: 1,
width: 100.w,
height: 30.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular( 30.r),
borderColor: const Color(0xFFD90B2E),
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 10.w),

6
lib/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart
View File

@@ -110,11 +110,11 @@ class _SubGroupsState extends State<SubGroups> {
padding: EdgeInsets.only(bottom: 25.h),
child: GestureDetector(
onTap: ontap,
child: commonGlassContainer(
border: 0.9,
child: commonGlassUI(
borderwidth: 0.9,
width: double.infinity,
height: 162.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 16.h),
child: Column(

6
lib/Main_Screens/ProfileTab/Clubs/Clubs.dart
View File

@@ -81,11 +81,11 @@ class _ClubsState extends State<Clubs> {
padding: EdgeInsets.only(bottom: 25.h),
child: GestureDetector(
onTap: ontap,
child: commonGlassContainer(
border: 0.9,
child: commonGlassUI(
borderwidth: 0.9,
width: double.infinity,
height: 143.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 16.h),
child: Column(

12
lib/Main_Screens/ProfileTab/Settings/AccountSessions.dart
View File

@@ -125,22 +125,22 @@ class _AccountSessionState extends State<AccountSession> {
required String ipaddress}) {
return Padding(
padding: const EdgeInsets.symmetric(vertical: 15),
child: commonGlassContainer(
child: commonGlassUI(
width: double.infinity,
height: 90.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
child: Column(
children: [
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 25.w,
height: 25.h,
opacity1: 0.24,
opacity2: 0.24,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
"assets/images/png/Group 58645.png",
@@ -148,7 +148,7 @@ class _AccountSessionState extends State<AccountSession> {
width: 9.w,
),
),
border: 1),
borderwidth: 1),
sizedBoxWidth(10.w),
text16400white(title),
],
@@ -170,7 +170,7 @@ class _AccountSessionState extends State<AccountSession> {
],
),
),
border: 1),
borderwidth: 1),
);
}
}

6
lib/Main_Screens/ProfileTab/Settings/FaqScreen.dart
View File

@@ -170,10 +170,10 @@ class _FaqScreenState extends State<FaqScreen> {
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
commonGlassContainer(
commonGlassUI(
width: double.infinity,
height: isExpanded ? 250.h : 82.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: SingleChildScrollView(
child: Padding(
padding:
@@ -208,7 +208,7 @@ class _FaqScreenState extends State<FaqScreen> {
),
),
),
border: 1),
borderwidth: 1),
],
),
);

12
lib/Main_Screens/ProfileTab/Settings/Settings.dart
View File

@@ -211,13 +211,13 @@ class _SettingsState extends State<Settings> {
dialogwidget() {
Get.dialog(Dialog(
backgroundColor: Colors.transparent,
child: commonGlassContainer(
child: commonGlassUI(
width: double.infinity,
height: 200.h,
borderradius: 14,
borderRadius: BorderRadius.circular( 14),
opacity1: 0.09,
opacity2: 0.13,
border: 0.8,
borderwidth: 0.8,
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 20.h),
child: Column(
@@ -238,15 +238,15 @@ class _SettingsState extends State<Settings> {
// Get.offAllNamed(RouteName.loginScreen);
Uploadata();
},
child: commonGlassContainer(
child: commonGlassUI(
width: 130.w,
height: 40.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular( 30.r),
opacity1: 0.05,
opacity2: 0.07,
customWidget:
Center(child: text14400white("Yes, I want to")),
border: 1),
borderwidth: 1),
),
Container(
height: 40.h,

12
lib/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart
View File

@@ -436,10 +436,10 @@ class _BlockedUsersState extends State<BlockedUsers> {
Get.dialog(Dialog(
backgroundColor: Colors.transparent,
surfaceTintColor: Colors.transparent,
child: commonGlassContainer(
child: commonGlassUI(
width: double.infinity,
height: 200.h,
borderradius: 14,
borderRadius: BorderRadius.circular(14),
opacity1: 0.09,
opacity2: 0.13,
customWidget: Padding(
@@ -458,14 +458,14 @@ class _BlockedUsersState extends State<BlockedUsers> {
onTap: () {
Get.back();
},
child: commonGlassContainer(
child: commonGlassUI(
width: 110.w,
height: 40.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular( 30.r),
opacity1: 0.05,
opacity2: 0.07,
customWidget: Center(child: text14400white("No")),
border: 1),
borderwidth: 1),
),
InkWell(
onTap: () {
@@ -490,7 +490,7 @@ class _BlockedUsersState extends State<BlockedUsers> {
],
),
),
border: 0.8)));
borderwidth: 0.8)));
}
Widget blockedUser({

6
lib/Main_Screens/ProfileTab/Share profile/ShareProfile.dart
View File

@@ -149,9 +149,9 @@ class _ShareProfileState extends State<ShareProfile> {
],
),
Spacer(),
commonGlassContainer(
border: 1,
borderradius: 2,
commonGlassUI(
borderwidth: 1,
borderRadius: BorderRadius.circular( 2),
height: 23.h,
width: 23.w,
opacity1: 0.24,

58
lib/Notifications/notification.dart
View File

@@ -57,49 +57,15 @@ 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()),
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: [
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// 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),
],
),
child: Column(
// const CommonBlurLeftRed(),
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
Column(
children: [
ListView.separated(
separatorBuilder: (context, index) {
@@ -122,9 +88,9 @@ class _NotificationPageState extends State<NotificationPage> {
},
),
],
)),
],
),
)]),
);
}
}

6
lib/Utils/Common/CommonAppbar.dart
View File

@@ -129,11 +129,11 @@ class CommonAppbar extends StatelessWidget implements PreferredSizeWidget {
child: Row(
children: [
sizedBoxWidth(10.w),
commonGlassContainer(
border: 0.5,
commonGlassUI(
borderwidth: 0.5,
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular(100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(

21
lib/Utils/texts.dart
View File

@@ -45,9 +45,10 @@ Widget text20400white(String text) {
);
}
Widget text20400FCFCFC(String text) {
Widget text20400FCFCFC(String text, {TextAlign? textAlign}) {
return Text(
text,
textAlign: textAlign,
style: TextStyle(
fontSize: 20.sp,
color: const Color(0xFFFCFCFC),
@@ -172,6 +173,18 @@ Widget text144005DFD63(String text) {
);
}
Widget text13400A7A7A7(String text) {
return Text(
text,
// textAlign: TextAlign.center,
style: TextStyle(
fontSize: 13.sp,
color: const Color(0xFFA7A7A7),
fontWeight: FontWeight.w400,
fontFamily: 'Helvetica'),
);
}
Widget text14400whiteblur(String text, {TextAlign? textAlign}) {
return Text(
text,
@@ -382,9 +395,10 @@ Widget txt20Black(txt) {
);
}
Widget text16w400_FCFCFC(String text) {
Widget text16w400_FCFCFC(String text, {TextAlign? textAlign}) {
return Text(
text,
textAlign: textAlign,
style: TextStyle(
fontSize: 16.sp,
color: const Color(0xFFFCFCFC),
@@ -447,9 +461,10 @@ Widget text10400whiteblur(String text) {
);
}
Widget text16w700_FCFCFC(String text) {
Widget text16w700_FCFCFC(String text, {TextAlign? textAlign}) {
return Text(
text,
textAlign: textAlign,
style: TextStyle(
fontSize: 16.sp,
color: const Color(0xFFFCFCFC),

4
lib/main.dart
View File

@@ -122,7 +122,9 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
fontFamily: 'Cambria',
),
debugShowCheckedModeBanner: false,
initialRoute: RouteName.splashScreen,
// initialRoute: RouteName.individualactivitystep2,
initialRoute: RouteName.individualactivitystep2,
getPages: AppRoutes.appRoutes(),
),
designSize: const Size(390, 844),

280
lib/onboarding/Signup/View/Business/View/step2Selectgroup.dart Normal file
View File

@@ -0,0 +1,280 @@
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: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
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')
],
),
),
),
]);
}
}

280
lib/onboarding/Signup/View/Business/View/step3SelectCommunity.dart Normal file
View File

@@ -0,0 +1,280 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:glassmorphism/glassmorphism.dart';
import 'package:regroup/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 SelectBusinessCommunity extends StatefulWidget {
const SelectBusinessCommunity({super.key});
@override
State<SelectBusinessCommunity> createState() =>
_SelectBusinessCommunityState();
}
class _SelectBusinessCommunityState extends State<SelectBusinessCommunity> {
TextEditingController searchcontroller = TextEditingController();
// StreamController<BlogsModel> blogsController = StreamController();
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: const Color.fromARGB(255, 18, 32, 47),
body: 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, 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 3 of 3')),
sizedBoxHeight(20.h),
Container(
width: 358.w,
height: 25.h,
decoration: ShapeDecoration(
shape: RoundedRectangleBorder(
side: const 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: 273.w,
height: 15.h,
decoration: ShapeDecoration(
gradient: const 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: const 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 community'),
sizedBoxWidth(5.w),
Image.asset(
'assets/images/png/informationicon.png',
)
],
)),
sizedBoxHeight(10.w),
Center(
child: Container(
width: 108.w,
decoration: const 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: const Icon(
Icons.search,
size: 35,
color: Colors.white,
),
),
// validatorText: "Enter your full name",
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
],
),
sizedBoxHeight(30.h),
const Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
CommunitySelect(
titleString: 'Active alliance network ',
image: 'assets/images/png/community1.png'),
CommunitySelect(
titleString: 'Fitfam federation',
image: 'assets/images/png/community2.png'),
],
),
sizedBoxHeight(30.h),
const Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
CommunitySelect(
titleString: 'The athletic town',
image:
'assets/images/png/groupindividual3.png'),
CommunitySelect(
titleString: 'Football Fever',
image: 'assets/images/png/community3.png'),
],
),
const Spacer(flex: 1),
CustomButton(
text: "Continue",
onPressed: () {
Get.toNamed(RouteName.communitycommitscreen);
})
],
),
)]),
);
}
}
class CommunitySelect extends StatefulWidget {
final String titleString;
final String image;
const CommunitySelect({
Key? key,
required this.titleString,
required this.image,
}) : super(key: key);
@override
State<CommunitySelect> createState() => _CommunitySelectState();
}
class _CommunitySelectState extends State<CommunitySelect> {
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: const BorderSide(width: 1, color: Color(0xFFFF002B)),
borderRadius: BorderRadius.circular(30),
),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
_text ? text10400white('Regrouping') : text10400white('Join')
],
),
),
),
]);
}
}

44
lib/onboarding/Signup/View/Individual/FindCommunityPage.dart Normal file
View File

@@ -0,0 +1,44 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Common/CommonButton.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
class FindCommunityPage extends StatelessWidget {
const FindCommunityPage({super.key});
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color(0xFF222935),
body: SingleChildScrollView(
child: Padding(
padding: EdgeInsets.symmetric(
vertical: 60.h,
),
child: Column(children: [
sizedBoxHeight(40.h),
Image.asset("assets/images/png/Organizing projects-pana 1.png"),
sizedBoxHeight(30.h),
Padding(
padding: EdgeInsets.symmetric(horizontal: 10.w),
child: Column(children: [
text20400FCFCFC(
'''ReGroup helps organise individuals into groups, and groups within communities. For example, an individual is part of a local football club, while all the football clubs in the city form a wider football community. If you already know which communities you're interested in, you can search for them here.''',
textAlign: TextAlign.center),
sizedBoxHeight(20.h),
CommonBtn(
text: "Find communities",
onTap: () {
// individualcommunitystep4
// Get.toNamed(RouteName.individualgroupstep3);
Get.toNamed(RouteName.individualcommunitystep4);
}),
]),
),
])),
));
}
}

238
lib/onboarding/Signup/View/Individual/step1Selectprofile.dart Normal file
View File

@@ -0,0 +1,238 @@
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:regroup/Utils/Common/CustomNextButton.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
class SelectIndividualProfile extends StatefulWidget {
const SelectIndividualProfile({super.key});
@override
State<SelectIndividualProfile> createState() =>
_SelectIndividualProfileState();
}
class _SelectIndividualProfileState extends State<SelectIndividualProfile> {
ValueNotifier<int> selectedIndex = ValueNotifier(-1);
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: const Color.fromARGB(255, 18, 32, 47),
body: 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, 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 1 of 4')),
sizedBoxHeight(20.h),
Container(
width: 358.w,
height: 25.h,
decoration: ShapeDecoration(
shape: RoundedRectangleBorder(
side:
const 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: 15,
height: 15,
decoration: ShapeDecoration(
gradient: const LinearGradient(
begin: Alignment(0.98, -0.21),
end: Alignment(-0.98, 0.21),
colors: [
Color(0xA5D90B2E),
Color(0x42D90B2E)
],
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(30),
),
),
)
],
),
),
),
sizedBoxHeight(30.h),
Center(child: text20400white('Select your profile type')),
sizedBoxHeight(10.w),
Center(
child: Container(
width: 154.w,
decoration: const ShapeDecoration(
shape: RoundedRectangleBorder(
side: BorderSide(
width: 1,
strokeAlign: BorderSide.strokeAlignCenter,
color: Color(0xFF858585),
),
),
),
),
),
sizedBoxHeight(30.h),
ProfileContainer(
titleString: "Athlete",
contentString:
"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s.",
image: 'assets/images/svg/runningindividual.svg',
selectedIndex: selectedIndex,
index: 0,
),
sizedBoxHeight(20.h),
ProfileContainer(
titleString: "Coach",
contentString:
"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s.",
image: 'assets/images/svg/coachindividual.svg',
selectedIndex: selectedIndex,
index: 1,
),
sizedBoxHeight(20.h),
ProfileContainer(
titleString: "Social",
contentString:
"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s.",
image: 'assets/images/svg/userindividual.svg',
selectedIndex: selectedIndex,
index: 2,
),
const Spacer(flex: 1),
CustomButton(
text: "Continue",
onPressed: () {
Get.toNamed(RouteName.individualactivitystep2);
})
],
),
)
],
));
}
}
class ProfileContainer extends StatefulWidget {
final String titleString;
final String contentString;
final String image;
final ValueNotifier<int> selectedIndex;
final int index;
const ProfileContainer({
Key? key,
required this.titleString,
required this.contentString,
required this.image,
required this.selectedIndex,
required this.index,
}) : super(key: key);
@override
State<ProfileContainer> createState() => _ProfileContainerState();
}
class _ProfileContainerState extends State<ProfileContainer> {
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: () {
// Set the selected ValueNotifier to true when tapped
widget.selectedIndex.value = widget.index;
},
child: ValueListenableBuilder<int>(
valueListenable: widget.selectedIndex,
builder: (context, selectedIndex, child) {
bool isSelected = selectedIndex == widget.index;
return Container(
width: 358.w,
height: 126.h,
decoration: BoxDecoration(
gradient: LinearGradient(
begin: const Alignment(0.98, -0.21),
end: const Alignment(-0.98, 0.21),
colors: isSelected
? [
const Color(0XFFD90B2E).withOpacity(0.80),
const Color(0XFFD90B2E).withOpacity(0.77),
const Color(0XFFD90B2E).withOpacity(0.66),
const Color(0XFFD90B2E).withOpacity(0.18),
]
: [
Colors.white.withOpacity(0.06),
Colors.white.withOpacity(0.08)
],
),
border: Border.all(width: 1, color: const Color(0xFF434A53)),
borderRadius: BorderRadius.circular(10),
),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 16.h),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
SvgPicture.asset(widget.image),
sizedBoxWidth(10.w),
SizedBox(
width: 241.w,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
text16400white(widget.titleString),
sizedBoxHeight(3.h),
text12400white(widget.contentString)
],
),
),
],
),
),
);
},
),
);
}
}

754
lib/onboarding/Signup/View/Individual/step2Selectactivity.dart
View File

@@ -1,19 +1,19 @@
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/CommonButton.dart';
import 'package:regroup/Common/base_manager.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/onboarding/Signup/view_model/getmethod.dart';
import 'package:regroup/onboarding/Signup/view_model/postmethod.dart';
import 'package:regroup/resources/routes/route_name.dart';
import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart';
int? _firstSelectedIndex;
bool _isFirstSelectionActive = false;
class SelectIndividualActivity extends StatefulWidget {
const SelectIndividualActivity({super.key});
@@ -42,16 +42,49 @@ class _SelectIndividualActivityState extends State<SelectIndividualActivity> {
// });
// }
void _onContainerTap(int id) {
void _onContainerTap(int index) {
setState(() {
if (_selectedIndices.contains(id)) {
_selectedIndices.remove(id);
if (_selectedIndices.contains(index)) {
_selectedIndices.remove(index);
if (_firstSelectedIndex == index) {
// If the first selected container is unselected, reset the active state
_firstSelectedIndex = null;
_isFirstSelectionActive = false;
}
} else {
_selectedIndices.add(id);
if (_firstSelectedIndex == null) {
// The first item is being selected
_firstSelectedIndex = index;
_isFirstSelectionActive = true;
}
_selectedIndices.add(index);
}
});
}
Color _getGradientColor(int index) {
if (_selectedIndices.isEmpty) {
return Colors.transparent;
} else if (_firstSelectedIndex == index && _isFirstSelectionActive) {
// Apply Color(0XFFD90B2E) to the first selected item
return Color(0XFFD90B2E);
} else if (_selectedIndices.contains(index)) {
// Apply Color(0xFF009DAB) to all other selected items
return Color(0xFF009DAB);
}
return Colors.transparent;
}
// void _onContainerTap(int id) {
// setState(() {
// if (_selectedIndices.contains(id)) {
// _selectedIndices.remove(id);
// } else {
// _selectedIndices.add(id);
// }
// });
// }
// to give two different colors for selectedd two containers
// Color _getGradientColor(int index) {
// if (_selectedIndices.isEmpty) {
@@ -69,12 +102,12 @@ class _SelectIndividualActivityState extends State<SelectIndividualActivity> {
// return Colors.transparent;
// }
Color _getGradientColor(int id) {
if (_selectedIndices.contains(id)) {
return const Color(0XFFD90B2E); // Selected color
}
return Colors.transparent; // Default color
}
// Color _getGradientColor(int id) {
// if (_selectedIndices.contains(id)) {
// return const Color(0XFFD90B2E); // Selected color
// }
// return Colors.transparent; // Default color
// }
Uploadata() async {
utils.loader();
@@ -87,7 +120,9 @@ class _SelectIndividualActivityState extends State<SelectIndividualActivity> {
final data = await Onboard().PostIndividualActivity(updata);
if (data.status == ResponseStatus.SUCCESS) {
Get.back();
Get.toNamed(RouteName.individualgroupstep3);
print("Activities selected");
// Get.toNamed(RouteName.individualgroupstep3);
Get.toNamed(RouteName.findcommunitypage);
return utils.showToast(data.message);
} else {
@@ -99,309 +134,291 @@ class _SelectIndividualActivityState extends State<SelectIndividualActivity> {
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
child: Scaffold(
backgroundColor: const Color.fromARGB(255, 18, 32, 47),
bottomNavigationBar: Padding(
padding: const EdgeInsets.only(bottom: 10, left: 16, right: 16),
child: CustomButton(
text: "Continue",
onPressed: () {
if (_selectedIndices.isEmpty &&
otheractivitycontroller.text.isEmpty) {
utils.showToast('Please select activity');
} else {
// String selectedIndicesString =
// _selectedIndices.join(',');
// print(
// 'Selected Indices: [$selectedIndicesString]');
Uploadata();
}
// Get.toNamed(
// RouteName.individualgroupstep3);
}),
),
body: SafeArea(
child: FutureBuilder(
future: Getonboard().getIndividualactivity(),
builder: (ctx, snapshot) {
if (snapshot.data == null) {
return const Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [Center(child: CircularProgressIndicator())],
);
}
if (snapshot.connectionState == ConnectionState.done) {
if (snapshot.hasError) {
return Center(
child: Text(
'${snapshot.error} occured',
style: TextStyle(fontSize: 18.spMin),
),
onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
child: Scaffold(
backgroundColor: const Color.fromARGB(255, 18, 32, 47),
bottomNavigationBar: Padding(
padding: const EdgeInsets.only(bottom: 10, left: 16, right: 16),
child: CustomButton(
text: "Continue",
onPressed: () {
if (_selectedIndices.isEmpty &&
otheractivitycontroller.text.isEmpty) {
utils.showToast('Please select activity');
} else {
print(_selectedIndices.toString());
// String selectedIndicesString =
// _selectedIndices.join(',');
// print(
// 'Selected Indices: [$selectedIndicesString]');
Uploadata();
}
// Get.toNamed(
// RouteName.individualgroupstep3);
}),
),
body: SafeArea(
child: FutureBuilder(
future: Getonboard().getIndividualactivity(),
builder: (ctx, snapshot) {
if (snapshot.data == null) {
return const Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [Center(child: CircularProgressIndicator())],
);
}
}
if (snapshot.connectionState == ConnectionState.done) {
if (snapshot.hasError) {
return Center(
child: Text(
'${snapshot.error} occured',
style: TextStyle(fontSize: 18.spMin),
),
);
}
}
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, vertical: 0.h),
child: SingleChildScrollView(
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),
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, vertical: 0.h),
child: SingleChildScrollView(
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 1 of 3')),
sizedBoxHeight(20.h),
Container(
width: double.infinity,
height: 25.h,
decoration: ShapeDecoration(
shape: RoundedRectangleBorder(
side: const BorderSide(
width: 1, color: Color(0xFF434A53)),
borderRadius: BorderRadius.circular(30),
sizedBoxHeight(30.h),
Align(
alignment: Alignment.center,
child: text16400white('Step 1 of 3')),
sizedBoxHeight(20.h),
Container(
width: double.infinity,
height: 25.h,
decoration: ShapeDecoration(
shape: RoundedRectangleBorder(
side: const 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: 120.w,
height: 15.h,
decoration: ShapeDecoration(
gradient: const 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: const 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),
indiactivityobj!.data == null ||
indiactivityobj!.data!.isEmpty
? _buildNoDataBody(context)
: Column(
crossAxisAlignment: CrossAxisAlignment.start,
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: 8.w, vertical: 2.h),
child: Row(
children: [
Center(
child: _selectedIndices.isEmpty
? text20400white(
'What is your main activity ?')
: text20400white(
'What else do you do?')),
sizedBoxHeight(10.w),
Center(
child: Container(
width: 154.w,
decoration: const ShapeDecoration(
Container(
width: 100.w,
height: 15.h,
decoration: ShapeDecoration(
gradient: const LinearGradient(
begin: Alignment(0.98, -0.21),
end: Alignment(-0.98, 0.21),
colors: [
Color(0xA5D90B2E),
Color(0x42D90B2E)
],
),
shape: RoundedRectangleBorder(
side: BorderSide(
width: 1,
strokeAlign:
BorderSide.strokeAlignCenter,
color: Color(0xFF858585),
),
borderRadius:
BorderRadius.circular(30),
),
),
),
),
sizedBoxHeight(30.h),
GridView.builder(
physics: const ScrollPhysics(),
shrinkWrap: true,
gridDelegate:
SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount:
3, // Number of items in each row
crossAxisSpacing: 12
.w, // Horizontal spacing between items
mainAxisSpacing: 12
.h, // Vertical spacing between items
),
itemCount: indiactivityobj!.data!.length,
itemBuilder: (context, index) {
return ActivityContainer(
index:
indiactivityobj!.data![index].id!,
titleString: indiactivityobj!
.data![index].name!,
image: indiactivityobj!
.data![index].image,
// 'assets/images/svg/individualact7.svg',
isSelected: _selectedIndices.contains(
indiactivityobj!
.data![index].id!),
gradientColor: _getGradientColor(
indiactivityobj!
.data![index].id!),
onTap: _onContainerTap,
);
},
),
sizedBoxHeight(30.h),
text20400FCFCFC("Add other activity"),
sizedBoxHeight(25.h),
CustomTextFormField(
textEditingController:
otheractivitycontroller,
texttype: TextInputType.text,
hintText: "Enter other activity",
// leadingIcon:
// // const Icon(Icons.mail_outline),
// Image.asset(
// width: 22.w,
// height: 17.h,
// 'assets/images/png/user.png',
// ),
// validatorText: "Enter your full name",
validator: (value) {
if (value!.isEmpty) {
return 'Enter your full name ';
}
return null;
},
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
FilteringTextInputFormatter.allow(
RegExp('[a-zA-Z ]'))
],
),
// CustomDropDownRadio(
// header: "",
// title: "",
// listData: [
// "American football",
// "Archery",
// "Athletics",
// "Baseball",
// "Basketball",
// "Boxing",
// "Canoeing",
// "Clay pigeon shooting",
// "Climbing",
// "Combat sports",
// "Cricket",
// "Dodgeball",
// "Equestrian",
// "Fencing",
// "Gaelic football",
// "Golf",
// "Gymnastics",
// "Handball",
// "Hockey",
// "Lacrosse",
// "Modern biathlon and pentathlon",
// "Netball",
// "Orienteering",
// "Pool and snooker",
// "Powerlifting",
// "Rifle",
// "Rugby league",
// "Rugby union",
// "Sailing",
// "Snowsports",
// "Squash",
// "Surfing",
// "Swimming",
// "Softball",
// "Table tennis",
// "Tennis",
// "Touch rugby",
// "Trampoline",
// "Triathlon",
// "Ultimate frisbee",
// "Volleyball",
// "Water polo",
// "Windsurfing"
// ],
// onItemSelected: (p0) {},
// leadingImage: SizedBox()),
// // Spacer(flex: 1),
sizedBoxHeight(35.h),
child: Row(
mainAxisAlignment:
MainAxisAlignment.end,
children: [
Container(
width: 15,
height: 15,
decoration: ShapeDecoration(
gradient: const 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),
indiactivityobj!.data == null ||
indiactivityobj!.data!.isEmpty
? _buildNoDataBody(context)
: Column(
crossAxisAlignment:
CrossAxisAlignment.center,
children: [
text20400white(
'What are your interests?'),
// sizedBoxHeight(5.w),
_isFirstSelectionActive
? text13400A7A7A7(
'Select your secondary interests')
: text13400A7A7A7(
'Select your primary interest'),
// Container(
// width: 154.w,
// decoration: const ShapeDecoration(
// shape: RoundedRectangleBorder(
// side: BorderSide(
// width: 1,
// strokeAlign:
// BorderSide.strokeAlignCenter,
// color: Color(0xFF858585),
// ),
// ),
// ),
// ),
sizedBoxHeight(30.h),
GridView.builder(
physics: const ScrollPhysics(),
shrinkWrap: true,
gridDelegate:
SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount:
3, // Number of items in each row
crossAxisSpacing: 12
.w, // Horizontal spacing between items
mainAxisSpacing: 12
.h, // Vertical spacing between items
),
itemCount:
indiactivityobj!.data!.length,
itemBuilder: (context, index) {
return ActivityContainer(
index: indiactivityobj!
.data![index].id!,
titleString: indiactivityobj!
.data![index].name!,
image: indiactivityobj!
.data![index].image,
// 'assets/images/svg/individualact7.svg',
isSelected: _selectedIndices
.contains(indiactivityobj!
.data![index].id!),
gradientColor: _getGradientColor(
indiactivityobj!
.data![index].id!),
onTap: _onContainerTap,
);
},
),
sizedBoxHeight(30.h),
// text20400FCFCFC("Add other activity"),
// sizedBoxHeight(25.h),
// CustomTextFormField(
// textEditingController:
// otheractivitycontroller,
// texttype: TextInputType.text,
// hintText: "Enter other activity",
// // leadingIcon:
// // // const Icon(Icons.mail_outline),
// // Image.asset(
// // width: 22.w,
// // height: 17.h,
// // 'assets/images/png/user.png',
// // ),
// // validatorText: "Enter your full name",
// validator: (value) {
// if (value!.isEmpty) {
// return 'Enter your full name ';
// }
// return null;
// },
// inputFormatters: [
// // LengthLimitingTextInputFormatter(20),
// RemoveEmojiInputFormatter(),
// FilteringTextInputFormatter.allow(
// RegExp('[a-zA-Z ]'))
// ],
// ),
sizedBoxHeight(35.h),
],
)
],
),
),
),
),
],
);
},
],
);
},
),
),
),
//
),
);
floatingActionButton: Stack(
alignment: Alignment.center,
clipBehavior: Clip.none, // Ensure the Positioned widget is visible
children: [
FloatingActionButton(
onPressed: () {
interestdialogwidget();
},
backgroundColor: const Color(0xFFD90B2E),
autofocus: true,
shape: const CircleBorder(),
child: Icon(
Icons.add,
color: Colors.white,
size: 27.sp,
),
),
Positioned(
right: 60.w,
child: Container(
width: 212.w,
height: 35.h,
decoration: BoxDecoration(
color: Color(0xFF363636),
borderRadius: BorderRadius.circular(20),
border:
Border.all(color: Color(0xFFD90B2E), width: 1.w)),
child: Center(
child: text16400white("Can’t find your interest"))),
)
],
),
));
}
Widget _buildNoDataBody(context) {
@@ -412,6 +429,108 @@ class _SelectIndividualActivityState extends State<SelectIndividualActivity> {
}
}
interestdialogwidget() {
Get.dialog(Dialog(
// backgroundColor: Colors.transparent,
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.r),
color: const Color(0xFF222935)),
child: Padding(
padding: EdgeInsets.only(
right: 16.w, left: 16.w, top: 20.h, bottom: 40.h),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Spacer(),
Image.asset(
"assets/images/png/x-circle.png",
height: 28.h,
width: 28.w,
)
],
),
text16w700_FCFCFC("Suggest interest"),
sizedBoxHeight(16.h),
Center(
child: CustomTextFormField(
hintText: "Please type your interest",
)),
sizedBoxHeight(10.h),
text10w400_FCFCFC_blur("We will surely make this happen"),
sizedBoxHeight(20.h),
Align(
alignment: Alignment.center,
child: SizedBox(
width: 177.w,
child: CommonBtn(
text: "Suggest",
onTap: () {
Get.back();
thankdialogwidget();
})),
)
],
),
),
),
],
),
));
}
thankdialogwidget() {
Get.dialog(Dialog(
// backgroundColor: Colors.transparent,
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.r),
color: const Color(0xFF222935)),
child: Padding(
padding: EdgeInsets.only(
right: 16.w, left: 16.w, top: 20.h, bottom: 40.h),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Row(
children: [
Spacer(),
Image.asset(
"assets/images/png/x-circle.png",
height: 28.h,
width: 28.w,
)
],
),
Image.asset(
"assets/images/png/correct 1.png",
height: 72.h,
width: 72.w,
),
sizedBoxHeight(20.h),
text16w700_FCFCFC(
"Thank You! \n for adding one more to the club",
textAlign: TextAlign.center),
sizedBoxHeight(16.h),
],
),
),
),
],
),
));
}
class ActivityContainer extends StatelessWidget {
final int index;
final String titleString;
@@ -441,19 +560,32 @@ class ActivityContainer extends StatelessWidget {
begin: const Alignment(0.98, -0.21),
end: const Alignment(-0.98, 0.21),
colors: isSelected
? [
gradientColor.withOpacity(0.80),
gradientColor.withOpacity(0.77),
gradientColor.withOpacity(0.66),
gradientColor.withOpacity(0.18),
]
? _firstSelectedIndex == index &&
_isFirstSelectionActive == true
? [
gradientColor.withOpacity(0.80),
gradientColor.withOpacity(0.77),
Color(0xFF009DAB).withOpacity(0.66),
Color(0xFF009DAB).withOpacity(0.18),
]
: [
Colors.white.withOpacity(0.06),
Colors.white.withOpacity(0.08),
]
: [
Colors.white.withOpacity(0.06),
Colors.white.withOpacity(0.08),
],
),
shape: RoundedRectangleBorder(
side: const BorderSide(width: 1, color: Color(0xFF434A53)),
side: isSelected
? _firstSelectedIndex == index &&
_isFirstSelectionActive == true
? BorderSide(width: 1.w, color: Color(0xFF434A53))
: BorderSide(width: 3.w, color: gradientColor)
: BorderSide(width: 3.w, color: gradientColor),
borderRadius: BorderRadius.circular(10),
),
),

202
lib/onboarding/Signup/View/Individual/step3Selectyourgroup.dart
View File

@@ -2,9 +2,10 @@ import 'dart:async';
import 'package:flutter/cupertino.dart';
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/CommonButton.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Utils/Common/CustomNextButton.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
@@ -67,7 +68,8 @@ class _SelectIndividualGroupState extends State<SelectIndividualGroup> {
if (data.status == ResponseStatus.SUCCESS) {
Get.back();
print("groups selected");
Get.toNamed(RouteName.individualcommunitystep4);
// Get.toNamed(RouteName.individualcommunitystep4);
Get.toNamed(RouteName.communitycommitscreen);
return utils.showToast(data.message);
} else {
@@ -82,7 +84,7 @@ class _SelectIndividualGroupState extends State<SelectIndividualGroup> {
return GestureDetector(
onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
child: Scaffold(
backgroundColor: Color.fromARGB(255, 18, 32, 47),
backgroundColor: const Color.fromARGB(255, 18, 32, 47),
body: Stack(
children: [
Container(
@@ -117,14 +119,15 @@ class _SelectIndividualGroupState extends State<SelectIndividualGroup> {
sizedBoxHeight(30.h),
Align(
alignment: Alignment.center,
child: text16400white('Step 2 of 3')),
child: text16400white('Step 3 of 3')),
sizedBoxHeight(20.h),
Container(
width: double.infinity,
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),
),
),
@@ -133,45 +136,47 @@ class _SelectIndividualGroupState extends State<SelectIndividualGroup> {
horizontal: 8.w, vertical: 2.h),
child: Row(
children: [
Container(
width: 216.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)
Expanded(
child: Container(
// width: 216.w,
height: 15.h,
decoration: ShapeDecoration(
gradient: const 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: const LinearGradient(
begin: Alignment(0.98, -0.21),
end: Alignment(-0.98, 0.21),
colors: [
Color(0xFFD90B2E),
Color(0x60D90B2E)
],
),
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(30),
),
),
)
],
),
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),
),
),
)
],
))
)),
)
],
),
),
@@ -183,14 +188,19 @@ class _SelectIndividualGroupState extends State<SelectIndividualGroup> {
children: [
text20400white('Find your group'),
sizedBoxWidth(5.w),
Image.asset('assets/images/png/informationicon.png')
InkWell(
onTap: () {
groupBottomsheet();
},
child: Image.asset(
'assets/images/png/informationicon.png'))
],
)),
sizedBoxHeight(10.w),
Center(
child: Container(
width: 108.w,
decoration: ShapeDecoration(
decoration: const ShapeDecoration(
shape: RoundedRectangleBorder(
side: BorderSide(
width: 1,
@@ -215,7 +225,7 @@ class _SelectIndividualGroupState extends State<SelectIndividualGroup> {
// ),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Icon(
child: const Icon(
Icons.search,
size: 35,
color: Colors.white,
@@ -241,13 +251,14 @@ class _SelectIndividualGroupState extends State<SelectIndividualGroup> {
if (snapshot.connectionState ==
ConnectionState.waiting) {
// Display shimmer effect while waiting for data
return Center(child: CircularProgressIndicator());
return const Center(
child: CircularProgressIndicator());
} else if (snapshot.hasError) {
// Handle error state
return Center(
child: Text(
'${snapshot.error} occurred',
style: TextStyle(fontSize: 18),
style: const TextStyle(fontSize: 18),
),
);
} else {
@@ -256,9 +267,9 @@ class _SelectIndividualGroupState extends State<SelectIndividualGroup> {
? _buildNoDataBody(context)
: Expanded(
child: GridView.builder(
physics: ScrollPhysics(),
physics: const ScrollPhysics(),
gridDelegate:
SliverGridDelegateWithFixedCrossAxisCount(
const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
crossAxisSpacing: 12.0,
mainAxisSpacing: 12.0,
@@ -328,6 +339,53 @@ class _SelectIndividualGroupState extends State<SelectIndividualGroup> {
),
);
}
void groupBottomsheet() {
Get.bottomSheet(
isScrollControlled: true,
Container(
// height: 700.h,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14.r),
color: const Color(0xFF222935)),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 20.h),
child: Column(mainAxisSize: MainAxisSize.min, children: [
// sizedBoxHeight(20.h),
Row(
children: [
Spacer(),
Image.asset(
"assets/images/png/x-circle.png",
height: 28.h,
width: 28.w,
),
],
),
Image.asset(
"assets/images/png/Group 1000004385.png",
height: 185.h,
width: 185.w,
),
sizedBoxHeight(20.h),
text16w400_FCFCFC(
'''Use this screen to find specific groups within your area. Groups span any club, society or hobbyist group e.g. sports clubs, social clubs, service clubs, musical groups or voluntary societies. If you are still exploring your options, you can skip this step. You can always join or create new groups later.''',
textAlign: TextAlign.center),
sizedBoxHeight(20.h),
SizedBox(
width: 239.w,
child: CommonBtn(
text: "Understood",
onTap: () {
Get.back();
},
)),
// sizedBoxHeight(40.h)
]))));
}
}
class GroupSelect extends StatelessWidget {
@@ -348,13 +406,13 @@ class GroupSelect extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
return Column(crossAxisAlignment: CrossAxisAlignment.center, children: [
Container(
width: 169,
height: 74,
width: 72.w,
height: 72.h,
decoration: ShapeDecoration(
image: image == null || image!.isEmpty
? DecorationImage(
? const DecorationImage(
image: AssetImage("assets/images/png/groupindividual3.png"),
fit: BoxFit.fill,
)
@@ -362,26 +420,42 @@ class GroupSelect extends StatelessWidget {
image: NetworkImage(image!),
fit: BoxFit.fill,
),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5)),
shape:
RoundedRectangleBorder(borderRadius: BorderRadius.circular(100)),
),
),
SizedBox(height: 15.0),
const SizedBox(height: 15.0),
Text(
titleString,
style: TextStyle(
style: const TextStyle(
color: Colors.white,
fontSize: 12.0,
overflow: TextOverflow.ellipsis),
),
SizedBox(height: 15.0),
const SizedBox(height: 15.0),
GestureDetector(
onTap: () => onTap(index),
child: Container(
width: 169,
height: 23,
width: 169.w,
height: 23.h,
decoration: ShapeDecoration(
gradient: isSelected
? LinearGradient(colors: [
Color(0xFFD90B2E),
Color(0xFFD90B2E),
])
: LinearGradient(
begin: Alignment(0.98, -0.21),
end: Alignment(-0.98, 0.21),
colors: [
Colors.white.withOpacity(0.04),
Colors.white.withOpacity(0.05)
],
),
shape: RoundedRectangleBorder(
side: BorderSide(width: 1, color: Color(0xFFFF002B)),
side: isSelected
? BorderSide(width: 1.w, color: Colors.transparent)
: BorderSide(width: 1.w, color: Color(0xFF434A53)),
borderRadius: BorderRadius.circular(30),
),
),
@@ -389,10 +463,8 @@ class GroupSelect extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: [
isSelected
? Text('Regrouping',
style: TextStyle(color: Colors.white, fontSize: 10.0))
: Text('Join',
style: TextStyle(color: Colors.white, fontSize: 10.0))
? text10400white("Leave group")
: text10400white("Join")
],
),
),

179
lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart
View File

@@ -2,13 +2,13 @@ import 'dart:async';
import 'package:flutter/cupertino.dart';
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/CommonButton.dart';
import 'package:regroup/Common/base_manager.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';
@@ -68,7 +68,9 @@ class _SelectIndividualCommunityState extends State<SelectIndividualCommunity> {
if (data.status == ResponseStatus.SUCCESS) {
// Get.back();
print("groups selected");
Get.toNamed(RouteName.communitycommitscreen);
// Get.toNamed(RouteName.communitycommitscreen);
Get.toNamed(RouteName.individualgroupstep3);
return utils.showToast(data.message);
} else {
@@ -118,7 +120,7 @@ class _SelectIndividualCommunityState extends State<SelectIndividualCommunity> {
sizedBoxHeight(30.h),
Align(
alignment: Alignment.center,
child: text16400white('Step 3 of 3')),
child: text16400white('Step 2 of 3')),
sizedBoxHeight(20.h),
Container(
width: double.infinity,
@@ -135,46 +137,45 @@ class _SelectIndividualCommunityState extends State<SelectIndividualCommunity> {
horizontal: 8.w, vertical: 2.h),
child: Row(
children: [
Expanded(
child: Container(
// width: 216.w,
height: 15.h,
decoration: ShapeDecoration(
gradient: const LinearGradient(
begin: Alignment(0.98, -0.21),
end: Alignment(-0.98, 0.21),
colors: [
Color(0xA5D90B2E),
Color(0x42D90B2E)
],
Container(
width: 170.w,
height: 15.h,
decoration: ShapeDecoration(
gradient: const 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: const LinearGradient(
begin: Alignment(0.98, -0.21),
end: Alignment(-0.98, 0.21),
colors: [
Color(0xFFD90B2E),
Color(0x60D90B2E)
],
),
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(30),
),
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(30),
),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Container(
width: 15,
height: 15,
decoration: ShapeDecoration(
gradient: const LinearGradient(
begin: Alignment(0.98, -0.21),
end: Alignment(-0.98, 0.21),
colors: [
Color(0xFFD90B2E),
Color(0x60D90B2E)
],
),
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(30),
),
),
)
],
)))
)
],
))
],
),
),
@@ -186,8 +187,13 @@ class _SelectIndividualCommunityState extends State<SelectIndividualCommunity> {
children: [
text20400white('Find your community'),
sizedBoxWidth(5.w),
Image.asset(
'assets/images/png/informationicon.png',
InkWell(
onTap: () {
communityBottomsheet();
},
child: Image.asset(
'assets/images/png/informationicon.png',
),
)
],
)),
@@ -335,6 +341,56 @@ class _SelectIndividualCommunityState extends State<SelectIndividualCommunity> {
),
);
}
void communityBottomsheet() {
Get.bottomSheet(
isScrollControlled: true,
Container(
// height: 700.h,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14.r),
color: const Color(0xFF222935)),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 20.h),
child: Column(mainAxisSize: MainAxisSize.min, children: [
// sizedBoxHeight(20.h),
Row(
children: [
Spacer(),
Image.asset(
"assets/images/png/x-circle.png",
height: 28.h,
width: 28.w,
),
],
),
Image.asset(
"assets/images/png/Connected world-amico 1.png",
height: 185.h,
width: 185.w,
),
sizedBoxHeight(20.h),
text16w400_FCFCFC(
'''Use this screen to find interesting communities near you. Communities are
a collection of groups, individuals and businesses that share common interests. e.g. 'London football clubs' or 'Cambridge rowing clubs'. If you aren't sure of which communities you'd like to be a part of or already know the specific club you'd like to join, you can skip this step. Don't worry, you can always join new communities later.''',
textAlign: TextAlign.center),
sizedBoxHeight(20.h),
SizedBox(
width: 239.w,
child: CommonBtn(
text: "Understood",
onTap: () {
Get.back();
},
)),
// sizedBoxHeight(40.h)
]))));
}
}
class CommunitySelect extends StatelessWidget {
@@ -357,8 +413,8 @@ class CommunitySelect extends StatelessWidget {
Widget build(BuildContext context) {
return Column(crossAxisAlignment: CrossAxisAlignment.center, children: [
Container(
width: 73.w,
height: 73.h,
width: 170.w,
height: 74.h,
decoration: ShapeDecoration(
image: image == null || image!.isEmpty
? const DecorationImage(
@@ -370,7 +426,7 @@ class CommunitySelect extends StatelessWidget {
fit: BoxFit.fill,
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(100),
borderRadius: BorderRadius.circular(5.r),
),
),
),
@@ -386,11 +442,26 @@ class CommunitySelect extends StatelessWidget {
GestureDetector(
onTap: () => onTap(index),
child: Container(
width: 169,
height: 23,
width: 169.w,
height: 23.h,
decoration: ShapeDecoration(
gradient: isSelected
? LinearGradient(colors: [
Color(0xFFD90B2E),
Color(0xFFD90B2E),
])
: LinearGradient(
begin: Alignment(0.98, -0.21),
end: Alignment(-0.98, 0.21),
colors: [
Colors.white.withOpacity(0.04),
Colors.white.withOpacity(0.05)
],
),
shape: RoundedRectangleBorder(
side: const BorderSide(width: 1, color: Color(0xFFFF002B)),
side: isSelected
? BorderSide(width: 1.w, color: Colors.transparent)
: BorderSide(width: 1.w, color: Color(0xFF434A53)),
borderRadius: BorderRadius.circular(30),
),
),
@@ -398,10 +469,8 @@ class CommunitySelect extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: [
isSelected
? const Text('Regrouping',
style: TextStyle(color: Colors.white, fontSize: 10.0))
: const Text('Join',
style: TextStyle(color: Colors.white, fontSize: 10.0))
? text10400white("Leave community")
: text10400white("Join")
],
),
),

2
lib/onboarding/Signup/View/Individual/tellusindividual.dart
View File

@@ -346,7 +346,7 @@ class _TellusaboutIndividualState extends State<TellusaboutIndividual> {
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
FilteringTextInputFormatter.allow(
RegExp('[a-zA-Z ]'))
RegExp('[a-zA-ZS0-9 ]')),
],
),
sizedBoxHeight(10.h),

131
lib/onboarding/Signup/View/communitycommitment.dart
View File

@@ -1,7 +1,7 @@
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/Utils/Common/CustomNextButton.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
@@ -107,7 +107,8 @@ class _CommunitycommitmentState extends State<Communitycommitment> {
CustomButton2(
text: 'Decline',
onPressed: () {
Get.offAllNamed(RouteName.loginScreen);
alertdialogwidget();
// Get.offAllNamed(RouteName.loginScreen);
})
],
),
@@ -115,4 +116,130 @@ class _CommunitycommitmentState extends State<Communitycommitment> {
],
));
}
alertdialogwidget() {
Get.dialog(Dialog(
// backgroundColor: Colors.transparent,
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.r),
color: const Color(0xFF222935)),
child: Padding(
padding: EdgeInsets.only(
right: 16.w, left: 16.w, top: 20.h, bottom: 40.h),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
text16w400_FCFCFC("Are you sure you don’t want to be \nNice?",
textAlign: TextAlign.center),
sizedBoxHeight(16.h),
Row(
children: [
InkWell(
onTap: () {
Get.back();
dialogwidget();
Future.delayed(Duration(seconds: 2), () {
Get.back();
Get.toNamed(RouteName.signupendpage);
});
},
child: Container(
// width: 120.w,
height: 40.h,
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.centerLeft,
end: Alignment.centerRight,
colors: [
Color.fromRGBO(255, 255, 255, 0.036),
Color.fromRGBO(255, 255, 255, 0.048),
],
),
border: Border.all(
color: Color(0xFF434A53),
width: 1.0,
),
borderRadius: BorderRadius.circular(30.r)),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 10.w),
child:
Center(child: text14400white("Yes, I am evil")),
),
),
),
Spacer(),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.signupendpage);
},
child: Container(
// height: 40.h,
// width: 120.w,
decoration: BoxDecoration(
color: Color(0xFFD90B2E),
borderRadius: BorderRadius.circular(30.r),
),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 20.w),
child: Center(
child: text14w400_FCFCFC(
"No, I want \nto be Nice")),
),
),
)
],
)
],
),
),
),
],
),
));
}
dialogwidget() {
Get.dialog(Dialog(
// backgroundColor: Colors.transparent,
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.r),
color: const Color(0xFF222935)),
child: Padding(
padding: EdgeInsets.only(
right: 80.w, left: 80.w, top: 20.h, bottom: 40.h),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Image.asset(
"assets/images/png/Group 1000004420.png",
height: 66.h,
width: 66.w,
),
sizedBoxHeight(14.w),
SizedBox(
width: 182.w,
child: text16w400_FCFCFC(
"Nah, I know you’re nice person...",
textAlign: TextAlign.center),
),
sizedBoxHeight(16.h),
],
),
),
),
],
),
));
}
}

78
lib/onboarding/Signup/View/signupendpage.dart
View File

@@ -27,54 +27,40 @@ class _SignupendPageState extends State<SignupendPage> {
fit: BoxFit.fill)),
),
Center(
child: Container(
width: 358.w,
height: 519.h,
decoration: ShapeDecoration(
gradient: LinearGradient(
begin: const Alignment(0.98, -0.21),
end: const Alignment(-0.98, 0.21),
colors: [
Colors.white.withOpacity(0.05999999865889549),
Colors.white.withOpacity(0.07999999821186066)
],
),
shape: RoundedRectangleBorder(
side: const BorderSide(width: 0.80, color: Color(0xFF434A53)),
borderRadius: BorderRadius.circular(5),
),
),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 30.h),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset('assets/images/png/regroupredtexticon.png'),
sizedBoxHeight(30.h),
text25700white('Welcome Edward '),
sizedBoxHeight(20.h),
// text16400white(
// '''Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.'''),
Text(
'''Congratulations, your account has been successfully created. Get ready to regroup with your community''',
textAlign: TextAlign.center,
style: TextStyle(
color: const Color(0xCCFCFCFC),
fontSize: 16.sp,
fontFamily: 'Helvetica',
fontWeight: FontWeight.w400,
),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 30.h),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset('assets/images/png/regroupredtexticon.png'),
sizedBoxHeight(30.h),
text25700white('Welcome Edward '),
sizedBoxHeight(20.h),
// text16400white(
// '''Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.'''),
SizedBox(
width: 246.w,
child: Text(
'''Your account is now active. Welcome to the ReGroup community''',
textAlign: TextAlign.center,
style: TextStyle(
color: const Color(0xCCFCFCFC),
fontSize: 16.sp,
fontFamily: 'Helvetica',
fontWeight: FontWeight.w400,
),
sizedBoxHeight(20.h),
CustomButton(
text: "Let's begin",
onPressed: () {
Get.toNamed(RouteName.mainscreen);
})
],
),
),
)),
sizedBoxHeight(20.h),
CustomButton(
text: "Let's begin",
onPressed: () {
Get.toNamed(RouteName.mainscreen);
})
],
),
),
)
],
));

56
lib/onboarding/forgotPass/View/ForgotOtp.dart
View File

@@ -2,12 +2,10 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:glassmorphism/glassmorphism.dart';
import 'package:pin_code_fields/pin_code_fields.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CustomNextButton.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/onboarding/forgotPass/ViewModel/ForgotPassAPI.dart';
@@ -85,45 +83,14 @@ class _ForgotOtpState extends State<ForgotOtp> {
),
body: Stack(
children: [
// CommonBlurLeftSecond(),
// Positioned(top: 150, right: -30, child: CommonBlurRightSecond()),
// Positioned(top: 350, left: -30, child: CommonBlurLeftBlue()),
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: [
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
const Color(0XFF222935).withOpacity(0.60),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// 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),
],
),
child: Padding(
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,
@@ -215,10 +182,9 @@ class _ForgotOtpState extends State<ForgotOtp> {
),
],
),
)),
],
),
);
)],),
);
}
}

2
lib/resources/routes/route_name.dart
View File

@@ -14,6 +14,8 @@ class RouteName {
static const String individualactivitystep2 = '/individualactivitystep2';
static const String individualgroupstep3 = '/individualgroupstep3';
static const String individualcommunitystep4 = '/individualcommunitystep4';
static const String findcommunitypage = '/findcommunitypage';
static const String communitycommitscreen = '/communitycommitscreen';
static const String signupendpage = '/signupendpage';

6
lib/resources/routes/routes.dart
View File

@@ -94,6 +94,8 @@ import 'package:regroup/onboarding/NewPass/View/NewPass.dart';
import 'package:regroup/onboarding/Signup/View/Business/View/step1Letusunderstandbetter.dart';
import 'package:regroup/onboarding/Signup/View/Business/View/tellusbusiness.dart';
import 'package:regroup/onboarding/Signup/View/Individual/FindCommunityPage.dart';
import 'package:regroup/onboarding/Signup/View/Individual/step1Selectprofile.dart';
import 'package:regroup/onboarding/Signup/View/Individual/step2Selectactivity.dart';
import 'package:regroup/onboarding/Signup/View/Individual/step3Selectyourgroup.dart';
import 'package:regroup/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart';
@@ -202,6 +204,10 @@ class AppRoutes {
GetPage(
name: RouteName.individualcommunitystep4,
page: () => const SelectIndividualCommunity(),
),
GetPage(
name: RouteName.findcommunitypage,
page: () => const FindCommunityPage(),
),
GetPage(
name: RouteName.communitycommitscreen,

12
lib/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart
View File

@@ -150,11 +150,11 @@ class _EditCommunityState extends State<EditCommunity> {
borderType: BorderType.RRect,
radius: Radius.circular(14.r),
color: Color(0xFF434A53),
child: commonGlassContainer(
border: 0,
child: commonGlassUI(
borderwidth: 0,
width: double.infinity,
height: 150.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: bannerPath.isNotEmpty && isbannerAdded
? Stack(children: [
Image.file(
@@ -210,10 +210,10 @@ class _EditCommunityState extends State<EditCommunity> {
),
),
sizedBoxHeight(16.w),
commonGlassContainer(
commonGlassUI(
width: double.infinity,
height: 60.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Center(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 12.w),
@@ -247,7 +247,7 @@ class _EditCommunityState extends State<EditCommunity> {
]),
),
),
border: 1),
borderwidth: 1),
sizedBoxHeight(25.h),
text16w400_FCFCFC("Community name"),
sizedBoxHeight(14.h),

6
lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart
View File

@@ -106,19 +106,19 @@ class _ManageGroupsState extends State<ManageGroups> {
sizedBoxHeight(25.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
opacity1: 0.24,
opacity2: 0.24,
width: 50.w,
height: 50.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
"assets/images/png/Black.png",
height: 30.h,
width: 30.w,
)),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(8.w),
text18w400_FCFCFC("Create group"),
Spacer(),

12
lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart
View File

@@ -168,22 +168,22 @@ Widget rowTagRequestTile({
}) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: commonGlassContainer(
child: commonGlassUI(
width: double.infinity,
height: 60.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Center(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Row(children: [
text16w700_FCFCFC(title),
Spacer(),
commonGlassContainer(
commonGlassUI(
width: 35.w,
height: 35.h,
opacity1: 0.24,
opacity2: 0.24,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Icon(
Icons.clear,
@@ -191,7 +191,7 @@ Widget rowTagRequestTile({
color: Colors.white,
weight: 1,
)),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(16.w),
Container(
height: 35.h,
@@ -210,7 +210,7 @@ Widget rowTagRequestTile({
]),
),
),
border: 1),
borderwidth: 1),
);
}

12
lib/sidemenu/Community/Announcements/AnnouncementRequest.dart
View File

@@ -53,11 +53,11 @@ class _AnnouncementRequestState extends State<AnnouncementRequest> {
required String title,
required String mainImg,
}) {
return commonGlassContainer(
return commonGlassUI(
width: double.infinity,
height: 400.h,
borderradius: 10.r,
border: 1,
borderRadius: BorderRadius.circular( 10.r),
borderwidth: 1,
customWidget: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(children: [
@@ -104,14 +104,14 @@ class _AnnouncementRequestState extends State<AnnouncementRequest> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
commonGlassContainer(
commonGlassUI(
width: 149.w,
height: 30.h,
opacity1: 0.05,
opacity2: 0.07,
borderradius: 30.r,
borderRadius: BorderRadius.circular( 30.r),
customWidget: Center(child: text12w400_FCFCFC("Decline")),
border: 1),
borderwidth: 1),
Container(
height: 30.h,
width: 150.h,

54
lib/sidemenu/Community/Announcements/ManageMembers.dart
View File

@@ -143,10 +143,10 @@ class _ManageMembersState extends State<ManageMembers> {
hintText: "Start date - End date",
)),
Spacer(),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(
@@ -156,7 +156,7 @@ class _ManageMembersState extends State<ManageMembers> {
width: 23.w,
),
),
border: 0.5)
borderwidth: 0.5)
],
),
],
@@ -236,32 +236,32 @@ class _ManageMembersState extends State<ManageMembers> {
sizedBoxHeight(16.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("M")),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(15.w),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("Tu")),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(15.w),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("W")),
border: 0.5),
borderwidth: 0.5),
Spacer(),
Row(
children: [
@@ -281,32 +281,32 @@ class _ManageMembersState extends State<ManageMembers> {
sizedBoxHeight(20.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular(100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("Th")),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(15.w),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("F")),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(15.w),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular(100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(child: text16w400_FCFCFC("Sa")),
border: 0.5),
borderwidth: 0.5),
Spacer(),
Row(
children: [
@@ -415,10 +415,10 @@ class _ManageMembersState extends State<ManageMembers> {
hintText: "Start date - End date",
)),
Spacer(),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(
@@ -428,7 +428,7 @@ class _ManageMembersState extends State<ManageMembers> {
width: 23.w,
),
),
border: 0.5)
borderwidth: 0.5)
],
),
],
@@ -539,10 +539,10 @@ class _ManageMembersState extends State<ManageMembers> {
hintText: "Start date - End date",
)),
Spacer(),
commonGlassContainer(
commonGlassUI(
width: 40.w,
height: 40.h,
borderradius: 100,
borderRadius: BorderRadius.circular(100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(
@@ -552,7 +552,7 @@ class _ManageMembersState extends State<ManageMembers> {
width: 23.w,
),
),
border: 0.5)
borderwidth: 0.5)
],
),
],

6
lib/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart
View File

@@ -42,17 +42,17 @@ class _NewAnnouncementState extends State<NewAnnouncement> {
sizedBoxHeight(20.h),
text16w400_FCFCFC("Description"),
sizedBoxHeight(30.h),
commonGlassContainer(
commonGlassUI(
width: double.infinity,
height: 150.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Padding(
padding:
EdgeInsets.symmetric(horizontal: 12.w, vertical: 12.h),
child: text14w400_FCFCFCblur(
"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s . . .Lorem Ipsum has been the industry's standard dummy text ever since the 1500s . . ."),
),
border: 1),
borderwidth: 1),
sizedBoxHeight(80.h),
CustomButton(
text: "Post",

6
lib/sidemenu/Community/Announcements/View/Announcements.dart
View File

@@ -130,10 +130,10 @@ Widget announcementWidget({
required String date,
required String subtitle,
}) {
return commonGlassContainer(
return commonGlassUI(
width: double.infinity,
height: 120.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 12.h),
child: Column(
@@ -155,5 +155,5 @@ Widget announcementWidget({
],
),
),
border: 1);
borderwidth: 1);
}

79
lib/sidemenu/Community/Group/view/Group.dart
View File

@@ -134,11 +134,11 @@ class _GroupState extends State<Group> {
padding: EdgeInsets.only(bottom: 25.h),
child: GestureDetector(
onTap: () {},
child: commonGlassContainer(
border: 0.9,
child: commonGlassUI(
borderwidth: 0.9,
width: double.infinity,
height: 162.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular(10.r),
customWidget: Padding(
padding: EdgeInsets.symmetric(
horizontal: 16.w, vertical: 16.h),
@@ -236,11 +236,12 @@ class _GroupState extends State<Group> {
),
Spacer(),
PopupMenuButton(
surfaceTintColor: Color(0xFF222935),
surfaceTintColor:
const Color(0xFF222935),
constraints: BoxConstraints.tightFor(
width: 200.w),
offset: Offset(0, 30),
color: Color(0xFF222935),
offset: const Offset(0, 30),
color: const Color(0xFF222935),
tooltip: "",
itemBuilder: (BuildContext context) =>
<PopupMenuEntry>[
@@ -252,8 +253,8 @@ class _GroupState extends State<Group> {
child: Row(
children: [
text14w400_FCFCFC(
"Mute community"),
Spacer(),
"Mute group"),
const Spacer(),
Image.asset(
"assets/images/png/Black (1).png",
height: 18.h,
@@ -263,7 +264,7 @@ class _GroupState extends State<Group> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -272,10 +273,30 @@ class _GroupState extends State<Group> {
child: Row(
children: [
text14w400_FCFCFC(
"Hide post"),
Spacer(),
"Pin group"),
const Spacer(),
Image.asset(
"assets/images/png/mingcute_eye-close-line.png",
"assets/images/png/f7_pin-fill (2).png",
height: 27.h,
width: 27.w,
)
],
),
),
),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: 8.w),
child: Row(
children: [
text14w400_FCFCFC(
"Make primary"),
const Spacer(),
Image.asset(
"assets/images/png/leave group.png",
height: 20.h,
width: 20.w,
)
@@ -283,7 +304,7 @@ class _GroupState extends State<Group> {
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -291,30 +312,12 @@ class _GroupState extends State<Group> {
horizontal: 8.w),
child: Row(
children: [
text14w400_FCFCFC("Pin"),
Spacer(),
// text14w400_FCFCFC("Leave group"),
text14w400_D90B2E(
"Leave group"),
const Spacer(),
Image.asset(
"assets/images/png/f7_pin-fill (2).png",
height: 25.h,
width: 25.w,
)
],
),
),
),
PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: 8.w),
child: Row(
children: [
text14w400_FCFCFC(
"Leave community"),
Spacer(),
Image.asset(
"assets/images/png/logout 1 (traced).png",
"assets/images/png/LightGray22.png",
height: 18.h,
width: 18.w,
)
@@ -325,8 +328,8 @@ class _GroupState extends State<Group> {
],
child: Image.asset(
"assets/images/png/Group 1000004071.png",
height: 13.h,
width: 3.w,
height: 18.h,
width: 20.w,
)),
],
),

12
lib/sidemenu/Community/MyCommunity/AddGroups.dart
View File

@@ -85,19 +85,19 @@ class _AddGroupState extends State<AddGroup> {
sizedBoxHeight(25.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
opacity1: 0.24,
opacity2: 0.24,
width: 50.w,
height: 50.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
"assets/images/png/Black.png",
height: 30.h,
width: 30.w,
)),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(8.w),
text18w400_FCFCFC("Create group"),
Spacer(),
@@ -176,9 +176,9 @@ class _AddGroupState extends State<AddGroup> {
),
Spacer(),
Obx(() {
return commonGlassContainer(
border: isCheckedList[index] ? 1.2 : 0.9,
borderradius: 2,
return commonGlassUI(
borderwidth: isCheckedList[index] ? 1.2 : 0.9,
borderRadius: BorderRadius.circular( 2),
height: 23.h,
width: 23.w,
opacity1: 0.24,

12
lib/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart
View File

@@ -93,10 +93,10 @@ class _CommunityInfoState extends State<CommunityInfo> {
sizedBoxHeight(30.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 35.w,
height: 35.h,
borderradius: 100.r,
borderRadius: BorderRadius.circular( 100.r),
customWidget: Center(
child: Image.asset(
"assets/images/png/Group 58645.png",
@@ -104,7 +104,7 @@ class _CommunityInfoState extends State<CommunityInfo> {
width: 13.w,
),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(8.w),
text16w400_white("Elm street london, United Kingdom")
],
@@ -112,10 +112,10 @@ class _CommunityInfoState extends State<CommunityInfo> {
sizedBoxHeight(15.h),
Row(
children: [
commonGlassContainer(
commonGlassUI(
width: 35.w,
height: 35.h,
borderradius: 100.r,
borderRadius: BorderRadius.circular( 100.r),
customWidget: Center(
child: Image.asset(
"assets/images/png/puzzle-pieces 1 (traced).png",
@@ -123,7 +123,7 @@ class _CommunityInfoState extends State<CommunityInfo> {
width: 20.w,
),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(8.w),
text16w400_white("Sports")
],

12
lib/sidemenu/Community/MyCommunity/NewCommunity.dart
View File

@@ -66,10 +66,10 @@ class _NewCommunityState extends State<NewCommunity> {
},
);
},
child: commonGlassContainer(
child: commonGlassUI(
width: 95.w,
height: 95.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: filePath.isNotEmpty && isImageAdded
@@ -90,7 +90,7 @@ class _NewCommunityState extends State<NewCommunity> {
width: 30.w,
),
),
border: 0.5),
borderwidth: 0.5),
),
),
sizedBoxHeight(20.h),
@@ -118,11 +118,11 @@ class _NewCommunityState extends State<NewCommunity> {
borderType: BorderType.RRect,
radius: Radius.circular(14.r),
color: Color(0xFF434A53),
child: commonGlassContainer(
border: 0,
child: commonGlassUI(
borderwidth: 0,
width: double.infinity,
height: 130.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular(10.r),
customWidget: bannerPath.isNotEmpty && isbannerAdded
? Stack(children: [
Image.file(

42
lib/sidemenu/Community/MyCommunity/View/CommunityDetails.dart
View File

@@ -210,10 +210,10 @@ class _CommunityDetailsState extends State<CommunityDetails> {
children: [
text20w700_FCFCFC("Active alliance network"),
Spacer(),
commonGlassContainer(
commonGlassUI(
width: 35.w,
height: 35.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(
@@ -222,16 +222,16 @@ class _CommunityDetailsState extends State<CommunityDetails> {
height: 18.w,
width: 18.w,
)),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(8.w),
text16w400_FCFCFCblur("Public"),
],
),
sizedBoxHeight(20.h),
commonGlassContainer(
commonGlassUI(
width: double.infinity,
height: 51.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
@@ -260,16 +260,16 @@ class _CommunityDetailsState extends State<CommunityDetails> {
),
],
),
border: 1.w),
borderwidth: 1.w),
sizedBoxHeight(20.h),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.addgroup);
},
child: commonGlassContainer(
child: commonGlassUI(
width: double.infinity,
height: 51.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Column(
@@ -293,17 +293,17 @@ class _CommunityDetailsState extends State<CommunityDetails> {
],
),
),
border: 1),
borderwidth: 1),
),
sizedBoxHeight(20.h),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.announcement);
},
child: commonGlassContainer(
child: commonGlassUI(
width: double.infinity,
height: 51.h,
borderradius: 10.r,
borderRadius: BorderRadius.circular( 10.r),
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Column(
@@ -331,7 +331,7 @@ class _CommunityDetailsState extends State<CommunityDetails> {
],
),
),
border: 1),
borderwidth: 1),
),
sizedBoxHeight(35.h),
Container(
@@ -598,13 +598,13 @@ class _CommunityDetailsState extends State<CommunityDetails> {
'assets/images/png/party-popper 2.png'
]),
Spacer(),
commonGlassContainer(
border: 0.43,
commonGlassUI(
borderwidth: 0.43,
width: 30.w,
height: 30.h,
opacity1: 0.05,
opacity2: 0.06,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
customWidget: Center(
child: Image.asset(
'assets/images/png/Frame 1000004088.png',
@@ -616,11 +616,11 @@ class _CommunityDetailsState extends State<CommunityDetails> {
sizedBoxWidth(12.w),
text14w400_FCFCFC('20'),
sizedBoxWidth(20.w),
commonGlassContainer(
border: 0.43,
commonGlassUI(
borderwidth: 0.43,
width: 30.w,
height: 30.h,
borderradius: 100,
borderRadius: BorderRadius.circular( 100),
opacity1: 0.05,
opacity2: 0.06,
customWidget: Center(
@@ -753,11 +753,11 @@ class _CommunityDetailsState extends State<CommunityDetails> {
}
Widget containertile({required String text}) {
return commonGlassContainer(
border: 1,
return commonGlassUI(
borderwidth: 1,
width: 100.w,
height: 30.h,
borderradius: 30.r,
borderRadius: BorderRadius.circular( 30.r),
borderColor: Color(0xFFD90B2E),
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 10.w),

6
lib/sidemenu/Community/MyCommunity/View/MyCommunity.dart
View File

@@ -198,11 +198,11 @@ class _MyCommunityState extends State<MyCommunity> {
Row(
children: [
Stack(clipBehavior: Clip.none, children: [
commonGlassContainer(
border: 0.9,
commonGlassUI(
borderwidth: 0.9,
width: 30.w,
height: 30.h,
borderradius: 100.r,
borderRadius: BorderRadius.circular(100.r),
opacity1: 0.24,
opacity2: 0.24,
customWidget: Center(