From 0ce171917960443dae329e0a11c68eb6645de1b5 Mon Sep 17 00:00:00 2001 From: kishan06 Date: Thu, 1 Aug 2024 17:57:15 +0530 Subject: [PATCH] comment tree added --- lib/Common/controller/MainController.dart | 2 +- .../Community.dart | 65 +--- .../CycleScreen.dart | 2 +- .../View/PostDetailScreen.dart | 353 ++++++++++++++---- .../PostDetailScreen/View/ReactionView.dart | 181 +++++---- .../PostScreen.dart | 0 .../Certificate/AddCertificate.dart | 18 +- .../EditProfile/View/EditProfile.dart | 8 +- .../ProfileTab/My Network/MyNetwork.dart | 5 +- .../ProfileTab/Settings/PrivacyPolicy.dart | 6 +- lib/Utils/Common/CommonAppbar.dart | 11 +- lib/resources/routes/routes.dart | 10 +- pubspec.lock | 24 ++ pubspec.yaml | 1 + 14 files changed, 433 insertions(+), 253 deletions(-) rename lib/Main_Screens/{Community => Community_HomePage}/Community.dart (95%) rename lib/Main_Screens/{Community => Community_HomePage}/CycleScreen.dart (99%) rename lib/Main_Screens/{Community => Community_HomePage}/PostDetailScreen/View/PostDetailScreen.dart (55%) rename lib/Main_Screens/{Community => Community_HomePage}/PostDetailScreen/View/ReactionView.dart (61%) rename lib/Main_Screens/{Community => Community_HomePage}/PostScreen.dart (100%) diff --git a/lib/Common/controller/MainController.dart b/lib/Common/controller/MainController.dart index 759e536..c6c63da 100644 --- a/lib/Common/controller/MainController.dart +++ b/lib/Common/controller/MainController.dart @@ -1,7 +1,7 @@ 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/Community_HomePage/Community.dart'; import 'package:regroup/Main_Screens/GroupTab/View/GroupTab.dart'; import 'package:regroup/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart'; diff --git a/lib/Main_Screens/Community/Community.dart b/lib/Main_Screens/Community_HomePage/Community.dart similarity index 95% rename from lib/Main_Screens/Community/Community.dart rename to lib/Main_Screens/Community_HomePage/Community.dart index 9a0336a..33b3e1d 100644 --- a/lib/Main_Screens/Community/Community.dart +++ b/lib/Main_Screens/Community_HomePage/Community.dart @@ -35,7 +35,6 @@ class _CommunityScreenState extends State { resizeToAvoidBottomInset: false, key: _scaffoldKey1, backgroundColor: const Color(0xFF222935), - // drawerEnableOpenDragGesture: false, drawer: SizedBox(width: 300.w, child: const SideMenu()), extendBody: true, appBar: AppBar( @@ -101,7 +100,6 @@ class _CommunityScreenState extends State { Expanded( child: DefaultTabController( length: 3, - // initialIndex: selectedIndex.value, child: Column( children: [ const CommonTabBar(tabs: [ @@ -138,7 +136,7 @@ class _CommunityScreenState extends State { shape: BoxShape.circle, boxShadow: [ BoxShadow( - color: Color(0x40000000), // Hex color with 40% opacity + color: Color(0x40000000), offset: Offset(0, 6), blurRadius: 8, ), @@ -158,7 +156,6 @@ class _CommunityScreenState extends State { ), ), ), - bottomNavigationBar: bottomnavigationbar(mainController), ); } @@ -244,30 +241,6 @@ Widget feedTab() { }, ), ), - // normalcardtile2( - // profileImg: 'assets/images/png/Ellipse 43.png', - // title: 'Edward Hackket', - // mainImg: 'assets/images/png/Rectangle 24.png', - // containerTitle: ['Cycle', 'Marathon', 'Events', 'Marathon', 'Events']), - // sizedBoxHeight(20.h), - // announcecardtile( - // profileImg: 'assets/images/png/Ellipse 48.png', - // title: 'Jocelyn Dokidis', - // mainImg: 'assets/images/png/Rectangle 46.png', - // containerTitle: ['Race', 'Swimming', 'Events', 'Marathon', 'Events']), - // sizedBoxHeight(20.h), - // normalcardtile2( - // profileImg: 'assets/images/png/Ellipse 52.png', - // title: 'Ryan Dorwat', - // mainImg: 'assets/images/png/Rectangle 25.png', - // containerTitle: [ - // 'Football', - // 'Teams player', - // 'Events', - // 'Marathon', - // 'Events' - // ]), - // sizedBoxHeight(20.h), ]); } @@ -573,9 +546,7 @@ Widget normalcardtile2({ itemAnimationDuration: const Duration(milliseconds: 500), hoverDuration: const Duration(milliseconds: 700), - // toggle: false, direction: ReactionsBoxAlignment.rtl, - child: _buildReactionsIcon(mainImage.value), ); }) @@ -919,9 +890,7 @@ Widget normalcardtile({ itemAnimationDuration: const Duration(milliseconds: 500), hoverDuration: const Duration(milliseconds: 700), - // toggle: false, direction: ReactionsBoxAlignment.rtl, - child: _buildReactionsIcon(mainImage.value), ); }) @@ -982,7 +951,6 @@ Widget announcecardtile({ } } -// MediaQuery.of(context).size.height return Column( children: [ commonGlassUIBlue( @@ -1132,9 +1100,7 @@ Widget announcecardtile({ ), sizedBoxHeight(20.h), GestureDetector( - onTap: () { - // Get.toNamed(RouteName.postdetailsScreen); - }, + onTap: () {}, child: SizedBox( height: 163.h, width: double.infinity, @@ -1157,9 +1123,7 @@ Widget announcecardtile({ return Padding( padding: EdgeInsets.only(right: 12.w), child: GestureDetector( - onTap: () { - // Get.toNamed(RouteName.cyclescreen); - }, + onTap: () {}, child: containertile2(text: containerTitle[index])), ); @@ -1171,9 +1135,7 @@ Widget announcecardtile({ "Lorem Ipsum has been the industry's standard dummy text ever since the 1500s . . ."), Row(children: [ InkWell( - onTap: () { - // Get.toNamed(RouteName.reactionview); - }, + onTap: () {}, child: stackReaction(number: '20', containerImages: [ 'assets/images/png/f7_hand-thumbsup.png', 'assets/images/png/heart 2.png', @@ -1275,17 +1237,13 @@ Widget announcecardtile({ itemAnimationDuration: const Duration(milliseconds: 500), hoverDuration: const Duration(milliseconds: 700), - // toggle: false, - child: _buildReactionsIcon(mainImage.value), ); }) ], ), GestureDetector( - onTap: () { - // Get.toNamed(RouteName.postdetailsScreen); - }, + onTap: () {}, child: Column( children: [ Image.asset( @@ -1526,18 +1484,5 @@ Widget latestTab() { }, ), ), - - // normalcardtile2( - // profileImg: 'assets/images/png/Ellipse 43.png', - // title: 'Edward Hackket', - // mainImg: 'assets/images/png/Rectangle 24.png', - // containerTitle: ['Cycle', 'Marathon', 'Events', 'Marathon', 'Events']), - // sizedBoxHeight(20.h), - // announcecardtile( - // profileImg: 'assets/images/png/Ellipse 48.png', - // title: 'Jocelyn Dokidis', - // mainImg: 'assets/images/png/Rectangle 46.png', - // containerTitle: ['Race', 'Swimming', 'Events', 'Marathon', 'Events']), - // sizedBoxHeight(20.h), ]); } diff --git a/lib/Main_Screens/Community/CycleScreen.dart b/lib/Main_Screens/Community_HomePage/CycleScreen.dart similarity index 99% rename from lib/Main_Screens/Community/CycleScreen.dart rename to lib/Main_Screens/Community_HomePage/CycleScreen.dart index 3849ef3..225b36c 100644 --- a/lib/Main_Screens/Community/CycleScreen.dart +++ b/lib/Main_Screens/Community_HomePage/CycleScreen.dart @@ -5,7 +5,7 @@ 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/Main_Screens/Community/Community.dart'; +import 'package:regroup/Main_Screens/Community_HomePage/Community.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/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart b/lib/Main_Screens/Community_HomePage/PostDetailScreen/View/PostDetailScreen.dart similarity index 55% rename from lib/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart rename to lib/Main_Screens/Community_HomePage/PostDetailScreen/View/PostDetailScreen.dart index d028ed2..e443cd5 100644 --- a/lib/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart +++ b/lib/Main_Screens/Community_HomePage/PostDetailScreen/View/PostDetailScreen.dart @@ -1,4 +1,6 @@ +import 'package:comment_tree/comment_tree.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter_reaction_button/flutter_reaction_button.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; @@ -18,6 +20,8 @@ class PostDetailsScreen extends StatefulWidget { } class _PostDetailsScreenState extends State { + List _hideReplies = List.filled(5, true); + // bool _hideReplies = true; @override Widget build(BuildContext context) { return Scaffold( @@ -50,60 +54,265 @@ class _PostDetailsScreenState extends State { 'Events' ]), sizedBoxHeight(35.h), - Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Column(children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - CircleAvatar( - radius: 20.r, - foregroundImage: const AssetImage( - "assets/images/png/Ellipse 48.png", - ), - ), - sizedBoxWidth(15.w), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text12w400_FCFCFC_blur("Roger Saris"), - text14w400_FCFCFC( - "Lorem Ipsum has been the industry's standard dummy text 😍"), - text10w400_FCFCFC_blur("Reply. . . ") - ], - ), - ), + ListView.builder( + physics: const NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemCount: 2, + itemBuilder: (context, index) { + return Container( + padding: const EdgeInsets.symmetric( + vertical: 12, horizontal: 16), + child: CommentTreeWidget( + Comment( + avatar: 'assets/images/png/Ellipse 52.png', + userName: 'Krishna', + content: + 'felangel made felangel/cubit_and_beyond public'), + [ + Comment( + avatar: 'assets/images/png/Ellipse 52.png', + userName: 'Kishan', + content: 'Sample comment from kishan'), + Comment( + avatar: 'assets/images/png/Ellipse 52.png', + userName: 'Ram', + content: + 'A Dart template generator which helps teams generator which helps teams generator which helps teams'), + // Comment( + // avatar: 'null', + // userName: 'null', + // content: + // 'A Dart template generator which helps teams'), + // Comment( + // avatar: 'null', + // userName: 'null', + // content: + // 'A Dart template generator which helps teams generator which helps teams '), ], - ), - sizedBoxHeight(50.h), - Align( - alignment: Alignment.bottomCenter, - child: Padding( - padding: const EdgeInsets.only(top: 15, bottom: 15), - child: Row( - children: [ - Expanded( - child: CustomTextFormField( - hintText: "Add comment", - suffixIcon: SizedBox( - height: 20.h, - width: 25.w, - child: Center( - child: Image.asset( - "assets/images/png/iconoir_send.png", - height: 20.h, - width: 25.w, - ), - ), + treeThemeData: const TreeThemeData( + lineColor: Color(0xFFD90B2E), lineWidth: 2.5), + avatarRoot: (context, data) => const PreferredSize( + preferredSize: Size.fromRadius(18), + child: CircleAvatar( + radius: 18, + backgroundColor: Colors.grey, + backgroundImage: AssetImage( + 'assets/images/png/Ellipse 52.png', + ), + ), + ), + avatarChild: (context, data) => const PreferredSize( + preferredSize: Size.fromRadius(12), + child: CircleAvatar( + radius: 12, + backgroundColor: Colors.grey, + backgroundImage: AssetImage( + 'assets/images/png/Ellipse 52.png', + ), + ), + ), + contentChild: (context, data) { + print("printing"); + return data.userName! == "Ram" && _hideReplies[index] + ? GestureDetector( + onTap: () { + setState(() { + _hideReplies[index] = false; + }); + }, + child: Container( + child: const Text( + "View more", + style: TextStyle(color: Colors.white), ), ), ) - ], - ), - )), - sizedBoxHeight(85.h) - ])) + : Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + padding: const EdgeInsets.symmetric( + vertical: 8, horizontal: 8), + decoration: BoxDecoration( + color: Colors.grey[100], + borderRadius: + BorderRadius.circular(12)), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Text( + '${data.userName}', + style: Theme.of(context) + .textTheme + .bodySmall + ?.copyWith( + fontWeight: FontWeight.w600, + color: Colors.black), + ), + const SizedBox( + height: 4, + ), + Text( + '${data.content}', + style: Theme.of(context) + .textTheme + .bodySmall + ?.copyWith( + fontWeight: FontWeight.w300, + color: Colors.black), + ), + ], + ), + ), + DefaultTextStyle( + style: Theme.of(context) + .textTheme + .bodySmall! + .copyWith( + color: Colors.grey[700], + fontWeight: FontWeight.bold), + child: const Padding( + padding: EdgeInsets.only(top: 4), + child: Row( + children: [ + SizedBox( + width: 8, + ), + Text('Like'), + SizedBox( + width: 24, + ), + Text('Reply'), + ], + ), + ), + ) + ], + ); + }, + contentRoot: (context, data) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + padding: const EdgeInsets.symmetric( + vertical: 8, horizontal: 8), + decoration: BoxDecoration( + color: Colors.grey[100], + borderRadius: BorderRadius.circular(12)), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'dangngocduc', + style: Theme.of(context) + .textTheme + .bodySmall! + .copyWith( + fontWeight: FontWeight.w600, + color: Colors.black), + ), + const SizedBox( + height: 4, + ), + Text( + '${data.content}', + style: Theme.of(context) + .textTheme + .bodySmall! + .copyWith( + fontWeight: FontWeight.w300, + color: Colors.black), + ), + ], + ), + ), + DefaultTextStyle( + style: Theme.of(context) + .textTheme + .bodySmall! + .copyWith( + color: Colors.grey[700], + fontWeight: FontWeight.bold), + child: const Padding( + padding: EdgeInsets.only(top: 4), + child: Row( + children: [ + SizedBox( + width: 8, + ), + Text('Like'), + SizedBox( + width: 24, + ), + Text('Reply'), + ], + ), + ), + ) + ], + ); + }, + ), + ); + }, + ), + + // Padding( + // padding: EdgeInsets.symmetric(horizontal: 16.w), + // child: Column(children: [ + // Row( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // CircleAvatar( + // radius: 20.r, + // foregroundImage: const AssetImage( + // "assets/images/png/Ellipse 48.png", + // ), + // ), + // sizedBoxWidth(15.w), + // Expanded( + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // text12w400_FCFCFC_blur("Roger Saris"), + // text14w400_FCFCFC( + // "Lorem Ipsum has been the industry's standard dummy text 😍"), + // text10w400_FCFCFC_blur("Reply. . . ") + // ], + // ), + // ), + // ], + // ), + // sizedBoxHeight(50.h), + // Align( + // alignment: Alignment.bottomCenter, + // child: Padding( + // padding: const EdgeInsets.only(top: 15, bottom: 15), + // child: Row( + // children: [ + // Expanded( + // child: CustomTextFormField( + // hintText: "Add comment", + // suffixIcon: SizedBox( + // height: 20.h, + // width: 25.w, + // child: Center( + // child: Image.asset( + // "assets/images/png/iconoir_send.png", + // height: 20.h, + // width: 25.w, + // ), + // ), + // ), + // ), + // ) + // ], + // ), + // )), + // sizedBoxHeight(85.h) + // ])) ])) ])); } @@ -125,11 +334,11 @@ class _PostDetailsScreenState extends State { } } - return commonGlassContainer( + return commonGlassUI( width: double.infinity, height: 570.h, - border: 0, - borderradius: 0, + borderwidth: 0.5, + borderRadius: BorderRadius.circular(0.r), customWidget: Column( children: [ sizedBoxHeight(25.h), @@ -151,14 +360,15 @@ class _PostDetailsScreenState extends State { children: [ text16w400_FCFCFC(title), const Spacer(), - commonGlassContainer( - width: 72.w, - height: 26.h, - borderradius: 5.r, - borderColor: const Color(0xFFD90B2E), - customWidget: - Center(child: text14400white("Follow")), - border: 1), + commonGlassUI( + width: 72.w, + height: 26.h, + borderRadius: BorderRadius.circular(5.r), + borderColor: const Color(0xFFD90B2E), + customWidget: + Center(child: text14400white("Follow")), + borderwidth: 0.9, + ), sizedBoxWidth(6.w), PopupMenuButton( surfaceTintColor: const Color(0xFF222935), @@ -329,11 +539,11 @@ class _PostDetailsScreenState extends State { 'assets/images/png/party-popper 2.png' ]), const Spacer(), - commonGlassContainer( - border: 0.9, + commonGlassUI( + borderwidth: 0.9, width: 30.w, height: 30.h, - borderradius: 100, + borderRadius: BorderRadius.circular(100.r), customWidget: Center( child: Image.asset( 'assets/images/png/Frame 1000004088.png', @@ -345,11 +555,11 @@ class _PostDetailsScreenState extends State { sizedBoxWidth(12.w), text14w400_FCFCFC('20'), sizedBoxWidth(20.w), - commonGlassContainer( - border: 0.9, + commonGlassUI( + borderwidth: 0.9, width: 30.w, height: 30.h, - borderradius: 100, + borderRadius: BorderRadius.circular(100.r), customWidget: Center( child: Image.asset( 'assets/images/png/Vector (1).png', @@ -419,7 +629,8 @@ class _PostDetailsScreenState extends State { const Duration(milliseconds: 200), itemAnimationDuration: const Duration(milliseconds: 500), - hoverDuration: const Duration(milliseconds: 700), + hoverDuration: + const Duration(milliseconds: 700), // toggle: false, child: _buildReactionsIcon(mainImage.value), @@ -452,11 +663,11 @@ class _PostDetailsScreenState extends State { } Widget containertile({required String text}) { - return commonGlassContainer( - border: 0.9, + return commonGlassUI( + borderwidth: 0.9, width: 100.w, height: 30.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular(30.r), borderColor: const Color(0xFFD90B2E), customWidget: Padding( padding: EdgeInsets.symmetric(horizontal: 10.w), diff --git a/lib/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart b/lib/Main_Screens/Community_HomePage/PostDetailScreen/View/ReactionView.dart similarity index 61% rename from lib/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart rename to lib/Main_Screens/Community_HomePage/PostDetailScreen/View/ReactionView.dart index 8519d05..8c2ee07 100644 --- a/lib/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart +++ b/lib/Main_Screens/Community_HomePage/PostDetailScreen/View/ReactionView.dart @@ -73,102 +73,101 @@ class _ReactionViewState 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, - children: [ - sizedBoxHeight(10.h), - Expanded( - child: DefaultTabController( - length: 4, - // initialIndex: selectedIndex.value, - child: Column(children: [ - CommonTabBar(tabs: [ - const Tab( - text: 'All', - ), - Tab( - child: Row(children: [ - commonGlassContainer( - borderColor: const Color(0xFF1E3A46), - opacity1: 0.05, - opacity2: 0.06, - width: 30.w, - height: 30.h, - borderradius: 100, - customWidget: Center( - child: Image.asset( - "assets/images/png/f7_hand-thumbsup.png", - height: 17.h, - width: 17.w, - ), - ), - border: 1.71), - const Spacer(), - text14400white("110K"), - ]), - ), - Tab( - child: Row(children: [ - commonGlassContainer( - borderColor: const Color(0xFF1E3A46), - opacity1: 0.05, - opacity2: 0.06, - width: 30.w, - height: 30.h, - borderradius: 100, - customWidget: Center( - child: Image.asset( - "assets/images/png/heart 2.png", - height: 17.h, - width: 17.w, - ), - ), - border: 1.71), - const Spacer(), - text14400white("9.7K"), - ]), - ), - Tab( - child: Row(children: [ - commonGlassContainer( - borderColor: const Color(0xFF1E3A46), - opacity1: 0.05, - opacity2: 0.06, - width: 30.w, - height: 30.h, - borderradius: 100, - customWidget: Center( - child: Image.asset( - "assets/images/png/party-popper 2.png", - height: 17.h, - width: 17.w, - ), - ), - border: 1.71), - const Spacer(), - text14400white("7.4K"), - ]), - ), + ), + Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + sizedBoxHeight(10.h), + Expanded( + child: DefaultTabController( + length: 4, + // initialIndex: selectedIndex.value, + child: Column(children: [ + CommonTabBar(tabs: [ + const Tab( + text: 'All', + ), + Tab( + child: Row(children: [ + commonGlassContainer( + borderColor: const Color(0xFF1E3A46), + opacity1: 0.05, + opacity2: 0.06, + width: 30.w, + height: 30.h, + borderradius: 100, + customWidget: Center( + child: Image.asset( + "assets/images/png/f7_hand-thumbsup.png", + height: 17.h, + width: 17.w, + ), + ), + border: 1.71), + const Spacer(), + text14400white("110K"), ]), - Expanded( - child: TabBarView( - children: [ - allTab(), - likeTab(), - favouriteTab(), - partyTab(), - ], - ), - ), - sizedBoxHeight(20.h) - ])), - ) - ]) + ), + Tab( + child: Row(children: [ + commonGlassContainer( + borderColor: const Color(0xFF1E3A46), + opacity1: 0.05, + opacity2: 0.06, + width: 30.w, + height: 30.h, + borderradius: 100, + customWidget: Center( + child: Image.asset( + "assets/images/png/heart 2.png", + height: 17.h, + width: 17.w, + ), + ), + border: 1.71), + const Spacer(), + text14400white("9.7K"), + ]), + ), + Tab( + child: Row(children: [ + commonGlassContainer( + borderColor: const Color(0xFF1E3A46), + opacity1: 0.05, + opacity2: 0.06, + width: 30.w, + height: 30.h, + borderradius: 100, + customWidget: Center( + child: Image.asset( + "assets/images/png/party-popper 2.png", + height: 17.h, + width: 17.w, + ), + ), + border: 1.71), + const Spacer(), + text14400white("7.4K"), + ]), + ), + ]), + Expanded( + child: TabBarView( + children: [ + allTab(), + likeTab(), + favouriteTab(), + partyTab(), + ], + ), + ), + sizedBoxHeight(20.h) + ])), + ) + ]) ])); } diff --git a/lib/Main_Screens/Community/PostScreen.dart b/lib/Main_Screens/Community_HomePage/PostScreen.dart similarity index 100% rename from lib/Main_Screens/Community/PostScreen.dart rename to lib/Main_Screens/Community_HomePage/PostScreen.dart diff --git a/lib/Main_Screens/ProfileTab/Certificate/AddCertificate.dart b/lib/Main_Screens/ProfileTab/Certificate/AddCertificate.dart index 2cc96d6..970e945 100644 --- a/lib/Main_Screens/ProfileTab/Certificate/AddCertificate.dart +++ b/lib/Main_Screens/ProfileTab/Certificate/AddCertificate.dart @@ -131,9 +131,9 @@ class _AddCertificateState extends State { onTap: () => FocusManager.instance.primaryFocus?.unfocus(), child: Scaffold( // key: _scaffoldKey1, - backgroundColor: Color(0xFF222935), + backgroundColor: const Color(0xFF222935), extendBody: true, - appBar: CommonAppbar( + appBar: const CommonAppbar( titleTxt: "Add certifications", ), body: Stack(children: [ @@ -248,8 +248,8 @@ class _AddCertificateState extends State { width: double.infinity, 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), @@ -258,7 +258,7 @@ class _AddCertificateState extends State { ], ), shape: RoundedRectangleBorder( - side: BorderSide( + side: const BorderSide( width: 0.50, color: Color(0xFF7E7E7E)), borderRadius: BorderRadius.circular(10), @@ -292,7 +292,7 @@ class _AddCertificateState extends State { BorderRadius.circular( 5)), ), - child: Icon( + child: const Icon( Icons.delete_outline_outlined, color: Colors.white, ))), @@ -337,8 +337,8 @@ class _AddCertificateState extends State { height: 167, 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), @@ -347,7 +347,7 @@ class _AddCertificateState extends State { ], ), shape: RoundedRectangleBorder( - side: BorderSide( + side: const BorderSide( width: 0.50, color: Color(0xFF7E7E7E)), borderRadius: BorderRadius.circular(10), diff --git a/lib/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart b/lib/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart index 3a512b3..a269c07 100644 --- a/lib/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart +++ b/lib/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart @@ -353,7 +353,7 @@ class _EditProfileState extends State { sizedBoxHeight(16.h), CustomTextFormField( textEditingController: fullNameController, - leadingIcon: Container( + leadingIcon: SizedBox( width: 18.w, height: 17.h, child: Center( @@ -375,7 +375,7 @@ class _EditProfileState extends State { sizedBoxHeight(16.h), CustomTextFormField( textEditingController: userNameController, - leadingIcon: Container( + leadingIcon: SizedBox( width: 18.w, height: 17.h, child: Center( @@ -400,7 +400,7 @@ class _EditProfileState extends State { datePicker(context, dateController), child: AbsorbPointer( child: CustomTextFormField( - leadingIcon: Container( + leadingIcon: SizedBox( width: 18.0, height: 17.0, child: Center( @@ -452,7 +452,7 @@ class _EditProfileState extends State { sizedBoxHeight(16.h), CustomTextFormField( textEditingController: locationController, - leadingIcon: Container( + leadingIcon: SizedBox( width: 18.w, height: 17.h, child: Center( diff --git a/lib/Main_Screens/ProfileTab/My Network/MyNetwork.dart b/lib/Main_Screens/ProfileTab/My Network/MyNetwork.dart index ed11f14..b6041ab 100644 --- a/lib/Main_Screens/ProfileTab/My Network/MyNetwork.dart +++ b/lib/Main_Screens/ProfileTab/My Network/MyNetwork.dart @@ -407,7 +407,7 @@ class _FollowersTabState extends State { ), ), ], - child: Container( + child: SizedBox( height: 20, width: 20, child: Center( @@ -495,7 +495,6 @@ class _FollowingTabState extends State { @override void initState() { - // TODO: implement initState var updata = ""; Profilegetmethod().getFollowing(updata, streamController: searchcontroller); @@ -750,7 +749,7 @@ class _FollowingTabState extends State { ), ), ], - child: Container( + child: SizedBox( height: 20, width: 20, child: Center( diff --git a/lib/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart b/lib/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart index 7f7b775..143bd0a 100644 --- a/lib/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart +++ b/lib/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart @@ -21,17 +21,17 @@ class _PrivacyPolicyState 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: "Privacy policy", ), body: FutureBuilder( future: Profilegetmethod().getPrivacypolicy(), 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/Utils/Common/CommonAppbar.dart b/lib/Utils/Common/CommonAppbar.dart index 614fd4b..6079eca 100644 --- a/lib/Utils/Common/CommonAppbar.dart +++ b/lib/Utils/Common/CommonAppbar.dart @@ -59,10 +59,11 @@ class CommonAppbar extends StatelessWidget implements PreferredSizeWidget { @override Widget build(BuildContext context) { return PreferredSize( - preferredSize: Size.fromHeight(80), + preferredSize: const Size.fromHeight(80), child: AppBar( + centerTitle: false, scrolledUnderElevation: 0.0, - backgroundColor: Color(0xFF222935).withOpacity(0.50), + backgroundColor: const Color(0xFF222935).withOpacity(0.50), elevation: 0, automaticallyImplyLeading: false, titleSpacing: 0, @@ -86,7 +87,7 @@ class CommonAppbar extends StatelessWidget implements PreferredSizeWidget { fontFamily: 'Helvetica', fontSize: 20.sp, fontWeight: FontWeight.w400, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), ), ), ), @@ -96,7 +97,7 @@ class CommonAppbar extends StatelessWidget implements PreferredSizeWidget { ) : SingleChildScrollView( scrollDirection: Axis.horizontal, - padding: EdgeInsets.only(top: 10), + padding: const EdgeInsets.only(top: 10), child: Row( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, @@ -112,7 +113,7 @@ class CommonAppbar extends StatelessWidget implements PreferredSizeWidget { fontFamily: 'Helvetica', fontSize: 20.sp, fontWeight: FontWeight.w400, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), ), ), ), diff --git a/lib/resources/routes/routes.dart b/lib/resources/routes/routes.dart index 6eb2bed..e641a4d 100644 --- a/lib/resources/routes/routes.dart +++ b/lib/resources/routes/routes.dart @@ -11,11 +11,11 @@ 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/Community_HomePage/Community.dart'; +import 'package:regroup/Main_Screens/Community_HomePage/CycleScreen.dart'; +import 'package:regroup/Main_Screens/Community_HomePage/PostDetailScreen/View/PostDetailScreen.dart'; +import 'package:regroup/Main_Screens/Community_HomePage/PostDetailScreen/View/ReactionView.dart'; +import 'package:regroup/Main_Screens/Community_HomePage/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'; diff --git a/pubspec.lock b/pubspec.lock index 0919602..35f959c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -89,6 +89,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.18.0" + comment_tree: + dependency: "direct main" + description: + name: comment_tree + sha256: f99978c6f4a47f9aec284753cc10442e509851d7d86192b963db70e6873f2ddb + url: "https://pub.dev" + source: hosted + version: "0.3.0" connectivity_plus: dependency: "direct main" description: @@ -808,6 +816,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.5" + nested: + dependency: transitive + description: + name: nested + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" + source: hosted + version: "1.0.0" nm: dependency: transitive description: @@ -968,6 +984,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.8" + provider: + dependency: transitive + description: + name: provider + sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c + url: "https://pub.dev" + source: hosted + version: "6.1.2" remove_emoji_input_formatter: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 0772b32..2f9ba08 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -76,6 +76,7 @@ dependencies: sign_in_with_apple: any timer_button: ^2.1.1 flutter_html: ^3.0.0-beta.2 + comment_tree: ^0.3.0