diff --git a/assets/images/png/Ellipse 1496.png b/assets/images/png/Ellipse 1496.png index 888aa5a..0058369 100644 Binary files a/assets/images/png/Ellipse 1496.png and b/assets/images/png/Ellipse 1496.png differ diff --git a/lib/Common/CommonGlassmorphism.dart b/lib/Common/CommonGlassmorphism.dart index c53818e..14cce85 100644 --- a/lib/Common/CommonGlassmorphism.dart +++ b/lib/Common/CommonGlassmorphism.dart @@ -15,7 +15,7 @@ Widget commonGlassContainer({ width: width, height: height, borderRadius: borderradius, - blur: 10, + blur: 6, alignment: Alignment.topCenter, border: border, linearGradient: LinearGradient( @@ -53,7 +53,7 @@ Widget commonGlassContainerblue({ width: width, height: height, borderRadius: borderradius, - blur: 10, + blur: 6, alignment: Alignment.topCenter, border: border, linearGradient: LinearGradient( diff --git a/lib/Common/controller/CommonTextFormField.dart b/lib/Common/controller/CommonTextFormField.dart index 6032017..62027b2 100644 --- a/lib/Common/controller/CommonTextFormField.dart +++ b/lib/Common/controller/CommonTextFormField.dart @@ -61,7 +61,7 @@ class _CustomTextFormFieldState extends State { width: double.infinity, height: 50.h, borderRadius: 30, - blur: 10, + blur: 6, alignment: Alignment.center, border: 1, linearGradient: LinearGradient( diff --git a/lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart b/lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart index 9f3c813..f040e6a 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart +++ b/lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart @@ -50,16 +50,17 @@ class _AddEventState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), SingleChildScrollView( child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( @@ -508,7 +509,7 @@ class _AddEventState extends State { sizedBoxHeight(70.h), ]), ), - )) + ) ])); } diff --git a/lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart b/lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart index cff841d..c857f56 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart +++ b/lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart @@ -63,18 +63,19 @@ class _AddUsersState extends State { Widget build(BuildContext context) { return Scaffold( // key: _scaffoldKey1, + resizeToAvoidBottomInset: false, backgroundColor: Color(0xFF222935), extendBody: true, appBar: CommonAppbar( titleTxt: "Add users", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), SingleChildScrollView( child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -123,7 +124,7 @@ class _AddUsersState extends State { ), ), ])) - ]))) + ])) ])); } @@ -394,7 +395,7 @@ class _AddUsersState extends State { Color(0xFFD90B2E), ], ), - blur: 10, + blur: 6, child: Center(child: text16w400_FCFCFC("Su")), ), sizedBoxWidth(8.w), diff --git a/lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart b/lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart index 728a525..220dad4 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart +++ b/lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart @@ -133,6 +133,7 @@ class _CalenderTabState extends State { @override Widget build(BuildContext context) { return Scaffold( + resizeToAvoidBottomInset: false, // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, @@ -191,43 +192,42 @@ class _CalenderTabState extends State { ], ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Stack(children: [ - Padding( - padding: const EdgeInsets.symmetric(vertical: 16), - child: Column(children: [ - Expanded( - child: DefaultTabController( - length: 2, - // initialIndex: selectedIndex.value, - child: Column( - children: [ - CommonTabBar(tabs: const [ - Tab( - text: 'My sessions', - ), - Tab( - text: 'Community session', - ), - ]), - Expanded( - child: TabBarView( - children: [ - MySessionsTab(), - ComSessionTab(), - ], - ), + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + Padding( + padding: const EdgeInsets.symmetric(vertical: 16), + child: Column(children: [ + Expanded( + child: DefaultTabController( + length: 2, + // initialIndex: selectedIndex.value, + child: Column( + children: [ + CommonTabBar(tabs: const [ + Tab( + text: 'My sessions', ), - sizedBoxHeight(90.h), - ], - ), + Tab( + text: 'Community session', + ), + ]), + Expanded( + child: TabBarView( + children: [ + MySessionsTab(), + ComSessionTab(), + ], + ), + ), + sizedBoxHeight(90.h), + ], ), ), - ])) - ]) + ), + ])) ]), bottomNavigationBar: bottomnavigationbar(mainController), ); diff --git a/lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart b/lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart index fe77686..f17ed4c 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart +++ b/lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart @@ -28,6 +28,7 @@ class _EventDetailsState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "", customActionWidget: Row( @@ -64,12 +65,12 @@ class _EventDetailsState extends State { ), ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), SingleChildScrollView( child: Column( children: [ Padding( @@ -361,7 +362,7 @@ class _EventDetailsState extends State { ), ), ], - ))) + )) ])); } diff --git a/lib/Feed Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart b/lib/Feed Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart index 5a578fb..d19eb59 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart +++ b/lib/Feed Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart @@ -62,6 +62,7 @@ class _ManageMembersCalState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Manage members", customActionWidget: InkWell( @@ -88,12 +89,12 @@ class _ManageMembersCalState extends State { ), ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), SingleChildScrollView( child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -133,7 +134,7 @@ class _ManageMembersCalState extends State { ); }, ), - ]))) + ])) ])); } diff --git a/lib/Feed Module/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart b/lib/Feed Module/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart index 83afc7c..0bb7986 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart +++ b/lib/Feed Module/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart @@ -47,13 +47,14 @@ class _ResourcePoolState extends State { appBar: CommonAppbar( titleTxt: "Resource pool", ), + resizeToAvoidBottomInset: false, body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column(children: [ sizedBoxHeight(10.h), @@ -85,7 +86,7 @@ class _ResourcePoolState extends State { ), ) ]), - )) + ) ])); } diff --git a/lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart b/lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart index 8bb86f4..edc83c3 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart +++ b/lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart @@ -37,158 +37,159 @@ class _SetAvailabillityState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Set availability", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + SingleChildScrollView( + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + sizedBoxHeight(10.h), + text16400white("Select event type"), + sizedBoxHeight(15.h), + CommonDropdownBtn(hint: "", items: []), + sizedBoxHeight(18.h), + text16400white("Select sport"), + sizedBoxHeight(15.h), + CommonDropdownBtn(hint: "", items: []), + sizedBoxHeight(18.h), + text16400white("Select role "), + sizedBoxHeight(15.h), + CommonDropdownBtn(hint: "", items: []), + sizedBoxHeight(18.h), + text16400white("Space selection"), + sizedBoxHeight(15.h), + CommonDropdownBtn(hint: "", items: []), + sizedBoxHeight(18.h), + Row( children: [ - sizedBoxHeight(10.h), - text16400white("Select event type"), - sizedBoxHeight(15.h), - CommonDropdownBtn(hint: "", items: []), - sizedBoxHeight(18.h), - text16400white("Select sport"), - sizedBoxHeight(15.h), - CommonDropdownBtn(hint: "", items: []), - sizedBoxHeight(18.h), - text16400white("Select role "), - sizedBoxHeight(15.h), - CommonDropdownBtn(hint: "", items: []), - sizedBoxHeight(18.h), - text16400white("Space selection"), - sizedBoxHeight(15.h), - CommonDropdownBtn(hint: "", items: []), - sizedBoxHeight(18.h), - Row( + text16w400_white("Availability"), + Spacer(), + Transform.scale( + scaleY: 1, + child: CupertinoSwitch( + value: swichvalue, + trackColor: Colors.white.withOpacity(0.4), + activeColor: Color(0xFF3192D8), + onChanged: (bool? value) { + setState(() { + swichvalue = value ?? false; + }); + })) + ], + ), + sizedBoxHeight(30.h), + text16400white("Select days"), + sizedBoxHeight(15.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + commondayContainer(text: "M", index: 1), + commondayContainer(text: "Tu", index: 2), + commondayContainer(text: "W", index: 3), + commondayContainer(text: "Th", index: 4), + commondayContainer(text: "F", index: 5), + commondayContainer(text: "Sa", index: 6), + commondayContainer(text: "Su", index: 7), + // GlassmorphicContainer( + // width: 40.w, + // height: 40.h, + // borderRadius: 100, + // blur: 10, + // alignment: Alignment.topCenter, + // border: 0.5, + // linearGradient: LinearGradient( + // begin: Alignment.topLeft, + // end: Alignment.bottomRight, + // colors: [ + // Color(0xFFD90B2E).withOpacity(0.18), + // const Color(0xFFD90B2E).withOpacity(0.4), + // ], + // stops: const [ + // 0.1, + // 1, + // ], + // ), + // borderGradient: LinearGradient( + // begin: Alignment.topLeft, + // end: Alignment.bottomRight, + // colors: [ + // Color(0xffD90B2E), + // Color(0xFFD90B2E), + // ], + // ), + // child: Center(child: text16w400_FCFCFC("Su")), + // ), + ], + ), + sizedBoxHeight(20.h), + Row( + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - text16w400_white("Availability"), - Spacer(), - Transform.scale( - scaleY: 1, - child: CupertinoSwitch( - value: swichvalue, - trackColor: - Colors.white.withOpacity(0.4), - activeColor: Color(0xFF3192D8), - onChanged: (bool? value) { - setState(() { - swichvalue = value ?? false; - }); - })) - ], - ), - sizedBoxHeight(30.h), - text16400white("Select days"), - sizedBoxHeight(15.h), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - commondayContainer(text: "M", index: 1), - commondayContainer(text: "Tu", index: 2), - commondayContainer(text: "W", index: 3), - commondayContainer(text: "Th", index: 4), - commondayContainer(text: "F", index: 5), - commondayContainer(text: "Sa", index: 6), - commondayContainer(text: "Su", index: 7), - // GlassmorphicContainer( - // width: 40.w, - // height: 40.h, - // borderRadius: 100, - // blur: 10, - // alignment: Alignment.topCenter, - // border: 0.5, - // linearGradient: LinearGradient( - // begin: Alignment.topLeft, - // end: Alignment.bottomRight, - // colors: [ - // Color(0xFFD90B2E).withOpacity(0.18), - // const Color(0xFFD90B2E).withOpacity(0.4), - // ], - // stops: const [ - // 0.1, - // 1, - // ], - // ), - // borderGradient: LinearGradient( - // begin: Alignment.topLeft, - // end: Alignment.bottomRight, - // colors: [ - // Color(0xffD90B2E), - // Color(0xFFD90B2E), - // ], - // ), - // child: Center(child: text16w400_FCFCFC("Su")), - // ), - ], - ), - sizedBoxHeight(20.h), - Row( - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text16400white("Start time"), - sizedBoxHeight(14.h), - commonGlassContainer( - width: 174.w, - height: 50.h, - borderradius: 30.r, - customWidget: Center( - child: Row(children: [ - sizedBoxWidth(16.w), - Image.asset( - "assets/images/png/clock.png", - height: 20.h, - width: 20.w, - ), - sizedBoxWidth(8.w), - text16w400_white("3:00 pm") - ]), + text16400white("Start time"), + sizedBoxHeight(14.h), + commonGlassContainer( + width: 174.w, + height: 50.h, + borderradius: 30.r, + customWidget: Center( + child: Row(children: [ + sizedBoxWidth(16.w), + Image.asset( + "assets/images/png/clock.png", + height: 20.h, + width: 20.w, ), - border: 1) - ], - ), - Spacer(), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text16400white("End time"), - sizedBoxHeight(14.h), - commonGlassContainer( - width: 174.w, - height: 50.h, - borderradius: 30.r, - customWidget: Center( - child: Row(children: [ - sizedBoxWidth(16.w), - Image.asset( - "assets/images/png/clock.png", - height: 20.h, - width: 20.w, - ), - sizedBoxWidth(8.w), - text16w400_white("5:00 pm") - ]), - ), - border: 1) - ], - ), + sizedBoxWidth(8.w), + text16w400_white("3:00 pm") + ]), + ), + border: 1) ], ), - sizedBoxHeight(30.h), - CommonBtn(text: "Send"), - sizedBoxHeight(30.h), - ])))) + Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text16400white("End time"), + sizedBoxHeight(14.h), + commonGlassContainer( + width: 174.w, + height: 50.h, + borderradius: 30.r, + customWidget: Center( + child: Row(children: [ + sizedBoxWidth(16.w), + Image.asset( + "assets/images/png/clock.png", + height: 20.h, + width: 20.w, + ), + sizedBoxWidth(8.w), + text16w400_white("5:00 pm") + ]), + ), + border: 1) + ], + ), + ], + ), + sizedBoxHeight(30.h), + CommonBtn(text: "Send"), + sizedBoxHeight(30.h), + ]))) ])); } diff --git a/lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart b/lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart index 4c40da0..b927181 100644 --- a/lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart +++ b/lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart @@ -149,70 +149,71 @@ class _ChatsMainScreenState extends State { child: Image.asset('assets/images/png/editicon.png')), ) ], - bottom: PreferredSize( - preferredSize: Size.fromHeight(90), - child: Column( - children: [ - Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0), - child: CustomTextFormField( - textEditingController: searchcontroller, - texttype: TextInputType.text, - hintText: "Search chats", - leadingIcon: Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Icon( - Icons.search, - size: 35, - color: Colors.white, - ), - ), - // validatorText: "Enter your full name", - inputFormatters: [ - // LengthLimitingTextInputFormatter(20), - RemoveEmojiInputFormatter(), - ], - ), - ), - ], - ), - ), + // bottom: PreferredSize( + // preferredSize: Size.fromHeight(90), + // child: + // ), ), body: Stack( children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Stack( - children: [ - SingleChildScrollView( - child: Padding( - padding: const EdgeInsets.symmetric( - vertical: 0, - ), - child: Column(children: [ - DefaultTabController( - length: 3, - // initialIndex: selectedIndex.value, - child: Column( - children: [ - Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: MyTabBar(), - ), - SizedBox( - height: 600.h, - child: TabBarView( - children: [feedTab(), clubsTab(), teamsTab()], - ), + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + SingleChildScrollView( + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 0, + ), + child: Column(children: [ + Column( + children: [ + sizedBoxHeight(25.h), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0), + child: CustomTextFormField( + textEditingController: searchcontroller, + texttype: TextInputType.text, + hintText: "Search chats", + leadingIcon: Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Icon( + Icons.search, + size: 35, + color: Colors.white, ), + ), + // validatorText: "Enter your full name", + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), ], ), ), - ])), - ) - ], + sizedBoxHeight(25.h) + ], + ), + DefaultTabController( + length: 3, + // initialIndex: selectedIndex.value, + child: Column( + children: [ + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: MyTabBar(), + ), + SizedBox( + height: 600.h, + child: TabBarView( + children: [feedTab(), clubsTab(), teamsTab()], + ), + ), + ], + ), + ), + ])), ) ], ), @@ -225,6 +226,7 @@ class _ChatsMainScreenState extends State { return SingleChildScrollView( child: Column( children: [ + sizedBoxHeight(30.h), ListView.separated( separatorBuilder: (context, index) { return Divider( @@ -804,7 +806,6 @@ class _SecondChatListState extends State { // String message; // bool isMessageRead; - // SecondChatList({ // Key? key, // required this.name, diff --git a/lib/Feed Module/Main_Screens/Chats/View/groupchat.dart b/lib/Feed Module/Main_Screens/Chats/View/groupchat.dart index 5337ebf..660f9c9 100644 --- a/lib/Feed Module/Main_Screens/Chats/View/groupchat.dart +++ b/lib/Feed Module/Main_Screens/Chats/View/groupchat.dart @@ -293,7 +293,7 @@ class _GroupChatPageState extends State { image: DecorationImage( image: AssetImage("assets/images/png/groupchat.png"), - fit: BoxFit.fill)), + fit: BoxFit.cover)), ), SizedBox( width: 12.w, @@ -348,16 +348,19 @@ class _GroupChatPageState extends State { ), body: Stack( children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), GlassmorphicContainer( width: MediaQuery.of(context).size.width, height: // 500.h, MediaQuery.of(context).size.height, borderRadius: 2, - blur: 10, + blur: 6, alignment: Alignment.bottomLeft, border: 2, linearGradient: LinearGradient( @@ -563,7 +566,7 @@ class _GroupChatPageState extends State { width: double.infinity, height: 48.h, borderRadius: 30.r, - blur: 10, + blur: 6, alignment: Alignment.bottomCenter, border: 0.8, linearGradient: LinearGradient( @@ -677,10 +680,8 @@ class _GroupChatPageState extends State { ), minLines: 1, maxLines: 1, - onChanged: (text) { - setState(() { - - }); + onChanged: (text) { + setState(() {}); }, ), ), diff --git a/lib/Feed Module/Main_Screens/Chats/View/newchatpage.dart b/lib/Feed Module/Main_Screens/Chats/View/newchatpage.dart index f38367c..1e7816d 100644 --- a/lib/Feed Module/Main_Screens/Chats/View/newchatpage.dart +++ b/lib/Feed Module/Main_Screens/Chats/View/newchatpage.dart @@ -71,154 +71,123 @@ class _NewChatPageState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusManager.instance.primaryFocus?.unfocus(), + onTap: () => FocusManager.instance.primaryFocus?.unfocus(), child: Scaffold( // backgroundColor: Color(0xFF222935), backgroundColor: Color.fromARGB(255, 18, 32, 47), - + appBar: CommonAppbar(titleTxt: 'New chat'), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - GlassmorphicContainer( - width: MediaQuery.of(context).size.width, - height: - // 500.h, - MediaQuery.of(context).size.height, - borderRadius: 2, - blur: 10, - alignment: Alignment.bottomLeft, - border: 2, - linearGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - ], - ), - borderGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - Color(0XFF222935).withOpacity(0.60), - - Color(0XFF222935).withOpacity(0.60), - ], - ), - child: ListView(children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: CustomTextFormField( - textEditingController: searchcontroller, - texttype: TextInputType.text, - hintText: "Search people", - leadingIcon: Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Icon( - Icons.search, - size: 35, - color: Colors.white, - ), + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + ListView(children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: CustomTextFormField( + textEditingController: searchcontroller, + texttype: TextInputType.text, + hintText: "Search people", + leadingIcon: Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Icon( + Icons.search, + size: 35, + color: Colors.white, ), - // validatorText: "Enter your full name", - inputFormatters: [ - // LengthLimitingTextInputFormatter(20), - RemoveEmojiInputFormatter(), + ), + // validatorText: "Enter your full name", + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + ], + ), + ), + sizedBoxHeight(30.h), + GestureDetector( + onTap: () { + Get.toNamed(RouteName.newgrouppage); + }, + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + width: 50, + height: 50, + decoration: ShapeDecoration( + image: DecorationImage( + image: AssetImage( + 'assets/images/png/chatgroup.png'), + ), + gradient: LinearGradient( + begin: Alignment(0.71, -0.70), + end: Alignment(-0.71, 0.7), + colors: [ + Colors.white + .withOpacity(0.30000001192092896), + Colors.white + .withOpacity(0.30000001192092896) + ], + ), + shape: OvalBorder( + side: BorderSide( + width: 0.50, color: Color(0xFF434A53)), + ), + ), + ), + sizedBoxWidth(10.w), + text18w400white('New group') + ], + ), + Image.asset('assets/images/png/arrow-left (2).png') ], ), ), - sizedBoxHeight(30.h), - GestureDetector( - onTap: () { - Get.toNamed(RouteName.newgrouppage); - }, - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - width: 50, - height: 50, - decoration: ShapeDecoration( - image: DecorationImage( - image: AssetImage( - 'assets/images/png/chatgroup.png'), - ), - gradient: LinearGradient( - begin: Alignment(0.71, -0.70), - end: Alignment(-0.71, 0.7), - colors: [ - Colors.white.withOpacity(0.30000001192092896), - Colors.white.withOpacity(0.30000001192092896) - ], - ), - shape: OvalBorder( - side: BorderSide( - width: 0.50, color: Color(0xFF434A53)), - ), - ), - ), - sizedBoxWidth(10.w), - text18w400white('New group') - ], - ), - Image.asset('assets/images/png/arrow-left (2).png') - ], + ), + sizedBoxHeight(30.h), + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: text18w700_FCFCFC('Contacts'), + ), + sizedBoxHeight(20.h), + ListView.separated( + separatorBuilder: (context, index) { + return Divider( + thickness: 0.6.h, + color: Color(0xffFFFFFF).withOpacity(0.72), + ); + }, + itemCount: chatcontents.length, + shrinkWrap: true, + padding: const EdgeInsets.only(top: 10.0), + physics: const NeverScrollableScrollPhysics(), + itemBuilder: (context, index) { + return GestureDetector( + onTap: () {}, + child: SecondChatList( + name: chatcontents[index]['tittle'], + imageurl: chatcontents[index]['image'], + message: chatcontents[index]['subtittle'], ), - ), - ), - sizedBoxHeight(30.h), - Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: text18w700_FCFCFC('Contacts'), - ), - sizedBoxHeight(20.h), - ListView.separated( - separatorBuilder: (context, index) { - return Divider( - thickness: 0.6.h, - color: Color(0xffFFFFFF).withOpacity(0.72), - ); - }, - itemCount: chatcontents.length, - shrinkWrap: true, - padding: const EdgeInsets.only(top: 10.0), - physics: const NeverScrollableScrollPhysics(), - itemBuilder: (context, index) { - return GestureDetector( - onTap: () {}, - child: SecondChatList( - name: chatcontents[index]['tittle'], - imageurl: chatcontents[index]['image'], - message: chatcontents[index]['subtittle'], - ), - ); - }, - ), - sizedBoxHeight(20.h), - ], - ), - ]), - ), + ); + }, + ), + sizedBoxHeight(20.h), + ], + ), + ]), ]), ), ); diff --git a/lib/Feed Module/Main_Screens/Chats/View/newgroup.dart b/lib/Feed Module/Main_Screens/Chats/View/newgroup.dart index 2343e98..ce261c7 100644 --- a/lib/Feed Module/Main_Screens/Chats/View/newgroup.dart +++ b/lib/Feed Module/Main_Screens/Chats/View/newgroup.dart @@ -84,189 +84,161 @@ class _NewGroupPageState extends State { appBar: CommonAppbar(titleTxt: 'New group'), body: Stack( children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - GlassmorphicContainer( - width: MediaQuery.of(context).size.width, - height: - // 500.h, - MediaQuery.of(context).size.height, - borderRadius: 2, - blur: 10, - alignment: Alignment.bottomLeft, - border: 2, - linearGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - ], - ), - borderGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - ], - ), - child: ListView(children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: EdgeInsets.symmetric(horizontal: 16.h), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - GestureDetector( - onTap: () { - ImageUploadBottomSheet().showModal( - context, - false, - (result) { - var file = File(result); - filePath.add(file); + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + ListView(children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.h), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + GestureDetector( + onTap: () { + ImageUploadBottomSheet().showModal( + context, + false, + (result) { + var file = File(result); + filePath.add(file); - setState(() {}); - }, - ); - }, - child: Container( - width: 50, - height: 50, - decoration: ShapeDecoration( - // image: DecorationImage( - // image: AssetImage('assets/images/png/camera1.png'), - // ), - gradient: LinearGradient( - begin: Alignment(0.71, -0.70), - end: Alignment(-0.71, 0.7), - colors: [ - Colors.white - .withOpacity(0.30000001192092896), - Colors.white - .withOpacity(0.30000001192092896) - ], - ), - shape: OvalBorder( - side: BorderSide( - width: 0.50, color: Color(0xFF434A53)), - ), - ), - child: - // Obx( - // () => - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - // addgroupImage.profilePicPath.value != '' - filePath.isNotEmpty - ? ClipOval( - child: SizedBox.fromSize( - size: Size.fromRadius(24.r), - child: Image.file( - filePath[0]!, - fit: BoxFit.cover, - width: double.infinity, - ), - ), - ) - : Image.asset( - 'assets/images/png/camera1.png') + setState(() {}); + }, + ); + }, + child: Container( + width: 50, + height: 50, + decoration: ShapeDecoration( + // image: DecorationImage( + // image: AssetImage('assets/images/png/camera1.png'), + // ), + gradient: LinearGradient( + begin: Alignment(0.71, -0.70), + end: Alignment(-0.71, 0.7), + colors: [ + Colors.white.withOpacity(0.30000001192092896), + Colors.white.withOpacity(0.30000001192092896) ], ), - // ), + shape: OvalBorder( + side: BorderSide( + width: 0.50, color: Color(0xFF434A53)), + ), ), - ), - sizedBoxWidth(10.w), - Expanded( - child: CustomTextFormField( - textEditingController: groupnamecontroller, - texttype: TextInputType.text, - hintText: "Group name", - - // validatorText: "Enter your full name", - inputFormatters: [ - // LengthLimitingTextInputFormatter(20), - RemoveEmojiInputFormatter(), + child: + // Obx( + // () => + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + // addgroupImage.profilePicPath.value != '' + filePath.isNotEmpty + ? ClipOval( + child: SizedBox.fromSize( + size: Size.fromRadius(24.r), + child: Image.file( + filePath[0]!, + fit: BoxFit.cover, + width: double.infinity, + ), + ), + ) + : Image.asset( + 'assets/images/png/camera1.png') ], ), - ), - ], - ), - ), - sizedBoxHeight(20.h), - Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: - text18w700_FCFCFC('Select contacts to add to group'), - ), - sizedBoxHeight(20.h), - Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: CustomTextFormField( - textEditingController: searchcontroller, - texttype: TextInputType.text, - hintText: "Search people", - leadingIcon: Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Icon( - Icons.search, - size: 35, - color: Colors.white, + // ), ), ), - // validatorText: "Enter your full name", - inputFormatters: [ - // LengthLimitingTextInputFormatter(20), - RemoveEmojiInputFormatter(), - ], - ), - ), - sizedBoxHeight(20.h), - ListView.separated( - separatorBuilder: (context, index) { - return Divider( - thickness: 0.6.h, - color: Color(0xffFFFFFF).withOpacity(0.72), - ); - }, - itemCount: chatcontents.length, - shrinkWrap: true, - padding: const EdgeInsets.only(top: 10.0), - physics: const NeverScrollableScrollPhysics(), - itemBuilder: (context, index) { - return GestureDetector( - onTap: () {}, - child: GroupsList( - name: chatcontents[index]['tittle'], - imageurl: chatcontents[index]['image'], - message: chatcontents[index]['subtittle'], + sizedBoxWidth(10.w), + Expanded( + child: CustomTextFormField( + textEditingController: groupnamecontroller, + texttype: TextInputType.text, + hintText: "Group name", + + // validatorText: "Enter your full name", + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + ], ), - ); - }, + ), + ], ), - sizedBoxHeight(20.h), - CustomButton( - text: 'Create group', - onPressed: () { - // Get.toNamed(RouteName.mainscreen); - Get.offUntil( - MaterialPageRoute( - builder: (context) => MainScreen()), - (Route route) => false); - }), - sizedBoxHeight(20.h) - ], - ), - ]), - ), + ), + sizedBoxHeight(20.h), + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: text18w700_FCFCFC('Select contacts to add to group'), + ), + sizedBoxHeight(20.h), + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: CustomTextFormField( + textEditingController: searchcontroller, + texttype: TextInputType.text, + hintText: "Search people", + leadingIcon: Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Icon( + Icons.search, + size: 35, + color: Colors.white, + ), + ), + // validatorText: "Enter your full name", + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + ], + ), + ), + sizedBoxHeight(20.h), + ListView.separated( + separatorBuilder: (context, index) { + return Divider( + thickness: 0.6.h, + color: Color(0xffFFFFFF).withOpacity(0.72), + ); + }, + itemCount: chatcontents.length, + shrinkWrap: true, + padding: const EdgeInsets.only(top: 10.0), + physics: const NeverScrollableScrollPhysics(), + itemBuilder: (context, index) { + return GestureDetector( + onTap: () {}, + child: GroupsList( + name: chatcontents[index]['tittle'], + imageurl: chatcontents[index]['image'], + message: chatcontents[index]['subtittle'], + ), + ); + }, + ), + sizedBoxHeight(20.h), + CustomButton( + text: 'Create group', + onPressed: () { + // Get.toNamed(RouteName.mainscreen); + Get.offUntil( + MaterialPageRoute( + builder: (context) => MainScreen()), + (Route route) => false); + }), + sizedBoxHeight(20.h) + ], + ), + ]), ], ), ), diff --git a/lib/Feed Module/Main_Screens/Chats/View/userchat.dart b/lib/Feed Module/Main_Screens/Chats/View/userchat.dart index 6cfe0fe..b024421 100644 --- a/lib/Feed Module/Main_Screens/Chats/View/userchat.dart +++ b/lib/Feed Module/Main_Screens/Chats/View/userchat.dart @@ -225,7 +225,7 @@ class _UserChatPageState extends State { } } - void _sendMessage() { + void _sendMessage() { if (messageController.text.isNotEmpty) { setState(() { messages.add(ChatMessage( @@ -270,6 +270,8 @@ class _UserChatPageState extends State { border: 0.9, width: 40.w, height: 40.h, + opacity1: 0.24, + opacity2: 0.24, borderradius: 100, customWidget: Center( child: Image.asset( @@ -342,321 +344,265 @@ class _UserChatPageState extends State { ), body: Stack( children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - GlassmorphicContainer( - width: MediaQuery.of(context).size.width, - height: - // 500.h, - MediaQuery.of(context).size.height, - borderRadius: 2, - blur: 10, - alignment: Alignment.bottomLeft, - border: 2, - linearGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - ], - ), - borderGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - ], - ), - child: Stack( - children: [ - ListView.builder( - controller: myController, - itemCount: messages.length, - padding: const EdgeInsets.only(top: 10.0, bottom: 70.0), - physics: const BouncingScrollPhysics(), - itemBuilder: (context, index) { - return messages[index].messageType == "receiver" - ? Padding( - padding: const EdgeInsets.only( - left: 16.0, - top: 5.0, - bottom: 5.0, - right: 90.0), - child: Align( - alignment: Alignment.topLeft, - child: Row( - mainAxisSize: MainAxisSize.min, + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + ListView.builder( + controller: myController, + itemCount: messages.length, + padding: const EdgeInsets.only(top: 10.0, bottom: 70.0), + physics: const BouncingScrollPhysics(), + itemBuilder: (context, index) { + return messages[index].messageType == "receiver" + ? Padding( + padding: const EdgeInsets.only( + left: 16.0, top: 5.0, bottom: 5.0, right: 90.0), + child: Align( + alignment: Alignment.topLeft, + child: Row( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Flexible( + child: Container( + decoration: ShapeDecoration( + gradient: LinearGradient( + begin: Alignment(1.00, -0.03), + end: Alignment(-1, 0.03), + colors: [ + Colors.white + .withOpacity(0.05999999865889549), + Colors.white + .withOpacity(0.07999999821186066) + ], + ), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(20), + topRight: Radius.circular(20), + bottomRight: Radius.circular(20), + ), + ), + ), + padding: const EdgeInsets.all(10.0), + child: Column( crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: - MainAxisAlignment.end, children: [ - Flexible( - child: Container( - decoration: ShapeDecoration( - gradient: LinearGradient( - begin: Alignment(1.00, -0.03), - end: Alignment(-1, 0.03), - colors: [ - Colors.white.withOpacity( - 0.05999999865889549), - Colors.white.withOpacity( - 0.07999999821186066) - ], - ), - shape: RoundedRectangleBorder( - borderRadius: - BorderRadius.only( - topLeft: - Radius.circular(20), - topRight: - Radius.circular(20), - bottomRight: - Radius.circular(20), - ), - ), - ), - padding: - const EdgeInsets.all(10.0), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Text( - messages[index].messageContent, - style: TextStyle( - fontSize: 16.sp, - color: Colors.white, - fontWeight: FontWeight.w400, - fontFamily: 'Helvetica', - ), - ), - sizedBoxHeight(2.h), - messages[index].isread == true - ? Image.asset( - 'assets/images/png/messagereadcheckmark.png') - : Image.asset( - 'assets/images/png/messagedelivered.png'), - ], - ), + Text( + messages[index].messageContent, + style: TextStyle( + fontSize: 16.sp, + color: Colors.white, + fontWeight: FontWeight.w400, + fontFamily: 'Helvetica', ), - ) + ), + sizedBoxHeight(2.h), + messages[index].isread == true + ? Image.asset( + 'assets/images/png/messagereadcheckmark.png') + : Image.asset( + 'assets/images/png/messagedelivered.png'), ], ), ), ) - : Padding( - padding: const EdgeInsets.only( - right: 16.0, - top: 5.0, - bottom: 5.0, - left: 90.0), - child: Align( - alignment: Alignment.topRight, - child: Row( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: - CrossAxisAlignment.start, - mainAxisAlignment: - MainAxisAlignment.end, + ], + ), + ), + ) + : Padding( + padding: const EdgeInsets.only( + right: 16.0, top: 5.0, bottom: 5.0, left: 90.0), + child: Align( + alignment: Alignment.topRight, + child: Row( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Flexible( + child: Container( + decoration: ShapeDecoration( + gradient: LinearGradient( + begin: Alignment(1.00, 0.05), + end: Alignment(-1, -0.05), + colors: [ + Color(0xFFD90B2E), + Color(0x38D90B2E) + ], + ), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(20), + topRight: Radius.circular(20), + bottomLeft: Radius.circular(20), + )), + ), + padding: const EdgeInsets.all(10.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.end, children: [ - Flexible( - child: Container( - decoration: ShapeDecoration( - gradient: LinearGradient( - begin: Alignment(1.00, 0.05), - end: Alignment(-1, -0.05), - colors: [ - Color(0xFFD90B2E), - Color(0x38D90B2E) - ], - ), - shape: RoundedRectangleBorder( - borderRadius: - BorderRadius.only( - topLeft: Radius.circular(20), - topRight: Radius.circular(20), - bottomLeft: - Radius.circular(20), - )), - ), - padding: - const EdgeInsets.all(10.0), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.end, - children: [ - Text( - messages[index].messageContent, - style: TextStyle( - fontSize: 16.sp, - color: Colors.white, - fontFamily: 'Helvetica', - fontWeight: FontWeight.w400, - ), - ), - sizedBoxHeight(2.h), - messages[index].isread == true - ? Image.asset( - 'assets/images/png/messagereadcheckmark.png') - : Image.asset( - 'assets/images/png/messagedelivered.png'), - ], - ), + Text( + messages[index].messageContent, + style: TextStyle( + fontSize: 16.sp, + color: Colors.white, + fontFamily: 'Helvetica', + fontWeight: FontWeight.w400, ), ), + sizedBoxHeight(2.h), + messages[index].isread == true + ? Image.asset( + 'assets/images/png/messagereadcheckmark.png') + : Image.asset( + 'assets/images/png/messagedelivered.png'), ], ), ), - ); - }, - ), - Align( - alignment: Alignment.bottomCenter, - child: Padding( - padding: EdgeInsets.only(top: 15, bottom: 15), - child: Row( - children: [ - sizedBoxWidth(16.w), - Expanded( - child: GlassmorphicContainer( - width: double.infinity, - height: 48.h, - borderRadius: 30.r, - blur: 10, - alignment: Alignment.bottomCenter, - border: 0.8, - linearGradient: LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - const Color(0xFFffffff).withOpacity(0.50), - const Color(0xFFFFFFFF).withOpacity(0.50), - ], - stops: [ - 0.1, - 1, - ]), - borderGradient: const LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - Color(0xff434A53), - Color(0xFF434A53), - ], - ), - child: TextFormField( - controller: messageController, - inputFormatters: [ - RemoveEmojiInputFormatter(), - ], - style: TextStyle( - fontSize: 16.sp, - color: Colors.white, - ), - autovalidateMode: - AutovalidateMode.onUserInteraction, - decoration: InputDecoration( - contentPadding: const EdgeInsets.all(10.0), - filled: true, - fillColor: Color(0XFF434A53), - border: InputBorder.none, - hintStyle: TextStyle( - fontSize: 14.sp, - color: - Color(0XFFFCFCFC).withOpacity(0.80), - fontWeight: FontWeight.w400, - fontFamily: 'Helvetica'), - hintText: "Type your message", - suffixIcon: messageController - .text.isNotEmpty || - isImageAdded == true - ? GestureDetector( - // onTap: () => _chatItemsAdd(), - onTap: _sendMessage, - // () { - // setState(() { - // // UploadData(); - // messageController.clear(); - // }); - // }, - // => UploadData(), - - child: Padding( - padding: EdgeInsets.only( - right: 8.w, - top: 2.h, - bottom: 2.h), - child: Container( - width: 45.w, - height: 30.h, - decoration: BoxDecoration( - color: Color(0xFFD90B2E), - borderRadius: - BorderRadius.circular( - 30.r)), - child: Center( - child: Icon( - Icons.send_outlined, - color: Colors.white, - ) - // Text( - // 'Send', - // style: TextStyle( - // color: Colors.white, - // fontSize: 16.sp), - // ) - )), - ), - ) - : IconButton( - onPressed: () { - ImageUploadBottomSheet() - .showModal( - context, - true, - (result) { - attachimage = result; - var filenameresult = - extractFileName(result); - - messageController.text = - filenameresult; - setState(() { - isImageAdded = true; - }); - }, - ); - }, - icon: Icon( - Icons.attach_file, - color: Colors.white, - size: 23.h, - ), - ), - ), - minLines: 1, - maxLines: 1, - onChanged: (text) { - setState(() { - - }); - }, - ), ), - ), - sizedBoxWidth(12.w), + ], + ), + ), + ); + }, + ), + Align( + alignment: Alignment.bottomCenter, + child: Padding( + padding: EdgeInsets.only(top: 15, bottom: 15), + child: Row( + children: [ + sizedBoxWidth(16.w), + Expanded( + child: GlassmorphicContainer( + width: double.infinity, + height: 48.h, + borderRadius: 30.r, + blur: 6, + alignment: Alignment.bottomCenter, + border: 0.8, + linearGradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + const Color(0xFFffffff).withOpacity(0.50), + const Color(0xFFFFFFFF).withOpacity(0.50), + ], + stops: [ + 0.1, + 1, + ]), + borderGradient: const LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + Color(0xff434A53), + Color(0xFF434A53), ], ), + child: TextFormField( + controller: messageController, + inputFormatters: [ + RemoveEmojiInputFormatter(), + ], + style: TextStyle( + fontSize: 16.sp, + color: Colors.white, + ), + autovalidateMode: AutovalidateMode.onUserInteraction, + decoration: InputDecoration( + contentPadding: const EdgeInsets.all(10.0), + filled: true, + fillColor: Color(0XFF434A53), + border: InputBorder.none, + hintStyle: TextStyle( + fontSize: 14.sp, + color: Color(0XFFFCFCFC).withOpacity(0.80), + fontWeight: FontWeight.w400, + fontFamily: 'Helvetica'), + hintText: "Type your message", + suffixIcon: messageController.text.isNotEmpty || + isImageAdded == true + ? GestureDetector( + // onTap: () => _chatItemsAdd(), + onTap: _sendMessage, + // () { + // setState(() { + // // UploadData(); + // messageController.clear(); + // }); + // }, + // => UploadData(), + + child: Padding( + padding: EdgeInsets.only( + right: 8.w, top: 2.h, bottom: 2.h), + child: Container( + width: 45.w, + height: 30.h, + decoration: BoxDecoration( + color: Color(0xFFD90B2E), + borderRadius: + BorderRadius.circular(30.r)), + child: Center( + child: Icon( + Icons.send_outlined, + color: Colors.white, + ) + // Text( + // 'Send', + // style: TextStyle( + // color: Colors.white, + // fontSize: 16.sp), + // ) + )), + ), + ) + : IconButton( + onPressed: () { + ImageUploadBottomSheet().showModal( + context, + true, + (result) { + attachimage = result; + var filenameresult = + extractFileName(result); + + messageController.text = + filenameresult; + setState(() { + isImageAdded = true; + }); + }, + ); + }, + icon: Icon( + Icons.attach_file, + color: Colors.white, + size: 23.h, + ), + ), + ), + minLines: 1, + maxLines: 1, + onChanged: (text) { + setState(() {}); + }, + ), ), ), + sizedBoxWidth(12.w), ], - )), + ), + ), + ), ], ), ), diff --git a/lib/Feed Module/Main_Screens/Community/CycleScreen.dart b/lib/Feed Module/Main_Screens/Community/CycleScreen.dart index af4c376..8d5eb5f 100644 --- a/lib/Feed Module/Main_Screens/Community/CycleScreen.dart +++ b/lib/Feed Module/Main_Screens/Community/CycleScreen.dart @@ -25,6 +25,7 @@ class _CycleScreenState extends State { return Scaffold( backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Cycle", customActionWidget: Image.asset( @@ -33,12 +34,12 @@ class _CycleScreenState extends State { width: 26.w, )), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned( - child: Column(children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), Column(children: [ sizedBoxHeight(10.h), DefaultTabController( length: 2, @@ -64,7 +65,7 @@ class _CycleScreenState extends State { ), ], )) - ])) + ]) ])); } } diff --git a/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart b/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart index 5d83e31..ea71e04 100644 --- a/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart +++ b/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart @@ -22,21 +22,22 @@ class _PostDetailsScreenState extends State { @override Widget build(BuildContext context) { return Scaffold( + resizeToAvoidBottomInset: false, backgroundColor: Color(0xFF222935), extendBody: true, appBar: CommonAppbar( titleTxt: "Post", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ postCards( profileImg: 'assets/images/png/Ellipse 52.png', title: 'Ryan Dorwat', @@ -95,7 +96,7 @@ class _PostDetailsScreenState extends State { ), ), sizedBoxHeight(85.h) - ]))) + ])) ])); } diff --git a/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart b/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart index 0b987e0..df8db14 100644 --- a/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart +++ b/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart @@ -72,13 +72,14 @@ class _ReactionViewState extends State { appBar: CommonAppbar( titleTxt: "Post", ), + resizeToAvoidBottomInset: false, body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Column( + 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), @@ -168,7 +169,7 @@ class _ReactionViewState extends State { sizedBoxHeight(20.h) ])), ) - ])) + ]) ])); } diff --git a/lib/Feed Module/Main_Screens/Community/PostScreen.dart b/lib/Feed Module/Main_Screens/Community/PostScreen.dart index 8498aac..4333b5b 100644 --- a/lib/Feed Module/Main_Screens/Community/PostScreen.dart +++ b/lib/Feed Module/Main_Screens/Community/PostScreen.dart @@ -44,16 +44,18 @@ class _PostScreenState extends State { return Scaffold( backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Create a post", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: SingleChildScrollView( child: Column( @@ -221,7 +223,7 @@ class _PostScreenState extends State { CustomDropDownRadio( header: "", title: "", - listData: ['Individual', 'Anonymous'], + listData: ['Individual'], onItemSelected: (p0) {}, leadingImage: SizedBox()), // CommonDropdownradioBtn( @@ -273,7 +275,7 @@ class _PostScreenState extends State { sizedBoxHeight(150.h), ]), ), - )) + ), ])); } diff --git a/lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart b/lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart index 9924794..4ae37a2 100644 --- a/lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart +++ b/lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart @@ -22,14 +22,15 @@ class _DetailExploreState extends State { return Scaffold( backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, body: SafeArea( child: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Column(children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), Column(children: [ sizedBoxHeight(20.h), commonDivider(), sizedBoxHeight(20.h), @@ -105,7 +106,7 @@ class _DetailExploreState extends State { ), ])), ) - ])) + ]) ]))); } diff --git a/lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart b/lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart index a6d11ef..9703903 100644 --- a/lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart +++ b/lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart @@ -58,13 +58,14 @@ class _ExploreScreenState extends State { // appBar: CommonAppbar( // titleTxt: "", // ), + resizeToAvoidBottomInset: false, body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Stack(children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), Stack(children: [ GoogleMap( mapType: MapType.normal, mapToolbarEnabled: true, @@ -131,7 +132,7 @@ class _ExploreScreenState extends State { ), ), )) - ])) + ]) ])); } diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart b/lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart index cf186dd..4509f77 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart @@ -36,16 +36,17 @@ class _ConnectCommunityState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Connect with communities", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ),Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -65,7 +66,7 @@ class _ConnectCommunityState extends State { ), ) ]), - )) + ) ])); } diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GoupSettings.dart b/lib/Feed Module/Main_Screens/GroupTab/View/GoupSettings.dart index e4511bb..6eb5044 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/GoupSettings.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/GoupSettings.dart @@ -37,16 +37,17 @@ class _GroupSettingsState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Group settings", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Column( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ),Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ sizedBoxHeight(30.h), @@ -91,7 +92,7 @@ class _GroupSettingsState extends State { ), ), ), - ])) + ]) ])); } diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart b/lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart index 661cc42..f693809 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart @@ -256,12 +256,12 @@ class _GroupDetailState extends State { ]), ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + SingleChildScrollView( child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ sizedBoxHeight(20.h), @@ -551,7 +551,7 @@ class _GroupDetailState extends State { ), ), ]), - )) + ) ])); } diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart b/lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart index 0ca2908..f8e2a0f 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart @@ -48,18 +48,19 @@ class _GroupEventState extends State { Widget build(BuildContext context) { return Scaffold( // key: _scaffoldKey1, + resizeToAvoidBottomInset: false, backgroundColor: Color(0xFF222935), extendBody: true, appBar: CommonAppbar( titleTxt: "", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + SingleChildScrollView( child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( @@ -522,7 +523,7 @@ class _GroupEventState extends State { sizedBoxHeight(70.h), ]), ), - )) + ) ])); } diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupInfo.dart b/lib/Feed Module/Main_Screens/GroupTab/View/GroupInfo.dart index 4c61250..6980c0d 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/GroupInfo.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/GroupInfo.dart @@ -27,13 +27,14 @@ class _GroupInfoState extends State { appBar: CommonAppbar( titleTxt: "Groups info", ), + resizeToAvoidBottomInset: false, body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Column( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ sizedBoxHeight(20.h), @@ -139,7 +140,7 @@ class _GroupInfoState extends State { ], ), ), - ])) + ]) ])); } } diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupManage.dart b/lib/Feed Module/Main_Screens/GroupTab/View/GroupManage.dart index 5154f34..acd66fe 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/GroupManage.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/GroupManage.dart @@ -36,6 +36,7 @@ class _GroupManageState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Manage members", customActionWidget: Container( @@ -57,12 +58,12 @@ class _GroupManageState extends State { ), ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Column( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ sizedBoxHeight(20.h), @@ -97,7 +98,7 @@ class _GroupManageState extends State { ), ], )) - ])) + ]) ])); } @@ -351,7 +352,7 @@ class _GroupManageState extends State { Color(0xFFD90B2E), ], ), - blur: 10, + blur: 6, child: Center(child: text16w400_FCFCFC("Su")), ), sizedBoxWidth(8.w), diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart b/lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart index da5daa8..aee892d 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart @@ -40,6 +40,7 @@ class _GroupTabState extends State { @override Widget build(BuildContext context) { return Scaffold( + resizeToAvoidBottomInset: false, // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, @@ -98,12 +99,13 @@ class _GroupTabState extends State { ], ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: Column(children: [ sizedBoxHeight(25.h), @@ -150,7 +152,7 @@ class _GroupTabState extends State { ), ) ]), - )), + ), ]), bottomNavigationBar: bottomnavigationbar(mainController), ); @@ -330,6 +332,4 @@ class _GroupTabState extends State { ), ); } - - } diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/NewPost.dart b/lib/Feed Module/Main_Screens/GroupTab/View/NewPost.dart index 2bfd548..23b212b 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/NewPost.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/NewPost.dart @@ -40,16 +40,17 @@ class _NewPostState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "New post", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: SingleChildScrollView( child: Column( @@ -240,7 +241,7 @@ class _NewPostState extends State { sizedBoxHeight(60.h), ]), ), - )) + ) ])); } diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart b/lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart index dd828b1..692f3c1 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart @@ -43,28 +43,26 @@ class _RequestedGroupsState extends State { titleTxt: "Requested groups", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - sizedBoxHeight(20.h), - ListView.builder( - shrinkWrap: true, - physics: BouncingScrollPhysics(), - itemCount: groupData.length, - itemBuilder: (context, index) { - return groupCard( - ontap: () {}, - imagepath: groupData[index]['imagePath'], - title: groupData[index]['text'], - members: groupData[index]['members']); - }, - ) - ])) + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + sizedBoxHeight(20.h), + ListView.builder( + shrinkWrap: true, + physics: BouncingScrollPhysics(), + itemCount: groupData.length, + itemBuilder: (context, index) { + return groupCard( + ontap: () {}, + imagepath: groupData[index]['imagePath'], + title: groupData[index]['text'], + members: groupData[index]['members']); + }, + ) + ]) ])); } diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart b/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart index 860c8ea..c3cd44a 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart @@ -30,16 +30,16 @@ class _EditSubgroupInfoState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + appBar: CommonAppbar( titleTxt: "Edit subgroup info", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: SingleChildScrollView( child: Column( @@ -206,7 +206,7 @@ class _EditSubgroupInfoState extends State { sizedBoxHeight(40.h), ], ), - ))) + )) ])); } } diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart b/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart index 4862c9b..27a60f2 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart @@ -44,6 +44,7 @@ class _SubGroupInfoState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "", customActionWidget: Row(children: [ @@ -241,12 +242,12 @@ class _SubGroupInfoState extends State { ]), ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + SingleChildScrollView( child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ sizedBoxHeight(20.h), @@ -360,7 +361,7 @@ class _SubGroupInfoState extends State { ), ), ]), - )) + ) ])); } diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart b/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart index 2c1df6a..7918eac 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart @@ -37,13 +37,14 @@ class _SubGroupSettingState extends State { appBar: CommonAppbar( titleTxt: "Subgroup settings", ), + resizeToAvoidBottomInset: false, body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Column( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ sizedBoxHeight(30.h), @@ -88,7 +89,7 @@ class _SubGroupSettingState extends State { ), ), ), - ])) + ]) ])); } diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart b/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart index c75497a..6b1b40d 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart +++ b/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart @@ -41,6 +41,7 @@ class _SubGroupsState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Subgroups", customActionWidget: InkWell( @@ -67,12 +68,12 @@ class _SubGroupsState extends State { ), ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -94,7 +95,7 @@ class _SubGroupsState extends State { }, ), ) - ]))) + ])) ])); } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Badges/Badges.dart b/lib/Feed Module/Main_Screens/ProfileTab/Badges/Badges.dart index 3d482e3..8ec6f61 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Badges/Badges.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Badges/Badges.dart @@ -46,53 +46,54 @@ class _BadgesState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Badges", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16), - child: Column(children: [ - sizedBoxHeight(25.h), - Container( - height: 600.h, - child: GridView.builder( - scrollDirection: Axis.vertical, - gridDelegate: - const SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 3, - mainAxisSpacing: 35, - crossAxisSpacing: 8, - childAspectRatio: 0.65, - ), - itemCount: BadgesData.length, - itemBuilder: (context, index) { - return Column( - children: [ - Image.asset( - BadgesData[index]["imagePath"], - height: 100.h, - width: 105.w, + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + SingleChildScrollView( + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: Column(children: [ + sizedBoxHeight(25.h), + Container( + height: 600.h, + child: GridView.builder( + scrollDirection: Axis.vertical, + gridDelegate: + const SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: 3, + mainAxisSpacing: 35, + crossAxisSpacing: 8, + childAspectRatio: 0.65, + ), + itemCount: BadgesData.length, + itemBuilder: (context, index) { + return Column( + children: [ + Image.asset( + BadgesData[index]["imagePath"], + height: 100.h, + width: 105.w, + ), + Expanded( + child: Center( + child: text14w400_FCFCFC( + BadgesData[index]["text"], + textAlign: TextAlign.center, ), - Expanded( - child: Center( - child: text14w400_FCFCFC( - BadgesData[index]["text"], - textAlign: TextAlign.center, - ), - ), - ), - ], - ); - }), - ) - ])))) + ), + ), + ], + ); + }), + ) + ]))), ])); } } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Certificate/Certificate.dart b/lib/Feed Module/Main_Screens/ProfileTab/Certificate/Certificate.dart index b15e62a..7a7a94f 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Certificate/Certificate.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Certificate/Certificate.dart @@ -51,13 +51,14 @@ class _CertificateState extends State { appBar: CommonAppbar( titleTxt: "Certifications/Qualifications", ), + resizeToAvoidBottomInset: false, body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), SingleChildScrollView( child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column(children: [ @@ -94,7 +95,7 @@ class _CertificateState extends State { ); }), ) - ])))) + ]))) ])); } } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Clubs/Clubs.dart b/lib/Feed Module/Main_Screens/ProfileTab/Clubs/Clubs.dart index b558c7e..b592b83 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Clubs/Clubs.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Clubs/Clubs.dart @@ -42,13 +42,14 @@ class _ClubsState extends State { appBar: CommonAppbar( titleTxt: "Clubs", ), + resizeToAvoidBottomInset: false, body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), SingleChildScrollView( child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column(children: [ @@ -65,7 +66,7 @@ class _ClubsState extends State { }, ) ]), - ))) + )) ])); } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/EditProfile.dart b/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/EditProfile.dart index 5be451a..d87c3d7 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/EditProfile.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/EditProfile.dart @@ -36,241 +36,241 @@ class _EditProfileState extends State { titleTxt: "", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16), - child: Column(children: [ - sizedBoxHeight(25.h), - Stack( - children: [ - filePath.isNotEmpty - ? ClipOval( - child: SizedBox.fromSize( - size: Size.fromRadius(50.r), - child: Image.file( - filePath[0]!, - fit: BoxFit.cover, - width: double.infinity, - ), - ), - ) - : CircleAvatar( - backgroundImage: AssetImage( - "assets/images/png/cimg3.png", - ), - radius: 50.r, + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + SingleChildScrollView( + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: Column(children: [ + sizedBoxHeight(25.h), + Stack( + children: [ + filePath.isNotEmpty + ? ClipOval( + child: SizedBox.fromSize( + size: Size.fromRadius(50.r), + child: Image.file( + filePath[0]!, + fit: BoxFit.cover, + width: double.infinity, ), - Positioned( - bottom: 0, - right: 0, - child: InkWell( - onTap: () { - ImageUploadBottomSheet().showModal( - context, - true, - (result) { - var file = File(result); + ), + ) + : CircleAvatar( + backgroundImage: AssetImage( + "assets/images/png/cimg3.png", + ), + radius: 50.r, + ), + Positioned( + bottom: 0, + right: 0, + child: InkWell( + onTap: () { + ImageUploadBottomSheet().showModal( + context, + true, + (result) { + var file = File(result); - filePath.add(file); - isImageAdded = true; - setState(() {}); - }, - ); + filePath.add(file); + isImageAdded = true; + setState(() {}); }, - child: Container( - height: 35.h, - width: 35.w, - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Color(0xFFD90B2E)), - child: Center( - child: Image.asset( - "assets/images/png/cameraicon2.png", - height: 19.h, - width: 19.w, - ), - ), + ); + }, + child: Container( + height: 35.h, + width: 35.w, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Color(0xFFD90B2E)), + child: Center( + child: Image.asset( + "assets/images/png/cameraicon2.png", + height: 19.h, + width: 19.w, ), - )) - ], + ), + ), + )) + ], + ), + sizedBoxHeight(15.h), + text16400white("Edit profile picture"), + sizedBoxHeight(20.h), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text16400white("Full name"), + sizedBoxHeight(16.h), + CustomTextFormField( + leadingIcon: Container( + width: 18.w, + height: 17.h, + child: Center( + child: Image.asset( + "assets/images/png/Frame 24.png", + width: 18.w, + height: 17.h, + ), + ), + ), + hintText: "Edward Hackett", ), - sizedBoxHeight(15.h), - text16400white("Edit profile picture"), sizedBoxHeight(20.h), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text16400white("Full name"), - sizedBoxHeight(16.h), - CustomTextFormField( - leadingIcon: Container( + text16400white("User name"), + sizedBoxHeight(16.h), + CustomTextFormField( + leadingIcon: Container( + width: 18.w, + height: 17.h, + child: Center( + child: Image.asset( + "assets/images/png/Frame 24.png", width: 18.w, height: 17.h, - child: Center( - child: Image.asset( - "assets/images/png/Frame 24.png", - width: 18.w, - height: 17.h, - ), - ), ), - hintText: "Edward Hackett", ), - sizedBoxHeight(20.h), - text16400white("User name"), - sizedBoxHeight(16.h), - CustomTextFormField( + ), + hintText: "edward_01", + ), + sizedBoxHeight(20.h), + text16400white("Date of birth"), + sizedBoxHeight(16.h), + GestureDetector( + onTap: () => datePicker(context, dateController), + child: AbsorbPointer( + child: CustomTextFormField( leadingIcon: Container( - width: 18.w, - height: 17.h, + width: 18.0, + height: 17.0, child: Center( child: Image.asset( - "assets/images/png/Frame 24.png", - width: 18.w, - height: 17.h, - ), - ), - ), - hintText: "edward_01", - ), - sizedBoxHeight(20.h), - text16400white("Date of birth"), - sizedBoxHeight(16.h), - GestureDetector( - onTap: () => datePicker(context, dateController), - child: AbsorbPointer( - child: CustomTextFormField( - leadingIcon: Container( + "assets/images/png/calender.png", width: 18.0, height: 17.0, - child: Center( - child: Image.asset( - "assets/images/png/calender.png", - width: 18.0, - height: 17.0, - ), - ), ), - hintText: "12-04-2024", - textEditingController: dateController, ), ), + hintText: "12-04-2024", + textEditingController: dateController, ), + ), + ), - sizedBoxHeight(20.h), - text16400white("Gender"), - sizedBoxHeight(16.h), - CustomDropDownRadio( - header: "Male", - title: "", - showOtherOption: true, - listData: ["Male", "Female", "Prefer not to say"], - onItemSelected: (p0) {}, - leadingImage: Image.asset( - "assets/images/png/Vector ws.png", - width: 18.w, - height: 17.h, - ), - ), - sizedBoxHeight(25.h), - Row( - children: [ - text16400white("Location"), - sizedBoxWidth(6.w), - Image.asset( - "assets/images/png/octicon_question-24.png", - height: 16.h, - width: 16.w, - ) - ], - ), - sizedBoxHeight(16.h), - CustomTextFormField( - leadingIcon: Container( - width: 18.w, - height: 17.h, - child: Center( - child: Image.asset( - "assets/images/png/Group 58645.png", - width: 18.w, - height: 17.h, - ), - ), - ), - hintText: "Elm street london, United Kingdom", - ), - sizedBoxHeight(20.h), - Row( - children: [ - text16400white("Primary sport"), - sizedBoxWidth(6.w), - Image.asset( - "assets/images/png/octicon_question-24.png", - height: 16.h, - width: 16.w, - ) - ], - ), - sizedBoxHeight(16.h), - CustomDropDownRadio( - showOtherOption: true, - header: "Rowing, Rugby, Swimming", - title: "", - listData: [ - "Rowing", - "Cycling", - "Running", - "Swimming", - "Triathlon", - "Hiking", - "Football", - "Rugby" - ], - onItemSelected: (p0) {}, - leadingImage: Image.asset( - "assets/images/png/Vector (4).png", - width: 18.w, - height: 17.h, - ), - ), - // CommonDropdownradioBtn( - // hint: "Rowing, Rugby, Swimming", - // items: [ - // "Rowing", - // "Cycling", - // "Running", - // "Swimming", - // "Triathlon", - // "Hiking", - // "Football", - // "Rugby" - // ], - // leadingIcon: Image.asset( - // "assets/images/png/Vector (4).png", - // width: 18.w, - // height: 17.h, - // ), - // showOtherOption: true, - // ), - sizedBoxHeight(20.h), - text16400white("Bio"), - sizedBoxHeight(16.h), - CustomTextFormField2( - hintText: - "Lorem Ipsum has been the industry's standard dummy text ever since the 1500s. Lorem Ipsum has been the industry's standard", - maxlines: 3, - ), - sizedBoxHeight(60.h), - CommonBtn(text: "Save"), - sizedBoxHeight(60.h), + sizedBoxHeight(20.h), + text16400white("Gender"), + sizedBoxHeight(16.h), + CustomDropDownRadio( + header: "Male", + title: "", + showOtherOption: true, + listData: ["Male", "Female", "Prefer not to say"], + onItemSelected: (p0) {}, + leadingImage: Image.asset( + "assets/images/png/Vector ws.png", + width: 18.w, + height: 17.h, + ), + ), + sizedBoxHeight(25.h), + Row( + children: [ + text16400white("Location"), + sizedBoxWidth(6.w), + Image.asset( + "assets/images/png/octicon_question-24.png", + height: 16.h, + width: 16.w, + ) ], - ) - ])))) + ), + sizedBoxHeight(16.h), + CustomTextFormField( + leadingIcon: Container( + width: 18.w, + height: 17.h, + child: Center( + child: Image.asset( + "assets/images/png/Group 58645.png", + width: 18.w, + height: 17.h, + ), + ), + ), + hintText: "Elm street london, United Kingdom", + ), + sizedBoxHeight(20.h), + Row( + children: [ + text16400white("Primary sport"), + sizedBoxWidth(6.w), + Image.asset( + "assets/images/png/octicon_question-24.png", + height: 16.h, + width: 16.w, + ) + ], + ), + sizedBoxHeight(16.h), + CustomDropDownRadio( + showOtherOption: true, + header: "Rowing, Rugby, Swimming", + title: "", + listData: [ + "Rowing", + "Cycling", + "Running", + "Swimming", + "Triathlon", + "Hiking", + "Football", + "Rugby" + ], + onItemSelected: (p0) {}, + leadingImage: Image.asset( + "assets/images/png/Vector (4).png", + width: 18.w, + height: 17.h, + ), + ), + // CommonDropdownradioBtn( + // hint: "Rowing, Rugby, Swimming", + // items: [ + // "Rowing", + // "Cycling", + // "Running", + // "Swimming", + // "Triathlon", + // "Hiking", + // "Football", + // "Rugby" + // ], + // leadingIcon: Image.asset( + // "assets/images/png/Vector (4).png", + // width: 18.w, + // height: 17.h, + // ), + // showOtherOption: true, + // ), + sizedBoxHeight(20.h), + text16400white("Bio"), + sizedBoxHeight(16.h), + CustomTextFormField2( + hintText: + "Lorem Ipsum has been the industry's standard dummy text ever since the 1500s. Lorem Ipsum has been the industry's standard", + maxlines: 3, + ), + sizedBoxHeight(60.h), + CommonBtn(text: "Save"), + sizedBoxHeight(60.h), + ], + ) + ]))) ])); } } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Followers/Followers.dart b/lib/Feed Module/Main_Screens/ProfileTab/Followers/Followers.dart index c799154..686fc05 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Followers/Followers.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Followers/Followers.dart @@ -62,13 +62,14 @@ class _FollowersState extends State { appBar: CommonAppbar( titleTxt: "Followers", ), + resizeToAvoidBottomInset: false, body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), SingleChildScrollView( child: Column(children: [ Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ Padding( @@ -105,7 +106,7 @@ class _FollowersState extends State { }, ) ]) - ]))) + ])) ])); } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart b/lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart index 1d0b979..6dd9960 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart @@ -59,16 +59,17 @@ class _FollowingState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Following", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), SingleChildScrollView( child: Column(children: [ Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ Padding( @@ -105,7 +106,7 @@ class _FollowingState extends State { }, ) ]) - ]))) + ])) ])); } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/ProfileTab.dart b/lib/Feed Module/Main_Screens/ProfileTab/ProfileTab.dart index 2c6c8a4..368c7a7 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/ProfileTab.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/ProfileTab.dart @@ -64,366 +64,358 @@ class _ProfileTabState extends State { backgroundColor: Color(0xFF222935), extendBody: true, body: Stack(clipBehavior: Clip.none, children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: commonGlassContainer( - border: 0, - width: double.infinity, - height: MediaQuery.of(context).size.height, - borderradius: 1, - customWidget: SafeArea( - child: SingleChildScrollView( - child: Column( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + SafeArea( + child: SingleChildScrollView( + child: Column( + children: [ + Stack( children: [ - Stack( - children: [ - Container( - height: 484.h, - width: double.infinity, - child: Image.asset( - "assets/images/png/profileimg.png", - fit: BoxFit.cover, - ), - ), - Positioned.fill( - child: Container( - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Color.fromRGBO(34, 41, 53, 0.1), - Color.fromRGBO(34, 41, 53, 0.79), - ], - stops: [ - 0.5788, - 0.8, - ], - ), - ), - ), - ), - Positioned( - bottom: 0, - right: 0, - left: 0, - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Column( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Column( - children: [ - text20700white("Edward Hackett"), - sizedBoxHeight(5.h), - text18w400white("@edward_01"), - sizedBoxHeight(15.h), - Row( - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - GestureDetector( - onTap: () { - Get.toNamed(RouteName.followers); - }, - child: Column( - children: [ - text16400white("254"), - sizedBoxHeight(6.h), - text12400whiteblur("Followers") - ], - ), - ), - sizedBoxWidth(20.w), - Container( - height: 58.h, - decoration: BoxDecoration( - color: Colors.white, - border: Border.all( - color: Colors.white, - width: 1.0, - ), - boxShadow: [ - BoxShadow( - color: Color(0x66000000), - offset: Offset(0, 4), - blurRadius: 4.0, - ), - ], - ), - ), - sizedBoxWidth(20.w), - GestureDetector( - onTap: () { - Get.toNamed(RouteName.following); - }, - child: Column( - children: [ - text16400white("254"), - sizedBoxHeight(6.h), - text12400whiteblur("Following") - ], - ), - ), - sizedBoxWidth(20.w), - Container( - height: 58.h, - decoration: BoxDecoration( - color: Colors.white, - border: Border.all( - color: Colors.white, - width: 1.0, - ), - boxShadow: [ - BoxShadow( - color: Color(0x66000000), - offset: Offset(0, 4), - blurRadius: 4.0, - ), - ], - ), - ), - sizedBoxWidth(20.w), - GestureDetector( - onTap: () { - Get.toNamed(RouteName.clubs); - }, - child: Column( - children: [ - text16400white("10"), - sizedBoxHeight(6.h), - text12400whiteblur("Clubs") - ], - ), - ), - ], - ), - sizedBoxHeight(20.h), - ], - ), - ], - ), - ), - ), - ], - ), - Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - sizedBoxHeight(30.h), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - GestureDetector( - onTap: () { - Get.toNamed(RouteName.editProfile); - }, - child: Container( - height: 40.h, - width: 170.w, - decoration: BoxDecoration( - color: Color(0xFFD90B2E), - borderRadius: BorderRadius.circular(30.r), - ), - child: Center( - child: text16w400_FCFCFC("Edit profile")), - ), - ), - GestureDetector( - onTap: () { - Get.toNamed(RouteName.shareProfile); - }, - child: commonGlassContainer( - width: 170.w, - height: 40.h, - opacity1: 0.05, - opacity2: 0.07, - borderradius: 30.r, - customWidget: Center( - child: text16w400_FCFCFC("Share profile"), - ), - border: 1, - ), - ) - ], - ), - sizedBoxHeight(30.h), - text18w700white("Bio"), - sizedBoxHeight(10.h), - text14400white( - "Lorem Ipsum has been the industry's standard dummy text ever since the 1500s."), - sizedBoxHeight(25.h), - Row( - children: [ - commonGlassContainer( - width: 25.w, - height: 25.h, - opacity1: 0.24, - opacity2: 0.24, - borderradius: 100, - customWidget: Center( - child: Image.asset( - "assets/images/png/Group 58645.png", - height: 12.h, - width: 12.w, - )), - border: 0.5), - sizedBoxWidth(12.w), - text14400whiteblur( - "Elm street london, United Kingdom"), - ], - ), - sizedBoxHeight(20.h), - Row( - children: [ - commonGlassContainer( - width: 25.w, - height: 25.h, - opacity1: 0.24, - opacity2: 0.24, - borderradius: 100, - customWidget: Center( - child: Image.asset( - "assets/images/png/Vector (4).png", - height: 12.h, - width: 12.w, - )), - border: 0.5), - sizedBoxWidth(12.w), - text14400whiteblur("Rowing, Football, Swimming"), - ], - ), - sizedBoxHeight(30.h), - commonGlassContainer( - width: double.infinity, - height: 135.h, - borderradius: 10, - customWidget: Padding( - padding: EdgeInsets.symmetric( - vertical: 12.h, horizontal: 16.w), - child: Column( - children: [ - Row( - children: [ - text16w700white("Badges"), - Spacer(), - GestureDetector( - onTap: () { - Get.toNamed(RouteName.badges); - }, - child: text12400white("View more")) - ], - ), - sizedBoxHeight(8.h), - Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Image.asset( - "assets/images/png/Frame 1000004056.png", - height: 70.h, - width: 74.w, - ), - Image.asset( - "assets/images/png/Frame 1000004056.png", - height: 70.h, - width: 74.w, - ), - Image.asset( - "assets/images/png/Frame 1000004056.png", - height: 70.h, - width: 74.w, - ), - Image.asset( - "assets/images/png/Frame 1000004056.png", - height: 70.h, - width: 74.w, - ), - ], - ), - ], - ), - ), - border: 1), - sizedBoxHeight(40.h), - ], + Container( + height: 484.h, + width: double.infinity, + child: Image.asset( + "assets/images/png/profileimg.png", + fit: BoxFit.cover, ), ), - SizedBox( - height: 190.h, - child: ListView.builder( - shrinkWrap: true, - scrollDirection: Axis.horizontal, - padding: EdgeInsets.only(left: 16.w), - itemCount: cardtile.length, - itemBuilder: (context, index) { - return Padding( - padding: EdgeInsets.only(right: 20.w), - child: profilecardtile( - imagePath: cardtile[index]["imagePath"], - title: cardtile[index]["title"]), - ); - }, + Positioned.fill( + child: Container( + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [ + Color.fromRGBO(34, 41, 53, 0.1), + Color.fromRGBO(34, 41, 53, 0.79), + ], + stops: [ + 0.5788, + 0.8, + ], + ), + ), ), ), - sizedBoxHeight(20.h), - Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + Positioned( + bottom: 0, + right: 0, + left: 0, + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Column( + mainAxisAlignment: MainAxisAlignment.end, children: [ - Row( + Column( children: [ - text18w700white("Timeline"), - Spacer(), - InkWell( - onTap: () { - Get.toNamed(RouteName.addtimeline); - }, - child: Image.asset( - "assets/images/png/iconamoon_edit-thin.png", - height: 20.h, - width: 20.w, - ), - ) + text20700white("Edward Hackett"), + sizedBoxHeight(5.h), + text18w400white("@edward_01"), + sizedBoxHeight(15.h), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + GestureDetector( + onTap: () { + Get.toNamed(RouteName.followers); + }, + child: Column( + children: [ + text16400white("254"), + sizedBoxHeight(6.h), + text12400whiteblur("Followers") + ], + ), + ), + sizedBoxWidth(20.w), + Container( + height: 58.h, + decoration: BoxDecoration( + color: Colors.white, + border: Border.all( + color: Colors.white, + width: 1.0, + ), + boxShadow: [ + BoxShadow( + color: Color(0x66000000), + offset: Offset(0, 4), + blurRadius: 4.0, + ), + ], + ), + ), + sizedBoxWidth(20.w), + GestureDetector( + onTap: () { + Get.toNamed(RouteName.following); + }, + child: Column( + children: [ + text16400white("254"), + sizedBoxHeight(6.h), + text12400whiteblur("Following") + ], + ), + ), + sizedBoxWidth(20.w), + Container( + height: 58.h, + decoration: BoxDecoration( + color: Colors.white, + border: Border.all( + color: Colors.white, + width: 1.0, + ), + boxShadow: [ + BoxShadow( + color: Color(0x66000000), + offset: Offset(0, 4), + blurRadius: 4.0, + ), + ], + ), + ), + sizedBoxWidth(20.w), + GestureDetector( + onTap: () { + Get.toNamed(RouteName.clubs); + }, + child: Column( + children: [ + text16400white("10"), + sizedBoxHeight(6.h), + text12400whiteblur("Clubs") + ], + ), + ), + ], + ), + sizedBoxHeight(20.h), ], ), - sizedBoxHeight(20.h), - SizedBox( - height: 300.h, - child: ListView.builder( - shrinkWrap: true, - itemCount: timeline.length, - itemBuilder: (context, index) { - return commonTimelineCard( - imagePath: timeline[index]["imagePath"], - title: timeline[index]["title"]); - }, - )), - sizedBoxHeight(30.h), - text18w700white("Posts"), - ]), + ], + ), + ), ), - normalcardtile( - profileImg: 'assets/images/png/Ellipse 48.png', - title: 'Jocelyn Dokidis', - mainImg: 'assets/images/png/Rectangle 46.png', - containerTitle: [ - 'Race', - 'Swimming', - 'Events', - 'Marathon', - 'Events' - ]), - sizedBoxHeight(120.h), ], ), - ), + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + sizedBoxHeight(30.h), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + GestureDetector( + onTap: () { + Get.toNamed(RouteName.editProfile); + }, + child: Container( + height: 40.h, + width: 170.w, + decoration: BoxDecoration( + color: Color(0xFFD90B2E), + borderRadius: BorderRadius.circular(30.r), + ), + child: Center( + child: text16w400_FCFCFC("Edit profile")), + ), + ), + GestureDetector( + onTap: () { + Get.toNamed(RouteName.shareProfile); + }, + child: commonGlassContainer( + width: 170.w, + height: 40.h, + opacity1: 0.05, + opacity2: 0.07, + borderradius: 30.r, + customWidget: Center( + child: text16w400_FCFCFC("Share profile"), + ), + border: 1, + ), + ) + ], + ), + sizedBoxHeight(30.h), + text18w700white("Bio"), + sizedBoxHeight(10.h), + text14400white( + "Lorem Ipsum has been the industry's standard dummy text ever since the 1500s."), + sizedBoxHeight(25.h), + Row( + children: [ + commonGlassContainer( + width: 25.w, + height: 25.h, + opacity1: 0.24, + opacity2: 0.24, + borderradius: 100, + customWidget: Center( + child: Image.asset( + "assets/images/png/Group 58645.png", + height: 12.h, + width: 12.w, + )), + border: 0.5), + sizedBoxWidth(12.w), + text14400whiteblur( + "Elm street london, United Kingdom"), + ], + ), + sizedBoxHeight(20.h), + Row( + children: [ + commonGlassContainer( + width: 25.w, + height: 25.h, + opacity1: 0.24, + opacity2: 0.24, + borderradius: 100, + customWidget: Center( + child: Image.asset( + "assets/images/png/Vector (4).png", + height: 12.h, + width: 12.w, + )), + border: 0.5), + sizedBoxWidth(12.w), + text14400whiteblur("Rowing, Football, Swimming"), + ], + ), + sizedBoxHeight(30.h), + commonGlassContainer( + width: double.infinity, + height: 135.h, + borderradius: 10, + customWidget: Padding( + padding: EdgeInsets.symmetric( + vertical: 12.h, horizontal: 16.w), + child: Column( + children: [ + Row( + children: [ + text16w700white("Badges"), + Spacer(), + GestureDetector( + onTap: () { + Get.toNamed(RouteName.badges); + }, + child: text12400white("View more")) + ], + ), + sizedBoxHeight(8.h), + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Image.asset( + "assets/images/png/Frame 1000004056.png", + height: 70.h, + width: 74.w, + ), + Image.asset( + "assets/images/png/Frame 1000004056.png", + height: 70.h, + width: 74.w, + ), + Image.asset( + "assets/images/png/Frame 1000004056.png", + height: 70.h, + width: 74.w, + ), + Image.asset( + "assets/images/png/Frame 1000004056.png", + height: 70.h, + width: 74.w, + ), + ], + ), + ], + ), + ), + border: 1), + sizedBoxHeight(40.h), + ], + ), + ), + SizedBox( + height: 190.h, + child: ListView.builder( + shrinkWrap: true, + scrollDirection: Axis.horizontal, + padding: EdgeInsets.only(left: 16.w), + itemCount: cardtile.length, + itemBuilder: (context, index) { + return Padding( + padding: EdgeInsets.only(right: 20.w), + child: profilecardtile( + imagePath: cardtile[index]["imagePath"], + title: cardtile[index]["title"]), + ); + }, + ), + ), + sizedBoxHeight(20.h), + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + text18w700white("Timeline"), + Spacer(), + InkWell( + onTap: () { + Get.toNamed(RouteName.addtimeline); + }, + child: Image.asset( + "assets/images/png/iconamoon_edit-thin.png", + height: 20.h, + width: 20.w, + ), + ) + ], + ), + sizedBoxHeight(20.h), + SizedBox( + height: 300.h, + child: ListView.builder( + shrinkWrap: true, + itemCount: timeline.length, + itemBuilder: (context, index) { + return commonTimelineCard( + imagePath: timeline[index]["imagePath"], + title: timeline[index]["title"]); + }, + )), + sizedBoxHeight(30.h), + text18w700white("Posts"), + ]), + ), + normalcardtile( + profileImg: 'assets/images/png/Ellipse 48.png', + title: 'Jocelyn Dokidis', + mainImg: 'assets/images/png/Rectangle 46.png', + containerTitle: [ + 'Race', + 'Swimming', + 'Events', + 'Marathon', + 'Events' + ]), + sizedBoxHeight(120.h), + ], ), ), ), diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSessions.dart b/lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSessions.dart index 7d1bfd4..73c2ed1 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSessions.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSessions.dart @@ -24,18 +24,19 @@ class _AccountSessionState extends State { Widget build(BuildContext context) { return Scaffold( // key: _scaffoldKey1, + resizeToAvoidBottomInset: false, backgroundColor: Color(0xFF222935), extendBody: true, appBar: CommonAppbar( titleTxt: "Account sessions", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -50,7 +51,7 @@ class _AccountSessionState extends State { }, ) ]), - )) + ) ])); } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSetting.dart b/lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSetting.dart index 477410b..a37e0aa 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSetting.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSetting.dart @@ -22,21 +22,25 @@ class _AccountSettingsState extends State { Widget build(BuildContext context) { return Scaffold( // key: _scaffoldKey1, + resizeToAvoidBottomInset: false, backgroundColor: Color(0xFF222935), extendBody: true, appBar: CommonAppbar( titleTxt: "Account settings", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage( + "assets/images/png/Ellipse 1496.png", + ), + fit: BoxFit.fill)), + ), + SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ sizedBoxHeight(20.h), Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), @@ -114,7 +118,7 @@ class _AccountSettingsState extends State { ]), ), ) - ]))) + ])) ])); } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/BlockedUsers.dart b/lib/Feed Module/Main_Screens/ProfileTab/Settings/BlockedUsers.dart index fcf5b5c..88882cc 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/BlockedUsers.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Settings/BlockedUsers.dart @@ -59,59 +59,57 @@ class _BlockedUsersState extends State { Widget build(BuildContext context) { return Scaffold( // key: _scaffoldKey1, + resizeToAvoidBottomInset: false, backgroundColor: Color(0xFF222935), extendBody: true, appBar: CommonAppbar( titleTxt: "Blocked users", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - sizedBoxHeight(25.h), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 16), - child: CustomTextFormField( - leadingIcon: SizedBox( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + sizedBoxHeight(25.h), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: CustomTextFormField( + leadingIcon: SizedBox( + height: 23, + width: 23, + child: Center( + child: Image.asset( + "assets/images/png/ion_search-outline.png", height: 23, width: 23, - child: Center( - child: Image.asset( - "assets/images/png/ion_search-outline.png", - height: 23, - width: 23, - ), - ), ), - hintText: "Search people", ), ), - sizedBoxHeight(25.h), - Expanded( - child: ListView.builder( - shrinkWrap: true, - itemCount: blockedUserData.length, - itemBuilder: (context, index) { - return Column( - children: [ - blockedUser( - imagePath: blockedUserData[index]["imagePath"], - title: blockedUserData[index]["title"], - subtitle: blockedUserData[index]["subtitle"]), - if (index != blockedUserData.length - 1) - commonDivider(), - ], - ); - }, - ), - ), - sizedBoxHeight(20.h) - ])) + hintText: "Search people", + ), + ), + sizedBoxHeight(25.h), + Expanded( + child: ListView.builder( + shrinkWrap: true, + itemCount: blockedUserData.length, + itemBuilder: (context, index) { + return Column( + children: [ + blockedUser( + imagePath: blockedUserData[index]["imagePath"], + title: blockedUserData[index]["title"], + subtitle: blockedUserData[index]["subtitle"]), + if (index != blockedUserData.length - 1) commonDivider(), + ], + ); + }, + ), + ), + sizedBoxHeight(20.h) + ]) ])); } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ChangePassword.dart b/lib/Feed Module/Main_Screens/ProfileTab/Settings/ChangePassword.dart index e829b9b..985436a 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ChangePassword.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Settings/ChangePassword.dart @@ -22,6 +22,7 @@ class _ChangePasswordState extends State { @override Widget build(BuildContext context) { return Scaffold( + resizeToAvoidBottomInset: false, // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, @@ -29,12 +30,12 @@ class _ChangePasswordState extends State { titleTxt: "Change password", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: SingleChildScrollView( child: Column( @@ -127,7 +128,7 @@ class _ChangePasswordState extends State { ) ]), ), - )) + ) ])); } } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ContactUs.dart b/lib/Feed Module/Main_Screens/ProfileTab/Settings/ContactUs.dart index d5901de..45290de 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ContactUs.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Settings/ContactUs.dart @@ -28,82 +28,81 @@ class _ContactUsState extends State { titleTxt: "Contact us", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16), - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - sizedBoxHeight(20.h), - text16400white("Full name"), - sizedBoxHeight(16.h), - CustomTextFormField( - leadingIcon: Container( - height: 17.h, - width: 18.w, - child: Center( - child: Image.asset( - "assets/images/png/Frame 24.png", - height: 17.h, - width: 18.w, - fit: BoxFit.cover, + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + sizedBoxHeight(20.h), + text16400white("Full name"), + sizedBoxHeight(16.h), + CustomTextFormField( + leadingIcon: Container( + height: 17.h, + width: 18.w, + child: Center( + child: Image.asset( + "assets/images/png/Frame 24.png", + height: 17.h, + width: 18.w, + fit: BoxFit.cover, + ), ), ), + hintText: "Edward Hackett", ), - hintText: "Edward Hackett", - ), - text16400white("Email address"), - sizedBoxHeight(16.h), - CustomTextFormField( - leadingIcon: Container( - height: 17.h, - width: 18.w, - child: Center( - child: Image.asset( - "assets/images/png/Frame 12.png", - height: 17.h, - width: 18.w, - fit: BoxFit.cover, + text16400white("Email address"), + sizedBoxHeight(16.h), + CustomTextFormField( + leadingIcon: Container( + height: 17.h, + width: 18.w, + child: Center( + child: Image.asset( + "assets/images/png/Frame 12.png", + height: 17.h, + width: 18.w, + fit: BoxFit.cover, + ), ), ), + hintText: "loremipsum@gmail.com", ), - hintText: "loremipsum@gmail.com", - ), - text16400white("Reason to contact"), - sizedBoxHeight(16.h), - CustomDropDownRadio( - header: "", - title: "", - listData: [ - "Feature suggestion", - "Issues with app", - "Scoreboard", - "Feedback" - ], - onItemSelected: (p0) {}, - leadingImage: Image.asset( - "assets/images/png/fluent_person-support-20-regular.png", - height: 17.h, - width: 18.w, + text16400white("Reason to contact"), + sizedBoxHeight(16.h), + CustomDropDownRadio( + header: "", + title: "", + listData: [ + "Feature suggestion", + "Issues with app", + "Scoreboard", + "Feedback" + ], + onItemSelected: (p0) {}, + leadingImage: Image.asset( + "assets/images/png/fluent_person-support-20-regular.png", + height: 17.h, + width: 18.w, + ), ), - ), - sizedBoxHeight(25.h), - text16400white("Query"), - sizedBoxHeight(16.h), - CustomTextFormField2( - maxlines: 3, - hintText: - "Lorem Ipsum has been the industry's standard dummy text ever since the 1500s. Lorem Ipsum has been the industry's standard", - ), - CommonBtn(text: "Send") - ]), - ), - )) + sizedBoxHeight(25.h), + text16400white("Query"), + sizedBoxHeight(16.h), + CustomTextFormField2( + maxlines: 3, + hintText: + "Lorem Ipsum has been the industry's standard dummy text ever since the 1500s. Lorem Ipsum has been the industry's standard", + ), + CommonBtn(text: "Send") + ]), + )) ])); } } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/DeleteAccount.dart b/lib/Feed Module/Main_Screens/ProfileTab/Settings/DeleteAccount.dart index 4fff1ab..513816c 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/DeleteAccount.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Settings/DeleteAccount.dart @@ -19,18 +19,19 @@ class _DeleteAccountState extends State { Widget build(BuildContext context) { return Scaffold( // key: _scaffoldKey1, + resizeToAvoidBottomInset: false, backgroundColor: Color(0xFF222935), extendBody: true, appBar: CommonAppbar( titleTxt: "", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + SingleChildScrollView( child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column(children: [ @@ -61,7 +62,7 @@ class _DeleteAccountState extends State { text16400white("Yes I am ready to delete my account"), ]), ), - )) + ) ])); } } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/FaqScreen.dart b/lib/Feed Module/Main_Screens/ProfileTab/Settings/FaqScreen.dart index f42aacd..f046a3f 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/FaqScreen.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Settings/FaqScreen.dart @@ -61,15 +61,17 @@ class _FaqScreenState extends State { return Scaffold( // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), + resizeToAvoidBottomInset: false, extendBody: true, appBar: CommonAppbar( titleTxt: "FAQ’s", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), Positioned.fill( child: SingleChildScrollView( child: Padding( diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart b/lib/Feed Module/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart index fe2fc82..abcdaeb 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart @@ -20,21 +20,22 @@ class _HelpAndSupportState extends State { Widget build(BuildContext context) { return Scaffold( // key: _scaffoldKey1, + resizeToAvoidBottomInset: false, backgroundColor: Color(0xFF222935), extendBody: true, appBar: CommonAppbar( titleTxt: "Help & Support", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ sizedBoxHeight(20.h), GestureDetector( onTap: () { @@ -66,7 +67,7 @@ class _HelpAndSupportState extends State { text: "Report a bug", ), ), - ]))) + ])) ])); } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/Notification.dart b/lib/Feed Module/Main_Screens/ProfileTab/Settings/Notification.dart index b09450d..4c0577c 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/Notification.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Settings/Notification.dart @@ -20,6 +20,7 @@ class _NotificationScreenState extends State { @override Widget build(BuildContext context) { return Scaffold( + resizeToAvoidBottomInset: false, // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, @@ -27,13 +28,13 @@ class _NotificationScreenState extends State { titleTxt: "Notifications", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( - child: Column(children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + SingleChildScrollView( + child: Column(children: [ sizedBoxHeight(20.h), rowTile(text: "Group notification", index: 0), commonDivider(), @@ -44,7 +45,7 @@ class _NotificationScreenState extends State { rowTile(text: "New follower notification", index: 3), commonDivider(), rowTile(text: "Direct message notification", index: 4), - ]))) + ])) ])); } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart b/lib/Feed Module/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart index 145a632..bdbe277 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart @@ -19,16 +19,17 @@ class _PrivacyPolicyState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Privacy policy", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: SingleChildScrollView( child: Column(children: [ @@ -43,7 +44,7 @@ class _PrivacyPolicyState extends State { "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.") ]), ), - )) + ) ])); } } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ReportABug.dart b/lib/Feed Module/Main_Screens/ProfileTab/Settings/ReportABug.dart index f99261c..e36df66 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ReportABug.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Settings/ReportABug.dart @@ -21,18 +21,19 @@ class _ReportABugState extends State { Widget build(BuildContext context) { return Scaffold( // key: _scaffoldKey1, + resizeToAvoidBottomInset: false, backgroundColor: Color(0xFF222935), extendBody: true, appBar: CommonAppbar( titleTxt: "Report a bug", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: SingleChildScrollView( child: Column( @@ -140,7 +141,7 @@ class _ReportABugState extends State { sizedBoxHeight(20.h), CommonBtn(text: "Send") ])), - )) + ) ])); } } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/Settings.dart b/lib/Feed Module/Main_Screens/ProfileTab/Settings/Settings.dart index f67cc70..b31c071 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/Settings.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Settings/Settings.dart @@ -24,16 +24,17 @@ class _SettingsState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Settings", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Column(children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + Column(children: [ GestureDetector( onTap: () { Get.toNamed(RouteName.accountsettings); @@ -94,7 +95,7 @@ class _SettingsState extends State { text: "Logout", ), ), - ])) + ]) ])); } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart b/lib/Feed Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart index f0093b8..b46c099 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart @@ -19,16 +19,17 @@ class _TermsConditionState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Terms & Condition", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: SingleChildScrollView( child: Column(children: [ @@ -43,7 +44,7 @@ class _TermsConditionState extends State { "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.") ]), ), - )) + ) ])); } } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/VerifyCode.dart b/lib/Feed Module/Main_Screens/ProfileTab/Settings/VerifyCode.dart index b518c38..6764e32 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/VerifyCode.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Settings/VerifyCode.dart @@ -25,56 +25,57 @@ class _VerifyCodeState extends State { return Scaffold( backgroundColor: const Color(0xFF222935), appBar: CommonAppbar(titleTxt: ""), + resizeToAvoidBottomInset: false, body: Stack( children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - sizedBoxHeight(20.h), - text20700white("Check your email"), - sizedBoxHeight(10.h), - text14400whiteblur( - "Enter the verification code that we sent to loremipsum@gmail.com"), - sizedBoxHeight(30.h), - text16400white("Enter code"), - sizedBoxHeight(20.h), - commonGlassContainer( - width: double.infinity, - height: 50.h, - borderradius: 30.r, - border: 1, - customWidget: CustomPinCodeField( - controller: pincodeController, - onChanged: (value) { - print(value); - }, - onCompleted: (value) { - print("Completed"); - pincodeController.text = value; - }, - ), - ), - sizedBoxHeight(70.h), - CustomButton( - text: 'Continue', - onPressed: () { - if (pincodeController.text.isEmpty) { - utils.showToast("Pin field is empty"); - } else { - return; - } + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + sizedBoxHeight(20.h), + text20700white("Check your email"), + sizedBoxHeight(10.h), + text14400whiteblur( + "Enter the verification code that we sent to loremipsum@gmail.com"), + sizedBoxHeight(30.h), + text16400white("Enter code"), + sizedBoxHeight(20.h), + commonGlassContainer( + width: double.infinity, + height: 50.h, + borderradius: 30.r, + border: 1, + customWidget: CustomPinCodeField( + controller: pincodeController, + onChanged: (value) { + print(value); + }, + onCompleted: (value) { + print("Completed"); + pincodeController.text = value; }, ), - ], - ), + ), + sizedBoxHeight(70.h), + CustomButton( + text: 'Continue', + onPressed: () { + if (pincodeController.text.isEmpty) { + utils.showToast("Pin field is empty"); + } else { + return; + } + }, + ), + ], ), ), ), diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Share profile/ShareProfile.dart b/lib/Feed Module/Main_Screens/ProfileTab/Share profile/ShareProfile.dart index 1de31fc..ee9b84a 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Share profile/ShareProfile.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/Share profile/ShareProfile.dart @@ -62,13 +62,13 @@ class _ShareProfileState extends State { titleTxt: "Share profile", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( - child: Column(children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + ), + SingleChildScrollView( + child: Column(children: [ Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ sizedBoxHeight(10.h), Padding( @@ -118,7 +118,7 @@ class _ShareProfileState extends State { child: CommonBtn(text: "Send"), ) ]) - ]))) + ])), ])); } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart b/lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart index ccd7eae..dcb222c 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart @@ -26,6 +26,7 @@ class _AddTimelineState extends State { @override Widget build(BuildContext context) { return Scaffold( + resizeToAvoidBottomInset: false, // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, @@ -33,13 +34,14 @@ class _AddTimelineState extends State { titleTxt: "Add timeline", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + SingleChildScrollView( + child: Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -154,7 +156,7 @@ class _AddTimelineState extends State { child: CommonBtn(text: "Add timeline"), ), ]), - ))) + )) ])); } } diff --git a/lib/Feed Module/Notification/View/notification.dart b/lib/Feed Module/Notification/View/notification.dart index 41d2970..fa8fb0d 100644 --- a/lib/Feed Module/Notification/View/notification.dart +++ b/lib/Feed Module/Notification/View/notification.dart @@ -69,7 +69,7 @@ class _NotificationPageState extends State { // 500.h, MediaQuery.of(context).size.height, borderRadius: 2, - blur: 10, + blur: 6, alignment: Alignment.bottomLeft, border: 2, linearGradient: LinearGradient( 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 de84138..38784d9 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 @@ -22,16 +22,17 @@ class _CommunitySettingState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Community settings", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Column(children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), Column(children: [ sizedBoxHeight(30.h), GestureDetector( onTap: () { @@ -57,7 +58,7 @@ class _CommunitySettingState extends State { }, child: rowTile(text: 'Manage tags')), sizedBoxHeight(20.h), - ])) + ]) ])); } diff --git a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart b/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart index 4bb94e7..0a14f8b 100644 --- a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart +++ b/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart @@ -46,13 +46,15 @@ class _EditCommunityState extends State { appBar: CommonAppbar( titleTxt: "Edit community info", ), + resizeToAvoidBottomInset: false, body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + SingleChildScrollView( child: Column(children: [ sizedBoxHeight(30.h), Stack( @@ -299,7 +301,7 @@ class _EditCommunityState extends State { ), ) ]), - )) + ) ])); } } 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 index 7c76a01..6dbf089 100644 --- a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart +++ b/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart @@ -50,6 +50,7 @@ class _ManageGroupsState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Manage groups", customActionWidget: InkWell( @@ -74,12 +75,12 @@ class _ManageGroupsState extends State { ), ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), SingleChildScrollView( child: Column(children: [ Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), @@ -148,7 +149,7 @@ class _ManageGroupsState extends State { }, ) ]), - )) + ) ])); } } 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 9078d71..0bacc8b 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 @@ -28,13 +28,14 @@ class _ManageTagsState extends State { appBar: CommonAppbar( titleTxt: "Manage tags", ), + resizeToAvoidBottomInset: false, body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), SingleChildScrollView( child: Column(children: [ sizedBoxHeight(20.h), DefaultTabController( @@ -59,7 +60,7 @@ class _ManageTagsState extends State { ), ), ])) - ]))) + ])) ]), floatingActionButtonLocation: CustomFloatingActionButtonLocation(60.0), floatingActionButton: Container( diff --git a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart b/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart index f0a163d..2e0b01f 100644 --- a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart +++ b/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart @@ -24,13 +24,14 @@ class _NewTagState extends State { appBar: CommonAppbar( titleTxt: "New tag", ), + resizeToAvoidBottomInset: false, body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), SingleChildScrollView( child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( @@ -52,7 +53,7 @@ class _NewTagState extends State { sizedBoxHeight(80.h), CustomButton(text: "Add", onPressed: () {}) ]), - ))) + )) ])); } } diff --git a/lib/Feed Module/sidemenu/Community/Announcements/AnnouncementRequest.dart b/lib/Feed Module/sidemenu/Community/Announcements/AnnouncementRequest.dart index 38514f9..6299508 100644 --- a/lib/Feed Module/sidemenu/Community/Announcements/AnnouncementRequest.dart +++ b/lib/Feed Module/sidemenu/Community/Announcements/AnnouncementRequest.dart @@ -22,16 +22,17 @@ class _AnnouncementRequestState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Announcement requests", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), SingleChildScrollView( child: Padding( padding: EdgeInsets.symmetric(horizontal: 16), child: Column( @@ -42,7 +43,7 @@ class _AnnouncementRequestState extends State { title: "title", mainImg: "assets/images/png/Rectangle 22.png") ], - )))) + ))) ])); } diff --git a/lib/Feed Module/sidemenu/Community/Announcements/ManageMembers.dart b/lib/Feed Module/sidemenu/Community/Announcements/ManageMembers.dart index 854cbde..64c2bb4 100644 --- a/lib/Feed Module/sidemenu/Community/Announcements/ManageMembers.dart +++ b/lib/Feed Module/sidemenu/Community/Announcements/ManageMembers.dart @@ -36,6 +36,7 @@ class _ManageMembersState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "Manage members", customActionWidget: Container( @@ -57,12 +58,12 @@ class _ManageMembersState extends State { ), ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Column( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ sizedBoxHeight(20.h), @@ -97,7 +98,7 @@ class _ManageMembersState extends State { ), ], )) - ])) + ]) ])); } @@ -351,7 +352,7 @@ class _ManageMembersState extends State { Color(0xFFD90B2E), ], ), - blur: 10, + blur: 6, child: Center(child: text16w400_FCFCFC("Su")), ), sizedBoxWidth(8.w), diff --git a/lib/Feed Module/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart b/lib/Feed Module/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart index 62c57af..a99b5bd 100644 --- a/lib/Feed Module/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart +++ b/lib/Feed Module/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart @@ -26,13 +26,14 @@ class _NewAnnouncementState extends State { appBar: CommonAppbar( titleTxt: "New announcement", ), + resizeToAvoidBottomInset: false, body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), SingleChildScrollView( child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: @@ -58,7 +59,7 @@ class _NewAnnouncementState extends State { Get.toNamed(RouteName.announcement); }) ]), - ))) + )) ])); } } diff --git a/lib/Feed Module/sidemenu/Community/Group/view/Group.dart b/lib/Feed Module/sidemenu/Community/Group/view/Group.dart index b60a26e..053cb1f 100644 --- a/lib/Feed Module/sidemenu/Community/Group/view/Group.dart +++ b/lib/Feed Module/sidemenu/Community/Group/view/Group.dart @@ -45,13 +45,14 @@ class _GroupState extends State { appBar: CommonAppbar( titleTxt: "Groups", ), + resizeToAvoidBottomInset: false, body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), Padding( padding: EdgeInsets.symmetric(horizontal: 16), child: SingleChildScrollView( child: Column( @@ -67,7 +68,7 @@ class _GroupState extends State { }), ) ], - )))) + ))) ])); } diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/AddGroups.dart b/lib/Feed Module/sidemenu/Community/MyCommunity/AddGroups.dart index ddc6b43..e02620a 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/AddGroups.dart +++ b/lib/Feed Module/sidemenu/Community/MyCommunity/AddGroups.dart @@ -52,13 +52,14 @@ class _AddGroupState extends State { appBar: CommonAppbar( titleTxt: "Add groups", ), + resizeToAvoidBottomInset: false, body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), SingleChildScrollView( child: Column(children: [ Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), @@ -144,7 +145,7 @@ class _AddGroupState extends State { ), ), ]), - )) + ) ])); } diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart b/lib/Feed Module/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart index 53fc3db..8be3ddf 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart +++ b/lib/Feed Module/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart @@ -26,13 +26,14 @@ class _CommunityInfoState extends State { appBar: CommonAppbar( titleTxt: "Community info page", ), + resizeToAvoidBottomInset: false, body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), SingleChildScrollView( child: Column(children: [ Stack(clipBehavior: Clip.none, children: [ GestureDetector( @@ -128,7 +129,7 @@ class _CommunityInfoState extends State { ) ]), ) - ]))) + ])) ])); } } diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/NewCommunity.dart b/lib/Feed Module/sidemenu/Community/MyCommunity/NewCommunity.dart index 3d5c94b..c3b1e58 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/NewCommunity.dart +++ b/lib/Feed Module/sidemenu/Community/MyCommunity/NewCommunity.dart @@ -5,7 +5,6 @@ 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/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; @@ -35,16 +34,17 @@ class _NewCommunityState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "New community", ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: SingleChildScrollView( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), SingleChildScrollView( child: Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: @@ -234,7 +234,7 @@ class _NewCommunityState extends State { sizedBoxHeight(25.h), sizedBoxHeight(150.h), ]), - ))) + )) ])); } } diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart b/lib/Feed Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart index d2d9c03..ceadd24 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart +++ b/lib/Feed Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart @@ -25,6 +25,7 @@ class _CommunityDetailsState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "", customActionWidget: PopupMenuButton( @@ -151,10 +152,12 @@ class _CommunityDetailsState extends State { )), ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), Positioned.fill( child: SingleChildScrollView( child: 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 594dd66..d11062d 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/View/MyCommunity.dart +++ b/lib/Feed Module/sidemenu/Community/MyCommunity/View/MyCommunity.dart @@ -63,6 +63,7 @@ class _MyCommunityState extends State { // key: _scaffoldKey1, backgroundColor: Color(0xFF222935), extendBody: true, + resizeToAvoidBottomInset: false, appBar: CommonAppbar( titleTxt: "My Communities", customActionWidget: Row( @@ -101,12 +102,12 @@ class _MyCommunityState extends State { ), ), body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: SingleChildScrollView( child: Column( @@ -145,7 +146,7 @@ class _MyCommunityState extends State { }), ) ]), - ))) + )) ])); } diff --git a/lib/Feed Module/sidemenu/SavedPosts/SavedPosts.dart b/lib/Feed Module/sidemenu/SavedPosts/SavedPosts.dart index bc279c1..8a31586 100644 --- a/lib/Feed Module/sidemenu/SavedPosts/SavedPosts.dart +++ b/lib/Feed Module/sidemenu/SavedPosts/SavedPosts.dart @@ -33,42 +33,44 @@ class _SavedPostsState extends State { appBar: CommonAppbar( titleTxt: "Saved posts", ), + resizeToAvoidBottomInset: false, body: Stack(children: [ - const CommonBlurLeftRed(), - const CommonBlurRightRed(), - const CommonBlurLeft(), - const CommonBlurRight(), - Positioned.fill( - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Column( - children: [ - sizedBoxHeight(40.h), - Expanded( - child: GridView.builder( - scrollDirection: Axis.vertical, - gridDelegate: - const SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 3, - mainAxisSpacing: 8, - crossAxisSpacing: 8, - childAspectRatio: 1, - ), - itemCount: images.length, - itemBuilder: (context, index) { - return Container( - width: 115.w, - height: 115.h, - child: Image.asset( - images[index], - width: 115.w, - height: 115.h, - fit: BoxFit.cover, - )); - }), - ) - ], - ))), + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Column( + children: [ + sizedBoxHeight(40.h), + Expanded( + child: GridView.builder( + scrollDirection: Axis.vertical, + gridDelegate: + const SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: 3, + mainAxisSpacing: 8, + crossAxisSpacing: 8, + childAspectRatio: 1, + ), + itemCount: images.length, + itemBuilder: (context, index) { + return Container( + width: 115.w, + height: 115.h, + child: Image.asset( + images[index], + width: 115.w, + height: 115.h, + fit: BoxFit.cover, + )); + }), + ) + ], + )) ])); } } diff --git a/lib/Login/View/loginscreen.dart b/lib/Login/View/loginscreen.dart index eabc455..9b83556 100644 --- a/lib/Login/View/loginscreen.dart +++ b/lib/Login/View/loginscreen.dart @@ -40,21 +40,37 @@ class _LoginScreenState extends State { Container( decoration: const BoxDecoration( image: DecorationImage( - image: AssetImage("assets/images/png/Choice screen.png"))), + image: AssetImage("assets/images/png/Choice screen.png"), + fit: BoxFit.cover)), ), Center( child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ SizedBox( - height: 271.h, + height: 150.h, ), Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - sizedBoxHeight(35.h), + Align( + alignment: Alignment.center, + child: Container( + width: 107.w, + height: 70.h, + child: SvgPicture.asset( + "assets/images/svg/onboarding2.svg", + fit: BoxFit.cover, + ), + ), + ), + sizedBoxHeight(20.h), + Align( + alignment: Alignment.center, + child: text22400FCFCFC("Find your community")), + sizedBoxHeight(40.h), text16400white('Email address'), sizedBoxHeight(10.h), CustomTextFormField( diff --git a/lib/Utils/Common/CustomTextformfield.dart b/lib/Utils/Common/CustomTextformfield.dart index e58dcf1..a6caef8 100644 --- a/lib/Utils/Common/CustomTextformfield.dart +++ b/lib/Utils/Common/CustomTextformfield.dart @@ -442,7 +442,7 @@ class _CustomtextFormFieldPasswordState width: double.infinity, height: 50, borderRadius: 30, - blur: 10, + blur: 6, alignment: Alignment.bottomCenter, border: 0.8, linearGradient: LinearGradient( @@ -615,7 +615,7 @@ class _SearchTextFormFieldState extends State { width: double.infinity, height: 50, borderRadius: 10, - blur: 10, + blur: 6, alignment: Alignment.bottomCenter, border: 0.8, linearGradient: LinearGradient( diff --git a/lib/Utils/texts.dart b/lib/Utils/texts.dart index 5047c9d..4d49394 100644 --- a/lib/Utils/texts.dart +++ b/lib/Utils/texts.dart @@ -21,6 +21,17 @@ Widget text22400white(String text) { fontFamily: 'Helvetica'), ); } +Widget text22400FCFCFC(String text) { + return Text( + text, + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 22.sp, + color: Color(0xFFFCFCFC), + fontWeight: FontWeight.w400, + fontFamily: 'Helvetica'), + ); +} Widget text20400white(String text) { return Text( diff --git a/lib/onboarding/Signup/View/Business/step1Letusunderstandbetter.dart b/lib/onboarding/Signup/View/Business/step1Letusunderstandbetter.dart index ecd4d2e..98ad3ac 100644 --- a/lib/onboarding/Signup/View/Business/step1Letusunderstandbetter.dart +++ b/lib/onboarding/Signup/View/Business/step1Letusunderstandbetter.dart @@ -56,7 +56,7 @@ class _LetusUnderstandState extends State { // 500.h, MediaQuery.of(context).size.height, borderRadius: 2, - blur: 10, + blur: 6, alignment: Alignment.bottomLeft, border: 2, linearGradient: LinearGradient( diff --git a/lib/onboarding/Signup/View/Business/step2Selectgroup.dart b/lib/onboarding/Signup/View/Business/step2Selectgroup.dart index c8c6c38..514e86c 100644 --- a/lib/onboarding/Signup/View/Business/step2Selectgroup.dart +++ b/lib/onboarding/Signup/View/Business/step2Selectgroup.dart @@ -39,7 +39,7 @@ class _SelectgroupStep2State extends State { // 500.h, MediaQuery.of(context).size.height, borderRadius: 2, - blur: 10, + blur: 6, alignment: Alignment.bottomLeft, border: 2, linearGradient: LinearGradient( diff --git a/lib/onboarding/Signup/View/Business/step3SelectCommunity.dart b/lib/onboarding/Signup/View/Business/step3SelectCommunity.dart index 3ac4dac..6ae2a71 100644 --- a/lib/onboarding/Signup/View/Business/step3SelectCommunity.dart +++ b/lib/onboarding/Signup/View/Business/step3SelectCommunity.dart @@ -39,7 +39,7 @@ class _SelectBusinessCommunityState extends State { // 500.h, MediaQuery.of(context).size.height, borderRadius: 2, - blur: 10, + blur: 6, alignment: Alignment.bottomLeft, border: 2, linearGradient: LinearGradient( diff --git a/lib/onboarding/Signup/View/Business/tellusbusiness.dart b/lib/onboarding/Signup/View/Business/tellusbusiness.dart index 5503541..5af8b5a 100644 --- a/lib/onboarding/Signup/View/Business/tellusbusiness.dart +++ b/lib/onboarding/Signup/View/Business/tellusbusiness.dart @@ -58,7 +58,7 @@ class _TellusaboutBusinessState extends State { // 500.h, MediaQuery.of(context).size.height, borderRadius: 2, - blur: 10, + blur: 6, alignment: Alignment.bottomLeft, border: 2, linearGradient: LinearGradient( diff --git a/lib/onboarding/Signup/View/Individual/step1Selectprofile.dart b/lib/onboarding/Signup/View/Individual/step1Selectprofile.dart index 130cb0f..6ec2b9b 100644 --- a/lib/onboarding/Signup/View/Individual/step1Selectprofile.dart +++ b/lib/onboarding/Signup/View/Individual/step1Selectprofile.dart @@ -35,7 +35,7 @@ class _SelectIndividualProfileState extends State { // 500.h, MediaQuery.of(context).size.height, borderRadius: 2, - blur: 10, + blur: 6, alignment: Alignment.bottomLeft, border: 2, linearGradient: LinearGradient( diff --git a/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart b/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart index 39e79b9..456b0e5 100644 --- a/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart +++ b/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart @@ -65,7 +65,7 @@ class _SelectIndividualActivityState extends State { width: MediaQuery.of(context).size.width, height: MediaQuery.of(context).size.height, borderRadius: 2, - blur: 10, + blur: 6, alignment: Alignment.bottomLeft, border: 2, linearGradient: LinearGradient( diff --git a/lib/onboarding/Signup/View/Individual/step3Selectyourgroup.dart b/lib/onboarding/Signup/View/Individual/step3Selectyourgroup.dart index e1b432d..1c7c207 100644 --- a/lib/onboarding/Signup/View/Individual/step3Selectyourgroup.dart +++ b/lib/onboarding/Signup/View/Individual/step3Selectyourgroup.dart @@ -39,7 +39,7 @@ class _SelectIndividualGroupState extends State { // 500.h, MediaQuery.of(context).size.height, borderRadius: 2, - blur: 10, + blur: 6, alignment: Alignment.bottomLeft, border: 2, linearGradient: LinearGradient( diff --git a/lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart b/lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart index a022118..850735b 100644 --- a/lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart +++ b/lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart @@ -39,7 +39,7 @@ class _SelectIndividualCommunityState extends State { // 500.h, MediaQuery.of(context).size.height, borderRadius: 2, - blur: 10, + blur: 6, alignment: Alignment.bottomLeft, border: 2, linearGradient: LinearGradient( diff --git a/lib/onboarding/Signup/View/Individual/tellusindividual.dart b/lib/onboarding/Signup/View/Individual/tellusindividual.dart index 865f0b1..bb62941 100644 --- a/lib/onboarding/Signup/View/Individual/tellusindividual.dart +++ b/lib/onboarding/Signup/View/Individual/tellusindividual.dart @@ -128,7 +128,7 @@ class _TellusaboutIndividualState extends State { // 500.h, MediaQuery.of(context).size.height, borderRadius: 2, - blur: 10, + blur: 6, alignment: Alignment.bottomLeft, border: 2, linearGradient: LinearGradient( diff --git a/lib/onboarding/Signup/View/communitycommitment.dart b/lib/onboarding/Signup/View/communitycommitment.dart index ba526ce..63eb617 100644 --- a/lib/onboarding/Signup/View/communitycommitment.dart +++ b/lib/onboarding/Signup/View/communitycommitment.dart @@ -32,7 +32,7 @@ class _CommunitycommitmentState extends State { // 500.h, MediaQuery.of(context).size.height, borderRadius: 2, - blur: 10, + blur: 6, alignment: Alignment.bottomLeft, border: 2, linearGradient: LinearGradient( diff --git a/lib/onboarding/Signup/View/signupendpage.dart b/lib/onboarding/Signup/View/signupendpage.dart index d8d0eb7..9da949c 100644 --- a/lib/onboarding/Signup/View/signupendpage.dart +++ b/lib/onboarding/Signup/View/signupendpage.dart @@ -33,7 +33,7 @@ class _SignupendPageState extends State { // 500.h, MediaQuery.of(context).size.height, borderRadius: 2, - blur: 10, + blur: 6, alignment: Alignment.bottomLeft, border: 2, linearGradient: LinearGradient( diff --git a/lib/onboarding/Signup/View/signupscreen.dart b/lib/onboarding/Signup/View/signupscreen.dart index a04be55..db7f6c6 100644 --- a/lib/onboarding/Signup/View/signupscreen.dart +++ b/lib/onboarding/Signup/View/signupscreen.dart @@ -2,17 +2,14 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:glassmorphism/glassmorphism.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; -import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; +import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart'; -import 'package:show_fps/show_fps.dart'; class SignupScreen extends StatefulWidget { const SignupScreen({super.key}); @@ -49,8 +46,8 @@ class _SignupScreenState extends State { Container( decoration: const BoxDecoration( image: DecorationImage( - image: - AssetImage("assets/images/png/Choice screen.png"))), + image: AssetImage("assets/images/png/Choice screen.png"), + fit: BoxFit.fill)), ), Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -173,7 +170,7 @@ class _SignupScreenState extends State { ], ), sizedBoxHeight(10.h), - CustomDropDownWidgetSignup( + CustomDropDownRadio( header: 'Select account type', title: '', listData: _dropdownProductItems, diff --git a/lib/onboarding/Signup/View/verifyuser.dart b/lib/onboarding/Signup/View/verifyuser.dart index 5ee39c6..fc1575a 100644 --- a/lib/onboarding/Signup/View/verifyuser.dart +++ b/lib/onboarding/Signup/View/verifyuser.dart @@ -41,7 +41,7 @@ class _VerifyuserScreenStateState extends State { // 500.h, MediaQuery.of(context).size.height, borderRadius: 2, - blur: 10, + blur: 6, alignment: Alignment.bottomLeft, border: 2, linearGradient: LinearGradient(