From 2a492595feaad364de1ac04fe5667a1500dcbb18 Mon Sep 17 00:00:00 2001 From: cj201199 Date: Wed, 5 Jun 2024 11:52:59 +0530 Subject: [PATCH] community tab done. --- assets/images/png/BottomBar/ActiveCal.png | Bin 0 -> 853 bytes assets/images/png/BottomBar/ActiveChat.png | Bin 0 -> 1786 bytes assets/images/png/BottomBar/activeGroup.png | Bin 0 -> 2678 bytes assets/images/png/BottomBar/inactiveHome.png | Bin 0 -> 1184 bytes lib/Common/CommonBottomNavigationBar.dart | 8 +- lib/Common/CommonDropDown.dart | 279 ++++++++---------- lib/Common/CommonWidget.dart | 4 +- .../Main_Screens/Community/Community.dart | 8 +- .../Community settings/CommunitySetting.dart | 6 +- .../Community settings/ManageGroup.dart | 194 ++++++++++++ .../ManageTags.dart/ManageTags.dart | 2 +- .../Community/MyCommunity/AddGroups.dart | 201 +++++++++++++ .../Community/MyCommunity/NewCommunity.dart | 129 ++++++++ .../MyCommunity/View/CommunityDetails.dart | 199 ++++++++----- .../MyCommunity/View/MyCommunity.dart | 41 +-- lib/Utils/texts.dart | 12 + lib/resources/routes/route_name.dart | 8 +- lib/resources/routes/routes.dart | 45 +-- 18 files changed, 859 insertions(+), 277 deletions(-) create mode 100644 assets/images/png/BottomBar/ActiveCal.png create mode 100644 assets/images/png/BottomBar/ActiveChat.png create mode 100644 assets/images/png/BottomBar/activeGroup.png create mode 100644 assets/images/png/BottomBar/inactiveHome.png create mode 100644 lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart create mode 100644 lib/Feed Module/sidemenu/Community/MyCommunity/AddGroups.dart create mode 100644 lib/Feed Module/sidemenu/Community/MyCommunity/NewCommunity.dart diff --git a/assets/images/png/BottomBar/ActiveCal.png b/assets/images/png/BottomBar/ActiveCal.png new file mode 100644 index 0000000000000000000000000000000000000000..f316bfa6c046cbc7b4b3be407a37e246d76c2bd0 GIT binary patch literal 853 zcmeAS@N?(olHy`uVBq!ia0vp^At21b1|(&&1r7o!&H|6fVg?2sZxCi&YCCNuP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&di3{0;)T^vIy7~jr)Kk<@-#IgH1MK$|`cJQ6! z+OyhWEyFtIH4ip0zhSUGz||ot6UHF>!aPlZ@xD0=Z{lJme>Io+_s{Un<`p)xH~Xz_ zeY4}rfwJ9i)jW-^Zn$a?zc%dqC4*`0Ccg2XY<#DmP7S~1dm2=5LZ4c9Jza6w>J<6NQ$$oBUdav2FhAlm&-^REJOS=*gvrZ2vF^1!;hZuV=O+wEpe=)TxgDV{0&A!cL!Lf1;A z-CRFZzW7U3O*&q+r`5zc{PPuk^{l$KBDq@aj;Ahby{m&H`a}=^nKbe2{(BqGyT`@l z>%EtgT_E~q!5vwJ{RZZ*-ZrO)Z(o({KeOJUwMw>d2}_&P!2k^jE>`D-39p2trf(CM z+UMo$5@<5{@jP!G(}3=Px5w=~=Ow<~e73~o+q#o=YyWP0_Hd&?Q1{l&|5Z!{Jb9l; z)=$xPYHtnmdcPzsqP=NhfPn}X&{URvwoe$NxQQ#3?)THz+a+(&i6VAUzBTjqCuwk@5r>}9m#{-c)V zTR3*;>L&G3X1w>&?q8}1{~#{cfw zGqr0!Tuv;#v4}T*lezAb_x~$C>ZuQ~LE__=?;6L}|`DJ~sc9ysw24x%uPgg&ebxsLQ06KwdU;qFB literal 0 HcmV?d00001 diff --git a/assets/images/png/BottomBar/ActiveChat.png b/assets/images/png/BottomBar/ActiveChat.png new file mode 100644 index 0000000000000000000000000000000000000000..15df1049bf2ab75dc6ea9b0b493719b98ac7c249 GIT binary patch literal 1786 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 items; final void Function(String)? onItemSelected; - final bool isEnabled; - final bool islocation; final bool textcolor; @override @@ -203,161 +198,147 @@ class _CommonDropdownradioBtnState extends State { @override Widget build(BuildContext context) { return DropdownButtonHideUnderline( - child: Row( - children: [ - widget.islocation - ? Padding( - padding: EdgeInsets.only(left: 4.w), - child: SvgPicture.asset("assets/svg/location.svg"), - ) - : SizedBox(), - Expanded( - child: DropdownButton2( - isExpanded: true, - hint: Obx(() { - return Row( - children: [ - Expanded( - child: Text( - selectedValue.isEmpty - ? widget.hint - : selectedValue.value, + child: DropdownButton2( + isExpanded: true, + hint: Obx(() { + return Row( + children: [ + Expanded( + child: Text( + selectedValue.isEmpty ? widget.hint : selectedValue.value, + style: TextStyle( + fontSize: 12.sp, + fontFamily: 'hiragino', + color: Colors.white, + fontWeight: FontWeight.w500, + ), + overflow: TextOverflow.ellipsis, + ), + ), + ], + ); + }), + items: widget.items!.asMap().entries.map((entry) { + int index = entry.key; + String item = entry.value; + return DropdownMenuItem( + value: item, + child: Column( + children: [ + InkWell( + onTap: () { + selectedValue.value = item; + if (widget.onItemSelected != null) { + widget.onItemSelected!(item); + } + }, + child: Row( + children: [ + Obx(() { + return Radio( + value: item, + activeColor: Colors.white, + groupValue: selectedValue.value, + onChanged: (value) { + selectedValue.value = value!; + if (widget.onItemSelected != null) { + widget.onItemSelected!(value); + } + }, + ); + }), + SizedBox(width: 8.w), + Text( + item, style: TextStyle( - fontSize: 12.sp, - fontFamily: 'hiragino', color: Colors.white, + fontSize: 16.sp, + fontFamily: 'hiragino', fontWeight: FontWeight.w500, ), overflow: TextOverflow.ellipsis, ), - ), - ], - ); - }), - items: widget.items!.asMap().entries.map((entry) { - int index = entry.key; - String item = entry.value; - return DropdownMenuItem( - value: item, - child: Column( - children: [ - InkWell( - onTap: () { - selectedValue.value = item; - if (widget.onItemSelected != null) { - widget.onItemSelected!(item); - } - }, - child: Row( - children: [ - Obx(() { - return Radio( - value: item, - activeColor: Colors.white, - groupValue: selectedValue.value, - onChanged: (value) { - selectedValue.value = value!; - if (widget.onItemSelected != null) { - widget.onItemSelected!(value); - } - }, - ); - }), - SizedBox(width: 8.w), - Text( - item, - style: TextStyle( - color: Colors.white, - fontSize: 16.sp, - fontFamily: 'hiragino', - fontWeight: FontWeight.w500, - ), - overflow: TextOverflow.ellipsis, - ), - ], - ), - ), - if (index != widget.items!.length - 1) commonDivider(), ], ), - ); - }).toList(), - value: null, - onChanged: (value) {}, - selectedItemBuilder: (BuildContext context) { - return widget.items!.map((item) { - return Row( - children: [ - Expanded( - child: Obx(() { - return Text( - selectedValue.value, - style: TextStyle( - color: Colors.white, - fontSize: 16.sp, - fontFamily: 'hiragino', - fontWeight: FontWeight.w500, - ), - overflow: TextOverflow.ellipsis, - ); - }), - ), - ], - ); - }).toList(); - }, - buttonStyleData: ButtonStyleData( - height: 50.h, - width: double.infinity, - padding: EdgeInsets.only(left: 12.w, right: 4.w), - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - Color(0xFFffffff).withOpacity(0.8), - Color(0xFFFFFFFF).withOpacity(0.8), - ], - stops: [0.1, 1], - ), - borderRadius: BorderRadius.circular(30.r), - border: Border.all( - color: Color(0xff434A53), - ), - color: Color(0xFFFFFFFF).withOpacity(0.05), ), - elevation: 0, - ), - iconStyleData: IconStyleData( - icon: Icon( - Icons.keyboard_arrow_down, - ), - iconSize: 23.sp, - iconEnabledColor: Color(0xFFFFFFFF), - iconDisabledColor: Color(0xFFFFFFFF), - ), - dropdownStyleData: DropdownStyleData( - maxHeight: 200, - width: 400, - padding: null, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(30), - color: Color(0xFF222935), - ), - elevation: 0, - scrollbarTheme: ScrollbarThemeData( - radius: const Radius.circular(40), - thickness: MaterialStateProperty.all(6), - thumbVisibility: MaterialStateProperty.all(true), - ), - ), - menuItemStyleData: const MenuItemStyleData( - height: 50, - padding: EdgeInsets.only(left: 14, right: 14), - ), + if (index != widget.items!.length - 1) commonDivider(), + ], ), + ); + }).toList(), + value: null, + onChanged: (value) {}, + selectedItemBuilder: (BuildContext context) { + return widget.items!.map((item) { + return Row( + children: [ + Expanded( + child: Obx(() { + return Text( + selectedValue.value, + style: TextStyle( + color: Colors.white, + fontSize: 16.sp, + fontFamily: 'hiragino', + fontWeight: FontWeight.w500, + ), + overflow: TextOverflow.ellipsis, + ); + }), + ), + ], + ); + }).toList(); + }, + buttonStyleData: ButtonStyleData( + height: 50.h, + width: double.infinity, + padding: EdgeInsets.only(left: 12.w, right: 4.w), + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + Color(0xFFffffff).withOpacity(0.8), + Color(0xFFFFFFFF).withOpacity(0.8), + ], + stops: [0.1, 1], + ), + borderRadius: BorderRadius.circular(30.r), + border: Border.all( + color: Color(0xff434A53), + ), + color: Color(0xFFFFFFFF).withOpacity(0.05), ), - ], + elevation: 0, + ), + iconStyleData: IconStyleData( + icon: Icon( + Icons.keyboard_arrow_down, + ), + iconSize: 23.sp, + iconEnabledColor: Color(0xFFFFFFFF), + iconDisabledColor: Color(0xFFFFFFFF), + ), + dropdownStyleData: DropdownStyleData( + maxHeight: 200, + width: 400, + padding: null, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(30), + color: Color(0xFF222935), + ), + elevation: 0, + scrollbarTheme: ScrollbarThemeData( + radius: const Radius.circular(40), + thickness: MaterialStateProperty.all(6), + thumbVisibility: MaterialStateProperty.all(true), + ), + ), + menuItemStyleData: const MenuItemStyleData( + height: 50, + padding: EdgeInsets.only(left: 14, right: 14), + ), ), ); } diff --git a/lib/Common/CommonWidget.dart b/lib/Common/CommonWidget.dart index 690620c..598c2b4 100644 --- a/lib/Common/CommonWidget.dart +++ b/lib/Common/CommonWidget.dart @@ -137,12 +137,10 @@ Widget commonDivider() { ); } - String extractFileName(String filePath) { return path.basename(filePath); } - Widget stackContainers({ required String number, required List containerImages, @@ -222,6 +220,8 @@ Widget stackReaction({ width: 30.w, height: 30.h, borderradius: 100, + opacity1: 0.05, + opacity2: 0.06, customWidget: Center( child: Image.asset( containerImages[index], diff --git a/lib/Feed Module/Main_Screens/Community/Community.dart b/lib/Feed Module/Main_Screens/Community/Community.dart index 21d1ebb..a4a9bd7 100644 --- a/lib/Feed Module/Main_Screens/Community/Community.dart +++ b/lib/Feed Module/Main_Screens/Community/Community.dart @@ -382,9 +382,11 @@ Widget normalcardtile({ ]), Spacer(), commonGlassContainer( - border: 0.9, + border: 0.43, width: 30.w, height: 30.h, + opacity1: 0.05, + opacity2: 0.06, borderradius: 100, customWidget: Center( child: ReactionButton( @@ -409,10 +411,12 @@ Widget normalcardtile({ text14w400_FCFCFC('20'), sizedBoxWidth(20.w), commonGlassContainer( - border: 0.9, + border: 0.43, width: 30.w, height: 30.h, borderradius: 100, + opacity1: 0.05, + opacity2: 0.06, customWidget: Center( child: ReactionButton( itemSize: Size.fromHeight(20), diff --git a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart b/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart index 900dd59..de84138 100644 --- a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart +++ b/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart @@ -45,7 +45,11 @@ class _CommunitySettingState extends State { }, child: rowTile(text: 'Manage members')), commonDivider(), - rowTile(text: 'Manage groups'), + GestureDetector( + onTap: () { + Get.toNamed(RouteName.managegroups); + }, + child: rowTile(text: 'Manage groups')), commonDivider(), GestureDetector( onTap: () { diff --git a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart b/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart new file mode 100644 index 0000000..16bbe17 --- /dev/null +++ b/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart @@ -0,0 +1,194 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:regroup/Common/CommonGlassmorphism.dart'; +import 'package:regroup/Common/CommonWidget.dart'; +import 'package:regroup/Common/controller/CommonTextFormField.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'; + +class ManageGroups extends StatefulWidget { + const ManageGroups({super.key}); + + @override + State createState() => _ManageGroupsState(); +} + +class _ManageGroupsState extends State { + List groupData = [ + { + "imagePath": "assets/images/png/img45.png", + "title": "Iron titans fitness crew", + "subtitle": "Lorem ipsum dummy text", + }, + { + "imagePath": "assets/images/png/Rectangle 25.png", + "title": "Body blitz brigade", + "subtitle": "Lorem ipsum dummy text", + }, + { + "imagePath": "assets/images/png/img2.png", + "title": "Fit fusion squad", + "subtitle": "Lorem ipsum dummy text", + }, + { + "imagePath": "assets/images/png/img2.png", + "title": "Power pulse posse", + "subtitle": "Lorem ipsum dummy text", + }, + { + "imagePath": "assets/images/png/img2.png", + "title": "Wellness warriors collective", + "subtitle": "Lorem ipsum dummy text", + }, + ]; + + @override + Widget build(BuildContext context) { + return Scaffold( + // key: _scaffoldKey1, + backgroundColor: Color(0xFF222935), + extendBody: true, + appBar: CommonAppbar( + titleTxt: "Manage groups", + ), + body: Stack(children: [ + const CommonBlurLeftRed(), + const CommonBlurRightRed(), + const CommonBlurLeft(), + const CommonBlurRight(), + Positioned.fill( + child: SingleChildScrollView( + child: Column(children: [ + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + sizedBoxHeight(20.h), + CustomTextFormField( + leadingIcon: SizedBox( + height: 23, + width: 23, + child: Center( + child: Image.asset( + "assets/images/png/ion_search-outline.png", + height: 23, + width: 23, + ), + ), + ), + hintText: "Search groups", + ), + sizedBoxHeight(25.h), + Row( + children: [ + commonGlassContainer( + opacity1: 0.24, + opacity2: 0.24, + width: 50.w, + height: 50.h, + borderradius: 100, + customWidget: Center( + child: Image.asset( + "assets/images/png/Black.png", + height: 30.h, + width: 30.w, + )), + border: 0.5), + sizedBoxWidth(8.w), + text18w400_FCFCFC("Create group"), + Spacer(), + Icon( + Icons.arrow_forward_ios_outlined, + color: Colors.white, + size: 14.sp, + ), + ], + ), + sizedBoxHeight(25.h), + Row( + children: [ + commonGlassContainer( + opacity1: 0.24, + opacity2: 0.24, + width: 50.w, + height: 50.h, + borderradius: 100, + customWidget: Center( + child: Icon( + Icons.add, + color: Colors.white, + weight: 1.4.w, + size: 25.sp, + )), + border: 0.5), + sizedBoxWidth(8.w), + text18w400_FCFCFC("Add existing groups"), + Spacer(), + Icon( + Icons.arrow_forward_ios_outlined, + color: Colors.white, + size: 14.sp, + ), + ], + ), + sizedBoxHeight(30.h), + text18w700white("Groups"), + sizedBoxHeight(20.h), + ]), + ), + ListView.builder( + shrinkWrap: true, + itemCount: groupData.length, + itemBuilder: (context, index) { + return Column( + children: [ + groupWidget( + imagePath: groupData[index]["imagePath"], + title: groupData[index]["title"], + subtitle: groupData[index]["subtitle"]), + commonDivider(), + ], + ); + }, + ) + ]), + )) + ])); + } +} + +Widget groupWidget({ + required String imagePath, + required String title, + required String subtitle, +}) { + return Padding( + padding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 16.w), + child: Row( + children: [ + CircleAvatar( + backgroundImage: AssetImage(imagePath), + radius: 20.r, + ), + sizedBoxWidth(10.w), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text16w400_FCFCFC(title), + sizedBoxHeight(4.h), + text12w400_FCFCFC_blur(subtitle) + ], + ), + Spacer(), + Icon( + Icons.clear, + color: Color(0xFFFFFFFF), + weight: 1.88, + ) + ], + ), + ); +} diff --git a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart b/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart index 60f64fc..6c0f67d 100644 --- a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart +++ b/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart @@ -93,7 +93,7 @@ class _ManageTagsState extends State { } Widget tagsTab() { - List tags = ['Cycle', 'Sports', 'Fitness', 'Kayaking' 'Sports club']; + List tags = ['Cycle', 'Sports', 'Fitness', 'Kayaking', 'Sports club']; return Column( children: [ sizedBoxHeight(25.h), diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/AddGroups.dart b/lib/Feed Module/sidemenu/Community/MyCommunity/AddGroups.dart new file mode 100644 index 0000000..46aee0a --- /dev/null +++ b/lib/Feed Module/sidemenu/Community/MyCommunity/AddGroups.dart @@ -0,0 +1,201 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:regroup/Common/CommonButton.dart'; +import 'package:regroup/Common/CommonGlassmorphism.dart'; +import 'package:regroup/Common/CommonWidget.dart'; +import 'package:regroup/Common/controller/CommonTextFormField.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'; + +class AddGroup extends StatefulWidget { + const AddGroup({super.key}); + + @override + State createState() => _AddGroupState(); +} + +class _AddGroupState extends State { + List isCheckedList = [false, false, false, false]; + + List groupData = [ + { + "imagePath": "assets/images/png/img45.png", + "title": "Iron titans fitness crew", + "subtitle": "Lorem ipsum dummy text", + }, + { + "imagePath": "assets/images/png/Rectangle 25.png", + "title": "Body blitz brigade", + "subtitle": "Lorem ipsum dummy text", + }, + { + "imagePath": "assets/images/png/img2.png", + "title": "Fit fusion squad", + "subtitle": "Lorem ipsum dummy text", + }, + { + "imagePath": "assets/images/png/img2.png", + "title": "Power pulse posse", + "subtitle": "Lorem ipsum dummy text", + }, + ]; + @override + Widget build(BuildContext context) { + return Scaffold( + // key: _scaffoldKey1, + backgroundColor: Color(0xFF222935), + extendBody: true, + appBar: CommonAppbar( + titleTxt: "Add groups", + ), + body: Stack(children: [ + const CommonBlurLeftRed(), + const CommonBlurRightRed(), + const CommonBlurLeft(), + const CommonBlurRight(), + Positioned.fill( + child: SingleChildScrollView( + child: Column(children: [ + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + sizedBoxHeight(20.h), + CustomTextFormField( + leadingIcon: SizedBox( + height: 23, + width: 23, + child: Center( + child: Image.asset( + "assets/images/png/ion_search-outline.png", + height: 23, + width: 23, + ), + ), + ), + hintText: "Search groups", + ), + sizedBoxHeight(25.h), + Row( + children: [ + commonGlassContainer( + opacity1: 0.24, + opacity2: 0.24, + width: 50.w, + height: 50.h, + borderradius: 100, + customWidget: Center( + child: Image.asset( + "assets/images/png/Black.png", + height: 30.h, + width: 30.w, + )), + border: 0.5), + sizedBoxWidth(8.w), + text18w400_FCFCFC("Create group"), + Spacer(), + Icon( + Icons.arrow_forward_ios_outlined, + color: Colors.white, + size: 14.sp, + ), + ], + ), + sizedBoxHeight(25.h), + sizedBoxHeight(30.h), + text18w700white("Existing Groups"), + sizedBoxHeight(20.h), + ]), + ), + ListView.builder( + shrinkWrap: true, + itemCount: groupData.length, + itemBuilder: (context, index) { + return Column( + children: [ + groupWidget( + index: index, + imagePath: groupData[index]["imagePath"], + title: groupData[index]["title"], + subtitle: groupData[index]["subtitle"], + isChecked: isCheckedList[index], + onCheckedChanged: (bool? value) { + setState(() { + isCheckedList[index] = value ?? false; + }); + }, + ), + commonDivider(), + ], + ); + }, + ), + sizedBoxHeight(50.h), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: CommonBtn( + text: "Add", + onTap: () { + Get.toNamed(RouteName.mycommunity); + }, + ), + ), + ]), + )) + ])); + } + + Widget groupWidget({ + required int index, + required String imagePath, + required String title, + required String subtitle, + required bool isChecked, + required ValueChanged onCheckedChanged, + }) { + return Padding( + padding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 16.w), + child: Row( + children: [ + CircleAvatar( + backgroundImage: AssetImage(imagePath), + radius: 20.r, + ), + sizedBoxWidth(10.w), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text16w400_FCFCFC(title), + sizedBoxHeight(4.h), + text12w400_FCFCFC_blur(subtitle), + ], + ), + Spacer(), + commonGlassContainer( + border: 1, + borderradius: 2, + height: 23.h, + width: 23.w, + opacity1: 0.24, + opacity2: 0.24, + customWidget: Transform.scale( + scale: 1.4, + child: Checkbox( + side: BorderSide(color: Color(0xFF434A53)), + value: isChecked, + activeColor: Colors.transparent, + checkColor: Colors.white, + onChanged: onCheckedChanged, + ), + ), + ), + ], + ), + ); + } +} diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/NewCommunity.dart b/lib/Feed Module/sidemenu/Community/MyCommunity/NewCommunity.dart new file mode 100644 index 0000000..c47e0f0 --- /dev/null +++ b/lib/Feed Module/sidemenu/Community/MyCommunity/NewCommunity.dart @@ -0,0 +1,129 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:regroup/Common/CommonButton.dart'; +import 'package:regroup/Common/CommonDropDown.dart'; +import 'package:regroup/Common/CommonGlassmorphism.dart'; +import 'package:regroup/Common/controller/CommonTextFormField.dart'; +import 'package:regroup/Utils/Common/CommonAppbar.dart'; +import 'package:regroup/Utils/Common/CommonDropdown.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 NewCommunity extends StatefulWidget { + const NewCommunity({super.key}); + + @override + State createState() => _NewCommunityState(); +} + +class _NewCommunityState extends State { + @override + Widget build(BuildContext context) { + return Scaffold( + // key: _scaffoldKey1, + backgroundColor: Color(0xFF222935), + extendBody: true, + appBar: CommonAppbar( + titleTxt: "New community", + ), + body: Stack(children: [ + const CommonBlurLeftRed(), + const CommonBlurRightRed(), + const CommonBlurLeft(), + const CommonBlurRight(), + Positioned.fill( + child: SingleChildScrollView( + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: + Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + sizedBoxHeight(20.h), + Center( + child: commonGlassContainer( + width: 95.w, + height: 95.h, + borderradius: 100, + opacity1: 0.24, + opacity2: 0.24, + customWidget: Center( + child: Image.asset( + "assets/images/png/cameraicon2.png", + height: 30.h, + width: 30.w, + ), + ), + border: 0.5), + ), + sizedBoxHeight(20.h), + Center(child: text16w400_white("Add community profile picture")), + sizedBoxHeight(30.h), + text16w400_FCFCFC("Banner image"), + sizedBoxHeight(15.h), + commonGlassContainer( + border: 0.9, + width: double.infinity, + height: 130.h, + borderradius: 10.r, + customWidget: Padding( + padding: EdgeInsets.symmetric(vertical: 16.h), + child: Column( + children: [ + Image.asset( + "assets/images/png/bi_download.png", + height: 36.h, + width: 36.w, + ), + sizedBoxHeight(10.h), + text14w400white('Upload banner image'), + sizedBoxHeight(8.h), + text8w400_8A8A8A( + "Allowed file extensions: jpg, png, gif Max file size: 10 MB"), + ], + ), + ), + ), + sizedBoxHeight(25.h), + text16w400_FCFCFC("Community name*"), + sizedBoxHeight(15.h), + CustomTextFormField(), + sizedBoxHeight(25.h), + text16w400_FCFCFC("Type of community*"), + sizedBoxHeight(15.h), + CommonDropdownradioBtn( + hint: '', items: ['Public', 'Private', 'Secret']), + sizedBoxHeight(25.h), + text16w400_FCFCFC("Location*"), + sizedBoxHeight(15.h), + CommonDropdownradioBtn( + // showOther: true, + hint: '', + items: ['Public', 'Private', 'Secret']), + sizedBoxHeight(25.h), + text16w400_FCFCFC("Primary activity*"), + sizedBoxHeight(15.h), + CustomDropDownWidgetSignup( + header: 'Primary activity', + title: 'ss', + listData: ['Public', 'Private', 'Secret'], + onItemSelected: (p0) => {}, + leadingImage: SizedBox()), + CommonDropdownBtn( + hint: '', items: ['Public', 'Private', 'Secret']), + sizedBoxHeight(25.h), + sizedBoxHeight(25.h), + CommonBtn( + text: "Create community", + onTap: () { + Get.toNamed(RouteName.addgroup); + }, + ), + sizedBoxHeight(25.h), + sizedBoxHeight(25.h), + ]), + ))) + ])); + } +} diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart b/lib/Feed Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart index 6bef6ee..0599380 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart +++ b/lib/Feed Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart @@ -211,6 +211,8 @@ class _CommunityDetailsState extends State { width: 35.w, height: 35.h, borderradius: 100, + opacity1: 0.24, + opacity2: 0.24, customWidget: Center( child: Image.asset( "assets/images/png/img12.png", @@ -258,7 +260,7 @@ class _CommunityDetailsState extends State { sizedBoxHeight(20.h), GestureDetector( onTap: () { - Get.toNamed(RouteName.group); + Get.toNamed(RouteName.addgroup); }, child: commonGlassContainer( width: double.infinity, @@ -374,7 +376,17 @@ class _CommunityDetailsState extends State { return Column( children: [ sizedBoxHeight(20.h), - normalcardtile(), + normalcardtile( + profileImg: 'assets/images/png/Ellipse 43.png', + title: 'Edward Hackket', + mainImg: 'assets/images/png/Rectangle 24.png', + containerTitle: [ + 'Cycle', + 'Marathon', + 'Events', + 'Marathon', + 'Events' + ]), ], ); } @@ -385,14 +397,23 @@ class _CommunityDetailsState extends State { ); } - Widget normalcardtile() { - final List titles = [ - 'Race', - 'Swimming', - 'Events', - 'Swimming', - 'Events', - ]; + Widget normalcardtile({ + required String profileImg, + required String title, + required String mainImg, + required List containerTitle, + }) { + var mainImage = 'assets/images/png/uiw_like-o.png'.obs; + void updateImage(String reaction) { + if (reaction == 'like') { + mainImage.value = 'assets/images/png/f7_hand-thumbsup.png'; + } else if (reaction == 'heart') { + mainImage.value = 'assets/images/png/heart 2.png'; + } else if (reaction == 'party') { + mainImage.value = 'assets/images/png/party-popper 2.png'; + } + } + return Column( children: [ sizedBoxHeight(25.h), @@ -402,14 +423,14 @@ class _CommunityDetailsState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ CircleAvatar( - foregroundImage: AssetImage('assets/images/png/Ellipse 43.png'), + foregroundImage: AssetImage(profileImg), radius: 25.r, ), sizedBoxWidth(12.w), Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - text16w400_FCFCFC('Edward Hackket'), + text16w400_FCFCFC(title), sizedBoxHeight(5.h), Row( children: [ @@ -520,7 +541,7 @@ class _CommunityDetailsState extends State { ], child: Image.asset( 'assets/images/png/Group 1000004071.png', - width: 4.w, + width: 16.w, height: 18.h, ), ), @@ -533,7 +554,14 @@ class _CommunityDetailsState extends State { onTap: () { Get.toNamed(RouteName.postdetailsScreen); }, - child: Image.asset('assets/images/png/Rectangle 22.png')), + child: Container( + height: 163.h, + width: double.infinity, + child: Image.asset( + mainImg, + fit: BoxFit.cover, + ), + )), sizedBoxHeight(20.h), Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), @@ -543,7 +571,7 @@ class _CommunityDetailsState extends State { child: ListView.builder( scrollDirection: Axis.horizontal, shrinkWrap: true, - itemCount: titles.length, + itemCount: containerTitle.length, itemBuilder: (context, index) { return Padding( padding: EdgeInsets.only(right: 12.w), @@ -551,7 +579,7 @@ class _CommunityDetailsState extends State { onTap: () { Get.toNamed(RouteName.cyclescreen); }, - child: containertile(text: titles[index])), + child: containertile(text: containerTitle[index])), ); }, ), @@ -560,11 +588,18 @@ class _CommunityDetailsState extends State { text16w400_FCFCFC( "Lorem Ipsum has been the industry's standard dummy text ever since the 1500s . . ."), Row(children: [ + stackReaction(number: '20', containerImages: [ + 'assets/images/png/f7_hand-thumbsup.png', + 'assets/images/png/heart 2.png', + 'assets/images/png/party-popper 2.png' + ]), Spacer(), commonGlassContainer( - border: 0.9, + border: 0.43, width: 30.w, height: 30.h, + opacity1: 0.05, + opacity2: 0.06, borderradius: 100, customWidget: Center( child: ReactionButton( @@ -589,10 +624,12 @@ class _CommunityDetailsState extends State { text14w400_FCFCFC('20'), sizedBoxWidth(20.w), commonGlassContainer( - border: 0.9, + border: 0.43, width: 30.w, height: 30.h, borderradius: 100, + opacity1: 0.05, + opacity2: 0.06, customWidget: Center( child: ReactionButton( itemSize: Size.fromHeight(20), @@ -627,63 +664,58 @@ class _CommunityDetailsState extends State { Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - ReactionButton( - onReactionChanged: (reaction) { - debugPrint( - 'Selected value: ${reaction?.value}'); - }, - reactions: ?>[ - Reaction( + Obx(() { + return ReactionButton( + onReactionChanged: (reaction) { + updateImage(reaction?.value ?? 'like'); + debugPrint( + 'Selected value: ${reaction?.value}'); + }, + reactions: ?>[ + Reaction( + value: 'like', + previewIcon: _buildReactionsPreviewIcon( + 'assets/images/png/f7_hand-thumbsup.png'), + icon: _buildReactionsIcon( + 'assets/images/png/f7_hand-thumbsup.png'), + ), + Reaction( + value: 'heart', + previewIcon: _buildReactionsPreviewIcon( + 'assets/images/png/heart 2.png'), + icon: _buildReactionsIcon( + 'assets/images/png/heart 2.png'), + ), + Reaction( + value: 'party', + previewIcon: _buildReactionsPreviewIcon( + 'assets/images/png/party-popper 2.png'), + icon: _buildReactionsIcon( + 'assets/images/png/party-popper 2.png'), + ), + ], + selectedReaction: Reaction( value: 'like', - previewIcon: _buildReactionsPreviewIcon( - 'assets/images/png/f7_hand-thumbsup.png'), icon: _buildReactionsIcon( 'assets/images/png/f7_hand-thumbsup.png'), ), - Reaction( - value: 'heart', - previewIcon: _buildReactionsPreviewIcon( - 'assets/images/png/heart 2.png'), - icon: _buildReactionsIcon( - 'assets/images/png/heart 2.png'), - ), - Reaction( - value: 'party', - previewIcon: _buildReactionsPreviewIcon( - 'assets/images/png/party-popper 2.png'), - icon: _buildReactionsIcon( - 'assets/images/png/party-popper 2.png'), - ), - - // Add more reactions here if needed - ], - placeholder: Reaction( - value: 'like', - icon: _buildReactionsIcon( - 'assets/images/png/f7_hand-thumbsup.png'), - ), - selectedReaction: Reaction( - value: 'like', - icon: _buildReactionsIcon( - 'assets/images/png/f7_hand-thumbsup.png'), - ), - boxColor: Colors.white, - boxElevation: 5, - boxRadius: 50, - itemsSpacing: 8, - itemScale: 0.3, - itemSize: Size(40.w, 40.h), - boxPadding: EdgeInsets.all(4), - boxAnimationDuration: Duration(milliseconds: 200), - itemAnimationDuration: - Duration(milliseconds: 100), - hoverDuration: Duration(milliseconds: 400), - toggle: false, - direction: ReactionsBoxAlignment.ltr, - child: _buildReactionsIcon( - 'assets/images/png/uiw_like-o.png', - ), - ), + boxColor: Colors.white, + boxElevation: 5, + boxRadius: 50, + itemsSpacing: 8, + itemScale: 0.3, + itemSize: Size(40.0, 40.0), + boxPadding: EdgeInsets.all(4), + boxAnimationDuration: + Duration(milliseconds: 200), + itemAnimationDuration: + Duration(milliseconds: 100), + hoverDuration: Duration(milliseconds: 400), + toggle: false, + direction: ReactionsBoxAlignment.ltr, + child: _buildReactionsIcon(mainImage.value), + ); + }) ], ), ], @@ -692,16 +724,21 @@ class _CommunityDetailsState extends State { text11w400_FCFCFC('Like') ], ), - Column( - children: [ - Image.asset( - 'assets/images/png/Vector.png', - height: 19.h, - width: 19.w, - ), - sizedBoxHeight(8.h), - text11w400_FCFCFC('Comment') - ], + GestureDetector( + onTap: () { + Get.toNamed(RouteName.postdetailsScreen); + }, + child: Column( + children: [ + Image.asset( + 'assets/images/png/Vector.png', + height: 19.h, + width: 19.w, + ), + sizedBoxHeight(8.h), + text11w400_FCFCFC('Comment') + ], + ), ), Column( children: [ diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/View/MyCommunity.dart b/lib/Feed Module/sidemenu/Community/MyCommunity/View/MyCommunity.dart index 9ab8fbf..3721477 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/View/MyCommunity.dart +++ b/lib/Feed Module/sidemenu/Community/MyCommunity/View/MyCommunity.dart @@ -53,22 +53,28 @@ class _MyCommunityState extends State { titleTxt: "My Community", customActionWidget: Row( children: [ - Container( - height: 30.h, - width: 30.w, - decoration: BoxDecoration( - color: Color(0xFFD90B2E), - boxShadow: [ - BoxShadow( - color: Color(0xFF000000).withOpacity(0.25), - offset: Offset(0, 6), - blurRadius: 8, - ), - ], - shape: BoxShape.circle), - child: Icon( - Icons.add, - color: Colors.white, + GestureDetector( + onTap: () { + Get.toNamed(RouteName.newcommunity); + }, + child: Container( + height: 30.h, + width: 30.w, + decoration: BoxDecoration( + color: Color(0xFFD90B2E), + boxShadow: [ + BoxShadow( + color: Color(0x40000000), + offset: Offset(0, 6), + blurRadius: 8, + spreadRadius: 0, + ), + ], + shape: BoxShape.circle), + child: Icon( + Icons.add, + color: Colors.white, + ), ), ), sizedBoxWidth(12.w), @@ -179,6 +185,8 @@ class _MyCommunityState extends State { width: 30.w, height: 30.h, borderradius: 100.r, + opacity1: 0.24, + opacity2: 0.24, customWidget: Center( child: Image.asset( "assets/images/png/Black.png", @@ -308,5 +316,4 @@ class _MyCommunityState extends State { ), ); } - } diff --git a/lib/Utils/texts.dart b/lib/Utils/texts.dart index b16a056..3232d67 100644 --- a/lib/Utils/texts.dart +++ b/lib/Utils/texts.dart @@ -177,6 +177,18 @@ Widget text16w400white(String text, {TextAlign? textAlign}) { ), ); } +Widget text18w700white(String text, {TextAlign? textAlign}) { + return Text( + text, + textAlign: textAlign, + style: TextStyle( + fontSize: 18.sp, + fontFamily: 'Helvetica', + fontWeight: FontWeight.w700, + color: AppColors.white, + ), + ); +} Widget text14w400white(String text, {TextAlign? textAlign}) { return Text( diff --git a/lib/resources/routes/route_name.dart b/lib/resources/routes/route_name.dart index b9ac546..f96b1a1 100644 --- a/lib/resources/routes/route_name.dart +++ b/lib/resources/routes/route_name.dart @@ -16,13 +16,10 @@ class RouteName { static const String communitycommitscreen = '/communitycommitscreen'; static const String signupendpage = '/signupendpage'; - static const String businessletusunderstandstep1 = '/businessletusunderstand'; static const String businessSelectgroupstep2 = '/businessselectgroup'; static const String businessSelectcommunitystep3 = '/businessselectcommunity'; - - static const String communityScreen = '/communityScreen'; static const String mainscreen = '/mainscreen'; static const String sidemenu = '/sidemenu'; @@ -42,4 +39,9 @@ class RouteName { static const String newannouncement = '/newannouncement'; static const String announcementrequest = '/announcementrequest'; static const String managemembers = '/managemembers'; + static const String managegroups = '/managegroups'; + static const String addgroup = '/addgroup'; + static const String newcommunity = '/newcommunity'; + + } diff --git a/lib/resources/routes/routes.dart b/lib/resources/routes/routes.dart index d7f797b..b013d90 100644 --- a/lib/resources/routes/routes.dart +++ b/lib/resources/routes/routes.dart @@ -1,11 +1,14 @@ import 'package:get/get_navigation/src/routes/get_route.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/Login/View/loginscreen.dart'; @@ -122,46 +125,43 @@ class AppRoutes { name: RouteName.group, page: () => const Group(), ), - GetPage( + GetPage( name: RouteName.individualprofilestep1, page: () => const SelectIndividualProfile(), ), - GetPage( + GetPage( name: RouteName.individualactivitystep2, page: () => const SelectIndividualActivity(), ), - GetPage( + GetPage( name: RouteName.individualgroupstep3, page: () => const SelectIndividualGroup(), ), - GetPage( + GetPage( name: RouteName.individualcommunitystep4, page: () => const SelectIndividualCommunity(), ), - GetPage( + GetPage( name: RouteName.communitycommitscreen, page: () => const Communitycommitment(), ), - GetPage( + GetPage( name: RouteName.signupendpage, page: () => const SignupendPage(), ), - GetPage( + GetPage( name: RouteName.businessletusunderstandstep1, page: () => const LetusUnderstand(), ), - GetPage( + GetPage( name: RouteName.businessSelectgroupstep2, page: () => const SelectgroupStep2(), ), - GetPage( + GetPage( name: RouteName.businessSelectcommunitystep3, page: () => const SelectBusinessCommunity(), ), - - - - GetPage( + GetPage( name: RouteName.communitysetting, page: () => const CommunitySetting(), ), @@ -177,18 +177,29 @@ class AppRoutes { name: RouteName.newtag, page: () => const NewTag(), ), - GetPage( + GetPage( name: RouteName.newannouncement, page: () => const NewAnnouncement(), ), - GetPage( + GetPage( name: RouteName.announcementrequest, page: () => const AnnouncementRequest(), ), - GetPage( + GetPage( name: RouteName.managemembers, page: () => const ManageMembers(), ), - + GetPage( + name: RouteName.managegroups, + page: () => const ManageGroups(), + ), + GetPage( + name: RouteName.addgroup, + page: () => const AddGroup(), + ), + GetPage( + name: RouteName.newcommunity, + page: () => const NewCommunity(), + ), ]; }