diff --git a/assets/images/png/BottomBar/groupBottomBarIcon.svg b/assets/images/png/BottomBar/groupBottomBarIcon.svg
new file mode 100644
index 0000000..0c8f561
--- /dev/null
+++ b/assets/images/png/BottomBar/groupBottomBarIcon.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/png/HomeScreenBackground.png b/assets/images/png/HomeScreenBackground.png
new file mode 100644
index 0000000..0058369
Binary files /dev/null and b/assets/images/png/HomeScreenBackground.png differ
diff --git a/assets/images/png/unactiveHomeBottomBar.svg b/assets/images/png/unactiveHomeBottomBar.svg
new file mode 100644
index 0000000..a0507a0
--- /dev/null
+++ b/assets/images/png/unactiveHomeBottomBar.svg
@@ -0,0 +1,3 @@
+
diff --git a/lib/Common/CommonBottomNavigationBar.dart b/lib/Common/CommonBottomNavigationBar.dart
index 2be08c2..d187bce 100644
--- a/lib/Common/CommonBottomNavigationBar.dart
+++ b/lib/Common/CommonBottomNavigationBar.dart
@@ -7,7 +7,7 @@ import 'package:regroup/Common/controller/MainController.dart';
GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
return GlassmorphicContainer(
width: double.infinity,
- height: 83.h,
+ height: 100.h,
borderRadius: 2,
blur: 6,
alignment: Alignment.center,
@@ -38,6 +38,7 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
selectedItemColor: Colors.white,
unselectedItemColor: const Color(0xFF676767),
unselectedLabelStyle: TextStyle(
+ height: 3,
fontSize: 10.sp,
color: const Color(0xFF676767),
fontWeight: FontWeight.w400,
@@ -54,26 +55,21 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
items: [
BottomNavigationBarItem(
icon: SvgPicture.asset(
- 'assets/images/svg/fluent_home-20-regular.svg',
+ 'assets/images/png/unactiveHomeBottomBar.svg',
height: 25.h,
- width: 25.w,
+ // width: 25.w,
),
- // Icon(
- // Icons.home,
- // color: Color(0xFF676767),
- // ),
activeIcon: Stack(
clipBehavior: Clip.none,
children: [
if (_mainController.selectedIndex.value == 0)
Container(
- height: 39.h,
- // width: 40.w,
+ height: 25.h,
decoration: BoxDecoration(
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
- color: Colors.amber,
+ color: const Color(0xFFD90B2E).withOpacity(0.5),
spreadRadius: 15,
blurRadius: 25,
offset: const Offset(0, 10),
@@ -98,37 +94,34 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
right: 0,
left: 0,
child: Center(
- child: SvgPicture.asset(
- 'assets/images/svg/fluent_home-20-regular.svg',
- // height: 25.h,
- // width: 25.w,
+ child: Image.asset(
+ "assets/images/png/BottomBar/ActiveHome.png",
+ height: 30.h,
+ width: 30.w,
),
),
)
],
),
-
- // activeIcon: SvgPicture.asset('assets/image/svg/active_home.svg'),
label: 'Community',
),
BottomNavigationBarItem(
- icon: Image.asset(
- 'assets/images/png/BottomBar/inactiveGroup.png',
- height: 26.h,
- width: 26.w,
+ icon: SvgPicture.asset(
+ 'assets/images/png/BottomBar/groupBottomBarIcon.svg',
+ height: 25.h,
+ // width: 25.w,
),
activeIcon: Stack(
clipBehavior: Clip.none,
children: [
if (_mainController.selectedIndex.value == 1)
Container(
- height: 40.h,
- width: 40.w,
+ height: 25.h,
decoration: BoxDecoration(
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
- color: const Color(0xFFD90B2E).withOpacity(0.16),
+ color: const Color(0xFFD90B2E).withOpacity(0.5),
spreadRadius: 15,
blurRadius: 25,
offset: const Offset(0, 10),
@@ -136,17 +129,17 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
],
),
),
- Positioned(
- left: 0,
- right: 0,
- top: -15,
- child: Container(
- height: 2.h,
- width: 20.w,
- decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(10.r),
- color: const Color(0xFFD90B2E)),
- )),
+ // Positioned(
+ // left: 0,
+ // right: 0,
+ // //top: -20,
+ // child: Container(
+ // height: 2.h,
+ // // width: 10.w,
+ // decoration: BoxDecoration(
+ // borderRadius: BorderRadius.circular(10.r),
+ // color: const Color(0xFFD90B2E)),
+ // )),
Positioned(
left: 0,
right: 0,
@@ -168,16 +161,15 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
BottomNavigationBarItem(
icon: Image.asset(
'assets/images/png/BottomBar/inactiveCal.png',
- height: 24.h,
- width: 24.w,
+ height: 25.h,
+ width: 25.w,
),
activeIcon: Stack(
clipBehavior: Clip.none,
children: [
if (_mainController.selectedIndex.value == 2)
Container(
- height: 40.h,
- width: 40.w,
+ height: 25.h,
decoration: BoxDecoration(
shape: BoxShape.circle,
boxShadow: [
@@ -190,17 +182,17 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
],
),
),
- Positioned(
- left: 0,
- right: 0,
- top: -15,
- child: Container(
- height: 2.h,
- width: 20.w,
- decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(10.r),
- color: const Color(0xFFD90B2E)),
- )),
+ // Positioned(
+ // left: 0,
+ // right: 0,
+ // top: -15,
+ // child: Container(
+ // height: 2.h,
+ // width: 20.w,
+ // decoration: BoxDecoration(
+ // borderRadius: BorderRadius.circular(10.r),
+ // color: const Color(0xFFD90B2E)),
+ // )),
Positioned(
left: 0,
right: 0,
@@ -209,29 +201,25 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
child: Center(
child: Image.asset(
'assets/images/png/BottomBar/ActiveCal.png',
- height: 28.h,
- width: 28.w,
+ height: 30.h,
+ width: 30.w,
),
))
],
),
-
- // SvgPicture.asset('assets/image/svg/active_shortTrade.svg'),
label: 'Calender',
),
BottomNavigationBarItem(
icon: Image.asset(
'assets/images/png/BottomBar/inactiveChat.png',
- height: 24.h,
- width: 24.w,
+ height: 25.h,
),
activeIcon: Stack(
clipBehavior: Clip.none,
children: [
if (_mainController.selectedIndex.value == 3)
Container(
- height: 40.h,
- width: 40.w,
+ height: 25.h,
decoration: BoxDecoration(
shape: BoxShape.circle,
boxShadow: [
@@ -244,17 +232,17 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
],
),
),
- Positioned(
- left: 0,
- right: 0,
- top: -15,
- child: Container(
- height: 2.h,
- width: 20.w,
- decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(10.r),
- color: const Color(0xFFD90B2E)),
- )),
+ // Positioned(
+ // left: 0,
+ // right: 0,
+ // top: -15,
+ // child: Container(
+ // height: 2.h,
+ // width: 20.w,
+ // decoration: BoxDecoration(
+ // borderRadius: BorderRadius.circular(10.r),
+ // color: const Color(0xFFD90B2E)),
+ // )),
Positioned(
left: 0,
right: 0,
@@ -263,8 +251,8 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
child: Center(
child: Image.asset(
'assets/images/png/BottomBar/ActiveChat.png',
- height: 28.h,
- width: 28.w,
+ height: 30.h,
+ width: 30.w,
),
))
],
@@ -276,16 +264,15 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
BottomNavigationBarItem(
icon: Image.asset(
'assets/images/png/BottomBar/inactivePeople.png',
- height: 26.h,
- width: 26.w,
+ height: 25.h,
+ width: 25.w,
),
activeIcon: Stack(
clipBehavior: Clip.none,
children: [
if (_mainController.selectedIndex.value == 4)
Container(
- height: 40.h,
- width: 40.w,
+ height: 25.h,
decoration: BoxDecoration(
shape: BoxShape.circle,
boxShadow: [
@@ -298,17 +285,17 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
],
),
),
- Positioned(
- left: 0,
- right: 0,
- top: -15,
- child: Container(
- height: 2.h,
- width: 20.w,
- decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(10.r),
- color: const Color(0xFFD90B2E)),
- )),
+ // Positioned(
+ // left: 0,
+ // right: 0,
+ // top: -15,
+ // child: Container(
+ // height: 2.h,
+ // width: 20.w,
+ // decoration: BoxDecoration(
+ // borderRadius: BorderRadius.circular(10.r),
+ // color: const Color(0xFFD90B2E)),
+ // )),
Positioned(
left: 0,
right: 0,
diff --git a/lib/Feed Module/Main_Screens/Community/Community.dart b/lib/Feed Module/Main_Screens/Community/Community.dart
index b613e85..b2d3add 100644
--- a/lib/Feed Module/Main_Screens/Community/Community.dart
+++ b/lib/Feed Module/Main_Screens/Community/Community.dart
@@ -33,6 +33,7 @@ class _CommunityScreenState extends State {
@override
Widget build(BuildContext context) {
return Scaffold(
+ resizeToAvoidBottomInset: false,
key: _scaffoldKey1,
backgroundColor: const Color(0xFF222935),
// drawerEnableOpenDragGesture: false,
@@ -86,12 +87,15 @@ class _CommunityScreenState extends State {
sizedBoxWidth(16.w),
],
),
- body:
- // const CommonBlurLeftRed(),
- // const CommonBlurRightRed(),
- // const CommonBlurLeft(),
- // const CommonBlurRight(),
- Stack(children: [
+ body: Stack(clipBehavior: Clip.none, children: [
+ Container(
+ decoration: const BoxDecoration(
+ image: DecorationImage(
+ fit: BoxFit.fill,
+ image: AssetImage(
+ 'assets/images/png/HomeScreenBackground.png',
+ ))),
+ ),
Padding(
padding: const EdgeInsets.symmetric(vertical: 16),
child: Column(children: [