From d297bcde846c269209fa8b29aa8bba658b2399cc Mon Sep 17 00:00:00 2001 From: Shubhamshirva Date: Tue, 20 Aug 2024 17:53:49 +0530 Subject: [PATCH] communities edit changes done and also some fixes --- assets/images/png/Group 1000004149.png | Bin 0 -> 1705 bytes lib/Common/api_urls.dart | 3 + .../Community_HomePage/Community.dart | 7 +- lib/Utils/Helper.dart | 13 +- .../EditCommunity/EditCommunity.dart | 113 +++++++++++------- .../Community settings/ManageGroup.dart | 53 ++++---- .../MyCommunity/Model/ComPostModel.dart | 41 ++++++- .../Model/activitiesListModel.dart | 44 +++++++ .../Community/MyCommunity/NewCommunity.dart | 19 ++- .../MyCommunity/View/CommunityDetails.dart | 33 ++++- .../view_model/primaryactivity.dart | 10 +- 11 files changed, 240 insertions(+), 96 deletions(-) create mode 100644 assets/images/png/Group 1000004149.png create mode 100644 lib/sidemenu/Community/MyCommunity/Model/activitiesListModel.dart diff --git a/assets/images/png/Group 1000004149.png b/assets/images/png/Group 1000004149.png new file mode 100644 index 0000000000000000000000000000000000000000..855035dfae4989f61f8fb8a1e71fabe35eac4e45 GIT binary patch literal 1705 zcmV;a23GlrP)eUWXog$U5qWu*0b=Ktsa{`brxF>VCK8#HCAV9M}IvonA@B~a< z(-iDcv5%9uFh^CVp;Q~qQqitt6kExp)8|V68#sCBrRj(nOb!}`sR1A%AR4gf+XpBV zXfI-5YB)pz@KUK#OQ$cK%k+}3_F6oAPR8Qn=8bE=tvnF;(2K9mjD$Ar1HUr4ZO0G}!tjKnU{1gV00&f8L3HjC z7YoJ!Sl_1wV$sow@XGaHv-br)eB_mb6jXzKkUR{SfGEU}Fjs`HDIlLc3L|3R=KL;I z0CuwoAny8*rboAo#XBtbfL}N~lX#?W^Ygl@GG-Yz5Cq=F)Di`Wlt2nsj6Lv66=5{Y zvfNWbK2$9YtFfW&+w9!R^;;fra%LtRRzoubM$nX-h}Z{+u7u#xWlmLE1k8nHS7-!8BpSJt%jFzi6SkJvY#L!2FQQ0eg~=E*i`wgai$>!i=9sNf zzIKs04iOpB-Z>BqLU|5Pds4!tk)Soo>P6b+RR|Xs86GtJf;hcHMP+PaY=BE7G+d}n z!JdktfH6(`15O@zd9q&*ggfh#StJa`%J@Wl;N*uV-`=}FF~Wu54uNz`?MsZjcjBGY z;84WqMVCqhp%Kw8sP5RYdtaolFXokuzaABZy^F>5x|O$X&K;jSO5avKUzWXxhG*}y zQzI#$&3`<<_}3q~fBgm!nj@@4I6sYbrQWdBCnoni*JtQqo|VW~yFzDBx&;|s$gh?u zXzIfX;m{dN<#<+=g&$z4w!>^BSzNldrR zK(pCpWrUe83i$#De{1e&A#dfPTeoZi(AoJ@0D9?)C7YQi0VXO&Ugx6&=E!a~H4Xe= zvTXJx7TbY2C-HhQW}-5euUHGG&MZ>bQe!>=ORvHjAw={~BG|ETwJ*g)d!Q#9OQANX zNC*$K(@D|}TD}w%ngy4SSrQ_CkYHb~;|>{wwAVCxp2FMo?2=7O9!F9cvG(--y(4pP zKq7&A=@M8zdj_5PZ28A41zu)Yuw$R*xZ@Cm_}S{jdNmZw>}y zlEA>kKG$~$Pl2U0drt%C@@1Mx93c-0m$$5&uS3l9tkeo+rPIAG!nmyt7+0)Rv+B0^ z9w(@)2~7adxUu4u8p0SFj+h^ucsF(W)cj)RGL(#n7ZQ9FjDiCAY&M&{R$N=Ju`;4O z0+cBLC2hl6sbXJ5$z;lm3^v~%2!%|gYf#}>#5q1b7QS(PWgYvq?;1mqA+z{T(Y|ND zI0NYaVzp8_clOhda5}wUSDN)DmT{tQ67j~qYzNT$-k;=HyS-*h>-Kr>m}n(qh4~#3Ik^6aW0o}wvJ9XhNg`N zG_9vAdB}*UT`cErcT4mS$xm5qu=aMT_D%YSvpEl#jz3p^zqKvC(==5zhP|#sJV5Wp z(K$y_xCHQnN-s13biG1}Z9V>?W6d5m76q*XpI@HK_kJL(RF>;>?ygQZZjOWmM7 zfu-fq?c*g7vqeSN#Bc$WcPD<&;sXmsT)8Id8t!Atoodxyuav+4_Uq5ny)ZWZgn>(- z=4gq2-AKUwIIQb>_osyKP=M-aG?aR)Y1itlCA(}brPFEqezG?N_KyPxj!h!X8P)Yb zR8vtD&L{rShTx+Ono+$@a)`KD+qSHY0Oj}(_69&N#xv=O00000NkvXXu0mjfGA}B! literal 0 HcmV?d00001 diff --git a/lib/Common/api_urls.dart b/lib/Common/api_urls.dart index 06c5fb8..4865794 100644 --- a/lib/Common/api_urls.dart +++ b/lib/Common/api_urls.dart @@ -180,6 +180,9 @@ class ApiUrls { static const posteditcommunity = "${baseUrl}update-community"; + static const getactivitieslist = "${baseUrl}get_activity"; + + } diff --git a/lib/Main_Screens/Community_HomePage/Community.dart b/lib/Main_Screens/Community_HomePage/Community.dart index f2360a8..a91e5b9 100644 --- a/lib/Main_Screens/Community_HomePage/Community.dart +++ b/lib/Main_Screens/Community_HomePage/Community.dart @@ -236,7 +236,7 @@ class _FeedTabState extends State { } } - setValues() { + Future setValues() async { if (mounted) { combinedList.clear(); combinedListGlobal.clear(); @@ -246,7 +246,7 @@ class _FeedTabState extends State { combinedListGlobal.addAll(combinedList); _setModel(); countersHelper.setListsPopular(); - _fetchIcons(); + await _fetchIcons(); } } @@ -658,7 +658,7 @@ class _NormalCardTileState extends State { .last; return commonGlassUI( width: double.infinity, - height: 765.h, + height: 769.h, mainOpacity: 1, borderRadius: BorderRadius.circular(1), customWidget: Column( @@ -864,6 +864,7 @@ class _NormalCardTileState extends State { child: Column(children: [ SizedBox( height: 30.h, + width: double.infinity, child: ListView.builder( scrollDirection: Axis.horizontal, shrinkWrap: true, diff --git a/lib/Utils/Helper.dart b/lib/Utils/Helper.dart index 6e5f658..78c737c 100644 --- a/lib/Utils/Helper.dart +++ b/lib/Utils/Helper.dart @@ -7,6 +7,7 @@ import 'package:flutter/services.dart'; import 'package:image_gallery_saver/image_gallery_saver.dart'; import 'package:path_provider/path_provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'package:path/path.dart' as path; class Helper { static Future networkImageToMultipartFile( @@ -16,14 +17,24 @@ class Helper { Response response = await dio.get(imageUrl, options: Options(responseType: ResponseType.bytes)); + final cleanedFileName = _cleanFileName(imageUrl); + MultipartFile multipartFile = MultipartFile.fromBytes( response.data!, - filename: imageUrl.substring(imageUrl.lastIndexOf("/") + 1), + filename: cleanedFileName, + // imageUrl.substring(imageUrl.lastIndexOf("/") + 1), ); return multipartFile; } +static String _cleanFileName(String url) { + // Parse the URL and extract the path + final uri = Uri.parse(url); + // Extract the base name from the path, removing any query parameters + return path.basename(uri.path); +} + static Future assetImageToMultipartFile( String assetImagePath, String fileName) async { ByteData assetByteData = await rootBundle.load(assetImagePath); diff --git a/lib/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart b/lib/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart index 264d57d..ff27986 100644 --- a/lib/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart +++ b/lib/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart @@ -8,8 +8,6 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart' hide MultipartFile, FormData; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart' - as primaryactlist; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; @@ -20,6 +18,8 @@ import 'package:regroup/Utils/Helper.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; +import 'package:regroup/sidemenu/Community/MyCommunity/Model/activitiesListModel.dart' + as primaryactlist; import 'package:regroup/sidemenu/Community/MyCommunity/view_model/getmethod.dart'; import 'package:regroup/sidemenu/Community/MyCommunity/view_model/postmethod.dart'; import 'package:regroup/sidemenu/Community/MyCommunity/view_model/primaryactivity.dart'; @@ -94,8 +94,8 @@ class _EditCommunityState extends State { }); } - primaryactlist.InterestModel? abilityModel; - List activity = []; + primaryactlist.ActivitiesListsModel? abilityModel; + List activity = []; List _activitydrop = []; String? selectedActivityName = ''; @@ -109,15 +109,16 @@ class _EditCommunityState extends State { ResponseData response = await abilityListAPI.getActivitylistApi(); if (response.status == ResponseStatus.SUCCESS) { - abilityModel = primaryactlist.InterestModel.fromJson(response.data!); + abilityModel = + primaryactlist.ActivitiesListsModel.fromJson(response.data!); setState(() { activity = abilityModel!.data ?? []; _activitydrop = - activity.map((platform) => platform.name.toString()).toList(); + activity.map((platform) => platform.title.toString()).toList(); _abilityMap = activity.map((platform) { return { "id": platform.id, - "name": platform.name.toString(), + "name": platform.title.toString(), }; }).toList(); }); @@ -164,53 +165,79 @@ class _EditCommunityState extends State { void getCatIdFromName(String selectedAbility) { selectedactivityid = activity - .firstWhere((item) => item.name == selectedAbility, + .firstWhere((item) => item.title == selectedAbility, orElse: () => activity.first) .id; print('Selected activity ID is $selectedactivityid'); } + String _cleanFileName(String filePath) { + return path + .basename(filePath) + .split('?') + .first; + } + Uploadata() async { utils.loader(); List bannermedialist = []; List profielpicturelist = []; MultipartFile? imageFile; + // for (var file in bannerPath.where((file) => file != null)) { + // bannermedialist.add( + // await MultipartFile.fromFile( + // file!.path, + // filename: path.basename(file.path), + // ), + // ); + // } + for (var file in bannerPath.where((file) => file != null)) { + final filePath = file!.path; + final cleanedFileName = _cleanFileName(filePath); + + print('Original File Path: $filePath'); + print('Cleaned File Name: $cleanedFileName'); + bannermedialist.add( await MultipartFile.fromFile( - file!.path, - filename: path.basename(file.path), + filePath, + filename: cleanedFileName, ), ); } - if (filePath.isNotEmpty && filePath[0] != null) { - var profileFile = filePath[0]; - if (profileFile!.path.isNotEmpty) { - // Convert local file to MultipartFile - imageFile = await MultipartFile.fromFile( - profileFile.path, - filename: path.basename(profileFile.path), - ); - } else { - // Handle case where file path is empty + if (filePath.isNotEmpty && filePath[0] != null) { + var profileFile = filePath[0]; + if (profileFile!.path.isNotEmpty) { + // Convert local file to MultipartFile + imageFile = await MultipartFile.fromFile( + profileFile.path, + filename: path.basename(profileFile.path), + ); + } else { + // Handle case where file path is empty + imageFile = await Helper.networkImageToMultipartFile( + communityeditobj!.data!.communityData!.communityProfilePhoto!, + ); + } + } else if (communityeditobj!.data!.communityData!.communityProfilePhoto != + null) { + // Handle case where no file is provided, fallback to network image imageFile = await Helper.networkImageToMultipartFile( communityeditobj!.data!.communityData!.communityProfilePhoto!, ); + } else { + // Handle case where no profile picture is provided + print('No profile picture provided.'); + return; } - } else if (communityeditobj!.data!.communityData!.communityProfilePhoto != null) { - // Handle case where no file is provided, fallback to network image - imageFile = await Helper.networkImageToMultipartFile( - communityeditobj!.data!.communityData!.communityProfilePhoto!, - ); - } else { - // Handle case where no profile picture is provided - print('No profile picture provided.'); - return; - } int communityTypeValue = _typeCommunityMap[_selectedtypecommunity] ?? 0; + print('Image File: ${imageFile.filename}'); + print( + 'Banner Media List: ${bannermedialist.map((file) => file.filename).toList()}'); FormData formdata = FormData.fromMap({ "community_profile_photo": imageFile, @@ -649,19 +676,19 @@ class _EditCommunityState extends State { initialSelectedValue: selectedActivityName ?? '', ), sizedBoxHeight(25.h), - text16w400_FCFCFC("Website link"), - sizedBoxHeight(14.h), - CustomTextFormField( - textEditingController: websitelinkcontroller, - validator: (val) { - if (!isValidWebBannerLink(val)) { - return 'Please enter a valid web banner link.'; - } - return null; - }, - hintText: 'Enter website link', - ), - sizedBoxHeight(25.h), + // text16w400_FCFCFC("Website link"), + // sizedBoxHeight(14.h), + // CustomTextFormField( + // textEditingController: websitelinkcontroller, + // validator: (val) { + // if (!isValidWebBannerLink(val)) { + // return 'Please enter a valid web banner link.'; + // } + // return null; + // }, + // hintText: 'Enter website link', + // ), + // sizedBoxHeight(25.h), sizedBoxHeight(50.h), CustomButton( text: 'Save changes', diff --git a/lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart b/lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart index 30c24e8..7665380 100644 --- a/lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart +++ b/lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart @@ -53,26 +53,26 @@ class _ManageGroupsState extends State { resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Manage groups", - customActionWidget: InkWell( - onTap: () {}, - child: Container( - height: 35.h, - width: 35.w, - decoration: BoxDecoration( - color: Color(0xFFD90B2E), - shape: BoxShape.circle, - boxShadow: [ - BoxShadow( - color: Color(0x40000000), - offset: Offset(0, 6), - blurRadius: 8, - spreadRadius: 0, - ), - ], - ), - child: Icon(Icons.add, color: Colors.white, weight: 2), - ), - ), + // customActionWidget: InkWell( + // onTap: () {}, + // child: Container( + // height: 35.h, + // width: 35.w, + // decoration: BoxDecoration( + // color: Color(0xFFD90B2E), + // shape: BoxShape.circle, + // boxShadow: [ + // BoxShadow( + // color: Color(0x40000000), + // offset: Offset(0, 6), + // blurRadius: 8, + // spreadRadius: 0, + // ), + // ], + // ), + // child: Icon(Icons.add, color: Colors.white, weight: 2), + // ), + // ), ), body: Stack(children: [ Container( @@ -111,7 +111,7 @@ class _ManageGroupsState extends State { opacity2: 0.24, width: 50.w, height: 50.h, - borderRadius: BorderRadius.circular( 100), + borderRadius: BorderRadius.circular(100), customWidget: Center( child: Image.asset( "assets/images/png/Black.png", @@ -178,11 +178,14 @@ Widget groupWidget({ ], ), Spacer(), - Icon( - Icons.clear, - color: Color(0xFFFFFFFF), - weight: 1.88, + Image.asset( + 'assets/images/png/Group 1000004149.png', ) + // Icon( + // Icons.clear, + // color: Color(0xFFFFFFFF), + // weight: 1.88, + // ) ], ), ); diff --git a/lib/sidemenu/Community/MyCommunity/Model/ComPostModel.dart b/lib/sidemenu/Community/MyCommunity/Model/ComPostModel.dart index 0a1fbe1..4b348b7 100644 --- a/lib/sidemenu/Community/MyCommunity/Model/ComPostModel.dart +++ b/lib/sidemenu/Community/MyCommunity/Model/ComPostModel.dart @@ -80,7 +80,7 @@ class Datum { final bool? isILiked; final bool? isIFollow; final bool? isISaved; - final dynamic likeIcon; + final LikeIcon? likeIcon; final int? totalComment; final int? totalSave; final List tagsXid; @@ -116,7 +116,8 @@ class Datum { isILiked: json["is_i_liked"], isIFollow: json["is_i_follow"], isISaved: json["is_i_saved"], - likeIcon: json["likeIcon"], + // likeIcon: json["likeIcon"], + likeIcon: json["likeIcon"] == null ? null : LikeIcon.fromJson(json["likeIcon"]), totalComment: json["total_comment"], totalSave: json["total_save"], tagsXid: json["tags_xid"] == null @@ -164,6 +165,42 @@ class AttachTag { } } +class LikeIcon { + LikeIcon({ + required this.likeIconsXid, + required this.likeIcon, + }); + + final int? likeIconsXid; + final LikeIconClass? likeIcon; + + factory LikeIcon.fromJson(Map json){ + return LikeIcon( + likeIconsXid: json["like_icons_xid"], + likeIcon: json["like_icon"] == null ? null : LikeIconClass.fromJson(json["like_icon"]), + ); + } + +} + +class LikeIconClass { + LikeIconClass({ + required this.id, + required this.image, + }); + + final int? id; + final String? image; + + factory LikeIconClass.fromJson(Map json){ + return LikeIconClass( + id: json["id"], + image: json["image"], + ); + } + +} + class ManageTag { ManageTag({ required this.id, diff --git a/lib/sidemenu/Community/MyCommunity/Model/activitiesListModel.dart b/lib/sidemenu/Community/MyCommunity/Model/activitiesListModel.dart new file mode 100644 index 0000000..5824135 --- /dev/null +++ b/lib/sidemenu/Community/MyCommunity/Model/activitiesListModel.dart @@ -0,0 +1,44 @@ +class ActivitiesListsModel { + ActivitiesListsModel({ + required this.status, + required this.statusCode, + required this.message, + required this.data, + }); + + final String? status; + final int? statusCode; + final String? message; + final List data; + + factory ActivitiesListsModel.fromJson(Map json){ + return ActivitiesListsModel( + status: json["status"], + statusCode: json["status_code"], + message: json["message"], + data: json["data"] == null ? [] : List.from(json["data"]!.map((x) => Datum.fromJson(x))), + ); + } + +} + +class Datum { + Datum({ + required this.id, + required this.title, + required this.image, + }); + + final int? id; + final String? title; + final String? image; + + factory Datum.fromJson(Map json){ + return Datum( + id: json["id"], + title: json["title"], + image: json["image"], + ); + } + +} diff --git a/lib/sidemenu/Community/MyCommunity/NewCommunity.dart b/lib/sidemenu/Community/MyCommunity/NewCommunity.dart index d8df538..59b7d66 100644 --- a/lib/sidemenu/Community/MyCommunity/NewCommunity.dart +++ b/lib/sidemenu/Community/MyCommunity/NewCommunity.dart @@ -2,17 +2,12 @@ import 'dart:developer'; import 'dart:io'; import 'dart:async'; -import 'package:dio/dio.dart'; import 'package:dotted_border/dotted_border.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart' hide MultipartFile, FormData; -import 'package:get/get_connect/http/src/utils/utils.dart'; -import 'package:regroup/Common/CommonButton.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart' - as primaryactlist; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; @@ -23,7 +18,7 @@ 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:regroup/sidemenu/Community/MyCommunity/view_model/postmethod.dart'; +import 'package:regroup/sidemenu/Community/MyCommunity/Model/activitiesListModel.dart' as primaryactlist; import 'package:regroup/sidemenu/Community/MyCommunity/view_model/primaryactivity.dart'; import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart'; import 'package:path/path.dart' as path; @@ -60,8 +55,8 @@ class _NewCommunityState extends State { }); } - primaryactlist.InterestModel? abilityModel; - List activity = []; + primaryactlist.ActivitiesListsModel? abilityModel; + List activity = []; List _activitydrop = []; Future fetchActivitylist() async { @@ -69,11 +64,11 @@ class _NewCommunityState extends State { ResponseData response = await abilityLsitAPI.getActivitylistApi(); if (response.status == ResponseStatus.SUCCESS) { - abilityModel = primaryactlist.InterestModel.fromJson(response.data!); + abilityModel = primaryactlist.ActivitiesListsModel.fromJson(response.data!); setState(() { - activity = abilityModel!.data ?? []; // Store the fetched cities + activity = abilityModel?.data ?? []; // Store the fetched cities _activitydrop = - activity.map((platform) => platform.name.toString()).toList(); + activity.map((platform) => platform.title.toString()).toList(); }); log(activity.toString()); } else { @@ -89,7 +84,7 @@ class _NewCommunityState extends State { // Find and add the ID of the selected ability for (var activityItem in activity) { - if (selectedAbility == activityItem.name) { + if (selectedAbility == activityItem.title) { selectedactivityid = activityItem.id!; break; // Stop once the matching item is found } diff --git a/lib/sidemenu/Community/MyCommunity/View/CommunityDetails.dart b/lib/sidemenu/Community/MyCommunity/View/CommunityDetails.dart index 79df067..ae6b4fc 100644 --- a/lib/sidemenu/Community/MyCommunity/View/CommunityDetails.dart +++ b/lib/sidemenu/Community/MyCommunity/View/CommunityDetails.dart @@ -182,6 +182,28 @@ class _CommunityDetailsState extends State { ), ), ), + PopupMenuDivider(), + PopupMenuItem( + onTap: () { + Get.toNamed(RouteName.communitysetting, arguments: { + 'communityid': CommunityId, + }); + }, + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 8.w), + child: Row( + children: [ + text14w400white("Edit community"), + Spacer(), + Image.asset( + "assets/images/png/setting2.png", + height: 18.h, + width: 18.w, + ) + ], + ), + ), + ), ], child: Image.asset( 'assets/images/png/Group 1000004071.png', @@ -436,10 +458,10 @@ class _CommunityDetailsState extends State { GestureDetector( onTap: () { // Get.toNamed(RouteName.addgroup); - Get.toNamed(RouteName.group, arguments: { - 'id': CommunityId, - 'iscommunity': true, - }); + Get.toNamed(RouteName.group, arguments: { + 'id': CommunityId, + 'iscommunity': true, + }); }, child: commonGlassUI( width: double.infinity, @@ -591,7 +613,7 @@ class _PostsTabState extends State { super.initState(); } - _fetchIcons() { + _fetchIcons() { _reactions = fetchlikeIconsModel!.data ?? []; for (var post in commonobjmodel!.data) { //Check if post as a like icon @@ -659,6 +681,7 @@ class _PostsTabState extends State { likeIcon: LikeIcon1( likeIcon: LikeIconClass1( id: e.likeIcon?.likeIcon?.id, + // likeIcon?.id, image: e.likeIcon?.likeIcon?.image), likeIconsXid: e.likeIcon?.likeIconsXid, ), diff --git a/lib/sidemenu/Community/MyCommunity/view_model/primaryactivity.dart b/lib/sidemenu/Community/MyCommunity/view_model/primaryactivity.dart index 818fd9c..045a1b3 100644 --- a/lib/sidemenu/Community/MyCommunity/view_model/primaryactivity.dart +++ b/lib/sidemenu/Community/MyCommunity/view_model/primaryactivity.dart @@ -1,9 +1,9 @@ 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/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart'; +import 'package:regroup/sidemenu/Community/MyCommunity/Model/activitiesListModel.dart'; -InterestModel? interestlistobj; +ActivitiesListsModel? interestlistobj; class PrimaryActivityListApi { @@ -11,7 +11,7 @@ class PrimaryActivityListApi { var data = ""; Future> getActivitylistApi() async { final response = await NetworkApiServices().getApi( - ApiUrls.getinterestlist, + ApiUrls.getactivitieslist, ); @@ -20,8 +20,8 @@ class PrimaryActivityListApi { Map.from(response.data); if (responseData['status'] == "success") { print("success"); - InterestModel interestlistobj = - InterestModel.fromJson(responseData); + ActivitiesListsModel interestlistobj = + ActivitiesListsModel.fromJson(responseData); } else { // return ResponseData( // responseData['message'], ResponseStatus.FAILED);