Skip to content

[MERGE] TF1.0.9 #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zzangzzangguy merged 2 commits into from
Feb 11, 2025
Merged

[MERGE] TF1.0.9 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36dfba5
[FIX]: ์ง€๋„์—์„œ ์„œ์น˜๋ทฐ๋กœ ์ด๋™์‹œ ํ•œ๋ฒˆ๋งŒ ์ „ํ™˜ , ์ง€๋„๋กœ ๋˜๋Œ์•„๊ฐ€๋„ ํƒญ๋ฐ” ํ‘œ๊ธฐ๋˜๋„๋ก ์ˆ˜์ •
zzangzzangguy Feb 11, 2025
2eeffe0
[FIX]: ๊ด€๋ฆฌ์žํŽ˜์ด์ง€ ์กฐํšŒ์—์„œ ์„œ๋ฒ„์— ๋“ฑ๋ก๋œ ์Šคํ† ์–ด๋“ค ๋ชจ๋‘ ์กฐํšŒํ• ์ˆ˜์žˆ๋„๋ก ์ˆ˜์ •
zzangzzangguy Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions Poppool/Poppool/Presentation/Admin/AdminBottomSheetViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ final class AdminBottomSheetViewController: BaseViewController, View {

// MARK: - Initialization
init(reactor: AdminBottomSheetReactor) {
super.init() // BaseViewController์˜ init() ํ˜ธ์ถœ
super.init()
self.reactor = reactor
}
required init?(coder: NSCoder) {
Expand All @@ -43,9 +43,7 @@ final class AdminBottomSheetViewController: BaseViewController, View {
view.backgroundColor = .clear

Logger.log(message: "์ดˆ๊ธฐ ๋ทฐ ๊ณ„์ธต:", category: .debug)
// print(view.value(forKey: "recursiveDescription") ?? "")

// mainView ์„ค์ • ๋ฐ ์ถ”๊ฐ€
view.addSubview(mainView)
mainView.isUserInteractionEnabled = true
mainView.containerView.isUserInteractionEnabled = true
Expand All @@ -60,24 +58,21 @@ final class AdminBottomSheetViewController: BaseViewController, View {
}

Logger.log(message: "mainView ์ถ”๊ฐ€ ํ›„ ๊ณ„์ธต:", category: .debug)
// print(view.value(forKey: "recursiveDescription") ?? "")

// dimmedView ์„ค์ • ๋ฐ ์ถ”๊ฐ€
dimmedView.backgroundColor = .black.withAlphaComponent(0.4)
dimmedView.alpha = 0
dimmedView.isUserInteractionEnabled = true
dimmedView.isUserInteractionEnabled = false

let tapGesture = UITapGestureRecognizer(target: self, action: #selector(dimmedViewTapped))
dimmedView.addGestureRecognizer(tapGesture)
tapGesture.cancelsTouchesInView = false // ํ„ฐ์น˜ ์ด๋ฒคํŠธ๊ฐ€ ๋‹ค๋ฅธ ๋ทฐ๋กœ ์ „๋‹ฌ๋˜๋„๋ก ์„ค์ •
tapGesture.cancelsTouchesInView = true // ํ„ฐ์น˜ ์ด๋ฒคํŠธ๊ฐ€ ๋‹ค๋ฅธ ๋ทฐ๋กœ ์ „๋‹ฌ๋˜๋„๋ก ์„ค์ •
view.insertSubview(dimmedView, belowSubview: mainView)

dimmedView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}

Logger.log(message: "์ตœ์ข… ๋ทฐ ๊ณ„์ธต:", category: .debug)
// print(view.value(forKey: "recursiveDescription") ?? "")
}

private func setupCollectionView() {
Expand All @@ -89,12 +84,8 @@ final class AdminBottomSheetViewController: BaseViewController, View {

// MARK: - Binding
func bind(reactor: Reactor) {
// Action
mainView.segmentedControl.rx.selectedSegmentIndex
.do(onNext: { index in
Logger.log(message: "์„ธ๊ทธ๋จผํŠธ ๋ณ€๊ฒฝ ์‹œ๋„: \(index)", category: .event)
Logger.log(message: "View ์ƒํƒœ: \(self.view.window != nil)", category: .debug)
Logger.log(message: "MainView ์ƒํƒœ: \(self.mainView.window != nil)", category: .debug)
})
.map { Reactor.Action.segmentChanged($0) }
.bind(to: reactor.action)
Expand All @@ -118,7 +109,6 @@ final class AdminBottomSheetViewController: BaseViewController, View {
.bind(to: reactor.action)
.disposed(by: disposeBag)

// State
reactor.state.map { state in
let items = state.activeSegment == 0 ?
state.statusOptions :
Expand Down
1 change: 0 additions & 1 deletion Poppool/Poppool/Presentation/Admin/AdminReactor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ final class AdminReactor: Reactor {
return .just(.navigateToRegister(true))

case let .tapEditButton(storeId):
// โœ… ์„ ํƒํ•œ storeId์— ํ•ด๋‹นํ•˜๋Š” ๋ฐ์ดํ„ฐ๋ฅผ ์ฐพ์•„์„œ Mutation์œผ๋กœ ์ „๋‹ฌ
if let store = currentState.storeList.first(where: { $0.id == storeId }) {
return .just(.navigateToEdit(store))
} else {
Expand Down
1 change: 0 additions & 1 deletion Poppool/Poppool/Presentation/Admin/AdminViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ final class AdminViewController: BaseViewController, View {

// MARK: - Reactor Binding
func bind(reactor: Reactor) {
// Search input
mainView.searchInput.rx.text.orEmpty
.distinctUntilChanged()
.debounce(.milliseconds(300), scheduler: MainScheduler.instance)
Expand Down
5 changes: 2 additions & 3 deletions Poppool/Poppool/Presentation/Admin/Data/DTO/GetAdminPopUpStoreListResponseDTO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ struct StoreListRequestDTO: Encodable {

enum CodingKeys: String, CodingKey {
case query
case page = "pageable.page"
case size = "pageable.size"
case page
case size
}
}

Expand All @@ -31,7 +31,6 @@ struct CreatePopUpStoreRequestDTO: Encodable {
let markerSnippet: String
let startDateBeforeEndDate: Bool

/// - ๋งŒ์•ฝ ๋Œ€ํ‘œ ์ด๋ฏธ์ง€ URL(mainImageUrl)์ด ๋น„์–ด ์žˆ์ง€ ์•Š๋‹ค๋ฉด ๋ฐฐ๋„ˆ ์ด๋ฏธ์ง€๋กœ ๊ฐ„์ฃผํ•˜์—ฌ bannerYn์„ true๋กœ ์„ค์ •ํ•ฉ๋‹ˆ๋‹ค.
init(name: String,
categoryId: Int64,
desc: String,
Expand Down
16 changes: 8 additions & 8 deletions Poppool/Poppool/Presentation/Map/MapSearchInput.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ final class MapSearchInput: UIView, View {
init() {
super.init(frame: .zero)
setupLayout()
setupActions()
// setupActions()
// setupGesture()
searchTextField.isEnabled = false


Expand All @@ -79,12 +80,12 @@ final class MapSearchInput: UIView, View {

func bind(reactor: MapReactor) {
// ์—”ํ„ฐ ํ‚ค๋กœ ๊ฒ€์ƒ‰ ์‹คํ–‰
searchTextField.rx.controlEvent(.editingDidEndOnExit)
.withLatestFrom(searchTextField.rx.text.orEmpty)
.bind { query in
reactor.action.onNext(.searchTapped(query))
}
.disposed(by: disposeBag)
// searchTextField.rx.controlEvent(.editingDidEndOnExit)
// .withLatestFrom(searchTextField.rx.text.orEmpty)
// .bind { query in
// reactor.action.onNext(.searchTapped(query))
// }
// .disposed(by: disposeBag)

// ํ…์ŠคํŠธ ์ž…๋ ฅ ๋กœ๊ทธ
searchTextField.rx.text.orEmpty
Expand Down Expand Up @@ -138,7 +139,6 @@ private extension MapSearchInput {
}

func setupActions() {
// ํ…์ŠคํŠธ ํ•„๋“œ ์•ก์…˜ ์„ค์ •
searchTextField.rx.controlEvent(.editingDidEndOnExit)
.withLatestFrom(searchTextField.rx.text.orEmpty)
.subscribe(onNext: { [weak self] query in
Expand Down
Loading