diff --git a/lib/modules/signIn/view/new_pw_view.dart b/lib/modules/signIn/view/new_pw_view.dart index 2b41aa4d..8ef78c45 100644 --- a/lib/modules/signIn/view/new_pw_view.dart +++ b/lib/modules/signIn/view/new_pw_view.dart @@ -75,14 +75,16 @@ class NewPwScreen extends GetView { ), ), SizedBox(height: 8.h), - Padding( - padding: EdgeInsets.symmetric(horizontal: 20.w), - child: CommonButton.login( - text: "확인", - onTap: () async { - //TODO) 비밀번호 변경 api - Get.back(); - }, + Expanded( + child: Padding( + padding: EdgeInsets.only(left: 6.w, right: 20), + child: CommonButton.login( + text: "확인", + onTap: () async { + //TODO) 비밀번호 변경 api + Get.back(); + }, + ), ), ), SizedBox(height: 24.h), diff --git a/lib/modules/signUp/controller/signup_controller.dart b/lib/modules/signUp/controller/signup_controller.dart index 674b81bc..f9c88836 100755 --- a/lib/modules/signUp/controller/signup_controller.dart +++ b/lib/modules/signUp/controller/signup_controller.dart @@ -7,6 +7,7 @@ class SignUpController extends GetxController { //TODO) signUp controller /// 회원가입 > id, pw, pw확인 Rx idTextController = TextEditingController().obs; + Rx idAuthNumTextController = TextEditingController().obs; Rx pwTextController = TextEditingController().obs; Rx pwConfirmTextController = TextEditingController().obs; diff --git a/lib/modules/signUp/view/signup_user_mail_view.dart b/lib/modules/signUp/view/signup_user_mail_view.dart index 8918973c..b08dcaaa 100755 --- a/lib/modules/signUp/view/signup_user_mail_view.dart +++ b/lib/modules/signUp/view/signup_user_mail_view.dart @@ -68,12 +68,35 @@ class SignUpMailScreen extends GetView { ), SizedBox(height: 20.h), + + Text( + '인증번호 입력', + style: AppTextStyles.T1Bold14, + ), + SizedBox(height: 10.h), + + Row( + children: [ + Expanded( + child: CommonInputField.signUpIdConfirm( + textController : controller.idAuthNumTextController.value, + onChange: (value) async { + print(">>> 입력한 이메일 인증번호: $value"); + }), + ), + SizedBox(width: 10.w), + certinumButton(), + ], + ), + + SizedBox(height: 20.h), + Text( '비밀번호', style: AppTextStyles.T1Bold14, ), SizedBox(height: 10.h), - CommonInputField.signInPW( + CommonInputField.signUpPw( textController : controller.pwTextController.value, onChange: (value) async { print(">>> 입력한 회원가입 pw: $value"); @@ -84,7 +107,7 @@ class SignUpMailScreen extends GetView { style: AppTextStyles.T1Bold14, ), SizedBox(height: 10.h), - CommonInputField.signInPW( + CommonInputField.signUpPwConfirm( textController : controller.pwConfirmTextController.value, onChange: (value) async { print(">>> 입력한 회원가입 확인pw: $value"); @@ -95,6 +118,7 @@ class SignUpMailScreen extends GetView { ], ), ), + SizedBox(height: 8.h), Padding( padding: EdgeInsets.symmetric(horizontal: 20.w), diff --git a/lib/util/components/gloabl_text_field.dart b/lib/util/components/gloabl_text_field.dart index 1d250d0e..685e1863 100755 --- a/lib/util/components/gloabl_text_field.dart +++ b/lib/util/components/gloabl_text_field.dart @@ -226,7 +226,56 @@ class CommonInputField extends StatelessWidget { onChanged: onChange, autoFocus: true); } + //TODO) signUp 회원가입 + /// id 입력 + factory CommonInputField.signUpId( + {required TextEditingController textController, + required Future Function(String) onChange}) { + return CommonInputField( + textController: textController, + placeHolder: "이메일을 입력해주세요.", + alwaysSuffix: false, + onSubmitted: (value) async {}, + onChanged: onChange, + autoFocus: true); + } + /// id confirm num 입력 + factory CommonInputField.signUpIdConfirm( + {required TextEditingController textController, + required Future Function(String) onChange}) { + return CommonInputField( + textController: textController, + placeHolder: "인증번호를 입력해주세요.", + alwaysSuffix: false, + onSubmitted: (value) async {}, + onChanged: onChange, + autoFocus: true); + } + /// pw 입력 + factory CommonInputField.signUpPw( + {required TextEditingController textController, + required Future Function(String) onChange}) { + return CommonInputField( + textController: textController, + placeHolder: "비밀번호를 입력해주세요.", + alwaysSuffix: false, + onSubmitted: (value) async {}, + onChanged: onChange, + autoFocus: true); + } + /// pw confirm 입력 + factory CommonInputField.signUpPwConfirm( + {required TextEditingController textController, + required Future Function(String) onChange}) { + return CommonInputField( + textController: textController, + placeHolder: "비밀번호를 입력해주세요.", + alwaysSuffix: false, + onSubmitted: (value) async {}, + onChanged: onChange, + autoFocus: true); + } /// 이름 입력 factory CommonInputField.userName( {required TextEditingController textController,