Skip to content

Commit 7893489

Browse files
committed
chore #128: 리베이스 및 코드정리
1 parent c77e821 commit 7893489

7 files changed

Lines changed: 8 additions & 39 deletions

File tree

dogether/Presentation/Base/BaseButton.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ import RxCocoa
1212
class BaseButton: UIButton {
1313
/// 외부 노출용 Signal
1414
var tap: Signal<Void> { tapRelay.asSignal() }
15-
1615
/// 내부 이벤트 스트림
17-
// fileprivate let tapRelay = PublishRelay<Void>()
1816
let tapRelay = PublishRelay<Void>()
17+
1918
fileprivate let disposeBag = DisposeBag()
2019

2120
override init(frame: CGRect) {

dogether/Presentation/Common/DogetherButton.swift

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ import RxCocoa
1212

1313
final class DogetherButton: BaseButton {
1414
private let title: String
15-
// ✅ 버튼 탭 이벤트 노출 (RxRelay)
16-
let tapRelay = PublishRelay<Void>()
17-
private let disposeBag = DisposeBag()
1815

1916
init(_ title: String) {
2017
self.title = title
@@ -29,11 +26,6 @@ final class DogetherButton: BaseButton {
2926
setTitle(title, for: .normal)
3027
titleLabel?.font = Fonts.body1B
3128
layer.cornerRadius = 8
32-
33-
rx.tap
34-
.throttle(.milliseconds(500), scheduler: MainScheduler.instance) // 중복클릭 방지
35-
.bind(to: tapRelay)
36-
.disposed(by: disposeBag)
3729
}
3830

3931
override func configureAction() {

dogether/Presentation/Common/JoinCodeShareButton.swift

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,13 @@
77

88
import UIKit
99

10-
//import RxSwift
11-
//import RxCocoa
12-
1310
final class JoinCodeShareButton: BaseButton {
1411
private let codeLabel = UILabel()
1512
private let iconImageView = UIImageView(
1613
image: .share.withRenderingMode(.alwaysTemplate)
1714
)
1815
private let stackView = UIStackView()
1916

20-
// // ✅ 버튼 탭 이벤트 노출
21-
// let tapRelay = PublishRelay<Void>()
22-
// private let disposeBag = DisposeBag()
23-
2417
override func configureView() {
2518
layer.cornerRadius = 12
2619
backgroundColor = .grey700
@@ -33,12 +26,6 @@ final class JoinCodeShareButton: BaseButton {
3326
stackView.axis = .horizontal
3427
stackView.spacing = 8
3528
stackView.isUserInteractionEnabled = false
36-
37-
// // ✅ 탭 이벤트 바인딩
38-
// rx.tap
39-
// .throttle(.milliseconds(500), scheduler: MainScheduler.instance) // 중복클릭 방지
40-
// .bind(to: tapRelay)
41-
// .disposed(by: disposeBag)
4229
}
4330

4431
override func configureAction() {

dogether/Presentation/Features/Complete/Components/CompletePage.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ import UIKit
1010
import RxCocoa
1111

1212
final class CompletePage: BasePage {
13-
// var homeTap: Signal<Void> { completeButton.tapRelay.asSignal() }
14-
// var shareTap: Signal<Void> { joinCodeShareButton.tapRelay.asSignal() }
15-
1613
var homeTap: Signal<Void> { completeButton.tap }
1714
var shareTap: Signal<Void> { joinCodeShareButton.tap }
1815

dogether/Presentation/Features/Main/Components/GroupInfoView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ final class GroupInfoView: BaseView {
149149
}
150150

151151
override func configureAction() {
152-
groupNameStackView.addTapAction { [weak self] in
152+
groupNameStackView.addTapAction { [weak self] _ in
153153
guard let self else { return }
154154
_eventRelay.accept(
155155
GroupInfoEvent(
@@ -159,7 +159,7 @@ final class GroupInfoView: BaseView {
159159
)
160160
}
161161

162-
joinCodeStackView.addTapAction { [weak self] in
162+
joinCodeStackView.addTapAction { [weak self] _ in
163163
guard let self else { return }
164164
_eventRelay.accept(
165165
GroupInfoEvent(

dogether/Presentation/Features/TodoWrite/Components/TodoWritePage.swift

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ import RxSwift
1111
import RxCocoa
1212

1313
final class TodoWritePage: BasePage {
14-
// ✅ 외부 노출용 Signal
15-
var todoChanged: Signal<(String?, Int)> { _todoChanged.asSignal() }
14+
var todoChanged: Signal<(String, Int)> { _todoChanged.asSignal() }
1615
var addTap: Signal<Int> { _addTap.asSignal() }
1716
var saveTap: Signal<Void> { _saveTap.asSignal() }
1817
var removeTap: Signal<Int> { _removeTap.asSignal() }
1918
var keyboardState: Signal<Bool> { _keyboardState.asSignal() }
2019

21-
// ✅ 내부 Relay
22-
private let _todoChanged = PublishRelay<(String?, Int)>()
20+
private let _todoChanged = PublishRelay<(String, Int)>()
2321
private let _addTap = PublishRelay<Int>()
2422
private let _saveTap = PublishRelay<Void>()
2523
private let _removeTap = PublishRelay<Int>()
@@ -135,8 +133,8 @@ final class TodoWritePage: BasePage {
135133
todoTableView.dataSource = self
136134
todoTableView.register(TodoWriteTableViewCell.self, forCellReuseIdentifier: TodoWriteTableViewCell.identifier)
137135

138-
// 텍스트 변경 → ViewModel로 전달 + 즉시 UI 갱신
139136
todoTextField.rx.text
137+
.orEmpty
140138
.skip(1)
141139
.do(onNext: { [weak self] _ in
142140
guard let self else { return }
@@ -146,7 +144,6 @@ final class TodoWritePage: BasePage {
146144
.bind(to: _todoChanged)
147145
.disposed(by: disposeBag)
148146

149-
// 텍스트 길이 제한 (20자)
150147
todoTextField.rx.controlEvent(.editingChanged)
151148
.withLatestFrom(todoTextField.rx.text.orEmpty)
152149
.subscribe(onNext: { [weak self] text in
@@ -168,19 +165,16 @@ final class TodoWritePage: BasePage {
168165
.bind(to: _saveTap)
169166
.disposed(by: disposeBag)
170167

171-
// Return 키 입력 시 (textFieldShouldReturn 대체)
172168
todoTextField.rx.controlEvent(.editingDidEndOnExit)
173169
.map { self.todoMaxCount }
174170
.bind(to: _addTap)
175171
.disposed(by: disposeBag)
176-
177-
// 키보드 등장 (textFieldDidBeginEditing 대체)
172+
178173
NotificationCenter.default.rx.notification(UIResponder.keyboardWillShowNotification)
179174
.map { _ in true }
180175
.bind(to: _keyboardState)
181176
.disposed(by: disposeBag)
182177

183-
// 키보드 사라짐 (textFieldDidEndEditing 대체)
184178
NotificationCenter.default.rx.notification(UIResponder.keyboardWillHideNotification)
185179
.map { _ in false }
186180
.bind(to: _keyboardState)

dogether/Presentation/Features/TodoWrite/TodoWriteViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ final class TodoWriteViewController: BaseViewController {
3636
todoWritePage.todoChanged
3737
.emit(onNext: { [weak self] (text, maxLen) in
3838
guard let self else { return }
39-
viewModel.updateTodo(todo: text, todoMaxLength: maxLen)
39+
viewModel.updateTodo(todo: text)
4040
})
4141
.disposed(by: disposeBag)
4242

0 commit comments

Comments
 (0)