diff --git a/lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart b/lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart index b927181..4a6530b 100644 --- a/lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart +++ b/lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart @@ -162,59 +162,51 @@ class _ChatsMainScreenState extends State { 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(), - ], - ), + 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, ), - sizedBoxHeight(25.h) + ), + // validatorText: "Enter your full name", + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), ], ), - 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()], - ), - ), - ], + ), + sizedBoxHeight(25.h) + ], + ), + Expanded( + child: DefaultTabController( + length: 3, + // initialIndex: selectedIndex.value, + child: Column( + children: [ + MyTabBar(), + Expanded( + child: TabBarView( + children: [feedTab(), clubsTab(), teamsTab()], + ), ), - ), - ])), - ) + ], + ), + ), + ), + ]) ], ), bottomNavigationBar: bottomnavigationbar(mainController), @@ -226,7 +218,7 @@ class _ChatsMainScreenState extends State { return SingleChildScrollView( child: Column( children: [ - sizedBoxHeight(30.h), + sizedBoxHeight(25.h), ListView.separated( separatorBuilder: (context, index) { return Divider( @@ -266,6 +258,7 @@ class _ChatsMainScreenState extends State { return SingleChildScrollView( child: Column( children: [ + sizedBoxHeight(25.h), ListView.separated( separatorBuilder: (context, index) { return Divider( @@ -300,6 +293,7 @@ class _ChatsMainScreenState extends State { return SingleChildScrollView( child: Column( children: [ + sizedBoxHeight(25.h), ListView.separated( separatorBuilder: (context, index) { return Divider( @@ -490,12 +484,11 @@ class _ChatListState extends State { padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 5.h), child: Row( crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Stack(children: [ Container( - width: 55, - height: 55, + width: 55.w, + height: 55.h, decoration: BoxDecoration( image: DecorationImage( image: AssetImage(widget.imageurl), @@ -504,99 +497,93 @@ class _ChatListState extends State { ), ), Positioned( - top: 40, - left: 45, + top: 40.h, + left: 45.w, child: widget.activestatus == true ? Container( - width: 10, - height: 10, + width: 10.w, + height: 10.h, decoration: ShapeDecoration( color: Color(0xFF32D74B), shape: OvalBorder(), ), ) : Container( - width: 10, - height: 10, + width: 10.w, + height: 10.h, decoration: ShapeDecoration( color: Color(0xFFFF453A), shape: OvalBorder(), )), ) ]), - Padding( - padding: EdgeInsets.only(top: 5), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text16400white(widget.name), - sizedBoxHeight(3.h), - Row( - children: [ - widget.isMessageRead == true - ? Image.asset( - 'assets/images/png/messagereadcheckmark.png') - : Image.asset( - 'assets/images/png/messagedelivered.png'), - sizedBoxWidth(5.w), - SizedBox( - width: 250, - child: Text( - widget.message, - style: TextStyle( - color: Color(0xCCFCFCFC), - fontSize: 12.sp, - fontFamily: 'Helvetica', - fontWeight: FontWeight.w400, - ), + sizedBoxWidth(8.w), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text16400white(widget.name), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + widget.isMessageRead == true + ? Image.asset( + 'assets/images/png/messagereadcheckmark.png') + : Image.asset('assets/images/png/messagedelivered.png'), + sizedBoxWidth(5.w), + SizedBox( + width: 170.w, + child: Text( + widget.message, + style: TextStyle( + color: Color(0xCCFCFCFC), + fontSize: 12.sp, + fontFamily: 'Helvetica', + fontWeight: FontWeight.w400, ), ), - ], - ), - ], - ), + ), + ], + ), + ], ), - Padding( - padding: const EdgeInsets.only(top: 5), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - text12400white('Yesterday'), - sizedBoxHeight(5.h), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - widget.ispinned == true - ? Image.asset('assets/images/png/pin.png') - : SizedBox( - width: 25, + Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + text12400white('Yesterday'), + sizedBoxHeight(5.h), + Row( + children: [ + widget.ispinned == true + ? Image.asset('assets/images/png/pin.png') + : SizedBox( + width: 25, + ), + sizedBoxWidth(3.w), + widget.count == true + ? Container( + width: 18, + height: 18, + decoration: ShapeDecoration( + color: Color(0xFFD90B2E), + shape: OvalBorder(), ), - sizedBoxWidth(3.w), - widget.count == true - ? Container( - width: 18, - height: 18, - decoration: ShapeDecoration( - color: Color(0xFFD90B2E), - shape: OvalBorder(), + child: Text( + '1', + textAlign: TextAlign.center, + style: TextStyle( + color: Color(0xFFFCFCFC), + fontSize: 12.sp, + fontFamily: 'Helvetica', + fontWeight: FontWeight.w400, ), - child: Text( - '1', - textAlign: TextAlign.center, - style: TextStyle( - color: Color(0xFFFCFCFC), - fontSize: 12.sp, - fontFamily: 'Helvetica', - fontWeight: FontWeight.w400, - ), - ), - ) - : SizedBox() - ], - ) - ], - ), + ), + ) + : SizedBox() + ], + ) + ], ) ], ), @@ -726,8 +713,8 @@ class _SecondChatListState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - width: 55, - height: 55, + width: 55.w, + height: 55.h, decoration: BoxDecoration( image: DecorationImage( image: AssetImage(widget.imageurl), diff --git a/lib/Feed Module/Main_Screens/Chats/View/groupchat.dart b/lib/Feed Module/Main_Screens/Chats/View/groupchat.dart index 660f9c9..14b240c 100644 --- a/lib/Feed Module/Main_Screens/Chats/View/groupchat.dart +++ b/lib/Feed Module/Main_Screens/Chats/View/groupchat.dart @@ -269,6 +269,8 @@ class _GroupChatPageState extends State { border: 0.9, width: 40.w, height: 40.h, + opacity1: 0.24, + opacity2: 0.24, borderradius: 100, customWidget: Center( child: Image.asset( @@ -564,7 +566,7 @@ class _GroupChatPageState extends State { Expanded( child: GlassmorphicContainer( width: double.infinity, - height: 48.h, + height: 50.h, borderRadius: 30.r, blur: 6, alignment: Alignment.bottomCenter, @@ -573,8 +575,8 @@ class _GroupChatPageState extends State { begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - const Color(0xFFffffff).withOpacity(0.50), - const Color(0xFFFFFFFF).withOpacity(0.50), + const Color(0xFFffffff).withOpacity(0.24), + const Color(0xFFFFFFFF).withOpacity(0.24), ], stops: [ 0.1, @@ -588,101 +590,107 @@ class _GroupChatPageState extends State { 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: Center( + child: TextFormField( + controller: messageController, + inputFormatters: [ + RemoveEmojiInputFormatter(), + ], + obscureText: false, + 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); + 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, + messageController.text = + filenameresult; + setState(() { + isImageAdded = true; + }); + }, + ); + }, + icon: Icon( + Icons.attach_file, + color: Colors.white, + size: 23.h, + ), ), - ), + ), + minLines: 1, + maxLines: 1, + onChanged: (text) { + setState(() {}); + }, ), - minLines: 1, - maxLines: 1, - onChanged: (text) { - setState(() {}); - }, ), ), ), diff --git a/lib/Feed Module/Main_Screens/Chats/View/userchat.dart b/lib/Feed Module/Main_Screens/Chats/View/userchat.dart index b024421..15c0059 100644 --- a/lib/Feed Module/Main_Screens/Chats/View/userchat.dart +++ b/lib/Feed Module/Main_Screens/Chats/View/userchat.dart @@ -492,8 +492,8 @@ class _UserChatPageState extends State { begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - const Color(0xFFffffff).withOpacity(0.50), - const Color(0xFFFFFFFF).withOpacity(0.50), + const Color(0xFFffffff).withOpacity(0.24), + const Color(0xFFFFFFFF).withOpacity(0.24), ], stops: [ 0.1, @@ -519,8 +519,8 @@ class _UserChatPageState extends State { autovalidateMode: AutovalidateMode.onUserInteraction, decoration: InputDecoration( contentPadding: const EdgeInsets.all(10.0), - filled: true, - fillColor: Color(0XFF434A53), + // filled: true, + // fillColor: Color(0XFF434A53), border: InputBorder.none, hintStyle: TextStyle( fontSize: 14.sp, diff --git a/lib/Feed Module/Main_Screens/Community/PostScreen.dart b/lib/Feed Module/Main_Screens/Community/PostScreen.dart index 54ddeeb..9d047f7 100644 --- a/lib/Feed Module/Main_Screens/Community/PostScreen.dart +++ b/lib/Feed Module/Main_Screens/Community/PostScreen.dart @@ -62,6 +62,7 @@ class _PostScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ sizedBoxHeight(20.h), + text16w400_FCFCFC("Caption"), sizedBoxHeight(18.h), diff --git a/lib/onboarding/Signup/View/signupscreen.dart b/lib/onboarding/Signup/View/signupscreen.dart index 2a087c9..e160bb7 100644 --- a/lib/onboarding/Signup/View/signupscreen.dart +++ b/lib/onboarding/Signup/View/signupscreen.dart @@ -52,346 +52,326 @@ class _SignupScreenState extends State { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - SizedBox( - width: double.infinity, - height: 221.h, - child: Column( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Padding( - padding: EdgeInsets.only(top: 150.h), - child: - Center(child: text22400white('Create account')), - ), - ], - )), + Padding( + padding: EdgeInsets.only(top: 150.h), + child: Center(child: text22400white('Create account')), + ), Expanded( child: SingleChildScrollView( - child: Column( - children: [ - Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + child: Padding( + padding: EdgeInsets.symmetric( + horizontal: 16.w, vertical: 30.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text16400white('Email address'), + sizedBoxHeight(10.h), + CustomTextFormField( + textEditingController: emailidcontroller, + hintText: "Enter your email address", + leadingIcon: + // const Icon(Icons.mail_outline), + SizedBox( + width: 22.w, + height: 17.h, + child: Image.asset( + 'assets/images/png/mail.png', + width: 22.w, + height: 17.h, + ), + ), + // validatorText: "Email Id", + validator: (value) { + if (value!.isEmpty) { + return 'Enter your e-mail address'; + } + if (!RegExp( + r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$') + .hasMatch(value)) { + return 'Enter a valid e-mail address'; + } + return null; + }, + inputFormatters: [ + LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter() + ], + ), + sizedBoxHeight(10.h), + text16400white('Password'), + sizedBoxHeight(10.h), + CustomTextFormField( + isInputPassword: true, + textEditingController: _password, + hintText: 'Enter your password', + leadingIcon: Image.asset( + 'assets/images/png/lock.png', + width: 22.w, + height: 17.h, + ), + // const Icon(Icons.lock_outline), + // validationMessage: "Enter your password", + validator: (val) { + if (val == null || val.isEmpty) { + return 'Please enter your password'; + } + return null; + }, + inputFormatters: [ + LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter() + ], + ), + sizedBoxHeight(10.h), + text16400white('Confirm password'), + sizedBoxHeight(10.h), + CustomTextFormField( + isInputPassword: true, + textEditingController: confirmpasscontroller, + hintText: "Enter your password", + leadingIcon: Image.asset( + 'assets/images/png/lock.png', + width: 22.w, + height: 17.h, + ), + // const Icon(Icons.lock_outline), + // validatorText: "Enter your password", + validator: (val) { + if (val == null || val.isEmpty) { + return 'Please enter your password'; + } + if (val != _password.text) { + return 'Password does not match'; + } + return null; + }, + inputFormatters: [ + LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter() + ], + ), + sizedBoxHeight(10.h), + Row( children: [ - text16400white('Email address'), - sizedBoxHeight(10.h), - CustomTextFormField( - textEditingController: emailidcontroller, - hintText: "Enter your email address", - leadingIcon: - // const Icon(Icons.mail_outline), - SizedBox( - width: 22.w, - height: 17.h, - child: Image.asset( - 'assets/images/png/mail.png', - width: 22.w, - height: 17.h, - ), - ), - // validatorText: "Email Id", - validator: (value) { - if (value!.isEmpty) { - return 'Enter your e-mail address'; - } - if (!RegExp( - r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$') - .hasMatch(value)) { - return 'Enter a valid e-mail address'; - } - return null; - }, - inputFormatters: [ - LengthLimitingTextInputFormatter(20), - RemoveEmojiInputFormatter() - ], - ), - sizedBoxHeight(10.h), - text16400white('Password'), - sizedBoxHeight(10.h), - CustomTextFormField( - isInputPassword: true, - textEditingController: _password, - hintText: 'Enter your password', - leadingIcon: Image.asset( - 'assets/images/png/lock.png', - width: 22.w, - height: 17.h, - ), - // const Icon(Icons.lock_outline), - // validationMessage: "Enter your password", - validator: (val) { - if (val == null || val.isEmpty) { - return 'Please enter your password'; - } - return null; - }, - inputFormatters: [ - LengthLimitingTextInputFormatter(20), - RemoveEmojiInputFormatter() - ], - ), - sizedBoxHeight(10.h), - text16400white('Confirm password'), - sizedBoxHeight(10.h), - CustomTextFormField( - isInputPassword: true, - textEditingController: confirmpasscontroller, - hintText: "Enter your password", - leadingIcon: Image.asset( - 'assets/images/png/lock.png', - width: 22.w, - height: 17.h, - ), - // const Icon(Icons.lock_outline), - // validatorText: "Enter your password", - validator: (val) { - if (val == null || val.isEmpty) { - return 'Please enter your password'; - } - if (val != _password.text) { - return 'Password does not match'; - } - return null; - }, - inputFormatters: [ - LengthLimitingTextInputFormatter(20), - RemoveEmojiInputFormatter() - ], - ), - sizedBoxHeight(10.h), - Row( - children: [ - text16400white('Account type'), - sizedBoxWidth(5.w), - Image.asset( - 'assets/images/png/informationicon.png') - ], - ), - sizedBoxHeight(10.h), - CustomDropDownRadio( - header: 'Select account type', - title: '', - listData: [ - 'Individual', - 'Business', - ], - onItemSelected: (p0) {}, - leadingImage: Image.asset( - 'assets/images/png/user.png', - ), - ), - sizedBoxHeight(30.h), - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - SizedBox( - width: 320.w, - height: 42.h, - child: Text.rich( - TextSpan( - children: [ - TextSpan( - text: - 'By signing up to ReGroup you agree to our ', - style: TextStyle( - color: const Color(0xCCFCFCFC), - fontSize: 14.sp, - fontFamily: 'Helvetica', - fontWeight: FontWeight.w400, - ), - ), - TextSpan( - text: 'Terms and Conditions', - style: TextStyle( - color: const Color(0xCCFCFCFC), - fontSize: 14.sp, - fontFamily: 'Helvetica', - fontWeight: FontWeight.w700, - decoration: - TextDecoration.underline, - decorationColor: - const Color(0xffFCFCFC) - .withOpacity(0.80), - ), - ), - TextSpan( - text: ' and ', - style: TextStyle( - color: const Color(0xCCFCFCFC), - fontSize: 14.sp, - fontFamily: 'Helvetica', - fontWeight: FontWeight.w400, - ), - ), - TextSpan( - text: 'Privacy Policy', - style: TextStyle( - color: const Color(0xCCFCFCFC), - fontSize: 14.sp, - fontFamily: 'Helvetica', - fontWeight: FontWeight.w700, - decoration: - TextDecoration.underline, - decorationColor: - const Color(0xffFCFCFC) - .withOpacity(0.80), - ), - ), - ], - ), - textAlign: TextAlign.center, - ), - ), - ], - ), - sizedBoxHeight(20.h), - CustomButton( - text: "Continue", - onPressed: () { - if (_selectedAccountType == 'Individual') { - // Get.to(() => IndividualPage()); - print('individual selected'); - Get.toNamed(RouteName.verifyusercreen, - arguments: _selectedAccountType); - } else if (_selectedAccountType == - 'Business') { - print('business selected'); - Get.toNamed(RouteName.verifyusercreen, - arguments: _selectedAccountType); - - // Get.to(() => BusinessPage()); - } else { - // Handle case where no selection is made - utils.showToast( - 'Please select an account type'); - } - }), - sizedBoxHeight(20.h), - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Container( - width: 160, - decoration: const ShapeDecoration( - shape: RoundedRectangleBorder( - side: BorderSide( - width: 0.50, - strokeAlign: - BorderSide.strokeAlignCenter, - color: Color(0xFF434A53), - ), - ), - ), - ), - sizedBoxWidth(6.w), - text14400white('Or'), - sizedBoxWidth(6.w), - Container( - width: 160, - decoration: const ShapeDecoration( - shape: RoundedRectangleBorder( - side: BorderSide( - width: 0.50, - strokeAlign: - BorderSide.strokeAlignCenter, - color: Color(0xFF434A53), - ), - ), - ), - ), - ], - ), - sizedBoxHeight(20.h), - Center( - child: SizedBox( - width: 220.w, - child: Row( + text16400white('Account type'), + sizedBoxWidth(5.w), + Image.asset( + 'assets/images/png/informationicon.png') + ], + ), + sizedBoxHeight(10.h), + CustomDropDownRadio( + header: 'Select account type', + title: '', + listData: [ + 'Individual', + 'Business', + ], + onItemSelected: (p0) {}, + leadingImage: Image.asset( + 'assets/images/png/user.png', + ), + ), + sizedBoxHeight(30.h), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + SizedBox( + width: 320.w, + height: 42.h, + child: Text.rich( + TextSpan( children: [ - Container( - width: 55, - height: 55, - decoration: ShapeDecoration( - gradient: LinearGradient( - begin: - const Alignment(0.71, -0.70), - end: const Alignment(-0.71, 0.7), - colors: [ - Colors.white.withOpacity( - 0.07999999821186066), - Colors.white.withOpacity( - 0.12999999523162842) - ], - ), - shape: const OvalBorder( - side: BorderSide( - width: 0.50, - color: Color(0xFF434A53)), - ), - image: const DecorationImage( - image: AssetImage( - 'assets/images/png/login2.png'))), + TextSpan( + text: + 'By signing up to ReGroup you agree to our ', + style: TextStyle( + color: const Color(0xCCFCFCFC), + fontSize: 14.sp, + fontFamily: 'Helvetica', + fontWeight: FontWeight.w400, + ), ), - const Spacer(), - Container( - width: 55, - height: 55, - decoration: ShapeDecoration( - gradient: LinearGradient( - begin: - const Alignment(0.71, -0.70), - end: const Alignment(-0.71, 0.7), - colors: [ - Colors.white.withOpacity( - 0.07999999821186066), - Colors.white.withOpacity( - 0.12999999523162842) - ], - ), - shape: const OvalBorder( - side: BorderSide( - width: 0.50, - color: Color(0xFF434A53)), - ), - image: const DecorationImage( - image: AssetImage( - 'assets/images/png/login3.png'))), + TextSpan( + text: 'Terms and Conditions', + style: TextStyle( + color: const Color(0xCCFCFCFC), + fontSize: 14.sp, + fontFamily: 'Helvetica', + fontWeight: FontWeight.w700, + decoration: TextDecoration.underline, + decorationColor: + const Color(0xffFCFCFC) + .withOpacity(0.80), + ), ), - const Spacer(), - Container( - width: 55, - height: 55, - decoration: ShapeDecoration( - gradient: LinearGradient( - begin: - const Alignment(0.71, -0.70), - end: const Alignment(-0.71, 0.7), - colors: [ - Colors.white.withOpacity( - 0.07999999821186066), - Colors.white.withOpacity( - 0.12999999523162842) - ], - ), - shape: const OvalBorder( - side: BorderSide( - width: 0.50, - color: Color(0xFF434A53)), - ), - image: const DecorationImage( - image: AssetImage( - 'assets/images/png/login4.png'))), + TextSpan( + text: ' and ', + style: TextStyle( + color: const Color(0xCCFCFCFC), + fontSize: 14.sp, + fontFamily: 'Helvetica', + fontWeight: FontWeight.w400, + ), + ), + TextSpan( + text: 'Privacy Policy', + style: TextStyle( + color: const Color(0xCCFCFCFC), + fontSize: 14.sp, + fontFamily: 'Helvetica', + fontWeight: FontWeight.w700, + decoration: TextDecoration.underline, + decorationColor: + const Color(0xffFCFCFC) + .withOpacity(0.80), + ), ), ], ), + textAlign: TextAlign.center, ), ), - sizedBoxHeight(20.h), ], ), - ), - ], + sizedBoxHeight(20.h), + CustomButton( + text: "Continue", + onPressed: () { + if (_selectedAccountType == 'Individual') { + // Get.to(() => IndividualPage()); + print('individual selected'); + Get.toNamed(RouteName.verifyusercreen, + arguments: _selectedAccountType); + } else if (_selectedAccountType == 'Business') { + print('business selected'); + Get.toNamed(RouteName.verifyusercreen, + arguments: _selectedAccountType); + + // Get.to(() => BusinessPage()); + } else { + // Handle case where no selection is made + utils.showToast( + 'Please select an account type'); + } + }), + sizedBoxHeight(20.h), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + width: 160, + decoration: const ShapeDecoration( + shape: RoundedRectangleBorder( + side: BorderSide( + width: 0.50, + strokeAlign: BorderSide.strokeAlignCenter, + color: Color(0xFF434A53), + ), + ), + ), + ), + sizedBoxWidth(6.w), + text14400white('Or'), + sizedBoxWidth(6.w), + Container( + width: 160, + decoration: const ShapeDecoration( + shape: RoundedRectangleBorder( + side: BorderSide( + width: 0.50, + strokeAlign: BorderSide.strokeAlignCenter, + color: Color(0xFF434A53), + ), + ), + ), + ), + ], + ), + sizedBoxHeight(20.h), + Center( + child: SizedBox( + width: 220.w, + child: Row( + children: [ + Container( + width: 55, + height: 55, + decoration: ShapeDecoration( + gradient: LinearGradient( + begin: const Alignment(0.71, -0.70), + end: const Alignment(-0.71, 0.7), + colors: [ + Colors.white.withOpacity( + 0.07999999821186066), + Colors.white.withOpacity( + 0.12999999523162842) + ], + ), + shape: const OvalBorder( + side: BorderSide( + width: 0.50, + color: Color(0xFF434A53)), + ), + image: const DecorationImage( + image: AssetImage( + 'assets/images/png/login2.png'))), + ), + const Spacer(), + Container( + width: 55, + height: 55, + decoration: ShapeDecoration( + gradient: LinearGradient( + begin: const Alignment(0.71, -0.70), + end: const Alignment(-0.71, 0.7), + colors: [ + Colors.white.withOpacity( + 0.07999999821186066), + Colors.white.withOpacity( + 0.12999999523162842) + ], + ), + shape: const OvalBorder( + side: BorderSide( + width: 0.50, + color: Color(0xFF434A53)), + ), + image: const DecorationImage( + image: AssetImage( + 'assets/images/png/login3.png'))), + ), + const Spacer(), + Container( + width: 55, + height: 55, + decoration: ShapeDecoration( + gradient: LinearGradient( + begin: const Alignment(0.71, -0.70), + end: const Alignment(-0.71, 0.7), + colors: [ + Colors.white.withOpacity( + 0.07999999821186066), + Colors.white.withOpacity( + 0.12999999523162842) + ], + ), + shape: const OvalBorder( + side: BorderSide( + width: 0.50, + color: Color(0xFF434A53)), + ), + image: const DecorationImage( + image: AssetImage( + 'assets/images/png/login4.png'))), + ), + ], + ), + ), + ), + sizedBoxHeight(20.h), + ], + ), ), ), )