폰인증 위젯 수정

blueberry-team · Jul 23, 2024 · 6c7b78e · 6c7b78e
1 parent 65f509e
commit 6c7b78e
Show file tree

Hide file tree

Showing 8 changed files with 323 additions and 271 deletions.
diff --git a/lib/providers/signup/PhoneNumberProvider.dart b/lib/providers/signup/PhoneNumberProvider.dart
@@ -0,0 +1,4 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+// 폰인증 provider
+final phoneNumberProvider = StateProvider<String>((ref) => '');
diff --git a/lib/providers/signup/PhoneVerificationProvider.dart b/lib/providers/signup/PhoneVerificationProvider.dart
@@ -1,9 +1,5 @@
-// 휴대폰인증 provider
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-// 휴대폰인증 provider
-final phoneNumberProvider = StateProvider<String>((ref) => '');
-final verificationCodeProvider = StateProvider<String>((ref) => '');
 final phoneVerificationProvider =
     NotifierProvider<PhoneVerificationNotifier, PhoneVerificationState>(() {
   return PhoneVerificationNotifier();
@@ -12,12 +8,20 @@ final phoneVerificationProvider =
 class PhoneVerificationNotifier extends Notifier<PhoneVerificationState> {
   @override
   PhoneVerificationState build() {
-    return VerificationInitialize();
+    return _initializeState();
   }
 
-  Future<bool> sendPhoneNumber(String phoneNumber) async {
+  void initialize() {
+    state = _initializeState();
+  }
+
+  PhoneVerificationState _initializeState() {
+    return VerificationInitialized();
+  }
+
+  Future<bool> sendVerificationRequest(String phoneNumber) async {
     try {
-      final verificationId = await getVerificationId(phoneNumber);
+      final verificationId = await requestVerificationId(phoneNumber);
       state = VerificationCodeSent(verificationId);
       return true;
     } catch (e) {
@@ -26,11 +30,11 @@ class PhoneVerificationNotifier extends Notifier<PhoneVerificationState> {
     }
   }
 
-  Future<bool> verifyCode(String code) async {
+  Future<bool> checkVerificationCode(String code) async {
     if (state is VerificationCodeSent) {
       final verificationId = (state as VerificationCodeSent).verificationId;
       try {
-        await verifyPhoneVerificationCode(verificationId, code);
+        await validateVerificationCode(verificationId, code);
         state = VerificationSuccess();
         return true;
       } catch (e) {
@@ -43,15 +47,9 @@ class PhoneVerificationNotifier extends Notifier<PhoneVerificationState> {
   }
 }
 
-// 휴대폰인증 상태관리 클래스
 abstract class PhoneVerificationState {}
 
-class VerificationInitialize extends PhoneVerificationState {
-  final String phoneNumber;
-  final String verificationNumber;
-
-  VerificationInitialize({this.phoneNumber = '', this.verificationNumber = ''});
-}
+class VerificationInitialized extends PhoneVerificationState {}
 
 class VerificationCodeSent extends PhoneVerificationState {
   final String verificationId;
@@ -68,8 +66,8 @@ class VerificationError extends PhoneVerificationState {
 }
 
 // 휴대폰번호 전송 로직 (구현 필요)
-Future<String> getVerificationId(String phoneNumber) async {
-  // 에러테스트
+Future<String> requestVerificationId(String phoneNumber) async {
+
   if (phoneNumber.length == 11) {
     return 'verificationId';
   }
@@ -78,7 +76,7 @@ Future<String> getVerificationId(String phoneNumber) async {
 }
 
 // 인증번호 전송 로직 (구현 필요)
-Future<bool> verifyPhoneVerificationCode(
+Future<bool> validateVerificationCode(
     String verificationId, String code) async {
   if (verificationId == 'verificationId' && code == "123456") {
     return true;

diff --git a/lib/providers/signup/VerificationCodeProvider.dart b/lib/providers/signup/VerificationCodeProvider.dart
@@ -0,0 +1,3 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+final verificationCodeProvider = StateProvider<String>((ref) => '');
diff --git a/lib/screens/mypage/PhoneVerificationScreen.dart b/lib/screens/mypage/PhoneVerificationScreen.dart
@@ -1,4 +1,4 @@
-import 'package:blueberry_flutter_template/screens/mypage/signup/PhoneInputPage.dart';
+import 'package:blueberry_flutter_template/screens/mypage/signup/PhoneVerificationPage.dart';
 import 'package:flutter/material.dart';
 
 final PageController _pageController = PageController();
@@ -14,13 +14,13 @@ class PhoneVerificationScreen extends StatelessWidget {
         controller: _pageController,
         physics: const NeverScrollableScrollPhysics(),
         children: [
-          PhoneInputPage(
+          PhoneNumberInputPage(
             onNext: () => _pageController.nextPage(
               duration: const Duration(milliseconds: 300),
               curve: Curves.easeInOut,
             ),
           ),
-          PhoneVerificationNumberInputPage(
+          VerificationCodeInputPage(
             onNext: () => _pageController.nextPage(
               duration: const Duration(milliseconds: 300),
               curve: Curves.easeInOut,

diff --git a/lib/screens/mypage/signup/PhoneInputPage.dart b/lib/screens/mypage/signup/PhoneInputPage.dart