From 67f07ee2060538a9272dead08cc8c4d224ca2bdb Mon Sep 17 00:00:00 2001 From: Gyuni Date: Sat, 2 Oct 2021 04:29:06 +0900 Subject: [PATCH] =?UTF-8?q?[#88]=20=EC=97=90=EB=9F=AC=20=EC=8B=9C=20?= =?UTF-8?q?=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EB=8C=80=EC=8B=A0=20alert=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TextFieldCaseTestBaseViewController.swift | 17 ++++++++++++++--- .../ViewModel/TextFieldCaseTestViewModel.swift | 4 ++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/YDS-Storybook/CaseTestViewController/View/TextFieldCaseTestBaseViewController.swift b/YDS-Storybook/CaseTestViewController/View/TextFieldCaseTestBaseViewController.swift index a117669d..35baedc6 100644 --- a/YDS-Storybook/CaseTestViewController/View/TextFieldCaseTestBaseViewController.swift +++ b/YDS-Storybook/CaseTestViewController/View/TextFieldCaseTestBaseViewController.swift @@ -128,10 +128,10 @@ class TextFieldCaseTestBaseViewController: UIViewController { }) .disposed(by: bag) - viewModel.shouldShowToastMessage + viewModel.shouldPresentAlert .filter { $0 } - .subscribe(onNext: { _ in - YDSToast.makeToast(text: "중복 닉네임입니다.", duration: .short) + .subscribe(onNext: { [weak self] _ in + self?.showAlert(title: nil, message: "중복 닉네임입니다.") }) .disposed(by: bag) @@ -162,3 +162,14 @@ extension TextFieldCaseTestBaseViewController { self.view.endEditing(true) } } + +// MARK: - Alert +extension TextFieldCaseTestBaseViewController { + private func showAlert(title: String?, message: String?) { + let alert = UIAlertController(title: title, message: message, preferredStyle: .alert) + let action = UIAlertAction(title: "확인", style: .default, handler: nil) + alert.addAction(action) + alert.view.tintColor = YDSColor.buttonPoint + present(alert, animated: true, completion: nil) + } +} diff --git a/YDS-Storybook/CaseTestViewController/ViewModel/TextFieldCaseTestViewModel.swift b/YDS-Storybook/CaseTestViewController/ViewModel/TextFieldCaseTestViewModel.swift index 108e598a..8c55a850 100644 --- a/YDS-Storybook/CaseTestViewController/ViewModel/TextFieldCaseTestViewModel.swift +++ b/YDS-Storybook/CaseTestViewController/ViewModel/TextFieldCaseTestViewModel.swift @@ -26,7 +26,7 @@ class TextFieldCaseTestViewModel { func confirmButtonDidTap() { textFieldIsNegative.onNext(true) confirmButtonIsDisabled.onNext(true) - shouldShowToastMessage.onNext(true) + shouldPresentAlert.onNext(true) switch caseType { case .withHaptic: @@ -48,7 +48,7 @@ class TextFieldCaseTestViewModel { let textFieldIsNegative = BehaviorSubject(value: false) let textFieldShoudShake = PublishSubject() let textFieldShoudShakeWithHaptic = PublishSubject() - let shouldShowToastMessage = PublishSubject() + let shouldPresentAlert = PublishSubject() // MARK: - Private Observable private let text = PublishSubject()