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

Merge pull request #95 from WDI-Ideas/k25july

Browse Source 
K25july
This commit is contained in:
Kishan Bhuta
2024-08-01 18:50:40 +05:30
committed by GitHub
parent ac60eaecff 18886dc6c0
commit b2b2b1d6eb
14 changed files with 324 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Common/controller/MainController.dart
View File

@@ -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';

28
lib/Main_Screens/Community/Community.dart → lib/Main_Screens/Community_HomePage/Community.dart
View File

@@ -40,7 +40,6 @@ class _CommunityScreenState extends State<CommunityScreen> {
resizeToAvoidBottomInset: false,
key: _scaffoldKey1,
backgroundColor: const Color(0xFF222935),
// drawerEnableOpenDragGesture: false,
drawer: SizedBox(width: 300.w, child: const SideMenu()),
extendBody: true,
appBar: AppBar(
@@ -106,7 +105,6 @@ class _CommunityScreenState extends State<CommunityScreen> {
Expanded(
child: DefaultTabController(
length: 3,
// initialIndex: selectedIndex.value,
child: Column(
children: [
const CommonTabBar(tabs: [
@@ -144,7 +142,7 @@ class _CommunityScreenState extends State<CommunityScreen> {
borderRadius: BorderRadius.circular(30.r),
boxShadow: [
BoxShadow(
color: Color(0x40000000), // Hex color with 40% opacity
color: Color(0x40000000),
offset: Offset(0, 6),
blurRadius: 8,
),
@@ -176,7 +174,6 @@ class _CommunityScreenState extends State<CommunityScreen> {
// ),
),
),
bottomNavigationBar: bottomnavigationbar(mainController),
);
}
@@ -603,9 +600,7 @@ Widget normalcardtile2({
itemAnimationDuration:
const Duration(milliseconds: 500),
hoverDuration: const Duration(milliseconds: 700),
// toggle: false,
direction: ReactionsBoxAlignment.rtl,
child: _buildReactionsIcon(mainImage.value),
);
})
@@ -949,9 +944,7 @@ Widget normalcardtile({
itemAnimationDuration:
const Duration(milliseconds: 500),
hoverDuration: const Duration(milliseconds: 700),
// toggle: false,
direction: ReactionsBoxAlignment.rtl,
child: _buildReactionsIcon(mainImage.value),
);
})
@@ -1012,7 +1005,6 @@ Widget announcecardtile({
}
}
// MediaQuery.of(context).size.height
return Column(
children: [
commonGlassUIBlue(
@@ -1162,9 +1154,7 @@ Widget announcecardtile({
),
sizedBoxHeight(20.h),
GestureDetector(
onTap: () {
// Get.toNamed(RouteName.postdetailsScreen);
},
onTap: () {},
child: SizedBox(
height: 163.h,
width: double.infinity,
@@ -1187,9 +1177,7 @@ Widget announcecardtile({
return Padding(
padding: EdgeInsets.only(right: 12.w),
child: GestureDetector(
onTap: () {
// Get.toNamed(RouteName.cyclescreen);
},
onTap: () {},
child:
containertile2(text: containerTitle[index])),
);
@@ -1201,9 +1189,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',
@@ -1305,17 +1291,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(

2
lib/Main_Screens/Community/CycleScreen.dart → lib/Main_Screens/Community_HomePage/CycleScreen.dart
View File

@@ -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';

316
lib/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart → lib/Main_Screens/Community_HomePage/PostDetailScreen/View/PostDetailScreen.dart
View File

@@ -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<PostDetailsScreen> {
List<bool> _hideReplies = List.filled(5, true);
// bool _hideReplies = true;
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -50,60 +54,265 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
'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, Comment>(
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: <Widget>[
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: <Widget>[
// 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)
// ]))
]))
]));
}
@@ -333,7 +542,7 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
borderwidth: 0.9,
width: 30.w,
height: 30.h,
borderRadius: BorderRadius.circular(100),
borderRadius: BorderRadius.circular(100.r),
customWidget: Center(
child: Image.asset(
'assets/images/png/Frame 1000004088.png',
@@ -349,7 +558,7 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
borderwidth: 0.9,
width: 30.w,
height: 30.h,
borderRadius: BorderRadius.circular( 100),
borderRadius: BorderRadius.circular(100.r),
customWidget: Center(
child: Image.asset(
'assets/images/png/Vector (1).png',
@@ -419,7 +628,8 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
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),

0
lib/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart → lib/Main_Screens/Community_HomePage/PostDetailScreen/View/ReactionView.dart
View File

0
lib/Main_Screens/Community/PostScreen.dart → lib/Main_Screens/Community_HomePage/PostScreen.dart
View File

18
lib/Main_Screens/ProfileTab/Certificate/AddCertificate.dart
View File

@@ -131,9 +131,9 @@ class _AddCertificateState extends State<AddCertificate> {
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<AddCertificate> {
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<AddCertificate> {
],
),
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<AddCertificate> {
BorderRadius.circular(
5)),
),
child: Icon(
child: const Icon(
Icons.delete_outline_outlined,
color: Colors.white,
))),
@@ -337,8 +337,8 @@ class _AddCertificateState extends State<AddCertificate> {
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<AddCertificate> {
],
),
shape: RoundedRectangleBorder(
side: BorderSide(
side: const BorderSide(
width: 0.50,
color: Color(0xFF7E7E7E)),
borderRadius: BorderRadius.circular(10),

8
lib/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart
View File

@@ -353,7 +353,7 @@ class _EditProfileState extends State<EditProfile> {
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<EditProfile> {
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<EditProfile> {
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<EditProfile> {
sizedBoxHeight(16.h),
CustomTextFormField(
textEditingController: locationController,
leadingIcon: Container(
leadingIcon: SizedBox(
width: 18.w,
height: 17.h,
child: Center(

5
lib/Main_Screens/ProfileTab/My Network/MyNetwork.dart
View File

@@ -407,7 +407,7 @@ class _FollowersTabState extends State<FollowersTab> {
),
),
],
child: Container(
child: SizedBox(
height: 20,
width: 20,
child: Center(
@@ -495,7 +495,6 @@ class _FollowingTabState extends State<FollowingTab> {
@override
void initState() {
// TODO: implement initState
var updata = "";
Profilegetmethod().getFollowing(updata, streamController: searchcontroller);
@@ -750,7 +749,7 @@ class _FollowingTabState extends State<FollowingTab> {
),
),
],
child: Container(
child: SizedBox(
height: 20,
width: 20,
child: Center(

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

@@ -21,17 +21,17 @@ class _PrivacyPolicyState extends State<PrivacyPolicy> {
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) {

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

@@ -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),
),
),
),

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

@@ -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';

24
pubspec.lock
View File

@@ -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:

1
pubspec.yaml
View File

@@ -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