From 9bd0f3affc68af4119ee1058afc84e72edc8739a Mon Sep 17 00:00:00 2001 From: kishan06 Date: Wed, 31 Jul 2024 16:08:23 +0530 Subject: [PATCH] code cleaning --- lib/Common/controller/MainController.dart | 12 +- lib/Common/controller/MainScreen.dart | 2 +- .../controller/data/network/network_api.dart | 6 +- .../ProfileTab/TimeLine/AddTimeline.dart | 978 ---------------- lib/Login/View/loginscreen.dart | 8 +- lib/Login/View/verifygoogleapple.dart | 27 +- .../CalenderTab/AddEvent/AddEvent.dart | 0 .../CalenderTab/AddUsers/AddUsers.dart | 0 .../CalenderTab/Availabillity.dart | 0 .../Main_Screens/CalenderTab/CalenderTab.dart | 0 .../CalenderTab/EventDetails.dart | 0 .../ManageMenmbers/ManageMembersCal.dart | 0 .../Resource Pool/ResourcePool.dart | 0 .../CalenderTab/SetAvailabillity.dart | 0 .../Chats/View/chatsmainscreen.dart | 0 .../Main_Screens/Chats/View/groupchat.dart | 0 .../Main_Screens/Chats/View/newchatpage.dart | 0 .../Main_Screens/Chats/View/newgroup.dart | 0 .../Main_Screens/Chats/View/userchat.dart | 0 .../Main_Screens/Community/Community.dart | 2 +- .../Main_Screens/Community/CycleScreen.dart | 3 +- .../View/PostDetailScreen.dart | 0 .../PostDetailScreen/View/ReactionView.dart | 0 .../Main_Screens/Community/PostScreen.dart | 0 .../ExploreDesign/DetailExplore.dart | 0 .../ExploreDesign/ExploreScreen.dart | 0 .../ExploreDesign/SearchGroup.dart | 0 .../GroupTab/View/ConnectCommunity.dart | 0 .../GroupTab/View/GoupSettings.dart | 0 .../GroupTab/View/GroupDetail.dart | 0 .../GroupTab/View/GroupEvent.dart | 0 .../Main_Screens/GroupTab/View/GroupInfo.dart | 0 .../GroupTab/View/GroupManage.dart | 0 .../Main_Screens/GroupTab/View/GroupTab.dart | 2 +- .../Main_Screens/GroupTab/View/NewPost.dart | 0 .../GroupTab/View/RequestedGroups.dart | 0 .../Main_Screens/GroupTab/View/Sessions.dart | 0 .../View/SubGroup/EditSubgroupInfo.dart | 0 .../GroupTab/View/SubGroup/SubGroupInfo.dart | 11 +- .../View/SubGroup/SubgroupSetting.dart | 89 +- .../GroupTab/View/SubGroup/Subgroups.dart | 49 +- .../ProfileTab/Badges/Badges.dart | 5 +- .../Certificate/AddCertificate.dart | 2 +- .../ProfileTab/Certificate/Certificate.dart | 4 +- .../Main_Screens/ProfileTab/Clubs/Clubs.dart | 10 +- .../EditProfile/Model/GetEditProfileBus.dart | 0 .../EditProfile/Model/GetEditProfileIndi.dart | 0 .../EditProfile/Model/InterestModel.dart | 0 .../EditProfile/View/BusEditProfile.dart | 4 +- .../EditProfile/View/EditProfile.dart | 62 +- .../EditProfile/View/ProfileTab.dart | 40 +- .../indiprofileimagecontroller.dart | 0 .../profileimagecontoller.dart | 0 .../EditProfile/ViewModel/EditProfileApi.dart | 4 +- .../ViewModel/InterestApiList.dart | 2 +- .../ProfileTab/Followers/Followers.dart | 14 +- .../ProfileTab/Following/Following.dart | 12 +- .../Guest User/Model/GetGuestFollowers.dart | 0 .../Guest User/Model/GetGuestFollowing.dart | 0 .../Model/GuestGetProfileDataBus.dart | 0 .../Model/GuestGetProfileDataIndi.dart | 0 .../View/Business/ProfileTabBusGuest.dart | 130 +-- .../View/Individual/ProfileTabIndGuest.dart | 31 +- .../Guest User/ViewModel/GuestProfileApi.dart | 9 +- .../ProfileTab/Model/accountSessionModel.dart | 0 .../ProfileTab/Model/certificateModel.dart | 0 .../ProfileTab/Model/editTimelineModel.dart | 0 .../ProfileTab/Model/faqModel.dart | 0 .../ProfileTab/Model/followersModel.dart | 0 .../ProfileTab/Model/followingModel.dart | 0 .../ProfileTab/Model/privacyPolicyModel.dart | 0 .../Model/termsconditionsModel.dart | 0 .../Model/timelineabilityModel.dart | 0 .../ProfileTab/My Network/MyNetwork.dart | 14 +- .../ProfileTab/Settings/AccountSessions.dart | 100 +- .../ProfileTab/Settings/AccountSetting.dart | 101 +- .../ProfileTab/Settings/ChangePassword.dart | 21 +- .../ProfileTab/Settings/ContactUs.dart | 2 +- .../ProfileTab/Settings/DeleteAccount.dart | 8 +- .../ProfileTab/Settings/FaqScreen.dart | 13 +- .../ProfileTab/Settings/HelpAndSupport.dart | 5 +- .../Settings/Model/FetchBlockUser.dart | 0 .../Settings/Model/FetchNotification.dart | 0 .../ProfileTab/Settings/PrivacyPolicy.dart | 5 +- .../ProfileTab/Settings/ReportABug.dart | 16 +- .../ProfileTab/Settings/Settings.dart | 19 +- .../ProfileTab/Settings/TermsCondition.dart | 7 +- .../ProfileTab/Settings/VerifyCode.dart | 37 +- .../Settings/View/BlockedUsers.dart | 4 +- .../Settings/View/Notification.dart | 4 +- .../Settings/ViewModel/BlockedUserApi.dart | 2 +- .../Settings/ViewModel/NotificationApi.dart | 2 +- .../Share profile/ShareProfile.dart | 5 +- .../ProfileTab/TimeLine/AddTimeline.dart | 1002 +++++++++++++++++ .../view_model/gettimelineability.dart | 2 +- .../view_model/profileGetmethod.dart | 18 +- .../view_model/profilePostmethod.dart | 43 - .../View => Notifications}/notification.dart | 15 +- .../View/step1Letusunderstandbetter.dart | 58 +- .../View/Business/View/step2Selectgroup.dart | 312 ----- .../Business/View/step3SelectCommunity.dart | 313 ----- .../View/Business/View/tellusbusiness.dart | 7 +- .../View/Individual/step1Selectprofile.dart | 271 ----- .../View/Individual/step2Selectactivity.dart | 12 +- .../View/Individual/step3Selectyourgroup.dart | 2 +- .../Individual/step4Selectyourcommunity.dart | 8 +- .../View/Individual/tellusindividual.dart | 23 +- .../Signup/View/communitycommitment.dart | 2 +- lib/onboarding/Signup/View/signupscreen.dart | 1 - lib/onboarding/SplashScreen.dart | 2 +- lib/onboarding/forgotPass/View/ForgotOtp.dart | 60 +- .../forgotPass/ViewModel/ForgotPassAPI.dart | 1 - lib/resources/routes/routes.dart | 237 ++-- .../Community settings/CommunitySetting.dart | 7 +- .../EditCommunity/EditCommunity.dart | 2 +- .../Community settings/ManageGroup.dart | 5 +- .../ManageTags.dart/ManageTags.dart | 9 +- .../ManageTags.dart/NewTag/NewTag.dart | 9 +- .../Announcements/AnnouncementRequest.dart | 29 +- .../Announcements/ManageMembers.dart | 73 +- .../NewAnnouncement/NewAnnounceent.dart | 9 +- .../Announcements/View/Announcements.dart | 2 +- .../sidemenu/Community/Group/view/Group.dart | 7 +- .../Community/MyCommunity/AddGroups.dart | 7 +- .../view/communityInfo.dart | 9 +- .../Community/MyCommunity/NewCommunity.dart | 9 +- .../MyCommunity/View/CommunityDetails.dart | 6 +- .../MyCommunity/View/MyCommunity.dart | 2 +- .../sidemenu/Community/Watchlist.dart | 2 +- .../sidemenu/Model/joineGroupsModel.dart | 0 .../sidemenu/SavedPosts/SavedPosts.dart | 2 +- lib/{Feed Module => }/sidemenu/sidemenu.dart | 0 .../sidemenu/view_model/getmethod.dart | 2 +- .../sidemenu/view_model/postmethod.dart | 0 134 files changed, 1732 insertions(+), 2731 deletions(-) delete mode 100644 lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart rename lib/{Feed Module => }/Main_Screens/CalenderTab/AddEvent/AddEvent.dart (100%) rename lib/{Feed Module => }/Main_Screens/CalenderTab/AddUsers/AddUsers.dart (100%) rename lib/{Feed Module => }/Main_Screens/CalenderTab/Availabillity.dart (100%) rename lib/{Feed Module => }/Main_Screens/CalenderTab/CalenderTab.dart (100%) rename lib/{Feed Module => }/Main_Screens/CalenderTab/EventDetails.dart (100%) rename lib/{Feed Module => }/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart (100%) rename lib/{Feed Module => }/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart (100%) rename lib/{Feed Module => }/Main_Screens/CalenderTab/SetAvailabillity.dart (100%) rename lib/{Feed Module => }/Main_Screens/Chats/View/chatsmainscreen.dart (100%) rename lib/{Feed Module => }/Main_Screens/Chats/View/groupchat.dart (100%) rename lib/{Feed Module => }/Main_Screens/Chats/View/newchatpage.dart (100%) rename lib/{Feed Module => }/Main_Screens/Chats/View/newgroup.dart (100%) rename lib/{Feed Module => }/Main_Screens/Chats/View/userchat.dart (100%) rename lib/{Feed Module => }/Main_Screens/Community/Community.dart (99%) rename lib/{Feed Module => }/Main_Screens/Community/CycleScreen.dart (99%) rename lib/{Feed Module => }/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart (100%) rename lib/{Feed Module => }/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart (100%) rename lib/{Feed Module => }/Main_Screens/Community/PostScreen.dart (100%) rename lib/{Feed Module => }/Main_Screens/ExploreDesign/DetailExplore.dart (100%) rename lib/{Feed Module => }/Main_Screens/ExploreDesign/ExploreScreen.dart (100%) rename lib/{Feed Module => }/Main_Screens/ExploreDesign/SearchGroup.dart (100%) rename lib/{Feed Module => }/Main_Screens/GroupTab/View/ConnectCommunity.dart (100%) rename lib/{Feed Module => }/Main_Screens/GroupTab/View/GoupSettings.dart (100%) rename lib/{Feed Module => }/Main_Screens/GroupTab/View/GroupDetail.dart (100%) rename lib/{Feed Module => }/Main_Screens/GroupTab/View/GroupEvent.dart (100%) rename lib/{Feed Module => }/Main_Screens/GroupTab/View/GroupInfo.dart (100%) rename lib/{Feed Module => }/Main_Screens/GroupTab/View/GroupManage.dart (100%) rename lib/{Feed Module => }/Main_Screens/GroupTab/View/GroupTab.dart (99%) rename lib/{Feed Module => }/Main_Screens/GroupTab/View/NewPost.dart (100%) rename lib/{Feed Module => }/Main_Screens/GroupTab/View/RequestedGroups.dart (100%) rename lib/{Feed Module => }/Main_Screens/GroupTab/View/Sessions.dart (100%) rename lib/{Feed Module => }/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart (100%) rename lib/{Feed Module => }/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart (99%) rename lib/{Feed Module => }/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart (70%) rename lib/{Feed Module => }/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart (89%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Badges/Badges.dart (97%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Certificate/AddCertificate.dart (99%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Certificate/Certificate.dart (98%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Clubs/Clubs.dart (98%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart (99%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart (93%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart (98%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart (93%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart (91%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Followers/Followers.dart (98%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Following/Following.dart (98%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowers.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowing.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataBus.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataIndi.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart (92%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart (98%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart (85%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Model/accountSessionModel.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Model/certificateModel.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Model/editTimelineModel.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Model/faqModel.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Model/followersModel.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Model/followingModel.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Model/termsconditionsModel.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Model/timelineabilityModel.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/My Network/MyNetwork.dart (98%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/AccountSessions.dart (66%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/AccountSetting.dart (70%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/ChangePassword.dart (93%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/ContactUs.dart (98%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/DeleteAccount.dart (95%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/FaqScreen.dart (95%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart (97%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart (100%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart (97%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/ReportABug.dart (96%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/Settings.dart (95%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/TermsCondition.dart (93%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/VerifyCode.dart (90%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart (99%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/View/Notification.dart (97%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart (95%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart (94%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/Share profile/ShareProfile.dart (98%) create mode 100644 lib/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart rename lib/{Feed Module => }/Main_Screens/ProfileTab/view_model/gettimelineability.dart (90%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/view_model/profileGetmethod.dart (81%) rename lib/{Feed Module => }/Main_Screens/ProfileTab/view_model/profilePostmethod.dart (78%) rename lib/{Feed Module/Notification/View => Notifications}/notification.dart (95%) delete mode 100644 lib/onboarding/Signup/View/Business/View/step2Selectgroup.dart delete mode 100644 lib/onboarding/Signup/View/Business/View/step3SelectCommunity.dart delete mode 100644 lib/onboarding/Signup/View/Individual/step1Selectprofile.dart rename lib/{Feed Module => }/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart (95%) rename lib/{Feed Module => }/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart (99%) rename lib/{Feed Module => }/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart (98%) rename lib/{Feed Module => }/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart (97%) rename lib/{Feed Module => }/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart (92%) rename lib/{Feed Module => }/sidemenu/Community/Announcements/AnnouncementRequest.dart (86%) rename lib/{Feed Module => }/sidemenu/Community/Announcements/ManageMembers.dart (93%) rename lib/{Feed Module => }/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart (94%) rename lib/{Feed Module => }/sidemenu/Community/Announcements/View/Announcements.dart (98%) rename lib/{Feed Module => }/sidemenu/Community/Group/view/Group.dart (99%) rename lib/{Feed Module => }/sidemenu/Community/MyCommunity/AddGroups.dart (98%) rename lib/{Feed Module => }/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart (97%) rename lib/{Feed Module => }/sidemenu/Community/MyCommunity/NewCommunity.dart (98%) rename lib/{Feed Module => }/sidemenu/Community/MyCommunity/View/CommunityDetails.dart (99%) rename lib/{Feed Module => }/sidemenu/Community/MyCommunity/View/MyCommunity.dart (99%) rename lib/{Feed Module => }/sidemenu/Community/Watchlist.dart (99%) rename lib/{Feed Module => }/sidemenu/Model/joineGroupsModel.dart (100%) rename lib/{Feed Module => }/sidemenu/SavedPosts/SavedPosts.dart (97%) rename lib/{Feed Module => }/sidemenu/sidemenu.dart (100%) rename lib/{Feed Module => }/sidemenu/view_model/getmethod.dart (89%) rename lib/{Feed Module => }/sidemenu/view_model/postmethod.dart (100%) diff --git a/lib/Common/controller/MainController.dart b/lib/Common/controller/MainController.dart index 32c64e1..759e536 100644 --- a/lib/Common/controller/MainController.dart +++ b/lib/Common/controller/MainController.dart @@ -1,12 +1,10 @@ import 'package:get/get.dart'; +import 'package:regroup/Main_Screens/CalenderTab/CalenderTab.dart'; +import 'package:regroup/Main_Screens/Chats/View/chatsmainscreen.dart'; +import 'package:regroup/Main_Screens/Community/Community.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/GroupTab.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/CalenderTab.dart'; - -import 'package:regroup/Feed%20Module/Main_Screens/Chats/View/chatsmainscreen.dart'; - -import 'package:regroup/Feed%20Module/Main_Screens/Community/Community.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/GroupTab.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart'; class MainController extends GetxController { var selectedIndex = 0.obs; diff --git a/lib/Common/controller/MainScreen.dart b/lib/Common/controller/MainScreen.dart index 6538f0d..87a871f 100644 --- a/lib/Common/controller/MainScreen.dart +++ b/lib/Common/controller/MainScreen.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/controller/MainController.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart'; -import '../../Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart'; final MainController mainController = Get.put(MainController()); diff --git a/lib/Common/controller/data/network/network_api.dart b/lib/Common/controller/data/network/network_api.dart index dfee1ad..853694a 100644 --- a/lib/Common/controller/data/network/network_api.dart +++ b/lib/Common/controller/data/network/network_api.dart @@ -16,9 +16,8 @@ class NetworkApiServices { Dio dio = Dio(); final controllerEntryPoint = Get.put(EntryPointController()); - String basicAuth = 'Basic ' + - base64.encode( - utf8.encode('RegroupUserName:71%@L%es^bUX94`J9XT*@bh,._WWM{\$%^^&&')); + String basicAuth = 'Basic ${base64.encode( + utf8.encode('RegroupUserName:71%@L%es^bUX94`J9XT*@bh,._WWM{\$%^^&&'))}'; Future getApi(String url, {bool optionalpar = false}) async { if (kDebugMode) { @@ -27,7 +26,6 @@ class NetworkApiServices { Response response; SharedPreferences prefs = await SharedPreferences.getInstance(); token = prefs.getString('access-token'); - print("url is $url"); log(token.toString()); try { diff --git a/lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart b/lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart deleted file mode 100644 index da21a2f..0000000 --- a/lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart +++ /dev/null @@ -1,978 +0,0 @@ -import 'dart:developer'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:regroup/Common/CommonGlassmorphism.dart'; -import 'package:regroup/Common/CommonWidget.dart'; -import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart' - as timelineabilist; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/gettimelineability.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; -import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/CommonDropdown.dart'; -import 'package:regroup/Utils/Common/CustomNextButton.dart'; -import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/sized_box.dart'; -import 'package:regroup/Utils/dialogs.dart'; -import 'package:regroup/Utils/texts.dart'; -import 'package:regroup/resources/routes/route_name.dart'; -import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart'; -import 'package:intl/intl.dart'; -import 'package:async/src/future_group.dart'; -import 'package:shared_preferences/shared_preferences.dart'; - -class AddTimeline extends StatefulWidget { - const AddTimeline({super.key}); - - @override - State createState() => _AddTimelineState(); -} - -class _AddTimelineState extends State { - 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 timeline = []; - List _abilitydrop = []; - - Future fetchABilitylist() async { - TimelineAbilityListApi abilityLsitAPI = TimelineAbilityListApi(); - ResponseData 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 selectedabilityid = []; - - void getCatIdFromName(List 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 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 abilitiesIds = []; - - UploadData() async { - // SharedPreferences prefs = await SharedPreferences.getInstance(); - utils.loader(); - String abilitiesIds = selectedabilityid.join(','); - print(abilitiesIds); - Map 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 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> _abilityMap = []; - List> _abilityMap = []; - List listData = []; - -// Function to get names from selected IDs - Future> getSelectedNames(List selectedIds) async { - List selectedNames = []; - for (int id in selectedIds) { - for (Map ability in _abilityMap) { - if (ability["id"] == id) { - selectedNames.add(ability["name"]); - break; - } - } - _abilitydrop = - _abilityMap.map((ability) => ability["name"] as String).toList(); - } - - return selectedNames; - } - - @override - Widget build(BuildContext context) { - return GestureDetector( - onTap: () => FocusManager.instance.primaryFocus?.unfocus(), - child: Scaffold( - // resizeToAvoidBottomInset: false, - // key: _scaffoldKey1, - backgroundColor: Color(0xFF222935), - extendBody: true, - appBar: CommonAppbar( - titleTxt: "Add timeline", - ), - body: Obx(() - // { - => - isloading.value - ? Center( - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - CircularProgressIndicator(), - ], - )) - : edited == true - ? Stack(children: [ - Container( - decoration: const BoxDecoration( - image: DecorationImage( - image: AssetImage( - "assets/images/png/Ellipse 1496.png"), - fit: BoxFit.fill)), - ), - ListView(physics: ScrollPhysics(), children: [ - Padding( - padding: - EdgeInsets.symmetric(horizontal: 16.w), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - sizedBoxHeight(20.h), - text16400white("Club name"), - sizedBoxHeight(15.h), - CustomTextFormField( - textEditingController: - clubNameController, - texttype: TextInputType.text, - hintText: 'Enter club name', - validator: (value) { - if (value!.isEmpty) { - return 'Enter your club name '; - } - return null; - }, - inputFormatters: [ - // LengthLimitingTextInputFormatter(20), - RemoveEmojiInputFormatter(), - FilteringTextInputFormatter.allow( - RegExp('[a-zA-Z ]')) - ], - ), - sizedBoxHeight(25.h), - text16400white("Role in "), - sizedBoxHeight(15.h), - CustomTextFormField( - textEditingController: - rollnameController, - texttype: TextInputType.text, - hintText: 'Enter role in the club', - validator: (value) { - if (value!.isEmpty) { - return 'Enter role in the club'; - } - return null; - }, - inputFormatters: [ - // LengthLimitingTextInputFormatter(20), - RemoveEmojiInputFormatter(), - FilteringTextInputFormatter.allow( - RegExp('[a-zA-Z ]')) - ], - ), - sizedBoxHeight(25.h), - text16400white("Team name"), - sizedBoxHeight(15.h), - CustomTextFormField( - textEditingController: - teamnameController, - texttype: TextInputType.text, - hintText: 'Enter team name', - validator: (value) { - if (value!.isEmpty) { - return 'Enter your team name '; - } - return null; - }, - inputFormatters: [ - // LengthLimitingTextInputFormatter(20), - RemoveEmojiInputFormatter(), - FilteringTextInputFormatter.allow( - RegExp('[a-zA-ZS0-9 ]')), - ], - ), - sizedBoxHeight(25.h), - Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - text16400white("Start date "), - sizedBoxHeight(10.h), - GestureDetector( - onTap: () => datePicker( - context, - dateController), - child: AbsorbPointer( - child: - CustomTextFormField( - textEditingController: - dateController, - leadingIcon: Container( - height: 20.h, - width: 20.w, - child: Center( - child: Image.asset( - "assets/images/png/calender.png", - height: 20.h, - width: 20.w, - ), - ), - ), - ), - ), - ) - ], - ), - ), - sizedBoxWidth(10.h), - Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - text16400white("End date"), - sizedBoxHeight(10.h), - GestureDetector( - onTap: () => datePicker( - context, - dateController2), - child: AbsorbPointer( - child: - CustomTextFormField( - textEditingController: - dateController2, - leadingIcon: Container( - height: 20.h, - width: 20.w, - child: Center( - child: Image.asset( - "assets/images/png/calender.png", - height: 20.h, - width: 20.w, - ), - ), - ), - ), - ), - ), - sizedBoxHeight(10.h), - Row( - children: [ - Obx(() { - return commonGlassContainer( - border: 1, - borderradius: 2, - height: 20.h, - width: 20.w, - opacity1: 0.24, - opacity2: 0.24, - customWidget: - Transform.scale( - scale: 1.2, - child: Checkbox( - side: BorderSide( - color: Color( - 0xFF434A53)), - value: isChecked - .value, - activeColor: Colors - .transparent, - checkColor: - Colors.white, - onChanged: - ((value) { - // isChecked.value = value!; - isChecked - .value = - value!; - if (isChecked - .value) { - // Set end date to today's date - dateController2 - .text = DateFormat( - 'yyyy-MM-dd') - .format(DateTime - .now()); - } else { - // Clear end date when checkbox is unchecked - dateController2 - .clear(); - } - }), - ), - ), - ); - }), - sizedBoxWidth(8.w), - text10400white("Present") - ], - ), - ], - ), - ) - ], - ), - text16400white("Ability"), - sizedBoxHeight(15.h), - // CustomDropDownCheckBoxTimeline( - // header: 'Select ability', - // title: '', - // listData: _abilitydrop, - // onItemSelected: getCatIdFromName, - // initiallySelected: abilitiesIds - // .map((id) => id.toString()) - // .toList(), - // ), - CustomDropDownCheckBoxTimeline( - header: 'Select ability', - title: '', - listData: _abilitydrop, - // _abilityMap.map((ability) => ability["name"]).toList(), - onItemSelected: getCatIdFromName, - // (selectedNames) { - // // Convert selected names back to IDs if needed - // List selectedIds = []; - // for (String name in selectedNames) { - // for (Map ability - // in _abilityMap) { - // if (ability["name"] == name) { - // selectedIds.add(ability["id"]); - // break; - // } - // } - // } - // // Use selectedIds as needed - // print(selectedIds); - // }, - initiallySelected: - seelctedNameList, // Pass initially selected names - ), - sizedBoxHeight(80.h), - Padding( - padding: EdgeInsets.symmetric( - horizontal: 20.w), - child: CustomButton( - text: "Add timeline", - onPressed: () { - if (clubNameController.text.isBlank! || - rollnameController - .text.isBlank! || - teamnameController - .text.isBlank! || - dateController - .text.isBlank! || - dateController2 - .text.isBlank! || - selectedabilityid.isEmpty) { - utils.showToast( - 'Please fill all fields'); - } else { - print(selectedabilityid - .toString()); - - EdituploadData(); - } - }, - ), - ), - ]), - ) - ]) - ]) - : Stack(children: [ - Container( - decoration: const BoxDecoration( - image: DecorationImage( - image: AssetImage( - "assets/images/png/Ellipse 1496.png"), - fit: BoxFit.fill)), - ), - ListView(physics: ScrollPhysics(), children: [ - Padding( - padding: - EdgeInsets.symmetric(horizontal: 16.w), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - sizedBoxHeight(20.h), - text16400white("Club name"), - sizedBoxHeight(15.h), - CustomTextFormField( - textEditingController: - clubNameController, - texttype: TextInputType.text, - hintText: 'Enter club name', - validator: (value) { - if (value!.isEmpty) { - return 'Enter your full name '; - } - return null; - }, - inputFormatters: [ - // LengthLimitingTextInputFormatter(20), - RemoveEmojiInputFormatter(), - FilteringTextInputFormatter.allow( - RegExp('[a-zA-Z ]')) - ], - ), - sizedBoxHeight(25.h), - text16400white("Role in the club"), - sizedBoxHeight(15.h), - CustomTextFormField( - textEditingController: - rollnameController, - texttype: TextInputType.text, - hintText: 'Enter role in the club', - validator: (value) { - if (value!.isEmpty) { - return 'Enter role in the club'; - } - return null; - }, - inputFormatters: [ - // LengthLimitingTextInputFormatter(20), - RemoveEmojiInputFormatter(), - FilteringTextInputFormatter.allow( - RegExp('[a-zA-Z ]')) - ], - ), - sizedBoxHeight(25.h), - text16400white("Team name"), - sizedBoxHeight(15.h), - CustomTextFormField( - textEditingController: - teamnameController, - texttype: TextInputType.text, - hintText: 'Enter team name', - validator: (value) { - if (value!.isEmpty) { - return 'Enter your team name '; - } - return null; - }, - inputFormatters: [ - // LengthLimitingTextInputFormatter(20), - RemoveEmojiInputFormatter(), - FilteringTextInputFormatter.allow( - RegExp('[a-zA-ZS0-9 ]')), - ], - ), - sizedBoxHeight(25.h), - Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - text16400white("Start date "), - sizedBoxHeight(10.h), - GestureDetector( - onTap: () => datePicker( - context, - dateController), - child: AbsorbPointer( - child: - CustomTextFormField( - textEditingController: - dateController, - leadingIcon: Container( - height: 20.h, - width: 20.w, - child: Center( - child: Image.asset( - "assets/images/png/calender.png", - height: 20.h, - width: 20.w, - ), - ), - ), - ), - ), - ) - ], - ), - ), - sizedBoxWidth(10.h), - Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - text16400white("End date"), - sizedBoxHeight(10.h), - GestureDetector( - onTap: () => datePicker( - context, - dateController2), - child: AbsorbPointer( - child: - CustomTextFormField( - textEditingController: - dateController2, - leadingIcon: Container( - height: 20.h, - width: 20.w, - child: Center( - child: Image.asset( - "assets/images/png/calender.png", - height: 20.h, - width: 20.w, - ), - ), - ), - ), - ), - ), - sizedBoxHeight(10.h), - Row( - children: [ - Obx(() { - return commonGlassContainer( - border: 1, - borderradius: 2, - height: 20.h, - width: 20.w, - opacity1: 0.24, - opacity2: 0.24, - customWidget: - Transform.scale( - scale: 1.2, - child: Checkbox( - side: BorderSide( - color: Color( - 0xFF434A53)), - value: isChecked - .value, - activeColor: Colors - .transparent, - checkColor: - Colors.white, - onChanged: - ((value) { - // isChecked.value = value!; - isChecked - .value = - value!; - if (isChecked - .value) { - // Set end date to today's date - dateController2 - .text = DateFormat( - 'yyyy-MM-dd') - .format(DateTime - .now()); - } else { - // Clear end date when checkbox is unchecked - dateController2 - .clear(); - } - }), - ), - ), - ); - }), - sizedBoxWidth(8.w), - text10400white("Present") - ], - ), - ], - ), - ) - ], - ), - text16400white("Ability"), - sizedBoxHeight(15.h), - CustomDropDownChexkBox( - header: 'Select ability', - title: '', - listData: _abilitydrop, - onItemSelected: getCatIdFromName, - initiallySelected: [], // or pass initial values if needed - ), - sizedBoxHeight(80.h), - Padding( - padding: EdgeInsets.symmetric( - horizontal: 20.w), - child: CustomButton( - text: "Add timeline", - onPressed: () { - if (clubNameController.text.isBlank! || - rollnameController - .text.isBlank! || - teamnameController - .text.isBlank! || - dateController - .text.isBlank! || - dateController2 - .text.isBlank! || - selectedabilityid.isEmpty) { - utils.showToast( - 'Please fill all fields'); - } else { - print(selectedabilityid - .toString()); - - UploadData(); - } - }, - ), - ), - ]), - ) - ]) - ]) - - // } - )), - ); - } -} - -class CustomDropDownCheckBoxTimeline extends StatefulWidget { - const CustomDropDownCheckBoxTimeline({ - Key? key, - required this.header, - required this.title, - required this.listData, - required this.onItemSelected, - this.leadingImage, - this.showOtherOption = false, - required this.initiallySelected, - }) : super(key: key); - - final String header; - final String title; - final List listData; - final Function(List) onItemSelected; - final Widget? leadingImage; - final bool showOtherOption; - final List initiallySelected; - - @override - State createState() => - _CustomDropDownCheckBoxTimelineState(); -} - -class _CustomDropDownCheckBoxTimelineState - extends State { - RxBool onDropTap = false.obs; - RxList selectedValues = [].obs; - final TextEditingController _textController = TextEditingController(); - - @override - void initState() { - super.initState(); - selectedValues - .addAll(widget.initiallySelected); // Initialize selectedValues - } - - List> _buildDropdownMenuItems() { - return widget.listData.asMap().entries.map((entry) { - int index = entry.key; - String item = entry.value; - return DropdownMenuItem( - 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(), - ), - ), - ), - ], - ), - ); - } -} diff --git a/lib/Login/View/loginscreen.dart b/lib/Login/View/loginscreen.dart index edfdfc8..0d187e4 100644 --- a/lib/Login/View/loginscreen.dart +++ b/lib/Login/View/loginscreen.dart @@ -5,9 +5,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; -import 'package:logger/web.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart'; import 'package:regroup/Login/ViewModel/LoginApi.dart'; import 'package:regroup/Utils/Common/AppleOAuthService.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; @@ -20,8 +18,7 @@ import 'package:regroup/onboarding/Signup/view_model/getUserprofile.dart'; import 'package:regroup/resources/routes/route_name.dart'; import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart'; import 'package:flutter_facebook_auth/flutter_facebook_auth.dart'; -import 'package:regroup/Common/global.dart' as global; -// import 'package:regroup/Common/global.dart' as global; + class LoginScreen extends StatefulWidget { const LoginScreen({super.key}); @@ -31,7 +28,6 @@ class LoginScreen extends StatefulWidget { } class _LoginScreenState extends State { - AccessToken? _accessToken; final TextEditingController _emailController = TextEditingController(); RxBool isObscured = true.obs; final TextEditingController _passwordController = TextEditingController(); @@ -124,7 +120,6 @@ class _LoginScreenState extends State { final LoginResult result = await FacebookAuth.instance.login(); if (result.status == LoginStatus.success) { - _accessToken = result.accessToken; final userData = await FacebookAuth.instance.getUserData(); logger.i(userData['email']); @@ -141,7 +136,6 @@ class _LoginScreenState extends State { _logout() async { await FacebookAuth.instance.logOut(); - _accessToken = null; setState(() {}); } diff --git a/lib/Login/View/verifygoogleapple.dart b/lib/Login/View/verifygoogleapple.dart index cd8df8d..a25141c 100644 --- a/lib/Login/View/verifygoogleapple.dart +++ b/lib/Login/View/verifygoogleapple.dart @@ -10,7 +10,7 @@ import 'package:regroup/Login/ViewModel/LoginApi.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -52,7 +52,7 @@ class _VerifygoogleandappleState extends State { } } - final Map _accountTypeMap = { + final Map _accountTypeMap = { 'Individual': 1, 'Business': 2, }; @@ -68,12 +68,11 @@ class _VerifygoogleandappleState extends State { SharedPreferences prefs = await SharedPreferences.getInstance(); if (resp.status == ResponseStatus.SUCCESS) { - int accountTypeValue = _accountTypeMap[_selectedAccountType] ?? 0; + int accountTypeValue = _accountTypeMap[_selectedAccountType] ?? 0; - await prefs.setString('accountTypefromLogin', - accountTypeValue.toString()); - await prefs.setString('accountTypeValue', - accountTypeValue.toString()); + await prefs.setString( + 'accountTypefromLogin', accountTypeValue.toString()); + await prefs.setString('accountTypeValue', accountTypeValue.toString()); if (_selectedAccountType == 'Individual') { Get.toNamed(RouteName.tellusindividualscreen); @@ -102,9 +101,9 @@ class _VerifygoogleandappleState extends State { backgroundColor: const Color.fromARGB(255, 18, 32, 47), body: Stack( children: [ - const Positioned( - top: 310, right: -30, child: CommonBlurRightSecond()), - const Positioned(top: 510, left: -30, child: CommonBlurLeftBlue()), + // const Positioned( + // top: 310, right: -30, child: CommonBlurRightSecond()), + // const Positioned(top: 510, left: -30, child: CommonBlurLeftBlue()), GlassmorphicContainer( width: MediaQuery.of(context).size.width, height: @@ -122,19 +121,13 @@ class _VerifygoogleandappleState extends State { 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), diff --git a/lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart b/lib/Main_Screens/CalenderTab/AddEvent/AddEvent.dart similarity index 100% rename from lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart rename to lib/Main_Screens/CalenderTab/AddEvent/AddEvent.dart diff --git a/lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart b/lib/Main_Screens/CalenderTab/AddUsers/AddUsers.dart similarity index 100% rename from lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart rename to lib/Main_Screens/CalenderTab/AddUsers/AddUsers.dart diff --git a/lib/Feed Module/Main_Screens/CalenderTab/Availabillity.dart b/lib/Main_Screens/CalenderTab/Availabillity.dart similarity index 100% rename from lib/Feed Module/Main_Screens/CalenderTab/Availabillity.dart rename to lib/Main_Screens/CalenderTab/Availabillity.dart diff --git a/lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart b/lib/Main_Screens/CalenderTab/CalenderTab.dart similarity index 100% rename from lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart rename to lib/Main_Screens/CalenderTab/CalenderTab.dart diff --git a/lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart b/lib/Main_Screens/CalenderTab/EventDetails.dart similarity index 100% rename from lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart rename to lib/Main_Screens/CalenderTab/EventDetails.dart diff --git a/lib/Feed Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart b/lib/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart similarity index 100% rename from lib/Feed Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart rename to lib/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart diff --git a/lib/Feed Module/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart b/lib/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart similarity index 100% rename from lib/Feed Module/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart rename to lib/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart diff --git a/lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart b/lib/Main_Screens/CalenderTab/SetAvailabillity.dart similarity index 100% rename from lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart rename to lib/Main_Screens/CalenderTab/SetAvailabillity.dart diff --git a/lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart b/lib/Main_Screens/Chats/View/chatsmainscreen.dart similarity index 100% rename from lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart rename to lib/Main_Screens/Chats/View/chatsmainscreen.dart diff --git a/lib/Feed Module/Main_Screens/Chats/View/groupchat.dart b/lib/Main_Screens/Chats/View/groupchat.dart similarity index 100% rename from lib/Feed Module/Main_Screens/Chats/View/groupchat.dart rename to lib/Main_Screens/Chats/View/groupchat.dart diff --git a/lib/Feed Module/Main_Screens/Chats/View/newchatpage.dart b/lib/Main_Screens/Chats/View/newchatpage.dart similarity index 100% rename from lib/Feed Module/Main_Screens/Chats/View/newchatpage.dart rename to lib/Main_Screens/Chats/View/newchatpage.dart diff --git a/lib/Feed Module/Main_Screens/Chats/View/newgroup.dart b/lib/Main_Screens/Chats/View/newgroup.dart similarity index 100% rename from lib/Feed Module/Main_Screens/Chats/View/newgroup.dart rename to lib/Main_Screens/Chats/View/newgroup.dart diff --git a/lib/Feed Module/Main_Screens/Chats/View/userchat.dart b/lib/Main_Screens/Chats/View/userchat.dart similarity index 100% rename from lib/Feed Module/Main_Screens/Chats/View/userchat.dart rename to lib/Main_Screens/Chats/View/userchat.dart diff --git a/lib/Feed Module/Main_Screens/Community/Community.dart b/lib/Main_Screens/Community/Community.dart similarity index 99% rename from lib/Feed Module/Main_Screens/Community/Community.dart rename to lib/Main_Screens/Community/Community.dart index 784968b..9a0336a 100644 --- a/lib/Feed Module/Main_Screens/Community/Community.dart +++ b/lib/Main_Screens/Community/Community.dart @@ -7,7 +7,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonTabBar.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/controller/MainScreen.dart'; -import 'package:regroup/Feed%20Module/sidemenu/sidemenu.dart'; +import 'package:regroup/sidemenu/sidemenu.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; diff --git a/lib/Feed Module/Main_Screens/Community/CycleScreen.dart b/lib/Main_Screens/Community/CycleScreen.dart similarity index 99% rename from lib/Feed Module/Main_Screens/Community/CycleScreen.dart rename to lib/Main_Screens/Community/CycleScreen.dart index 799e14e..3849ef3 100644 --- a/lib/Feed Module/Main_Screens/Community/CycleScreen.dart +++ b/lib/Main_Screens/Community/CycleScreen.dart @@ -5,9 +5,8 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonTabBar.dart'; import 'package:regroup/Common/CommonWidget.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Community/Community.dart'; +import 'package:regroup/Main_Screens/Community/Community.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; diff --git a/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart b/lib/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart similarity index 100% rename from lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart rename to lib/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart diff --git a/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart b/lib/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart similarity index 100% rename from lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart rename to lib/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart diff --git a/lib/Feed Module/Main_Screens/Community/PostScreen.dart b/lib/Main_Screens/Community/PostScreen.dart similarity index 100% rename from lib/Feed Module/Main_Screens/Community/PostScreen.dart rename to lib/Main_Screens/Community/PostScreen.dart diff --git a/lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart b/lib/Main_Screens/ExploreDesign/DetailExplore.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart rename to lib/Main_Screens/ExploreDesign/DetailExplore.dart diff --git a/lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart b/lib/Main_Screens/ExploreDesign/ExploreScreen.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart rename to lib/Main_Screens/ExploreDesign/ExploreScreen.dart diff --git a/lib/Feed Module/Main_Screens/ExploreDesign/SearchGroup.dart b/lib/Main_Screens/ExploreDesign/SearchGroup.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ExploreDesign/SearchGroup.dart rename to lib/Main_Screens/ExploreDesign/SearchGroup.dart diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart b/lib/Main_Screens/GroupTab/View/ConnectCommunity.dart similarity index 100% rename from lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart rename to lib/Main_Screens/GroupTab/View/ConnectCommunity.dart diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GoupSettings.dart b/lib/Main_Screens/GroupTab/View/GoupSettings.dart similarity index 100% rename from lib/Feed Module/Main_Screens/GroupTab/View/GoupSettings.dart rename to lib/Main_Screens/GroupTab/View/GoupSettings.dart diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart b/lib/Main_Screens/GroupTab/View/GroupDetail.dart similarity index 100% rename from lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart rename to lib/Main_Screens/GroupTab/View/GroupDetail.dart diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart b/lib/Main_Screens/GroupTab/View/GroupEvent.dart similarity index 100% rename from lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart rename to lib/Main_Screens/GroupTab/View/GroupEvent.dart diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupInfo.dart b/lib/Main_Screens/GroupTab/View/GroupInfo.dart similarity index 100% rename from lib/Feed Module/Main_Screens/GroupTab/View/GroupInfo.dart rename to lib/Main_Screens/GroupTab/View/GroupInfo.dart diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupManage.dart b/lib/Main_Screens/GroupTab/View/GroupManage.dart similarity index 100% rename from lib/Feed Module/Main_Screens/GroupTab/View/GroupManage.dart rename to lib/Main_Screens/GroupTab/View/GroupManage.dart diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart b/lib/Main_Screens/GroupTab/View/GroupTab.dart similarity index 99% rename from lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart rename to lib/Main_Screens/GroupTab/View/GroupTab.dart index 48c419d..de51eb8 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart +++ b/lib/Main_Screens/GroupTab/View/GroupTab.dart @@ -6,7 +6,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/controller/MainScreen.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/NewPost.dart b/lib/Main_Screens/GroupTab/View/NewPost.dart similarity index 100% rename from lib/Feed Module/Main_Screens/GroupTab/View/NewPost.dart rename to lib/Main_Screens/GroupTab/View/NewPost.dart diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart b/lib/Main_Screens/GroupTab/View/RequestedGroups.dart similarity index 100% rename from lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart rename to lib/Main_Screens/GroupTab/View/RequestedGroups.dart diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/Sessions.dart b/lib/Main_Screens/GroupTab/View/Sessions.dart similarity index 100% rename from lib/Feed Module/Main_Screens/GroupTab/View/Sessions.dart rename to lib/Main_Screens/GroupTab/View/Sessions.dart diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart b/lib/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart similarity index 100% rename from lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart rename to lib/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart b/lib/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart similarity index 99% rename from lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart rename to lib/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart index 1d7e562..94bb418 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart +++ b/lib/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart @@ -6,7 +6,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonTabBar.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -245,7 +245,8 @@ class _SubGroupInfoState extends State { Container( decoration: const BoxDecoration( image: DecorationImage( - image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), ), SingleChildScrollView( child: @@ -677,8 +678,10 @@ class _SubGroupInfoState extends State { itemScale: 0.4, itemSize: const Size(45, 45), boxPadding: const EdgeInsets.all(8), - boxAnimationDuration: const Duration(milliseconds: 200), - itemAnimationDuration: const Duration(milliseconds: 500), + boxAnimationDuration: + const Duration(milliseconds: 200), + itemAnimationDuration: + const Duration(milliseconds: 500), hoverDuration: const Duration(milliseconds: 700), // toggle: false, diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart b/lib/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart similarity index 70% rename from lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart rename to lib/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart index 7918eac..701bb6a 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart +++ b/lib/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart @@ -4,7 +4,7 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -39,57 +39,56 @@ class _SubGroupSettingState extends State { ), resizeToAvoidBottomInset: false, body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), Column( - crossAxisAlignment: CrossAxisAlignment.start, + ), + Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + sizedBoxHeight(30.h), + GestureDetector( + onTap: () { + inviteBottomSheet(); + }, + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Row( children: [ - sizedBoxHeight(30.h), - GestureDetector( - onTap: () { - inviteBottomSheet(); - }, - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Row( - children: [ - text18w400_FCFCFC("Group type"), - Spacer(), - Icon( - Icons.arrow_forward_ios_outlined, - color: Colors.white, - size: 18.sp, - ) - ], - ), - ), + text18w400_FCFCFC("Group type"), + Spacer(), + Icon( + Icons.arrow_forward_ios_outlined, + color: Colors.white, + size: 18.sp, + ) + ], ), - sizedBoxHeight(25.h), - commonDivider(), - sizedBoxHeight(25.h), - GestureDetector( - onTap: () { - Get.toNamed(RouteName.groupmanage); - }, - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Row( - children: [ - text18w400_FCFCFC("Manage members"), - Spacer(), - Icon( - Icons.arrow_forward_ios_outlined, - color: Colors.white, - size: 18.sp, - ) - ], - ), - ), + ), + ), + sizedBoxHeight(25.h), + commonDivider(), + sizedBoxHeight(25.h), + GestureDetector( + onTap: () { + Get.toNamed(RouteName.groupmanage); + }, + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Row( + children: [ + text18w400_FCFCFC("Manage members"), + Spacer(), + Icon( + Icons.arrow_forward_ios_outlined, + color: Colors.white, + size: 18.sp, + ) + ], ), - ]) + ), + ), + ]) ])); } diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart b/lib/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart similarity index 89% rename from lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart rename to lib/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart index 6b1b40d..664523e 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart +++ b/lib/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart @@ -4,7 +4,7 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -73,29 +73,30 @@ class _SubGroupsState extends State { image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - sizedBoxHeight(30.h), - Expanded( - child: ListView.builder( - shrinkWrap: true, - physics: BouncingScrollPhysics(), - itemCount: subgroupData.length, - itemBuilder: (context, index) { - return subgroupCard( - ontap: () { - Get.toNamed(RouteName.groupdetail); - }, - imagepath: subgroupData[index]['imagePath'], - title: subgroupData[index]['text'], - members: subgroupData[index]['members']); - }, - ), - ) - ])) + ), + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + sizedBoxHeight(30.h), + Expanded( + child: ListView.builder( + shrinkWrap: true, + physics: BouncingScrollPhysics(), + itemCount: subgroupData.length, + itemBuilder: (context, index) { + return subgroupCard( + ontap: () { + Get.toNamed(RouteName.groupdetail); + }, + imagepath: subgroupData[index]['imagePath'], + title: subgroupData[index]['text'], + members: subgroupData[index]['members']); + }, + ), + ) + ])) ])); } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Badges/Badges.dart b/lib/Main_Screens/ProfileTab/Badges/Badges.dart similarity index 97% rename from lib/Feed Module/Main_Screens/ProfileTab/Badges/Badges.dart rename to lib/Main_Screens/ProfileTab/Badges/Badges.dart index 8ec6f61..31dcdb2 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Badges/Badges.dart +++ b/lib/Main_Screens/ProfileTab/Badges/Badges.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -54,7 +54,8 @@ class _BadgesState extends State { Container( decoration: const BoxDecoration( image: DecorationImage( - image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), ), SingleChildScrollView( child: Padding( diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Certificate/AddCertificate.dart b/lib/Main_Screens/ProfileTab/Certificate/AddCertificate.dart similarity index 99% rename from lib/Feed Module/Main_Screens/ProfileTab/Certificate/AddCertificate.dart rename to lib/Main_Screens/ProfileTab/Certificate/AddCertificate.dart index a1ffd3a..2cc96d6 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Certificate/AddCertificate.dart +++ b/lib/Main_Screens/ProfileTab/Certificate/AddCertificate.dart @@ -7,7 +7,7 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart' hide MultipartFile, FormData; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Certificate/Certificate.dart b/lib/Main_Screens/ProfileTab/Certificate/Certificate.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/Certificate/Certificate.dart rename to lib/Main_Screens/ProfileTab/Certificate/Certificate.dart index d7b1fdd..a4f129a 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Certificate/Certificate.dart +++ b/lib/Main_Screens/ProfileTab/Certificate/Certificate.dart @@ -1,8 +1,8 @@ - import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; + import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Clubs/Clubs.dart b/lib/Main_Screens/ProfileTab/Clubs/Clubs.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/Clubs/Clubs.dart rename to lib/Main_Screens/ProfileTab/Clubs/Clubs.dart index b592b83..6c7cb08 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Clubs/Clubs.dart +++ b/lib/Main_Screens/ProfileTab/Clubs/Clubs.dart @@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -44,13 +44,14 @@ class _ClubsState extends State { ), resizeToAvoidBottomInset: false, body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( - child: Padding( + ), + SingleChildScrollView( + child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column(children: [ sizedBoxHeight(25.h), @@ -218,5 +219,4 @@ class _ClubsState extends State { ), ); } - } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart b/lib/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart rename to lib/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart b/lib/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart rename to lib/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart b/lib/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart rename to lib/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart b/lib/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart similarity index 99% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart rename to lib/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart index 9b23da0..a012092 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart +++ b/lib/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart @@ -8,8 +8,8 @@ import 'package:get/get.dart' hide MultipartFile, FormData; import 'package:regroup/Common/CommonButton.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/ImageUpload.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart b/lib/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart similarity index 93% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart rename to lib/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart index b67f5fb..3a512b3 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart +++ b/lib/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart @@ -9,9 +9,10 @@ import 'package:get/get.dart' hide MultipartFile, FormData; import 'package:regroup/Common/CommonButton.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart'; + import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; @@ -29,7 +30,7 @@ class EditProfile extends StatefulWidget { State createState() => _EditProfileState(); } -//location in normal profile individual api + class _EditProfileState extends State { TextEditingController fullNameController = TextEditingController(); @@ -72,7 +73,7 @@ class _EditProfileState extends State { RxBool isloading = true.obs; void getCatIdFromName(List selectedInterests) { - // selectedinterestid.clear(); + for (var name in selectedInterests) { for (var i = 0; i < interestlistobj!.data!.length; i++) { if (name == interestlistobj!.data![i].name) { @@ -130,32 +131,30 @@ class _EditProfileState extends State { : selectedinterestid; String abilitiesIds = selectedinterestid.toString(); - print("Interests String: $abilitiesIds"); if (editProfileImage.usserprofilePicPath.value.isNotEmpty) { imageFile = await MultipartFile.fromFile( editProfileImage.usserprofilePicPath.value, filename: path.basename(profilePicture), ); - print(imageFile.toString()); } updata = FormData.fromMap({ - // "email_address": "priyanka14@yopmail.com", + "full_name": fullNameController.text, "profile_image": editProfileImage.usserprofilePicPath.isNotEmpty ? imageFile : null, - // profilePicture.isNotEmpty - // ? await convertFileToMultiPart1(profilePicture) - // : null, - // "profile_image": "ghjkk.png", + + + + "user_name": userNameController.text, "date_of_birth": dateController.text, "gender": _selectedgenderType, - // "interest": "selectedSportsIds", + "interest": - // '[1,2,3,4]', + abilitiesIds, "about": aboutController.text, "position": positionController.text, @@ -166,7 +165,6 @@ class _EditProfileState extends State { "address_line1": battingAvgController.text, }); log(updata.toString()); - print(imageFile.toString()); final data = await EditProfileApi().postEditProfileIndividual(updata); if (data.status == ResponseStatus.SUCCESS) { @@ -174,7 +172,7 @@ class _EditProfileState extends State { Get.toNamed(RouteName.mainscreen, arguments: 4); } else { Get.back(); - // btnController.reset(); + Get.snackbar( "Error!", data.data['message'], @@ -185,7 +183,7 @@ class _EditProfileState extends State { snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); - // _controller.isTextFieldEnabled.value = true; + } } @@ -224,7 +222,6 @@ class _EditProfileState extends State { if (snapshot.connectionState == ConnectionState.done && snapshot.hasData) { - print("Data fetched-->"); return Stack(children: [ Container( decoration: const BoxDecoration( @@ -252,7 +249,7 @@ class _EditProfileState extends State { .value != '' ? Image( - // File(profilePicture), + image: FileImage( File( editProfileImage @@ -314,16 +311,14 @@ class _EditProfileState extends State { context, true, (result) { - // var filenameresult = - // extractFileName1(result); + + editProfileImage .usserprofilePicPath .value = result; var filenameresult = extractFileName1(result); - print( - "File name is $filenameresult"); profilePicture = result; isImageAdded = true; @@ -488,8 +483,8 @@ class _EditProfileState extends State { ), sizedBoxHeight(16.h), - //Obx(() { - //return + + CustomDropDownChexkBox( header: 'Select interest', title: "", @@ -500,10 +495,10 @@ class _EditProfileState extends State { width: 18.w, height: 17.h, ), - // showOtherOption: true, + initiallySelected: listofUserInterests, ), - // }), + sizedBoxHeight(20.h), text16400white("About"), @@ -514,7 +509,7 @@ class _EditProfileState extends State { "Lorem Ipsum has been the industry's standard dummy text ever since the 1500s. Lorem Ipsum has been the industry's standard", maxlines: 3, ), - // sizedBoxHeight(20.h), + text16400white("Position"), sizedBoxHeight(16.h), @@ -556,7 +551,7 @@ class _EditProfileState extends State { CustomTextFormField( textEditingController: weightController, hintText: "Enter your weight", - inputFormatters: [ + inputFormatters: [ FilteringTextInputFormatter.allow( RegExp(r'[a-zA-Z0-9\s]')), ], @@ -598,12 +593,11 @@ class _EditProfileState extends State { colorText: Colors.white, ); } - // else if (profilePicture == "") { - // utils.showToast( - // 'Upload edit profile picture!'); - // } + + + + else { - print(selectedinterestid.toString()); saveEditProfileInd(); } }, diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart b/lib/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart rename to lib/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart index 8fb24ad..01b7234 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart +++ b/lib/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart @@ -9,10 +9,10 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/MainScreen.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Global.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; @@ -128,8 +128,6 @@ class _ProfileTabState extends State { SharedPreferences prefs = await SharedPreferences.getInstance(); accountTypeValue = prefs.getString('accountTypeValue'); accounTypeLogin = prefs.getString('accountTypefromLogin'); - print('account tupe login is $accounTypeLogin'); - print('account tupe value is $accountTypeValue'); // foodItemDropdownController.selectedFooddynamic.clear(); // foodItemDropdownController.foodItemQControllerList.clear(); // foodItemDropdownController.OtherFoodIngredientList.clear(); @@ -154,7 +152,7 @@ class _ProfileTabState extends State { int? certificationsremoveid; - RemoveTimelineUploadata() async { + removeTimelineUploadata() async { utils.loader(); Map updata = { "timeline_id": timelineremoveid, @@ -162,11 +160,9 @@ class _ProfileTabState extends State { final data = await Profilepostmethod().postRemoveTimeline(updata); if (data.status == ResponseStatus.SUCCESS) { Get.back(); - print("block done"); return utils.showToast(data.message); } else { Get.back(); - print("block not done"); return utils.showToast(data.message); } } @@ -179,11 +175,9 @@ class _ProfileTabState extends State { final data = await Profilepostmethod().postRemoveCertification(updata); if (data.status == ResponseStatus.SUCCESS) { Get.back(); - print("block done"); return utils.showToast(data.message); } else { Get.back(); - print("block not done"); return utils.showToast(data.message); } } @@ -219,7 +213,6 @@ class _ProfileTabState extends State { if (snapshot.connectionState == ConnectionState.done && snapshot.hasData) { - print("Data fetched-->"); return Stack(clipBehavior: Clip.none, children: [ Container( decoration: const BoxDecoration( @@ -235,7 +228,7 @@ class _ProfileTabState extends State { children: [ Stack( children: [ - Container( + SizedBox( height: 484.h, width: double.infinity, child: getEditProfileIndi! @@ -367,7 +360,7 @@ class _ProfileTabState extends State { getEditProfileIndi!.data!.about == null || getEditProfileIndi! .data!.about!.isEmpty - ? SizedBox() + ? const SizedBox() : text14400white( getEditProfileIndi!.data!.about!), sizedBoxHeight(25.h), @@ -392,7 +385,7 @@ class _ProfileTabState extends State { null || getEditProfileIndi! .data!.location!.isEmpty - ? SizedBox() + ? const SizedBox() : text14400whiteblur( getEditProfileIndi! .data!.location!), @@ -590,7 +583,7 @@ class _ProfileTabState extends State { timelineremoveid = getEditProfileIndi!.data!.timelines![index].id ?? 0; getEditProfileIndi!.data!.timelines!.removeWhere((item) => item.id! == timelineremoveid); // .removeAt(index); - RemoveTimelineUploadata(); + removeTimelineUploadata(); }); }, child: SizedBox( @@ -1105,7 +1098,6 @@ class _ProfileTabState extends State { if (snapshot.connectionState == ConnectionState.done && snapshot.hasData) { - print("Data fetched-->"); return Stack(clipBehavior: Clip.none, children: [ Container( decoration: const BoxDecoration( @@ -1121,7 +1113,7 @@ class _ProfileTabState extends State { children: [ Stack( children: [ - Container( + SizedBox( height: 484.h, width: double.infinity, child: getEditProfileBus!.data! @@ -1221,8 +1213,8 @@ class _ProfileTabState extends State { color: Colors.white, width: 1.0, ), - boxShadow: [ - const BoxShadow( + boxShadow: const [ + BoxShadow( color: Color(0x66000000), offset: Offset(0, 4), @@ -1320,7 +1312,7 @@ class _ProfileTabState extends State { sizedBoxHeight(10.h), getEditProfileBus!.data!.bio == null || getEditProfileBus!.data!.bio!.isEmpty - ? SizedBox() + ? const SizedBox() : text14400white( getEditProfileBus!.data!.bio!), sizedBoxHeight(25.h), @@ -1346,7 +1338,7 @@ class _ProfileTabState extends State { null || getEditProfileBus!.data! .businessOwnerName!.isEmpty - ? SizedBox() + ? const SizedBox() : text14400whiteblur( getEditProfileBus! .data!.businessOwnerName!), @@ -1374,7 +1366,7 @@ class _ProfileTabState extends State { null || getEditProfileBus! .data!.websiteLink!.isEmpty - ? SizedBox() + ? const SizedBox() : text14400whiteblur( getEditProfileBus! .data!.websiteLink!), @@ -1403,7 +1395,7 @@ class _ProfileTabState extends State { null || getEditProfileBus!.data! .businessLocation!.isEmpty - ? SizedBox() + ? const SizedBox() : text14400whiteblur( getEditProfileBus! .data!.businessLocation!), @@ -1434,7 +1426,7 @@ class _ProfileTabState extends State { null || getEditProfileBus! .data!.foundedon!.isEmpty - ? SizedBox() + ? const SizedBox() : text14400whiteblur( getEditProfileBus! .data!.foundedon!), @@ -1520,7 +1512,7 @@ class _ProfileTabState extends State { }) { return Row( children: [ - Container( + SizedBox( width: 10, height: 170.h, child: Stack( diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart b/lib/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart rename to lib/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart b/lib/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart rename to lib/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart b/lib/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart similarity index 93% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart rename to lib/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart index 85524f2..6e497cf 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart +++ b/lib/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart @@ -3,8 +3,8 @@ import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart'; import 'package:shared_preferences/shared_preferences.dart'; GetEditProfileIndi? getEditProfileIndi; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart b/lib/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart similarity index 91% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart rename to lib/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart index 09036ae..f8ab05e 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart +++ b/lib/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart @@ -1,7 +1,7 @@ import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart'; InterestModel? interestlistobj; List listofInterests = []; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Followers/Followers.dart b/lib/Main_Screens/ProfileTab/Followers/Followers.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/Followers/Followers.dart rename to lib/Main_Screens/ProfileTab/Followers/Followers.dart index 8117225..69136b0 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Followers/Followers.dart +++ b/lib/Main_Screens/ProfileTab/Followers/Followers.dart @@ -5,11 +5,12 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowers.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followersModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowers.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/followersModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; + + import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; @@ -18,6 +19,8 @@ import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart'; +import '../view_model/profilePostmethod.dart'; + class Followers extends StatefulWidget { const Followers({super.key}); @@ -37,7 +40,6 @@ class _FollowersState extends State { @override void initState() { - // TODO: implement initState var updata = ""; if (fromMainBusProfile == 'MainBusProfile') { Profilegetmethod() diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart b/lib/Main_Screens/ProfileTab/Following/Following.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart rename to lib/Main_Screens/ProfileTab/Following/Following.dart index 31bc182..742a8ce 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart +++ b/lib/Main_Screens/ProfileTab/Following/Following.dart @@ -5,12 +5,12 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowers.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowing.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followingModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowing.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/followingModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; + import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowers.dart b/lib/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowers.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowers.dart rename to lib/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowers.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowing.dart b/lib/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowing.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowing.dart rename to lib/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowing.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataBus.dart b/lib/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataBus.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataBus.dart rename to lib/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataBus.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataIndi.dart b/lib/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataIndi.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataIndi.dart rename to lib/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataIndi.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart b/lib/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart similarity index 92% rename from lib/Feed Module/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart rename to lib/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart index a087b70..4d9d3d8 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart +++ b/lib/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart @@ -5,9 +5,10 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; + + import 'package:regroup/Utils/Common/ShimmerCommon.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; @@ -56,7 +57,6 @@ class _profiletabBusGestState extends State { // return utils.showToast(data.message); } else { Get.back(); - print("unfollow not done"); return utils.showToast(data.message); } } @@ -71,11 +71,9 @@ class _profiletabBusGestState extends State { Get.back(); // Get.back(); Get.toNamed(RouteName.mainscreen, arguments: 4); - print("block done"); return utils.showToast(data.message); } else { Get.back(); - print("block not done"); return utils.showToast(data.message); } } @@ -84,17 +82,17 @@ class _profiletabBusGestState extends State { Widget build(BuildContext context) { return Scaffold( // key: _scaffoldKey1, - backgroundColor: Color(0xFF222935), + backgroundColor: const Color(0xFF222935), extendBody: true, // accountTypeValue == '1' || body: FutureBuilder( future: guestBusfuture, builder: (ctx, snapshot) { if (snapshot.connectionState == ConnectionState.waiting) { - return - // ShimmerCommon(); + return + // ShimmerCommon(); - Center( + const Center( child: CircularProgressIndicator( color: Colors.blue, ), @@ -112,7 +110,6 @@ class _profiletabBusGestState extends State { if (snapshot.connectionState == ConnectionState.done && snapshot.hasData) { - print("Data fetched-->"); return Stack(clipBehavior: Clip.none, children: [ Container( decoration: const BoxDecoration( @@ -143,10 +140,10 @@ class _profiletabBusGestState extends State { ).image, fit: BoxFit.cover, ), - shape: LinearBorder(), + shape: const LinearBorder(), ), ) - : Container( + : SizedBox( height: 484.h, width: double.infinity, child: Image.asset( @@ -156,7 +153,7 @@ class _profiletabBusGestState extends State { ), Positioned.fill( child: Container( - decoration: BoxDecoration( + decoration: const BoxDecoration( gradient: LinearGradient( begin: Alignment.topCenter, end: Alignment.bottomCenter, @@ -232,7 +229,7 @@ class _profiletabBusGestState extends State { width: 1.0, ), boxShadow: [ - BoxShadow( + const BoxShadow( color: Color(0x66000000), offset: Offset(0, 4), blurRadius: 4.0, @@ -297,7 +294,6 @@ class _profiletabBusGestState extends State { followunfollowid = guestGetProfileBus!.data!.id; FollowUnfollowUploadata(); - print(followunfollowid); }, child: guestGetProfileBus!.data! .isIamFollowingToGuestUser == @@ -306,7 +302,7 @@ class _profiletabBusGestState extends State { height: 40.h, width: 170.w, decoration: BoxDecoration( - color: Color(0xFFD90B2E), + color: const Color(0xFFD90B2E), borderRadius: BorderRadius.circular(30.r), ), @@ -318,7 +314,7 @@ class _profiletabBusGestState extends State { height: 40.h, width: 170.w, decoration: BoxDecoration( - color: Color(0xFFD90B2E), + color: const Color(0xFFD90B2E), borderRadius: BorderRadius.circular(30.r), ), @@ -351,14 +347,11 @@ class _profiletabBusGestState extends State { sizedBoxHeight(30.h), text18w700white("About"), sizedBoxHeight(10.h), - guestGetProfileBus!.data!.bio == null || - guestGetProfileBus!.data!.bio!.isEmpty - ? - SizedBox() - : - - text14400white( - guestGetProfileBus!.data!.bio! ), + guestGetProfileBus!.data!.bio == null || + guestGetProfileBus!.data!.bio!.isEmpty + ? const SizedBox() + : text14400white( + guestGetProfileBus!.data!.bio!), sizedBoxHeight(25.h), Row( children: [ @@ -377,14 +370,13 @@ class _profiletabBusGestState extends State { )), ), sizedBoxWidth(12.w), - guestGetProfileBus! - .data!.businessOwnerName == null || guestGetProfileBus! - .data!.businessOwnerName!.isEmpty - ? - SizedBox() - : - text14400whiteblur(guestGetProfileBus! + .data!.businessOwnerName == + null || + guestGetProfileBus!.data! + .businessOwnerName!.isEmpty + ? const SizedBox() + : text14400whiteblur(guestGetProfileBus! .data!.businessOwnerName!), ], ), @@ -406,13 +398,13 @@ class _profiletabBusGestState extends State { )), ), sizedBoxWidth(12.w), - guestGetProfileBus!.data!.websiteLink == null || - guestGetProfileBus!.data!.websiteLink!.isEmpty - ? - SizedBox() - : - text14400whiteblur( - guestGetProfileBus!.data!.websiteLink!), + guestGetProfileBus!.data!.websiteLink == + null || + guestGetProfileBus! + .data!.websiteLink!.isEmpty + ? const SizedBox() + : text14400whiteblur(guestGetProfileBus! + .data!.websiteLink!), ], ), sizedBoxHeight(20.h), @@ -434,13 +426,12 @@ class _profiletabBusGestState extends State { ), sizedBoxWidth(12.w), guestGetProfileBus! - .data!.businessLocation == null || - guestGetProfileBus! - .data!.businessLocation!.isEmpty - ? - SizedBox() - : - text14400whiteblur(guestGetProfileBus! + .data!.businessLocation == + null || + guestGetProfileBus! + .data!.businessLocation!.isEmpty + ? const SizedBox() + : text14400whiteblur(guestGetProfileBus! .data!.businessLocation!), ], ), @@ -470,10 +461,9 @@ class _profiletabBusGestState extends State { null ? text14400whiteblur( ' Founded at : ${guestGetProfileBus!.data!.businessType!.createdAt}') - : - SizedBox(), - // text14400whiteblur( - // "Founded at : 2010") + : const SizedBox(), + // text14400whiteblur( + // "Founded at : 2010") ], ), sizedBoxHeight(30.h), @@ -529,7 +519,7 @@ class _profiletabBusGestState extends State { ), )), ), - Spacer(), + const Spacer(), commonContainer( width: 40.w, height: 40.h, @@ -704,7 +694,7 @@ Widget normalcardtile({ sizedBoxWidth(7.w), Icon( Icons.circle, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), size: 4.sp, ), sizedBoxWidth(6.w), @@ -713,12 +703,12 @@ Widget normalcardtile({ ) ], ), - Spacer(), + const Spacer(), PopupMenuButton( - surfaceTintColor: Color(0xFF222935), + surfaceTintColor: const Color(0xFF222935), constraints: BoxConstraints.tightFor(width: 176.w), - offset: Offset(0, 50), - color: Color(0xFF222935), + offset: const Offset(0, 50), + color: const Color(0xFF222935), tooltip: "", itemBuilder: (BuildContext context) => [ PopupMenuItem( @@ -736,7 +726,7 @@ Widget normalcardtile({ fontFamily: "Nunito Sans", ), ), - Spacer(), + const Spacer(), Image.asset( "assets/images/png/Vector (5).png", height: 15.h, @@ -746,7 +736,7 @@ Widget normalcardtile({ ), ), ), - PopupMenuDivider(), + const PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -762,7 +752,7 @@ Widget normalcardtile({ fontFamily: "Nunito Sans", ), ), - Spacer(), + const Spacer(), Image.asset( "assets/images/png/share.png", height: 20.h, @@ -772,7 +762,7 @@ Widget normalcardtile({ ), ), ), - PopupMenuDivider(), + const PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -788,7 +778,7 @@ Widget normalcardtile({ fontFamily: "Nunito Sans", ), ), - Spacer(), + const Spacer(), Image.asset( "assets/images/png/f7_pin-fill (2).png", height: 25.h, @@ -814,7 +804,7 @@ Widget normalcardtile({ onTap: () { Get.toNamed(RouteName.postdetailsScreen); }, - child: Container( + child: SizedBox( height: 163.h, width: double.infinity, child: Image.asset( @@ -853,7 +843,7 @@ Widget normalcardtile({ 'assets/images/png/heart 2.png', 'assets/images/png/party-popper 2.png' ]), - Spacer(), + const Spacer(), commonContainer( width: 30.w, height: 30.h, @@ -936,11 +926,11 @@ Widget normalcardtile({ boxRadius: 30, itemsSpacing: 8, itemScale: 0.4, - itemSize: Size(45, 45), - boxPadding: EdgeInsets.all(8), - boxAnimationDuration: Duration(milliseconds: 200), - itemAnimationDuration: Duration(milliseconds: 500), - hoverDuration: Duration(milliseconds: 700), + itemSize: const Size(45, 45), + boxPadding: const EdgeInsets.all(8), + boxAnimationDuration: const Duration(milliseconds: 200), + itemAnimationDuration: const Duration(milliseconds: 500), + hoverDuration: const Duration(milliseconds: 700), // toggle: false, child: _buildReactionsIcon(mainImage.value), @@ -1013,7 +1003,7 @@ Widget containertile({required String text}) { width: 100.w, height: 30.h, borderRadius: BorderRadius.circular(30.r), - borderColor: Color(0xFFD90B2E), + borderColor: const Color(0xFFD90B2E), borderwidth: 0.9, customWidget: Padding( padding: EdgeInsets.symmetric(horizontal: 10.w), diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart b/lib/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart rename to lib/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart index 741707c..ed6cd02 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart +++ b/lib/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart @@ -7,9 +7,8 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -217,7 +216,7 @@ class _ProfileTabIndGuestState extends State { ).image, fit: BoxFit.cover, ), - shape: LinearBorder(), + shape: const LinearBorder(), ), ) : Container( @@ -450,7 +449,7 @@ class _ProfileTabIndGuestState extends State { sizedBoxHeight(10.h), guestGetProfileInd!.data!.about == null || guestGetProfileInd!.data!.about!.isEmpty - ? SizedBox() + ? const SizedBox() : text14400white( guestGetProfileInd!.data!.about!), sizedBoxHeight(25.h), @@ -471,9 +470,11 @@ class _ProfileTabIndGuestState extends State { )), ), sizedBoxWidth(12.w), - guestGetProfileInd!.data!.location == null || - guestGetProfileInd!.data!.location!.isEmpty - ? SizedBox() + guestGetProfileInd!.data!.location == + null || + guestGetProfileInd! + .data!.location!.isEmpty + ? const SizedBox() : text14400whiteblur(guestGetProfileInd! .data!.location!), ], @@ -650,7 +651,7 @@ class _ProfileTabIndGuestState extends State { child: Container( height: 11.h, width: 11.w, - decoration: BoxDecoration( + decoration: const BoxDecoration( color: Colors .white, shape: BoxShape @@ -662,7 +663,7 @@ class _ProfileTabIndGuestState extends State { width: 1.w, height: 170.h, decoration: - BoxDecoration( + const BoxDecoration( color: Colors .white), ), @@ -705,7 +706,7 @@ class _ProfileTabIndGuestState extends State { children: [ guestGetProfileInd?.data?.profilePhoto == null || guestGetProfileInd!.data!.profilePhoto!.isEmpty - ? CircleAvatar(radius: 10.r, backgroundImage: AssetImage('assets/images/png/cimg1.png')) + ? CircleAvatar(radius: 10.r, backgroundImage: const AssetImage('assets/images/png/cimg1.png')) : CircleAvatar(radius: 10.r, backgroundImage: NetworkImage(guestGetProfileInd!.data!.profilePhoto!)), sizedBoxWidth( 8.w), @@ -886,7 +887,7 @@ class _ProfileTabIndGuestState extends State { scrollDirection: Axis.horizontal, // padding: // EdgeInsets.only(left: 16.w), - physics: ScrollPhysics(), + physics: const ScrollPhysics(), itemCount: guestGetProfileInd! .data!.certifications!.length, itemBuilder: (context, index) { @@ -996,7 +997,7 @@ class _ProfileTabIndGuestState extends State { fontSize: 9.sp, fontWeight: FontWeight.w400, - color: Color(0xffFFFFFF).withOpacity(0.70), + color: const Color(0xffFFFFFF).withOpacity(0.70), fontFamily: 'Helvetica'), ) : Text( @@ -1005,7 +1006,7 @@ class _ProfileTabIndGuestState extends State { fontSize: 9.sp, fontWeight: FontWeight.w400, - color: Color(0xffFFFFFF).withOpacity(0.70), + color: const Color(0xffFFFFFF).withOpacity(0.70), fontFamily: 'Helvetica'), ) ], @@ -1699,7 +1700,7 @@ class _ProfileTabIndGuestState extends State { ).image, fit: BoxFit.cover, ), - shape: LinearBorder(), + shape: const LinearBorder(), ), ) : Container( diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart b/lib/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart similarity index 85% rename from lib/Feed Module/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart rename to lib/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart index 824147b..4efe360 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart +++ b/lib/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart @@ -4,11 +4,10 @@ import 'dart:developer'; import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowers.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowing.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GuestGetProfileDataBus.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GuestGetProfileDataIndi.dart'; - +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowers.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowing.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GuestGetProfileDataBus.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GuestGetProfileDataIndi.dart'; GuestGetProfileDataIndi? guestGetProfileInd; GuestGetProfileDataBus? guestGetProfileBus; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/accountSessionModel.dart b/lib/Main_Screens/ProfileTab/Model/accountSessionModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/accountSessionModel.dart rename to lib/Main_Screens/ProfileTab/Model/accountSessionModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/certificateModel.dart b/lib/Main_Screens/ProfileTab/Model/certificateModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/certificateModel.dart rename to lib/Main_Screens/ProfileTab/Model/certificateModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/editTimelineModel.dart b/lib/Main_Screens/ProfileTab/Model/editTimelineModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/editTimelineModel.dart rename to lib/Main_Screens/ProfileTab/Model/editTimelineModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/faqModel.dart b/lib/Main_Screens/ProfileTab/Model/faqModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/faqModel.dart rename to lib/Main_Screens/ProfileTab/Model/faqModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/followersModel.dart b/lib/Main_Screens/ProfileTab/Model/followersModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/followersModel.dart rename to lib/Main_Screens/ProfileTab/Model/followersModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/followingModel.dart b/lib/Main_Screens/ProfileTab/Model/followingModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/followingModel.dart rename to lib/Main_Screens/ProfileTab/Model/followingModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart b/lib/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart rename to lib/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/termsconditionsModel.dart b/lib/Main_Screens/ProfileTab/Model/termsconditionsModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/termsconditionsModel.dart rename to lib/Main_Screens/ProfileTab/Model/termsconditionsModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart b/lib/Main_Screens/ProfileTab/Model/timelineabilityModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart rename to lib/Main_Screens/ProfileTab/Model/timelineabilityModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/My Network/MyNetwork.dart b/lib/Main_Screens/ProfileTab/My Network/MyNetwork.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/My Network/MyNetwork.dart rename to lib/Main_Screens/ProfileTab/My Network/MyNetwork.dart index 3a142af..ed11f14 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/My Network/MyNetwork.dart +++ b/lib/Main_Screens/ProfileTab/My Network/MyNetwork.dart @@ -8,10 +8,10 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonTabBar.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followersModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followingModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/followersModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/followingModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; @@ -117,11 +117,9 @@ class _FollowersTabState extends State { final data = await Profilepostmethod().postRemoveuser(updata); if (data.status == ResponseStatus.SUCCESS) { Get.back(); - print("block done"); return utils.showToast(data.message); } else { Get.back(); - print("block not done"); return utils.showToast(data.message); } } @@ -134,11 +132,9 @@ class _FollowersTabState extends State { final data = await Profilepostmethod().postBlockuser(updata); if (data.status == ResponseStatus.SUCCESS) { Get.back(); - print("block done"); return utils.showToast(data.message); } else { Get.back(); - print("block not done"); return utils.showToast(data.message); } } @@ -521,7 +517,6 @@ class _FollowingTabState extends State { final data = await Profilepostmethod().postunfollowuser(updata); if (data.status == ResponseStatus.SUCCESS) { Get.back(); - print("unfollow done"); // setState(() { // // Assuming followingobj is a list of items, remove the item with matching user ID // followingobj!.data!.removeWhere((item) => item.following!.id == userid); @@ -529,7 +524,6 @@ class _FollowingTabState extends State { return utils.showToast(data.message); } else { Get.back(); - print("unfollow not done"); return utils.showToast(data.message); } } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSessions.dart b/lib/Main_Screens/ProfileTab/Settings/AccountSessions.dart similarity index 66% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSessions.dart rename to lib/Main_Screens/ProfileTab/Settings/AccountSessions.dart index be6b13d..2e6502b 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSessions.dart +++ b/lib/Main_Screens/ProfileTab/Settings/AccountSessions.dart @@ -1,7 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; + import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -23,15 +24,14 @@ class _AccountSessionState extends State { @override Widget build(BuildContext context) { return Scaffold( - // key: _scaffoldKey1, - resizeToAvoidBottomInset: false, - backgroundColor: const Color(0xFF222935), - extendBody: true, - appBar: const CommonAppbar( - titleTxt: "Account sessions", - ), - body: - FutureBuilder( + // key: _scaffoldKey1, + resizeToAvoidBottomInset: false, + backgroundColor: const Color(0xFF222935), + extendBody: true, + appBar: const CommonAppbar( + titleTxt: "Account sessions", + ), + body: FutureBuilder( future: Profilegetmethod().getAccountSessions(), builder: (ctx, snapshot) { if (snapshot.data == null) { @@ -62,12 +62,10 @@ class _AccountSessionState extends State { : _buildBody(context); }, ), - - - ); + ); } - Widget _buildNoDataBody(context) { + Widget _buildNoDataBody(context) { return Center( child: Column( mainAxisAlignment: MainAxisAlignment.center, @@ -86,47 +84,45 @@ class _AccountSessionState extends State { } Widget _buildBody(context) { - return - - Stack(children: [ - Container( - decoration: const BoxDecoration( - image: DecorationImage( - image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), - Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: - Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ - sizedBoxHeight(25.h), - text18w400white("Last login sessions"), - sizedBoxHeight(16.h), - ListView.builder( - shrinkWrap: true, - physics: const ScrollPhysics(), - itemCount: accountsessionobj!.data!.length, - itemBuilder: (context, index) { - final city = accountsessionobj!.data![index].city; - final state = accountsessionobj!.data![index].state; - final country = accountsessionobj!.data![index].country; + return Stack(children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + sizedBoxHeight(25.h), + text18w400white("Last login sessions"), + sizedBoxHeight(16.h), + ListView.builder( + shrinkWrap: true, + physics: const ScrollPhysics(), + itemCount: accountsessionobj!.data!.length, + itemBuilder: (context, index) { + final city = accountsessionobj!.data![index].city; + final state = accountsessionobj!.data![index].state; + final country = accountsessionobj!.data![index].country; - // Combine city, state, and country - final locationTitle = '$city, $state, $country'; - return sessionCard( - title: locationTitle, - devicename: accountsessionobj!.data![index].deviceName!, - ipaddress: accountsessionobj!.data![index].ipAddress! - - ); - }, - ) - ]), + // Combine city, state, and country + final locationTitle = '$city, $state, $country'; + return sessionCard( + title: locationTitle, + devicename: accountsessionobj!.data![index].deviceName!, + ipaddress: accountsessionobj!.data![index].ipAddress!); + }, ) - ]); - - } + ]), + ) + ]); + } - Widget sessionCard({required String title, required String devicename, required String ipaddress}) { + Widget sessionCard( + {required String title, + required String devicename, + required String ipaddress}) { return Padding( padding: const EdgeInsets.symmetric(vertical: 15), child: commonGlassContainer( diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSetting.dart b/lib/Main_Screens/ProfileTab/Settings/AccountSetting.dart similarity index 70% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSetting.dart rename to lib/Main_Screens/ProfileTab/Settings/AccountSetting.dart index 815dab9..7054342 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSetting.dart +++ b/lib/Main_Screens/ProfileTab/Settings/AccountSetting.dart @@ -4,10 +4,10 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; + import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -24,7 +24,7 @@ class AccountSettings extends StatefulWidget { class _AccountSettingsState extends State { // bool swichvalue = false; - String? accountTypeValue; + String? accountTypeValue; String? accounTypeLogin; @override @@ -44,15 +44,14 @@ class _AccountSettingsState extends State { }); } - Future UploadData() async { + Future UploadData() async { print("upload data called"); SharedPreferences prefs = await SharedPreferences.getInstance(); - int? accountype ; + int? accountype; if (accountvisibility == false) { accountype = 0; - } - else if (accountvisibility == true) { + } else if (accountvisibility == true) { accountype = 1; } Map updata = { @@ -64,24 +63,20 @@ class _AccountSettingsState extends State { if (data.status == ResponseStatus.SUCCESS) { String? accountype; -accountype = prefs.getString('accountTypefromLogin'); - -if (accountype == "1") { - EditProfileApi() - .getEditProfileIndividual(); -} -else if (accountype == "2") { - EditProfileApi() - .getEditProfileBusiness(); -} - + accountype = prefs.getString('accountTypefromLogin'); + if (accountype == "1") { + EditProfileApi().getEditProfileIndividual(); + } else if (accountype == "2") { + EditProfileApi().getEditProfileBusiness(); + } return utils.showToast(data.message); } else { return utils.showToast(data.message); } } + @override Widget build(BuildContext context) { return Scaffold( @@ -112,42 +107,40 @@ else if (accountype == "2") { ), sizedBoxHeight(20.h), accounTypeLogin == '1' - ? + ? Column( + children: [ + Padding( + padding: EdgeInsets.symmetric( + horizontal: 16.w, vertical: 20.h), + child: Row(children: [ + Image.asset( + "assets/images/png/eyeIcon.png", + height: 21.h, + width: 21.w, + ), + sizedBoxWidth(12.w), + text16w400_FCFCFC("Account visibility"), + Spacer(), + Transform.scale( + scale: 0.9, + child: CupertinoSwitch( + value: accountvisibility, + trackColor: Colors.white.withOpacity(0.4), + activeColor: Color(0xFF34C759), + onChanged: (bool value) { + setState(() { + accountvisibility = value; + UploadData(); - Column( - children: [ - Padding( - padding: - EdgeInsets.symmetric(horizontal: 16.w, vertical: 20.h), - child: Row(children: [ - Image.asset( - "assets/images/png/eyeIcon.png", - height: 21.h, - width: 21.w, - ), - sizedBoxWidth(12.w), - text16w400_FCFCFC("Account visibility"), - Spacer(), - Transform.scale( - scale: 0.9, - child: CupertinoSwitch( - value: accountvisibility, - trackColor: Colors.white.withOpacity(0.4), - activeColor: Color(0xFF34C759), - onChanged: (bool value) { - setState(() { - accountvisibility = value; - UploadData(); - - // swichvalue = value ?? false; - }); - })) - ]), - ), - commonDivider(), - ], - ) - : SizedBox(), + // swichvalue = value ?? false; + }); + })) + ]), + ), + commonDivider(), + ], + ) + : SizedBox(), GestureDetector( onTap: () { Get.toNamed(RouteName.changepassword); diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ChangePassword.dart b/lib/Main_Screens/ProfileTab/Settings/ChangePassword.dart similarity index 93% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/ChangePassword.dart rename to lib/Main_Screens/ProfileTab/Settings/ChangePassword.dart index 6cd5d7f..a7d4acb 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ChangePassword.dart +++ b/lib/Main_Screens/ProfileTab/Settings/ChangePassword.dart @@ -4,10 +4,10 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonButton.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -38,13 +38,11 @@ class _ChangePasswordState extends State { Get.back(); print("Change pass up done"); - Get.toNamed(RouteName.verifycode, - arguments: { - "currentpass" : currentpasscontroller.text, - "newpass" : newpasscontroller.text, - "confirmpass" : repeatpasscontroller.text - } - ); + Get.toNamed(RouteName.verifycode, arguments: { + "currentpass": currentpasscontroller.text, + "newpass": newpasscontroller.text, + "confirmpass": repeatpasscontroller.text + }); return utils.showToast(data.message); } else { Get.back(); @@ -60,9 +58,9 @@ class _ChangePasswordState extends State { child: Scaffold( resizeToAvoidBottomInset: false, // key: _scaffoldKey1, - backgroundColor: Color(0xFF222935), + backgroundColor: const Color(0xFF222935), extendBody: true, - appBar: CommonAppbar( + appBar: const CommonAppbar( titleTxt: "Change password", ), body: Stack(children: [ @@ -172,7 +170,6 @@ class _ChangePasswordState extends State { utils.showToast('Please fill all fields'); } else { Uploadata(); - } }, ) diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ContactUs.dart b/lib/Main_Screens/ProfileTab/Settings/ContactUs.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/ContactUs.dart rename to lib/Main_Screens/ProfileTab/Settings/ContactUs.dart index f8d0d96..ca8e47a 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ContactUs.dart +++ b/lib/Main_Screens/ProfileTab/Settings/ContactUs.dart @@ -3,7 +3,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/DeleteAccount.dart b/lib/Main_Screens/ProfileTab/Settings/DeleteAccount.dart similarity index 95% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/DeleteAccount.dart rename to lib/Main_Screens/ProfileTab/Settings/DeleteAccount.dart index 9bfa5ea..9eb0a61 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/DeleteAccount.dart +++ b/lib/Main_Screens/ProfileTab/Settings/DeleteAccount.dart @@ -5,10 +5,10 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonButton.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -64,9 +64,9 @@ class _DeleteAccountState extends State { child: Scaffold( // key: _scaffoldKey1, // resizeToAvoidBottomInset: false, - backgroundColor: Color(0xFF222935), + backgroundColor: const Color(0xFF222935), extendBody: true, - appBar: CommonAppbar( + appBar: const CommonAppbar( titleTxt: "", ), body: Stack(children: [ diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/FaqScreen.dart b/lib/Main_Screens/ProfileTab/Settings/FaqScreen.dart similarity index 95% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/FaqScreen.dart rename to lib/Main_Screens/ProfileTab/Settings/FaqScreen.dart index ebb976d..6a4162a 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/FaqScreen.dart +++ b/lib/Main_Screens/ProfileTab/Settings/FaqScreen.dart @@ -2,9 +2,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; + import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -64,10 +65,10 @@ class _FaqScreenState extends State { Widget build(BuildContext context) { return Scaffold( // key: _scaffoldKey1, - backgroundColor: Color(0xFF222935), + backgroundColor: const Color(0xFF222935), resizeToAvoidBottomInset: false, extendBody: true, - appBar: CommonAppbar( + appBar: const CommonAppbar( titleTxt: "FAQ’s", ), body: FutureBuilder( @@ -96,8 +97,8 @@ class _FaqScreenState extends State { ); } } - isExpandedList = - RxList.generate(faqobj!.data!.length, (index) => index == 0); + isExpandedList = + RxList.generate(faqobj!.data!.length, (index) => index == 0); return faqobj!.data!.isEmpty ? _buildNoDataBody(context) : _buildBody(context); diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart b/lib/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart similarity index 97% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart rename to lib/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart index 2b12ccf..a669ec7 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart +++ b/lib/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart @@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -80,8 +80,7 @@ class _HelpAndSupportState extends State { ), ), accounTypeLogin == '1' - ? Column( - children: [ + ? Column(children: [ commonDivider(), GestureDetector( onTap: () { diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart b/lib/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart rename to lib/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart b/lib/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart rename to lib/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart b/lib/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart similarity index 97% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart rename to lib/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart index 609776d..7f7b775 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart +++ b/lib/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart @@ -2,9 +2,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; + import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ReportABug.dart b/lib/Main_Screens/ProfileTab/Settings/ReportABug.dart similarity index 96% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/ReportABug.dart rename to lib/Main_Screens/ProfileTab/Settings/ReportABug.dart index 9f559f0..905c70a 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ReportABug.dart +++ b/lib/Main_Screens/ProfileTab/Settings/ReportABug.dart @@ -7,12 +7,12 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonButton.dart'; import 'package:regroup/Common/CommonDropDown.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -69,9 +69,9 @@ class _ReportABugState extends State { child: Scaffold( // key: _scaffoldKey1, resizeToAvoidBottomInset: false, - backgroundColor: Color(0xFF222935), + backgroundColor: const Color(0xFF222935), extendBody: true, - appBar: CommonAppbar( + appBar: const CommonAppbar( titleTxt: "Report a bug", ), body: Stack(children: [ @@ -82,7 +82,7 @@ class _ReportABugState extends State { fit: BoxFit.fill)), ), SingleChildScrollView( - physics: ScrollPhysics(), + physics: const ScrollPhysics(), child: Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: Form( @@ -104,7 +104,7 @@ class _ReportABugState extends State { ), sizedBoxHeight(15.h), CustomTextFormField( - leadingIcon: Container( + leadingIcon: SizedBox( height: 25.h, width: 15.w, child: Center( @@ -145,7 +145,7 @@ class _ReportABugState extends State { ), sizedBoxHeight(15.h), CustomTextFormField( - leadingIcon: Container( + leadingIcon: SizedBox( height: 23.h, width: 23.w, child: Center( @@ -174,7 +174,7 @@ class _ReportABugState extends State { text16400white("Email address"), sizedBoxHeight(15.h), CustomTextFormField( - leadingIcon: Container( + leadingIcon: SizedBox( height: 17.h, width: 24.w, child: Center( diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/Settings.dart b/lib/Main_Screens/ProfileTab/Settings/Settings.dart similarity index 95% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/Settings.dart rename to lib/Main_Screens/ProfileTab/Settings/Settings.dart index 2cc16c7..c57d851 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/Settings.dart +++ b/lib/Main_Screens/ProfileTab/Settings/Settings.dart @@ -2,13 +2,12 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:glassmorphism/glassmorphism.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -75,10 +74,10 @@ class _SettingsState extends State { Widget build(BuildContext context) { return Scaffold( // key: _scaffoldKey1, - backgroundColor: Color(0xFF222935), + backgroundColor: const Color(0xFF222935), extendBody: true, resizeToAvoidBottomInset: false, - appBar: CommonAppbar( + appBar: const CommonAppbar( titleTxt: "Settings", ), body: Stack(children: [ @@ -124,7 +123,7 @@ class _SettingsState extends State { commonDivider(), ], ) - : SizedBox(), + : const SizedBox(), GestureDetector( onTap: () { Get.toNamed(RouteName.helpandsupport); @@ -157,7 +156,7 @@ class _SettingsState extends State { ), commonDivider(), accounTypeLogin == '1' - ? SizedBox() + ? const SizedBox() : Column( children: [ GestureDetector( @@ -199,8 +198,8 @@ class _SettingsState extends State { ), sizedBoxWidth(12.w), text16w400_FCFCFC(text), - Spacer(), - Icon( + const Spacer(), + const Icon( Icons.arrow_forward_ios, color: Colors.white, size: 20, @@ -253,7 +252,7 @@ class _SettingsState extends State { height: 40.h, width: 130.w, decoration: BoxDecoration( - color: Color(0xFFD90B2E), + color: const Color(0xFFD90B2E), borderRadius: BorderRadius.circular(30.r), ), child: Center(child: text14400white("Keep using App")), diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart b/lib/Main_Screens/ProfileTab/Settings/TermsCondition.dart similarity index 93% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart rename to lib/Main_Screens/ProfileTab/Settings/TermsCondition.dart index 96c8a2d..30d9c9b 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart +++ b/lib/Main_Screens/ProfileTab/Settings/TermsCondition.dart @@ -2,7 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; + import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; @@ -18,7 +19,7 @@ class _TermsConditionState extends State { Widget build(BuildContext context) { return Scaffold( // key: _scaffoldKey1, - backgroundColor: Color(0xFF222935), + backgroundColor: const Color(0xFF222935), extendBody: true, resizeToAvoidBottomInset: false, appBar: const CommonAppbar( @@ -28,7 +29,7 @@ class _TermsConditionState extends State { future: Profilegetmethod().getTermsConditions(), builder: (ctx, snapshot) { if (snapshot.data == null) { - return Center(child: CircularProgressIndicator()); + return const Center(child: CircularProgressIndicator()); } if (snapshot.connectionState == ConnectionState.done) { if (snapshot.hasError) { diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/VerifyCode.dart b/lib/Main_Screens/ProfileTab/Settings/VerifyCode.dart similarity index 90% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/VerifyCode.dart rename to lib/Main_Screens/ProfileTab/Settings/VerifyCode.dart index efa0b8c..3722179 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/VerifyCode.dart +++ b/lib/Main_Screens/ProfileTab/Settings/VerifyCode.dart @@ -3,14 +3,12 @@ import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:pin_code_fields/pin_code_fields.dart'; -import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Global.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; -import 'package:regroup/Utils/Common/googleOAuthService.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -41,7 +39,6 @@ class _VerifyCodeState extends State { final res = await Profilepostmethod().postChangepassverifyotp(updata); if (res.status == ResponseStatus.SUCCESS) { Get.back(); - print("verification done"); Get.back(); Get.back(); @@ -49,7 +46,6 @@ class _VerifyCodeState extends State { return utils.showToast(res.message); } else { Get.back(); - print("change pass not done"); return utils.showToast(res.message); } } @@ -64,7 +60,6 @@ class _VerifyCodeState extends State { final data = await Profilepostmethod().postChangepassword(updata); if (data.status == ResponseStatus.SUCCESS) { Get.back(); - print("otp done"); setState(() { pincodeController.clear(); @@ -73,7 +68,6 @@ class _VerifyCodeState extends State { return utils.showToast(data.message); } else { Get.back(); - print("otp not done"); return utils.showToast(data.message); } } @@ -82,7 +76,7 @@ class _VerifyCodeState extends State { Widget build(BuildContext context) { return Scaffold( backgroundColor: const Color(0xFF222935), - appBar: CommonAppbar(titleTxt: ""), + appBar: const CommonAppbar(titleTxt: ""), resizeToAvoidBottomInset: false, body: Stack( children: [ @@ -124,29 +118,27 @@ class _VerifyCodeState extends State { obscureText: false, animationType: AnimationType.fade, pinTheme: PinTheme( - selectedFillColor: Color(0xFF434A53), - inactiveFillColor: Color(0xFF434A53), - inactiveColor: Color(0xFF434A53), - activeColor: Color(0xFF434A53), - selectedColor: Color(0xFF434A53), + selectedFillColor: const Color(0xFF434A53), + inactiveFillColor: const Color(0xFF434A53), + inactiveColor: const Color(0xFF434A53), + activeColor: const Color(0xFF434A53), + selectedColor: const Color(0xFF434A53), shape: PinCodeFieldShape.underline, borderRadius: BorderRadius.circular(5), fieldHeight: 70, fieldWidth: 70, activeFillColor: // Colors.white - Color(0xFF303030).withOpacity(0.4), + const Color(0xFF303030).withOpacity(0.4), // textStyle: TextStyle(color: Colors.white, fontSize: 20), // Change text color and font size ), - animationDuration: Duration(milliseconds: 300), + animationDuration: const Duration(milliseconds: 300), enableActiveFill: true, autovalidateMode: AutovalidateMode.onUserInteraction, controller: pincodeController, onCompleted: (v) { - print("Completed"); }, onChanged: (value) { - print(value); setState(() { // currentText = value; }); @@ -158,7 +150,6 @@ class _VerifyCodeState extends State { fontFamily: 'Helvetica', ), beforeTextPaste: (text) { - print("Allowing to paste $text"); return true; }, appContext: context, @@ -166,9 +157,9 @@ class _VerifyCodeState extends State { sizedBoxHeight(10.h), Center( child: TimerButton( - disabledTextStyle: TextStyle(color: Colors.red), - activeTextStyle: TextStyle(color: Colors.white), - disabledColor: Color(0XFF222935).withOpacity(0.10), + disabledTextStyle: const TextStyle(color: Colors.red), + activeTextStyle: const TextStyle(color: Colors.white), + disabledColor: const Color(0XFF222935).withOpacity(0.10), buttonType: ButtonType.textButton, label: "Resend OTP", timeOutInSeconds: 6, @@ -179,7 +170,7 @@ class _VerifyCodeState extends State { }); }, // disabledColor: Colors.white, - color: Color(0XFF222935).withOpacity(0.10), + color: const Color(0XFF222935).withOpacity(0.10), ), ), // ), diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart b/lib/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart similarity index 99% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart rename to lib/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart index edfb5b6..f80841d 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart +++ b/lib/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart @@ -8,8 +8,8 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/View/Notification.dart b/lib/Main_Screens/ProfileTab/Settings/View/Notification.dart similarity index 97% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/View/Notification.dart rename to lib/Main_Screens/ProfileTab/Settings/View/Notification.dart index 98dd755..c00e370 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/View/Notification.dart +++ b/lib/Main_Screens/ProfileTab/Settings/View/Notification.dart @@ -4,9 +4,9 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart b/lib/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart similarity index 95% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart rename to lib/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart index 10b0369..74c9400 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart +++ b/lib/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart'; FetchBlockedUser? fetchblockuserobj; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart b/lib/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart similarity index 94% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart rename to lib/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart index 6f53d7c..569374a 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart +++ b/lib/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart @@ -1,7 +1,7 @@ import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart'; FetchNotification? fetchNoti; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Share profile/ShareProfile.dart b/lib/Main_Screens/ProfileTab/Share profile/ShareProfile.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/Share profile/ShareProfile.dart rename to lib/Main_Screens/ProfileTab/Share profile/ShareProfile.dart index ee9b84a..c92d6c8 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Share profile/ShareProfile.dart +++ b/lib/Main_Screens/ProfileTab/Share profile/ShareProfile.dart @@ -6,7 +6,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -65,7 +65,8 @@ class _ShareProfileState extends State { Container( decoration: const BoxDecoration( image: DecorationImage( - image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), ), SingleChildScrollView( child: Column(children: [ diff --git a/lib/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart b/lib/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart new file mode 100644 index 0000000..2fa1a54 --- /dev/null +++ b/lib/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart @@ -0,0 +1,1002 @@ +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/Feed%20Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart' +// as timelineabilist; +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'; + +class AddTimeline extends StatefulWidget { + const AddTimeline({super.key}); + + @override + State createState() => _AddTimelineState(); +} + +class _AddTimelineState extends State { + 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 timeline = []; + List _abilitydrop = []; + + Future fetchABilitylist() async { + TimelineAbilityListApi abilityLsitAPI = TimelineAbilityListApi(); + ResponseData 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 {} + } + + List selectedabilityid = []; + + void getCatIdFromName(List 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 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; + + 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 abilitiesIds = []; + + UploadData() async { + // SharedPreferences prefs = await SharedPreferences.getInstance(); + utils.loader(); + String abilitiesIds = selectedabilityid.join(','); + Map 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); + + return utils.showToast(data.message); + } else { + Get.back(); + return utils.showToast(data.message); + } + } + + EdituploadData() async { + utils.loader(); + String abilitiesIds = selectedabilityid.join(','); + Map 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(); + // 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(); + return utils.showToast(data.message); + } + } + +// List> _abilityMap = []; + List> _abilityMap = []; + List listData = []; + +// Function to get names from selected IDs + Future> getSelectedNames(List selectedIds) async { + List selectedNames = []; + for (int id in selectedIds) { + for (Map 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: const Color(0xFF222935), + extendBody: true, + appBar: const CommonAppbar( + titleTxt: "Add timeline", + ), + body: Obx(() + // { + => + isloading.value + ? const 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: const ScrollPhysics(), + children: [ + Padding( + padding: EdgeInsets.symmetric( + horizontal: 16.w), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + sizedBoxHeight(20.h), + text16400white("Club name"), + sizedBoxHeight(15.h), + CustomTextFormField( + textEditingController: + clubNameController, + texttype: TextInputType.text, + hintText: 'Enter club name', + validator: (value) { + if (value!.isEmpty) { + return 'Enter your club name '; + } + return null; + }, + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + FilteringTextInputFormatter + .allow(RegExp('[a-zA-Z ]')) + ], + ), + sizedBoxHeight(25.h), + text16400white("Role in "), + sizedBoxHeight(15.h), + CustomTextFormField( + textEditingController: + rollnameController, + texttype: TextInputType.text, + hintText: + 'Enter role in the club', + validator: (value) { + if (value!.isEmpty) { + return 'Enter role in the club'; + } + return null; + }, + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + FilteringTextInputFormatter + .allow(RegExp('[a-zA-Z ]')) + ], + ), + sizedBoxHeight(25.h), + text16400white("Team name"), + sizedBoxHeight(15.h), + CustomTextFormField( + textEditingController: + teamnameController, + texttype: TextInputType.text, + hintText: 'Enter team name', + validator: (value) { + if (value!.isEmpty) { + return 'Enter your team name '; + } + return null; + }, + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + FilteringTextInputFormatter + .allow(RegExp( + '[a-zA-ZS0-9 ]')), + ], + ), + sizedBoxHeight(25.h), + Row( + mainAxisAlignment: + MainAxisAlignment + .spaceBetween, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Expanded( + child: Column( + crossAxisAlignment: + CrossAxisAlignment + .start, + children: [ + text16400white( + "Start date "), + sizedBoxHeight(10.h), + GestureDetector( + onTap: () => datePicker( + context, + dateController), + child: AbsorbPointer( + child: + CustomTextFormField( + textEditingController: + dateController, + leadingIcon: + Container( + height: 20.h, + width: 20.w, + child: Center( + child: + Image.asset( + "assets/images/png/calender.png", + height: 20.h, + width: 20.w, + ), + ), + ), + ), + ), + ) + ], + ), + ), + sizedBoxWidth(10.h), + Expanded( + child: Column( + crossAxisAlignment: + CrossAxisAlignment + .start, + children: [ + text16400white( + "End date"), + sizedBoxHeight(10.h), + GestureDetector( + onTap: () => datePicker( + context, + dateController2), + child: AbsorbPointer( + child: + CustomTextFormField( + textEditingController: + dateController2, + leadingIcon: + Container( + height: 20.h, + width: 20.w, + child: Center( + child: + Image.asset( + "assets/images/png/calender.png", + height: 20.h, + width: 20.w, + ), + ), + ), + ), + ), + ), + sizedBoxHeight(10.h), + Row( + children: [ + Obx(() { + return commonGlassContainer( + border: 1, + borderradius: 2, + height: 20.h, + width: 20.w, + opacity1: 0.24, + opacity2: 0.24, + customWidget: + Transform + .scale( + scale: 1.2, + child: Checkbox( + side: const 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 selectedIds = []; + // for (String name in selectedNames) { + // for (Map 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 { + EdituploadData(); + } + }, + ), + ), + ]), + ) + ]) + ]) + : Stack(children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage( + "assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + ListView( + physics: const ScrollPhysics(), + children: [ + Padding( + padding: EdgeInsets.symmetric( + horizontal: 16.w), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + sizedBoxHeight(20.h), + text16400white("Club name"), + sizedBoxHeight(15.h), + CustomTextFormField( + textEditingController: + clubNameController, + texttype: TextInputType.text, + hintText: 'Enter club name', + validator: (value) { + if (value!.isEmpty) { + return 'Enter your full name '; + } + return null; + }, + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + FilteringTextInputFormatter + .allow(RegExp('[a-zA-Z ]')) + ], + ), + sizedBoxHeight(25.h), + text16400white("Role in the club"), + sizedBoxHeight(15.h), + CustomTextFormField( + textEditingController: + rollnameController, + texttype: TextInputType.text, + hintText: + 'Enter role in the club', + validator: (value) { + if (value!.isEmpty) { + return 'Enter role in the club'; + } + return null; + }, + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + FilteringTextInputFormatter + .allow(RegExp('[a-zA-Z ]')) + ], + ), + sizedBoxHeight(25.h), + text16400white("Team name"), + sizedBoxHeight(15.h), + CustomTextFormField( + textEditingController: + teamnameController, + texttype: TextInputType.text, + hintText: 'Enter team name', + validator: (value) { + if (value!.isEmpty) { + return 'Enter your team name '; + } + return null; + }, + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + FilteringTextInputFormatter + .allow(RegExp( + '[a-zA-ZS0-9 ]')), + ], + ), + sizedBoxHeight(25.h), + Row( + mainAxisAlignment: + MainAxisAlignment + .spaceBetween, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Expanded( + child: Column( + crossAxisAlignment: + CrossAxisAlignment + .start, + children: [ + text16400white( + "Start date "), + sizedBoxHeight(10.h), + GestureDetector( + onTap: () => datePicker( + context, + dateController), + child: AbsorbPointer( + child: + CustomTextFormField( + textEditingController: + dateController, + leadingIcon: + Container( + height: 20.h, + width: 20.w, + child: Center( + child: + Image.asset( + "assets/images/png/calender.png", + height: 20.h, + width: 20.w, + ), + ), + ), + ), + ), + ) + ], + ), + ), + sizedBoxWidth(10.h), + Expanded( + child: Column( + crossAxisAlignment: + CrossAxisAlignment + .start, + children: [ + text16400white( + "End date"), + sizedBoxHeight(10.h), + GestureDetector( + onTap: () => datePicker( + context, + dateController2), + child: AbsorbPointer( + child: + CustomTextFormField( + textEditingController: + dateController2, + leadingIcon: + Container( + height: 20.h, + width: 20.w, + child: Center( + child: + Image.asset( + "assets/images/png/calender.png", + height: 20.h, + width: 20.w, + ), + ), + ), + ), + ), + ), + sizedBoxHeight(10.h), + Row( + children: [ + Obx(() { + return commonGlassContainer( + border: 1, + borderradius: 2, + height: 20.h, + width: 20.w, + opacity1: 0.24, + opacity2: 0.24, + customWidget: + Transform + .scale( + scale: 1.2, + child: Checkbox( + side: const 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 { + 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 listData; + final Function(List) onItemSelected; + final Widget? leadingImage; + final bool showOtherOption; + final List initiallySelected; + + @override + State createState() => + _CustomDropDownCheckBoxTimelineState(); +} + +class _CustomDropDownCheckBoxTimelineState + extends State { + RxBool onDropTap = false.obs; + RxList selectedValues = [].obs; + final TextEditingController _textController = TextEditingController(); + + @override + void initState() { + super.initState(); + selectedValues + .addAll(widget.initiallySelected); // Initialize selectedValues + } + + List> _buildDropdownMenuItems() { + return widget.listData.asMap().entries.map((entry) { + int index = entry.key; + String item = entry.value; + return DropdownMenuItem( + 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: const 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 + ? const SizedBox() + : widget.leadingImage!, + const SizedBox(width: 12), + Expanded( + child: Text( + selectedValues.isEmpty + ? widget.header + : selectedValues.join(', '), + style: const 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(), + ), + ), + ), + ], + ), + ); + } +} diff --git a/lib/Feed Module/Main_Screens/ProfileTab/view_model/gettimelineability.dart b/lib/Main_Screens/ProfileTab/view_model/gettimelineability.dart similarity index 90% rename from lib/Feed Module/Main_Screens/ProfileTab/view_model/gettimelineability.dart rename to lib/Main_Screens/ProfileTab/view_model/gettimelineability.dart index 37223ee..cea1867 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/view_model/gettimelineability.dart +++ b/lib/Main_Screens/ProfileTab/view_model/gettimelineability.dart @@ -4,7 +4,7 @@ import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/timelineabilityModel.dart'; class TimelineAbilityListApi { TimelineAbilityListApi(); diff --git a/lib/Feed Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart b/lib/Main_Screens/ProfileTab/view_model/profileGetmethod.dart similarity index 81% rename from lib/Feed Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart rename to lib/Main_Screens/ProfileTab/view_model/profileGetmethod.dart index 15eb216..ca3898d 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart +++ b/lib/Main_Screens/ProfileTab/view_model/profileGetmethod.dart @@ -4,15 +4,15 @@ import 'dart:developer'; import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/accountSessionModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/certificateModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/editTimelineModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/faqModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followersModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followingModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/termsconditionsModel.dart'; -// import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/accountSessionModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/certificateModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/editTimelineModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/faqModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/followersModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/followingModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/termsconditionsModel.dart'; +// import 'package:regroup/Main_Screens/ProfileTab/Model/timelineabilityModel.dart'; FaqModel? faqobj; PrivacypolicyModel? privacyobj; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart b/lib/Main_Screens/ProfileTab/view_model/profilePostmethod.dart similarity index 78% rename from lib/Feed Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart rename to lib/Main_Screens/ProfileTab/view_model/profilePostmethod.dart index 0fc9289..2323265 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart +++ b/lib/Main_Screens/ProfileTab/view_model/profilePostmethod.dart @@ -17,112 +17,82 @@ class Profilepostmethod { utf8.encode('RegroupUserName:71%@L%es^bUX94`J9XT*@bh,._WWM{\$%^^&&')); Future> postContactus(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postcontactus, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postReportandbug(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postreportbug, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postBlockuser(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postblock, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postunfollowuser(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postunfollow, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postRemoveuser(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postremoveuser, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postChangepassword(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postchangepassword, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postChangepassverifyotp(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postchangepassverify, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postTimeline(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.posttimeline, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postAccountvisibility(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postaccountvisibility, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postDeleteaccount(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postdeleteaccount, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } @@ -179,7 +149,6 @@ class Profilepostmethod { return ResponseData("success", ResponseStatus.SUCCESS, data: response.data); } else if (response.statusCode == 203) { - print(response.data); return ResponseData("success", ResponseStatus.PRIVATE, data: response.data); } else { @@ -194,46 +163,34 @@ class Profilepostmethod { } Future> postEditTimeline(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postedittimeline, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postRemoveTimeline(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postremovetimeline, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postRemoveCertification(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postremovecertification, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postCertification(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postcertification, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } diff --git a/lib/Feed Module/Notification/View/notification.dart b/lib/Notifications/notification.dart similarity index 95% rename from lib/Feed Module/Notification/View/notification.dart rename to lib/Notifications/notification.dart index 619f56b..90f2fc6 100644 --- a/lib/Feed Module/Notification/View/notification.dart +++ b/lib/Notifications/notification.dart @@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:glassmorphism/glassmorphism.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -57,12 +57,13 @@ class _NotificationPageState extends State { ), body: Stack( children: [ - // const CommonBlurLeftRed(), - const Positioned(top: 10, left: -30, child: CommonBlurLeftSecond()), - // const CommonBlurRightRed(), - // const CommonBlurLeft(), - const Positioned(top: 150, right: -30, child: CommonBlurRightSecond()), - const Positioned(top: 350, left: -30, child: CommonBlurLeftBlue()), + // // const CommonBlurLeftRed(), + // const Positioned(top: 10, left: -30, child: CommonBlurLeftSecond()), + // // const CommonBlurRightRed(), + // // const CommonBlurLeft(), + // const Positioned( + // top: 150, right: -30, child: CommonBlurRightSecond()), + // const Positioned(top: 350, left: -30, child: CommonBlurLeftBlue()), GlassmorphicContainer( width: MediaQuery.of(context).size.width, height: diff --git a/lib/onboarding/Signup/View/Business/View/step1Letusunderstandbetter.dart b/lib/onboarding/Signup/View/Business/View/step1Letusunderstandbetter.dart index f60173a..2740593 100644 --- a/lib/onboarding/Signup/View/Business/View/step1Letusunderstandbetter.dart +++ b/lib/onboarding/Signup/View/Business/View/step1Letusunderstandbetter.dart @@ -8,7 +8,7 @@ import 'package:glassmorphism/glassmorphism.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/ImageUpload.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -98,10 +98,10 @@ class _LetusUnderstandState extends State { Get.snackbar( "Success!", 'success!', - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.green, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); @@ -111,10 +111,10 @@ class _LetusUnderstandState extends State { Get.snackbar( "Error!", data.message, - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.red, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); @@ -124,10 +124,10 @@ class _LetusUnderstandState extends State { Get.snackbar( "Error!", data.data['message'], - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.red, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); @@ -153,7 +153,7 @@ class _LetusUnderstandState extends State { Widget durationPickerDialog() { int selectedHour = 1; return AlertDialog( - title: Text('Select Duration'), + title: const Text('Select Duration'), content: Container( width: double.minPositive, child: Container( @@ -178,7 +178,7 @@ class _LetusUnderstandState extends State { ), actions: [ TextButton( - child: Text('Cancel'), + child: const Text('Cancel'), onPressed: () { Navigator.of(context).pop(); }, @@ -190,7 +190,7 @@ class _LetusUnderstandState extends State { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Color.fromARGB(255, 18, 32, 47), + backgroundColor: const Color.fromARGB(255, 18, 32, 47), body: Stack( children: [ // Positioned(top: 70, left: -30, child: CommonBlurLeftSecond()), @@ -274,7 +274,7 @@ class _LetusUnderstandState extends State { height: 25.h, decoration: ShapeDecoration( shape: RoundedRectangleBorder( - side: BorderSide(width: 1, color: Color(0xFF434A53)), + side: const BorderSide(width: 1, color: Color(0xFF434A53)), borderRadius: BorderRadius.circular(30), ), ), @@ -287,7 +287,7 @@ class _LetusUnderstandState extends State { width: 15, height: 15, decoration: ShapeDecoration( - gradient: LinearGradient( + gradient: const LinearGradient( begin: Alignment(0.98, -0.21), end: Alignment(-0.98, 0.21), colors: [ @@ -311,7 +311,7 @@ class _LetusUnderstandState extends State { Center( child: Container( width: 154.w, - decoration: ShapeDecoration( + decoration: const ShapeDecoration( shape: RoundedRectangleBorder( side: BorderSide( width: 1, @@ -566,8 +566,8 @@ class _LetusUnderstandState extends State { height: 115, decoration: ShapeDecoration( gradient: LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), + begin: const Alignment(0.98, -0.21), + end: const Alignment(-0.98, 0.21), colors: [ Colors.white .withOpacity(0.30000001192092896), @@ -576,7 +576,7 @@ class _LetusUnderstandState extends State { ], ), shape: RoundedRectangleBorder( - side: BorderSide( + side: const BorderSide( width: 0.50, color: Color(0xFF7E7E7E)), borderRadius: BorderRadius.circular(10), ), @@ -604,13 +604,13 @@ class _LetusUnderstandState extends State { width: 27, height: 27, decoration: ShapeDecoration( - color: Color(0xFF7E7E7E), + color: const Color(0xFF7E7E7E), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular( 5)), ), - child: Icon( + child: const Icon( Icons.delete_outline_outlined, color: Colors.white, ) @@ -644,8 +644,8 @@ class _LetusUnderstandState extends State { height: 115, decoration: ShapeDecoration( gradient: LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), + begin: const Alignment(0.98, -0.21), + end: const Alignment(-0.98, 0.21), colors: [ Colors.white .withOpacity(0.30000001192092896), @@ -654,7 +654,7 @@ class _LetusUnderstandState extends State { ], ), shape: RoundedRectangleBorder( - side: BorderSide( + side: const BorderSide( width: 0.50, color: Color(0xFF7E7E7E)), borderRadius: BorderRadius.circular(10), @@ -688,8 +688,8 @@ class _LetusUnderstandState extends State { height: 115, decoration: ShapeDecoration( gradient: LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), + begin: const Alignment(0.98, -0.21), + end: const Alignment(-0.98, 0.21), colors: [ Colors.white .withOpacity(0.30000001192092896), @@ -698,7 +698,7 @@ class _LetusUnderstandState extends State { ], ), shape: RoundedRectangleBorder( - side: BorderSide( + side: const BorderSide( width: 0.50, color: Color(0xFF7E7E7E)), borderRadius: BorderRadius.circular(10), ), @@ -726,13 +726,13 @@ class _LetusUnderstandState extends State { width: 27, height: 27, decoration: ShapeDecoration( - color: Color(0xFF7E7E7E), + color: const Color(0xFF7E7E7E), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular( 5)), ), - child: Icon( + child: const Icon( Icons.delete_outline_outlined, color: Colors.white, ) @@ -766,8 +766,8 @@ class _LetusUnderstandState extends State { height: 115, decoration: ShapeDecoration( gradient: LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), + begin: const Alignment(0.98, -0.21), + end: const Alignment(-0.98, 0.21), colors: [ Colors.white .withOpacity(0.30000001192092896), @@ -776,7 +776,7 @@ class _LetusUnderstandState extends State { ], ), shape: RoundedRectangleBorder( - side: BorderSide( + side: const BorderSide( width: 0.50, color: Color(0xFF7E7E7E)), borderRadius: BorderRadius.circular(10), diff --git a/lib/onboarding/Signup/View/Business/View/step2Selectgroup.dart b/lib/onboarding/Signup/View/Business/View/step2Selectgroup.dart deleted file mode 100644 index 514e86c..0000000 --- a/lib/onboarding/Signup/View/Business/View/step2Selectgroup.dart +++ /dev/null @@ -1,312 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:flutter_svg/flutter_svg.dart'; -import 'package:get/get.dart'; -import 'package:glassmorphism/glassmorphism.dart'; -import 'package:regroup/Utils/Common/CustomNextButton.dart'; -import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; -import 'package:regroup/Utils/Common/sized_box.dart'; -import 'package:regroup/Utils/texts.dart'; -import 'package:regroup/resources/routes/route_name.dart'; -import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart'; - -class SelectgroupStep2 extends StatefulWidget { - const SelectgroupStep2({super.key}); - - @override - State createState() => _SelectgroupStep2State(); -} - -class _SelectgroupStep2State extends State { - TextEditingController searchcontroller = TextEditingController(); - // StreamController blogsController = StreamController(); - - @override - Widget build(BuildContext context) { - return Scaffold( - backgroundColor: Color.fromARGB(255, 18, 32, 47), - body: Stack( - children: [ - Positioned(top: 70, left: -30, child: CommonBlurLeftSecond()), - Positioned(top: 400, right: -30, child: CommonBlurRightSecond()), - Positioned(top: 630, left: -30, child: CommonBlurLeftBlue()), - SingleChildScrollView( - child: GlassmorphicContainer( - width: MediaQuery.of(context).size.width, - height: - // 500.h, - MediaQuery.of(context).size.height, - borderRadius: 2, - blur: 6, - alignment: Alignment.bottomLeft, - border: 2, - linearGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - ], - ), - borderGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - Color(0XFF222935).withOpacity(0.60), - - Color(0XFF222935).withOpacity(0.60), - ], - ), - child: Padding( - padding: - EdgeInsets.symmetric(horizontal: 16.w, vertical: 50.h), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Align( - alignment: Alignment.topRight, - child: GestureDetector( - onTap: () { - Get.toNamed(RouteName.communitycommitscreen); - }, - child: Text( - 'Skip', - style: TextStyle( - color: Colors.white, - fontSize: 16.sp, - fontFamily: 'Helvetica', - fontWeight: FontWeight.w400, - decoration: TextDecoration.underline, - decorationColor: Colors.white), - ), - ), - ), - sizedBoxHeight(30.h), - Align( - alignment: Alignment.center, - child: text16400white('Step 2 of 3')), - sizedBoxHeight(20.h), - Container( - width: 358.w, - height: 25.h, - decoration: ShapeDecoration( - shape: RoundedRectangleBorder( - side: BorderSide( - width: 1, color: Color(0xFF434A53)), - borderRadius: BorderRadius.circular(30), - ), - ), - child: Padding( - padding: EdgeInsets.symmetric( - horizontal: 8.w, vertical: 2.h), - child: Row( - children: [ - Container( - width: 148.w, - height: 15.h, - decoration: ShapeDecoration( - gradient: LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), - colors: [ - Color(0xA5D90B2E), - Color(0x42D90B2E) - ], - ), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(30), - ), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Container( - width: 15, - height: 15, - decoration: ShapeDecoration( - gradient: LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), - colors: [ - Color(0xFFD90B2E), - Color(0x60D90B2E) - ], - ), - shape: RoundedRectangleBorder( - borderRadius: - BorderRadius.circular(30), - ), - ), - ) - ], - )) - ], - ), - ), - ), - sizedBoxHeight(40.h), - Center( - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - text20400white('Find your group'), - sizedBoxWidth(5.w), - Image.asset('assets/images/png/informationicon.png') - ], - )), - sizedBoxHeight(10.w), - Center( - child: Container( - width: 108.w, - decoration: ShapeDecoration( - shape: RoundedRectangleBorder( - side: BorderSide( - width: 1, - strokeAlign: BorderSide.strokeAlignCenter, - color: Color(0xFF858585), - ), - ), - ), - ), - ), - sizedBoxHeight(30.h), - SearchTextFormField( - textEditingController: searchcontroller, - texttype: TextInputType.text, - hintText: "Search groups", - isInputPassword: false, - suffixIcon: - // const Icon(Icons.mail_outline), - // SvgPicture.asset( - // // width: 23.w, - // // height: 23.h, - // 'assets/images/svg/search.svg', - // ), - Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Icon( - Icons.search, - size: 35, - color: Colors.white, - ), - ), - // validatorText: "Enter your full name", - inputFormatters: [ - // LengthLimitingTextInputFormatter(20), - RemoveEmojiInputFormatter(), - ], - ), - sizedBoxHeight(30.h), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - GroupSelect( - titleString: 'Cambridge university Boat ..', - image: 'assets/images/png/groupindividual.png'), - GroupSelect( - titleString: 'Liverpool FC', - image: - 'assets/images/png/groupindividual2.png'), - ], - ), - sizedBoxHeight(30.h), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - GroupSelect( - titleString: 'Cambridge rugby Club', - image: - 'assets/images/png/groupindividual3.png'), - GroupSelect( - titleString: 'Cambridge university Boat ..', - image: 'assets/images/png/groupindividual.png'), - ], - ), - Spacer(flex: 1), - CustomButton( - text: "Continue", - onPressed: () { - Get.toNamed(RouteName.businessSelectcommunitystep3); - }) - ], - ), - )), - ), - ], - )); - } -} - -class GroupSelect extends StatefulWidget { - final String titleString; - final String image; - - GroupSelect({ - Key? key, - required this.titleString, - required this.image, - }) : super(key: key); - - @override - State createState() => _GroupSelectState(); -} - -class _GroupSelectState extends State { - 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') - ], - ), - ), - ), - ]); - } -} diff --git a/lib/onboarding/Signup/View/Business/View/step3SelectCommunity.dart b/lib/onboarding/Signup/View/Business/View/step3SelectCommunity.dart deleted file mode 100644 index 9a678d8..0000000 --- a/lib/onboarding/Signup/View/Business/View/step3SelectCommunity.dart +++ /dev/null @@ -1,313 +0,0 @@ -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 createState() => - _SelectBusinessCommunityState(); -} - -class _SelectBusinessCommunityState extends State { - TextEditingController searchcontroller = TextEditingController(); - // StreamController blogsController = StreamController(); - - @override - Widget build(BuildContext context) { - return Scaffold( - backgroundColor: const Color.fromARGB(255, 18, 32, 47), - body: Stack( - children: [ - const Positioned(top: 70, left: -30, child: CommonBlurLeftSecond()), - const Positioned(top: 400, right: -30, child: CommonBlurRightSecond()), - const Positioned(top: 630, left: -30, child: CommonBlurLeftBlue()), - SingleChildScrollView( - child: GlassmorphicContainer( - width: MediaQuery.of(context).size.width, - 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( - 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 createState() => _CommunitySelectState(); -} - -class _CommunitySelectState extends State { - 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') - ], - ), - ), - ), - ]); - } -} diff --git a/lib/onboarding/Signup/View/Business/View/tellusbusiness.dart b/lib/onboarding/Signup/View/Business/View/tellusbusiness.dart index 73fe783..8428a80 100644 --- a/lib/onboarding/Signup/View/Business/View/tellusbusiness.dart +++ b/lib/onboarding/Signup/View/Business/View/tellusbusiness.dart @@ -7,7 +7,7 @@ import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -129,12 +129,11 @@ class _TellusaboutBusinessState extends State { @override Widget build(BuildContext context) { return WillPopScope( - onWillPop: ()async { + onWillPop: () async { // SystemNavigator.pop(); - Navigator.pop(context); + Navigator.pop(context); return true; - }, child: GestureDetector( onTap: () => FocusManager.instance.primaryFocus?.unfocus(), diff --git a/lib/onboarding/Signup/View/Individual/step1Selectprofile.dart b/lib/onboarding/Signup/View/Individual/step1Selectprofile.dart deleted file mode 100644 index 097b0e0..0000000 --- a/lib/onboarding/Signup/View/Individual/step1Selectprofile.dart +++ /dev/null @@ -1,271 +0,0 @@ -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/blureffect.dart'; -import 'package:regroup/Utils/Common/sized_box.dart'; -import 'package:regroup/Utils/texts.dart'; -import 'package:regroup/resources/routes/route_name.dart'; - -class SelectIndividualProfile extends StatefulWidget { - const SelectIndividualProfile({super.key}); - - @override - State createState() => - _SelectIndividualProfileState(); -} - -class _SelectIndividualProfileState extends State { - ValueNotifier selectedIndex = ValueNotifier(-1); - - @override - Widget build(BuildContext context) { - return Scaffold( - backgroundColor: const Color.fromARGB(255, 18, 32, 47), - body: Stack( - children: [ - const Positioned(top: 70, left: -30, child: CommonBlurLeftSecond()), - const Positioned(top: 310, right: -30, child: CommonBlurRightSecond()), - const Positioned(top: 540, left: -30, child: CommonBlurLeftBlue()), - GlassmorphicContainer( - width: MediaQuery.of(context).size.width, - height: - // 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( - 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 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 createState() => _ProfileContainerState(); -} - -class _ProfileContainerState extends State { - @override - Widget build(BuildContext context) { - return GestureDetector( - onTap: () { - // Set the selected ValueNotifier to true when tapped - widget.selectedIndex.value = widget.index; - }, - child: ValueListenableBuilder( - 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) - ], - ), - ), - ], - ), - ), - ); - }, - ), - ); - } -} diff --git a/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart b/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart index 97a11dd..769df0d 100644 --- a/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart +++ b/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart @@ -1,15 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; -import 'package:glassmorphism/glassmorphism.dart'; -import 'package:regroup/Common/CommonDropDown.dart'; + import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -82,23 +79,19 @@ class _SelectIndividualActivityState extends State { Uploadata() async { utils.loader(); String selectedIndicesString = '[${_selectedIndices.join(',')}]'; - print('Selected Indices: $selectedIndicesString'); Map updata = { "manage_interest_xid": selectedIndicesString, "other_interest": otheractivitycontroller.text, }; - print('Payload: $updata'); final data = await Onboard().PostIndividualActivity(updata); if (data.status == ResponseStatus.SUCCESS) { Get.back(); - print("Activities selected"); Get.toNamed(RouteName.individualgroupstep3); return utils.showToast(data.message); } else { Get.back(); - print("Not done"); return utils.showToast(data.message); } } @@ -118,7 +111,6 @@ class _SelectIndividualActivityState extends State { otheractivitycontroller.text.isEmpty) { utils.showToast('Please select activity'); } else { - print(_selectedIndices.toString()); // String selectedIndicesString = // _selectedIndices.join(','); // print( diff --git a/lib/onboarding/Signup/View/Individual/step3Selectyourgroup.dart b/lib/onboarding/Signup/View/Individual/step3Selectyourgroup.dart index 447b062..f3eaf0a 100644 --- a/lib/onboarding/Signup/View/Individual/step3Selectyourgroup.dart +++ b/lib/onboarding/Signup/View/Individual/step3Selectyourgroup.dart @@ -8,7 +8,7 @@ import 'package:glassmorphism/glassmorphism.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; diff --git a/lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart b/lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart index 78b3bd9..242e27e 100644 --- a/lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart +++ b/lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart @@ -8,7 +8,7 @@ import 'package:glassmorphism/glassmorphism.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -125,7 +125,8 @@ class _SelectIndividualCommunityState extends State { height: 25.h, decoration: ShapeDecoration( shape: RoundedRectangleBorder( - side: const BorderSide(width: 1, color: Color(0xFF434A53)), + side: const BorderSide( + width: 1, color: Color(0xFF434A53)), borderRadius: BorderRadius.circular(30), ), ), @@ -244,7 +245,8 @@ class _SelectIndividualCommunityState extends State { if (snapshot.connectionState == ConnectionState.waiting) { // Display shimmer effect while waiting for data - return const Center(child: CircularProgressIndicator()); + return const Center( + child: CircularProgressIndicator()); } else if (snapshot.hasError) { // Handle error state return Center( diff --git a/lib/onboarding/Signup/View/Individual/tellusindividual.dart b/lib/onboarding/Signup/View/Individual/tellusindividual.dart index 32364f3..a345905 100644 --- a/lib/onboarding/Signup/View/Individual/tellusindividual.dart +++ b/lib/onboarding/Signup/View/Individual/tellusindividual.dart @@ -14,7 +14,7 @@ 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/ImageUpload.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -154,7 +154,7 @@ class _TellusaboutIndividualState extends State { Get.toNamed(RouteName.individualactivitystep2); } else { Get.back(); - utils.showToast(data.message); + utils.showToast(data.message); } } @@ -162,14 +162,11 @@ class _TellusaboutIndividualState extends State { Widget build(BuildContext context) { return WillPopScope( onWillPop: () async { - SystemNavigator.pop(); + SystemNavigator.pop(); // Navigator.pop(context); - return true; - }, - child: GestureDetector( onTap: () => FocusManager.instance.primaryFocus?.unfocus(), child: Scaffold( @@ -179,7 +176,8 @@ class _TellusaboutIndividualState extends State { Container( decoration: const BoxDecoration( image: DecorationImage( - image: AssetImage("assets/images/png/Ellipse 1496.png"), + image: + AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), ), ListView(physics: const ScrollPhysics(), children: [ @@ -319,7 +317,8 @@ class _TellusaboutIndividualState extends State { inputFormatters: [ // LengthLimitingTextInputFormatter(20), RemoveEmojiInputFormatter(), - FilteringTextInputFormatter.allow(RegExp('[a-zA-Z ]')) + FilteringTextInputFormatter.allow( + RegExp('[a-zA-Z ]')) ], ), sizedBoxHeight(10.h), @@ -346,7 +345,8 @@ class _TellusaboutIndividualState extends State { inputFormatters: [ // LengthLimitingTextInputFormatter(20), RemoveEmojiInputFormatter(), - FilteringTextInputFormatter.allow(RegExp('[a-zA-Z ]')) + FilteringTextInputFormatter.allow( + RegExp('[a-zA-Z ]')) ], ), sizedBoxHeight(10.h), @@ -416,7 +416,8 @@ class _TellusaboutIndividualState extends State { inputFormatters: [ // LengthLimitingTextInputFormatter(20), RemoveEmojiInputFormatter(), - FilteringTextInputFormatter.allow(RegExp('[a-zA-Z ]')) + FilteringTextInputFormatter.allow( + RegExp('[a-zA-Z ]')) ], ), sizedBoxHeight(20.h), @@ -435,7 +436,7 @@ class _TellusaboutIndividualState extends State { } // if (_selectedgendertype.isNotEmpty) { // Get.toNamed(RouteName.individualprofilestep1); - + // // Get.to(() => BusinessPage()); // } else { // // Handle case where no selection is made diff --git a/lib/onboarding/Signup/View/communitycommitment.dart b/lib/onboarding/Signup/View/communitycommitment.dart index 7c441c5..6cd9d90 100644 --- a/lib/onboarding/Signup/View/communitycommitment.dart +++ b/lib/onboarding/Signup/View/communitycommitment.dart @@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:glassmorphism/glassmorphism.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; diff --git a/lib/onboarding/Signup/View/signupscreen.dart b/lib/onboarding/Signup/View/signupscreen.dart index 877b883..b4e9c5f 100644 --- a/lib/onboarding/Signup/View/signupscreen.dart +++ b/lib/onboarding/Signup/View/signupscreen.dart @@ -7,7 +7,6 @@ import 'package:flutter_facebook_auth/flutter_facebook_auth.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart'; import 'package:regroup/Global.dart'; import 'package:regroup/Login/ViewModel/LoginApi.dart'; import 'package:regroup/Utils/Common/AppleOAuthService.dart'; diff --git a/lib/onboarding/SplashScreen.dart b/lib/onboarding/SplashScreen.dart index 841450c..27aada9 100644 --- a/lib/onboarding/SplashScreen.dart +++ b/lib/onboarding/SplashScreen.dart @@ -10,8 +10,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/svg.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart'; import 'package:regroup/Global.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart'; import 'package:regroup/Utils/Common/NoInternet.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/onboarding/Signup/view_model/getUserprofile.dart'; diff --git a/lib/onboarding/forgotPass/View/ForgotOtp.dart b/lib/onboarding/forgotPass/View/ForgotOtp.dart index 918b4e3..9574c5d 100644 --- a/lib/onboarding/forgotPass/View/ForgotOtp.dart +++ b/lib/onboarding/forgotPass/View/ForgotOtp.dart @@ -7,7 +7,7 @@ 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/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/onboarding/forgotPass/ViewModel/ForgotPassAPI.dart'; @@ -22,11 +22,11 @@ class ForgotOtp extends StatefulWidget { } class _ForgotOtpState extends State { -TextEditingController? pincode = TextEditingController(); + TextEditingController? pincode = TextEditingController(); final String emailAddress = Get.arguments; double? principleId; - + get utils => null; // principleId = prefs.getString('email').toString(); @@ -48,14 +48,14 @@ TextEditingController? pincode = TextEditingController(); Get.snackbar( "Success!", 'OTP verification successful!', - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.green, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); - Future.delayed(Duration(seconds: 1), () { + Future.delayed(const Duration(seconds: 1), () { Get.toNamed(RouteName.newpassword, arguments: emailAddress); }); // print('success'); @@ -65,10 +65,10 @@ TextEditingController? pincode = TextEditingController(); Get.snackbar( "Error!", data.data['message'], - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.red, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); @@ -76,20 +76,18 @@ TextEditingController? pincode = TextEditingController(); } } - - @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Color.fromARGB(255, 18, 32, 47), - appBar: CommonAppbar( + backgroundColor: const Color.fromARGB(255, 18, 32, 47), + appBar: const CommonAppbar( titleTxt: '', ), body: Stack( children: [ // CommonBlurLeftSecond(), - Positioned(top: 150, right: -30, child: CommonBlurRightSecond()), - Positioned(top: 350, left: -30, child: CommonBlurLeftBlue()), + // Positioned(top: 150, right: -30, child: CommonBlurRightSecond()), + // Positioned(top: 350, left: -30, child: CommonBlurLeftBlue()), GlassmorphicContainer( width: MediaQuery.of(context).size.width, height: @@ -103,10 +101,10 @@ TextEditingController? pincode = TextEditingController(); begin: Alignment.topCenter, end: Alignment.bottomCenter, colors: [ - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), + const Color(0XFF222935).withOpacity(0.60), + const Color(0XFF222935).withOpacity(0.60), + const Color(0XFF222935).withOpacity(0.60), + const Color(0XFF222935).withOpacity(0.60), // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), @@ -120,9 +118,9 @@ TextEditingController? pincode = TextEditingController(); colors: [ // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - Color(0XFF222935).withOpacity(0.60), + const Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), + const Color(0XFF222935).withOpacity(0.60), ], ), child: Padding( @@ -157,29 +155,27 @@ TextEditingController? pincode = TextEditingController(); obscureText: false, animationType: AnimationType.fade, pinTheme: PinTheme( - selectedFillColor: Color(0xFF434A53), - inactiveFillColor: Color(0xFF434A53), - inactiveColor: Color(0xFF434A53), - activeColor: Color(0xFF434A53), - selectedColor: Color(0xFF434A53), + selectedFillColor: const Color(0xFF434A53), + inactiveFillColor: const Color(0xFF434A53), + inactiveColor: const Color(0xFF434A53), + activeColor: const Color(0xFF434A53), + selectedColor: const Color(0xFF434A53), shape: PinCodeFieldShape.underline, borderRadius: BorderRadius.circular(5), fieldHeight: 70, fieldWidth: 70, activeFillColor: // Colors.white - Color(0xFF303030).withOpacity(0.4), + const Color(0xFF303030).withOpacity(0.4), // textStyle: TextStyle(color: Colors.white, fontSize: 20), // Change text color and font size ), - animationDuration: Duration(milliseconds: 300), + animationDuration: const Duration(milliseconds: 300), enableActiveFill: true, autovalidateMode: AutovalidateMode.onUserInteraction, controller: pincode, onCompleted: (v) { - print("Completed"); }, onChanged: (value) { - print(value); setState(() { // currentText = value; }); @@ -191,7 +187,6 @@ TextEditingController? pincode = TextEditingController(); fontFamily: 'Helvetica', ), beforeTextPaste: (text) { - print("Allowing to paste $text"); return true; }, appContext: context, @@ -223,6 +218,7 @@ TextEditingController? pincode = TextEditingController(); )), ], ), - );; + ); + } -} \ No newline at end of file +} diff --git a/lib/onboarding/forgotPass/ViewModel/ForgotPassAPI.dart b/lib/onboarding/forgotPass/ViewModel/ForgotPassAPI.dart index 6303873..8e3a8dc 100644 --- a/lib/onboarding/forgotPass/ViewModel/ForgotPassAPI.dart +++ b/lib/onboarding/forgotPass/ViewModel/ForgotPassAPI.dart @@ -1,7 +1,6 @@ import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:shared_preferences/shared_preferences.dart'; class ForgotPassAPI { ForgotPassAPI(); diff --git a/lib/resources/routes/routes.dart b/lib/resources/routes/routes.dart index 12a47a7..6eb2bed 100644 --- a/lib/resources/routes/routes.dart +++ b/lib/resources/routes/routes.dart @@ -1,101 +1,99 @@ import 'package:flutter/material.dart'; import 'package:get/get_navigation/src/routes/get_route.dart'; +import 'package:regroup/Main_Screens/CalenderTab/AddEvent/AddEvent.dart'; +import 'package:regroup/Main_Screens/CalenderTab/AddUsers/AddUsers.dart'; +import 'package:regroup/Main_Screens/CalenderTab/Availabillity.dart'; +import 'package:regroup/Main_Screens/CalenderTab/EventDetails.dart'; +import 'package:regroup/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart'; +import 'package:regroup/Main_Screens/CalenderTab/Resource%20Pool/ResourcePool.dart'; +import 'package:regroup/Main_Screens/CalenderTab/SetAvailabillity.dart'; +import 'package:regroup/Main_Screens/Chats/View/groupchat.dart'; +import 'package:regroup/Main_Screens/Chats/View/newchatpage.dart'; +import 'package:regroup/Main_Screens/Chats/View/newgroup.dart'; +import 'package:regroup/Main_Screens/Chats/View/userchat.dart'; +import 'package:regroup/Main_Screens/Community/Community.dart'; +import 'package:regroup/Main_Screens/Community/CycleScreen.dart'; +import 'package:regroup/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart'; +import 'package:regroup/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart'; +import 'package:regroup/Main_Screens/Community/PostScreen.dart'; +import 'package:regroup/Main_Screens/ExploreDesign/DetailExplore.dart'; +import 'package:regroup/Main_Screens/ExploreDesign/ExploreScreen.dart'; +import 'package:regroup/Main_Screens/ExploreDesign/SearchGroup.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/ConnectCommunity.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/GoupSettings.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/GroupDetail.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/GroupEvent.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/GroupInfo.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/GroupManage.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/GroupTab.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/NewPost.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/RequestedGroups.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/Sessions.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Badges/Badges.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Certificate/AddCertificate.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Certificate/Certificate.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Clubs/Clubs.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Followers/Followers.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Following/Following.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/View/Business/ProfileTabBusGuest.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/View/Individual/ProfileTabIndGuest.dart'; +import 'package:regroup/Main_Screens/ProfileTab/My%20Network/MyNetwork.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/AccountSessions.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/AccountSetting.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/ChangePassword.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/ContactUs.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/DeleteAccount.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/FaqScreen.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/ReportABug.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/Settings.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/TermsCondition.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/VerifyCode.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/View/Notification.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Share%20profile/ShareProfile.dart'; +import 'package:regroup/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/Availabillity.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/EventDetails.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/Resource%20Pool/ResourcePool.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/SetAvailabillity.dart'; +import 'package:regroup/Notifications/notification.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Chats/View/groupchat.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Chats/View/newchatpage.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Chats/View/newgroup.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Chats/View/userchat.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ExploreDesign/DetailExplore.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ExploreDesign/ExploreScreen.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ExploreDesign/SearchGroup.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/ConnectCommunity.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/GoupSettings.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/GroupDetail.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/GroupEvent.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/GroupInfo.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/GroupManage.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/GroupTab.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/NewPost.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/RequestedGroups.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/Sessions.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Badges/Badges.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Certificate/AddCertificate.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Certificate/Certificate.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Clubs/Clubs.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Followers/Followers.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Following/Following.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/View/Business/ProfileTabBusGuest.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/View/Individual/ProfileTabIndGuest.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/My%20Network/MyNetwork.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/AccountSessions.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/AccountSetting.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/ChangePassword.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/ContactUs.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/DeleteAccount.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/FaqScreen.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/View/Notification.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/ReportABug.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/Settings.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/VerifyCode.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Share%20profile/ShareProfile.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart'; -import 'package:regroup/Feed%20Module/Notification/View/notification.dart'; - -import 'package:regroup/Feed%20Module/sidemenu/Community/Admin/PopupItem/Community%20settings/CommunitySetting.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Admin/PopupItem/Community%20settings/EditCommunity/EditCommunity.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Admin/PopupItem/Community%20settings/ManageGroup.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Admin/PopupItem/Community%20settings/ManageTags.dart/ManageTags.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Admin/PopupItem/Community%20settings/ManageTags.dart/NewTag/NewTag.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Announcements/AnnouncementRequest.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Announcements/ManageMembers.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/MyCommunity/AddGroups.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/MyCommunity/NewCommunity.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Watchlist.dart'; +import 'package:regroup/sidemenu/Community/Admin/PopupItem/Community%20settings/CommunitySetting.dart'; +import 'package:regroup/sidemenu/Community/Admin/PopupItem/Community%20settings/EditCommunity/EditCommunity.dart'; +import 'package:regroup/sidemenu/Community/Admin/PopupItem/Community%20settings/ManageGroup.dart'; +import 'package:regroup/sidemenu/Community/Admin/PopupItem/Community%20settings/ManageTags.dart/ManageTags.dart'; +import 'package:regroup/sidemenu/Community/Admin/PopupItem/Community%20settings/ManageTags.dart/NewTag/NewTag.dart'; +import 'package:regroup/sidemenu/Community/Announcements/AnnouncementRequest.dart'; +import 'package:regroup/sidemenu/Community/Announcements/ManageMembers.dart'; +import 'package:regroup/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart'; +import 'package:regroup/sidemenu/Community/MyCommunity/AddGroups.dart'; +import 'package:regroup/sidemenu/Community/MyCommunity/NewCommunity.dart'; +import 'package:regroup/sidemenu/Community/Watchlist.dart'; import 'package:regroup/Login/View/loginscreen.dart'; import 'package:regroup/Common/controller/MainScreen.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Community/Community.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Community/CycleScreen.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Community/PostScreen.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Announcements/View/Announcements.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Group/view/Group.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/MyCommunity/View/MyCommunity.dart'; -import 'package:regroup/Feed%20Module/sidemenu/SavedPosts/SavedPosts.dart'; -import 'package:regroup/Feed%20Module/sidemenu/sidemenu.dart'; + +import 'package:regroup/sidemenu/Community/Announcements/View/Announcements.dart'; +import 'package:regroup/sidemenu/Community/Group/view/Group.dart'; +import 'package:regroup/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart'; +import 'package:regroup/sidemenu/Community/MyCommunity/View/CommunityDetails.dart'; +import 'package:regroup/sidemenu/Community/MyCommunity/View/MyCommunity.dart'; +import 'package:regroup/sidemenu/SavedPosts/SavedPosts.dart'; +import 'package:regroup/sidemenu/sidemenu.dart'; import 'package:regroup/Login/View/verifygoogleapple.dart'; import 'package:regroup/Utils/Common/NoInternet.dart'; 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/step2Selectgroup.dart'; -import 'package:regroup/onboarding/Signup/View/Business/View/step3SelectCommunity.dart'; + import 'package:regroup/onboarding/Signup/View/Business/View/tellusbusiness.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'; @@ -192,10 +190,7 @@ class AppRoutes { name: RouteName.group, page: () => const Group(), ), - GetPage( - name: RouteName.individualprofilestep1, - page: () => const SelectIndividualProfile(), - ), + GetPage( name: RouteName.individualactivitystep2, page: () => const SelectIndividualActivity(), @@ -220,14 +215,8 @@ class AppRoutes { name: RouteName.businessletusunderstandstep1, page: () => const LetusUnderstand(), ), - GetPage( - name: RouteName.businessSelectgroupstep2, - page: () => const SelectgroupStep2(), - ), - GetPage( - name: RouteName.businessSelectcommunitystep3, - page: () => const SelectBusinessCommunity(), - ), + + GetPage( name: RouteName.communitysetting, page: () => const CommunitySetting(), @@ -456,79 +445,73 @@ class AppRoutes { name: RouteName.editsubgroupinfo, page: () => const EditSubgroupInfo(), ), - GetPage( + GetPage( name: RouteName.subgroupsetting, page: () => const SubGroupSetting(), ), - GetPage( + GetPage( name: RouteName.explorescreen, page: () => const ExploreScreen(), ), - GetPage( + GetPage( name: RouteName.searchgroup, page: () => const SearchGroup(), ), - GetPage( + GetPage( name: RouteName.detailexplore, page: () => const DetailExplore(), ), - - GetPage( + GetPage( name: RouteName.certificate, page: () => const Certificate(), ), - GetPage( + GetPage( name: RouteName.availability, page: () => const Availability(), ), - - GetPage( + GetPage( name: RouteName.sessions, page: () => const Sessions(), ), - - GetPage( + GetPage( name: RouteName.forgotpass, page: () => const ForgotPass(), ), - GetPage( + GetPage( name: RouteName.newpassword, page: () => const NewPassword(), ), - GetPage( + GetPage( name: RouteName.forgotOtp, page: () => const ForgotOtp(), - ), - GetPage( - name: RouteName.verifygoogleapplepage, - page: () => Verifygoogleandapple(), ), - GetPage( + GetPage( + name: RouteName.verifygoogleapplepage, + page: () => Verifygoogleandapple(), + ), + GetPage( name: RouteName.buseditprofile, - page: () => BusEditProfile(), + page: () => const BusEditProfile(), ), GetPage( name: RouteName.profiletab, - page: () => ProfileTab(), + page: () => const ProfileTab(), ), - - GetPage( + GetPage( name: RouteName.profiletabindguest, - page: () => ProfileTabIndGuest(), + page: () => const ProfileTabIndGuest(), ), - GetPage( + GetPage( name: RouteName.profiletabbusguest, - page: () => profiletabBusGest(), + page: () => const profiletabBusGest(), ), - GetPage( + GetPage( name: RouteName.mynetwork, - page: () => MyNetwork(), + page: () => const MyNetwork(), ), - GetPage( + GetPage( name: RouteName.addcertificate, - page: () => AddCertificate(), + page: () => const AddCertificate(), ), - - ]; } diff --git a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart b/lib/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart similarity index 95% rename from lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart rename to lib/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart index 38784d9..37e4aa1 100644 --- a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart +++ b/lib/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart @@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -27,12 +27,13 @@ class _CommunitySettingState extends State { titleTxt: "Community settings", ), body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), Column(children: [ + ), + Column(children: [ sizedBoxHeight(30.h), GestureDetector( onTap: () { diff --git a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart b/lib/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart similarity index 99% rename from lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart rename to lib/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart index 0a14f8b..49268b7 100644 --- a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart +++ b/lib/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart @@ -9,7 +9,7 @@ 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/ImageUpload.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; diff --git a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart b/lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart similarity index 98% rename from lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart rename to lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart index 6dbf089..6810b3e 100644 --- a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart +++ b/lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart @@ -4,7 +4,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -80,7 +80,8 @@ class _ManageGroupsState extends State { image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( + ), + SingleChildScrollView( child: Column(children: [ Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), diff --git a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart b/lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart similarity index 97% rename from lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart rename to lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart index 0bacc8b..1644835 100644 --- a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart +++ b/lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart @@ -6,7 +6,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonTabBar.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -30,13 +30,14 @@ class _ManageTagsState extends State { ), resizeToAvoidBottomInset: false, body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( - child: Column(children: [ + ), + SingleChildScrollView( + child: Column(children: [ sizedBoxHeight(20.h), DefaultTabController( length: 2, diff --git a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart b/lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart similarity index 92% rename from lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart rename to lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart index 2e0b01f..32a983b 100644 --- a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart +++ b/lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart @@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -26,13 +26,14 @@ class _NewTagState extends State { ), resizeToAvoidBottomInset: false, body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( - child: Padding( + ), + SingleChildScrollView( + child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/Feed Module/sidemenu/Community/Announcements/AnnouncementRequest.dart b/lib/sidemenu/Community/Announcements/AnnouncementRequest.dart similarity index 86% rename from lib/Feed Module/sidemenu/Community/Announcements/AnnouncementRequest.dart rename to lib/sidemenu/Community/Announcements/AnnouncementRequest.dart index 6299508..b533e3b 100644 --- a/lib/Feed Module/sidemenu/Community/Announcements/AnnouncementRequest.dart +++ b/lib/sidemenu/Community/Announcements/AnnouncementRequest.dart @@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -27,23 +27,24 @@ class _AnnouncementRequestState extends State { titleTxt: "Announcement requests", ), body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 16), - child: Column( - children: [ - sizedBoxHeight(25.h), - Announcementtile( - profileImg: "assets/images/png/Ellipse 43.png", - title: "title", - mainImg: "assets/images/png/Rectangle 22.png") - ], - ))) + ), + SingleChildScrollView( + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 16), + child: Column( + children: [ + sizedBoxHeight(25.h), + Announcementtile( + profileImg: "assets/images/png/Ellipse 43.png", + title: "title", + mainImg: "assets/images/png/Rectangle 22.png") + ], + ))) ])); } diff --git a/lib/Feed Module/sidemenu/Community/Announcements/ManageMembers.dart b/lib/sidemenu/Community/Announcements/ManageMembers.dart similarity index 93% rename from lib/Feed Module/sidemenu/Community/Announcements/ManageMembers.dart rename to lib/sidemenu/Community/Announcements/ManageMembers.dart index 64c2bb4..1e174f2 100644 --- a/lib/Feed Module/sidemenu/Community/Announcements/ManageMembers.dart +++ b/lib/sidemenu/Community/Announcements/ManageMembers.dart @@ -7,7 +7,7 @@ import 'package:regroup/Common/CommonTabBar.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -58,47 +58,46 @@ class _ManageMembersState extends State { ), ), body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), Column( - crossAxisAlignment: CrossAxisAlignment.start, + ), + Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + sizedBoxHeight(20.h), + DefaultTabController( + length: 4, + child: Column( children: [ - sizedBoxHeight(20.h), - DefaultTabController( - length: 4, - child: Column( - children: [ - CommonTabBar(tabs: const [ - Tab( - text: 'Members', - ), - Tab( - text: 'Admins', - ), - Tab( - text: 'Requests', - ), - Tab( - text: 'Invites', - ), - ]), - SizedBox( - height: 655.h, - child: TabBarView( - children: [ - membersTab(), - AdminsTab(), - RequestsTab(), - InvitesTab(), - ], - ), - ), - ], - )) - ]) + CommonTabBar(tabs: const [ + Tab( + text: 'Members', + ), + Tab( + text: 'Admins', + ), + Tab( + text: 'Requests', + ), + Tab( + text: 'Invites', + ), + ]), + SizedBox( + height: 655.h, + child: TabBarView( + children: [ + membersTab(), + AdminsTab(), + RequestsTab(), + InvitesTab(), + ], + ), + ), + ], + )) + ]) ])); } diff --git a/lib/Feed Module/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart b/lib/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart similarity index 94% rename from lib/Feed Module/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart rename to lib/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart index a99b5bd..67d557e 100644 --- a/lib/Feed Module/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart +++ b/lib/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart @@ -4,7 +4,7 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -28,13 +28,14 @@ class _NewAnnouncementState extends State { ), resizeToAvoidBottomInset: false, body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( - child: Padding( + ), + SingleChildScrollView( + child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/Feed Module/sidemenu/Community/Announcements/View/Announcements.dart b/lib/sidemenu/Community/Announcements/View/Announcements.dart similarity index 98% rename from lib/Feed Module/sidemenu/Community/Announcements/View/Announcements.dart rename to lib/sidemenu/Community/Announcements/View/Announcements.dart index 2b2493a..819122f 100644 --- a/lib/Feed Module/sidemenu/Community/Announcements/View/Announcements.dart +++ b/lib/sidemenu/Community/Announcements/View/Announcements.dart @@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; diff --git a/lib/Feed Module/sidemenu/Community/Group/view/Group.dart b/lib/sidemenu/Community/Group/view/Group.dart similarity index 99% rename from lib/Feed Module/sidemenu/Community/Group/view/Group.dart rename to lib/sidemenu/Community/Group/view/Group.dart index 11ba615..eff7079 100644 --- a/lib/Feed Module/sidemenu/Community/Group/view/Group.dart +++ b/lib/sidemenu/Community/Group/view/Group.dart @@ -4,9 +4,9 @@ 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/Feed%20Module/sidemenu/view_model/getmethod.dart'; +import 'package:regroup/sidemenu/view_model/getmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -39,7 +39,7 @@ class _GroupState extends State { }, ]; - late Future myfuture; + late Future myfuture; int id = Get.arguments["id"]; @override @@ -335,7 +335,6 @@ class _GroupState extends State { sizedBoxHeight(10.h), Row( children: [ - stackContainersGroups( number: joinedgroupsobj! .data![index].membersCount diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/AddGroups.dart b/lib/sidemenu/Community/MyCommunity/AddGroups.dart similarity index 98% rename from lib/Feed Module/sidemenu/Community/MyCommunity/AddGroups.dart rename to lib/sidemenu/Community/MyCommunity/AddGroups.dart index e02620a..eb1f2f3 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/AddGroups.dart +++ b/lib/sidemenu/Community/MyCommunity/AddGroups.dart @@ -6,7 +6,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -54,12 +54,13 @@ class _AddGroupState extends State { ), resizeToAvoidBottomInset: false, body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( + ), + SingleChildScrollView( child: Column(children: [ Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart b/lib/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart similarity index 97% rename from lib/Feed Module/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart rename to lib/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart index 8be3ddf..fa1c264 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart +++ b/lib/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart @@ -4,7 +4,7 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -28,13 +28,14 @@ class _CommunityInfoState extends State { ), resizeToAvoidBottomInset: false, body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( - child: Column(children: [ + ), + SingleChildScrollView( + child: Column(children: [ Stack(clipBehavior: Clip.none, children: [ GestureDetector( onTap: () { diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/NewCommunity.dart b/lib/sidemenu/Community/MyCommunity/NewCommunity.dart similarity index 98% rename from lib/Feed Module/sidemenu/Community/MyCommunity/NewCommunity.dart rename to lib/sidemenu/Community/MyCommunity/NewCommunity.dart index c3b1e58..e0b7589 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/NewCommunity.dart +++ b/lib/sidemenu/Community/MyCommunity/NewCommunity.dart @@ -10,7 +10,7 @@ import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; import 'package:regroup/Utils/Common/ImageUpload.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -39,13 +39,14 @@ class _NewCommunityState extends State { titleTxt: "New community", ), body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( - child: Padding( + ), + SingleChildScrollView( + child: Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart b/lib/sidemenu/Community/MyCommunity/View/CommunityDetails.dart similarity index 99% rename from lib/Feed Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart rename to lib/sidemenu/Community/MyCommunity/View/CommunityDetails.dart index ceadd24..531dff3 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart +++ b/lib/sidemenu/Community/MyCommunity/View/CommunityDetails.dart @@ -6,7 +6,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonTabBar.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -152,12 +152,12 @@ class _CommunityDetailsState extends State { )), ), body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), + ), Positioned.fill( child: SingleChildScrollView( child: Column(children: [ diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/View/MyCommunity.dart b/lib/sidemenu/Community/MyCommunity/View/MyCommunity.dart similarity index 99% rename from lib/Feed Module/sidemenu/Community/MyCommunity/View/MyCommunity.dart rename to lib/sidemenu/Community/MyCommunity/View/MyCommunity.dart index 41c9543..e0489b6 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/View/MyCommunity.dart +++ b/lib/sidemenu/Community/MyCommunity/View/MyCommunity.dart @@ -4,7 +4,7 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; diff --git a/lib/Feed Module/sidemenu/Community/Watchlist.dart b/lib/sidemenu/Community/Watchlist.dart similarity index 99% rename from lib/Feed Module/sidemenu/Community/Watchlist.dart rename to lib/sidemenu/Community/Watchlist.dart index 5063a82..348f972 100644 --- a/lib/Feed Module/sidemenu/Community/Watchlist.dart +++ b/lib/sidemenu/Community/Watchlist.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; diff --git a/lib/Feed Module/sidemenu/Model/joineGroupsModel.dart b/lib/sidemenu/Model/joineGroupsModel.dart similarity index 100% rename from lib/Feed Module/sidemenu/Model/joineGroupsModel.dart rename to lib/sidemenu/Model/joineGroupsModel.dart diff --git a/lib/Feed Module/sidemenu/SavedPosts/SavedPosts.dart b/lib/sidemenu/SavedPosts/SavedPosts.dart similarity index 97% rename from lib/Feed Module/sidemenu/SavedPosts/SavedPosts.dart rename to lib/sidemenu/SavedPosts/SavedPosts.dart index 8a31586..ef27041 100644 --- a/lib/Feed Module/sidemenu/SavedPosts/SavedPosts.dart +++ b/lib/sidemenu/SavedPosts/SavedPosts.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; class SavedPosts extends StatefulWidget { diff --git a/lib/Feed Module/sidemenu/sidemenu.dart b/lib/sidemenu/sidemenu.dart similarity index 100% rename from lib/Feed Module/sidemenu/sidemenu.dart rename to lib/sidemenu/sidemenu.dart diff --git a/lib/Feed Module/sidemenu/view_model/getmethod.dart b/lib/sidemenu/view_model/getmethod.dart similarity index 89% rename from lib/Feed Module/sidemenu/view_model/getmethod.dart rename to lib/sidemenu/view_model/getmethod.dart index 9b839b8..dc0f42b 100644 --- a/lib/Feed Module/sidemenu/view_model/getmethod.dart +++ b/lib/sidemenu/view_model/getmethod.dart @@ -3,7 +3,7 @@ import 'dart:developer'; import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Model/joineGroupsModel.dart'; +import 'package:regroup/sidemenu/Model/joineGroupsModel.dart'; GetmyJoinedGroupsModel? joinedgroupsobj; diff --git a/lib/Feed Module/sidemenu/view_model/postmethod.dart b/lib/sidemenu/view_model/postmethod.dart similarity index 100% rename from lib/Feed Module/sidemenu/view_model/postmethod.dart rename to lib/sidemenu/view_model/postmethod.dart