Skip to content
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

[Feat] #400 - 솝탬프 신고 기능 및 네트워크 오류 모달 추가 #403

Merged
merged 9 commits into from
Oct 16, 2024
Merged

[Feat] #400 - 솝탬프 신고 기능 및 네트워크 오류 모달 추가 #403

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
afd85c3
[Add] #400 - 신고 아이콘 에셋 추가
dlwogus0128 Oct 14, 2024
836cc2e
[Fix] #400 - 코드 리뷰 반영
dlwogus0128 Oct 14, 2024
6933cf4
[Feat] #400 - Report 버튼 레이아웃
dlwogus0128 Oct 14, 2024
db99103
[Feat] #400 - get Report URL Domain, Data 레이어 구현
dlwogus0128 Oct 14, 2024
5c341d3
[Feat] #400 - 신고 기능 뷰 바인딩
dlwogus0128 Oct 15, 2024
1922a46
[Feat] #400 - 신고 기능 뷰 생성 및 화면전환 구현
dlwogus0128 Oct 15, 2024
6458b4c
[Feat] #400 - 솝탬프에 네트워크 에러 모달 추가
dlwogus0128 Oct 15, 2024
ee66495
[Fix] #400 - 문자열 인덱스 참조 범위 재설정
dlwogus0128 Oct 15, 2024
b42aff7
[Fix] #400 - 코드 리뷰 반영
dlwogus0128 Oct 16, 2024
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
Prev Previous commit
Next Next commit
[Feat] #400 - 신고 기능 뷰 바인딩
  • Loading branch information
@dlwogus0128
dlwogus0128 committed Oct 15, 2024
commit 5c341d35dcb4baa8da976f03f7cb85492c709f85
10 changes: 9 additions & 1 deletion SOPT-iOS/Projects/Features/StampFeature/Sources/MissionListScene/VC/MissionListVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public class MissionListVC: UIViewController, MissionListViewControllable {
public var onCurrentGenerationRankingButtonTap: ((RankingViewType) -> Void)?
public var onGuideTap: (() -> Void)?
public var onCellTap: ((MissionListModel, String?) -> Void)?
public var onReportButtonTap: (() -> Void)?

private var usersActiveGenerationStatus: UsersActiveGenerationStatusViewResponse?

Expand Down Expand Up @@ -243,6 +244,12 @@ extension MissionListVC {
owner.onNaviBackTap?()
}.store(in: self.cancelBag)
}

naviBar.reportButtonTapped
.withUnretained(self)
.sink { owner, _ in
owner.onReportButtonTap?()
}.store(in: cancelBag)

partRankingFloatingButton.publisher(for: .touchUpInside)
.withUnretained(self)
Expand Down Expand Up @@ -270,7 +277,8 @@ extension MissionListVC {
let input = MissionListViewModel.Input(
viewDidLoad: Driver<Void>.just(()),
viewWillAppear: viewWillAppear.asDriver(),
missionTypeSelected: missionTypeMenuSelected
missionTypeSelected: missionTypeMenuSelected,
reportUrlButtonTapped: naviBar.reportButtonTapped
)
let output = self.viewModel.transform(from: input, cancelBag: self.cancelBag)

Expand Down
14 changes: 14 additions & 0 deletions ...jects/Features/StampFeature/Sources/MissionListScene/ViewModel/MissionListViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@ public class MissionListViewModel: ViewModelType {
let viewDidLoad: Driver<Void>
let viewWillAppear: Driver<Void>
let missionTypeSelected: CurrentValueSubject<MissionListFetchType, Never>
let reportUrlButtonTapped: Driver<Void>
}

// MARK: - Outputs

public class Output: NSObject {
@Published var missionListModel: [MissionListModel]?
@Published var usersActivateGenerationStatus: UsersActiveGenerationStatusViewResponse?
@Published var reportUrl: SoptampReportUrlModel?
}

// MARK: - init
Expand Down Expand Up @@ -66,6 +68,12 @@ extension MissionListViewModel {
owner.useCase.fetchMissionList(type: fetchType)
}.store(in: cancelBag)

input.reportUrlButtonTapped
.withUnretained(self)
.sink { owner, url in
owner.useCase.getReportUrl()
}.store(in: cancelBag)

return output
}

Expand Down Expand Up @@ -100,5 +108,11 @@ extension MissionListViewModel {
.sink { usersActivateGenerationStatus in
output.usersActivateGenerationStatus = usersActivateGenerationStatus
}.store(in: self.cancelBag)

self.useCase.reportUrl
.asDriver()
.sink { url in
output.reportUrl = url
}.store(in: cancelBag)
}
}
19 changes: 19 additions & 0 deletions SOPT-iOS/Projects/Modules/DSKit/Sources/Components/SoptampComponents/STNavigationBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ public class STNavigationBar: UIView {
private var naviType: NaviType!
private var rightButtonClosure: (() -> Void)?
private var leftButtonClosure: (() -> Void)?
private var reportButtonClosure: (() -> Void)?

public var rightButtonTapped: Driver<Void> {
rightButton.publisher(for: .touchUpInside)
.map { _ in () }
Expand All @@ -56,6 +58,11 @@ public class STNavigationBar: UIView {
.map { _ in () }
.asDriver()
}
public var reportButtonTapped: Driver<Void> {
reportButton.publisher(for: .touchUpInside)
.map { _ in () }
.asDriver()
}

// MARK: - Initialize

Expand Down Expand Up @@ -131,6 +138,13 @@ extension STNavigationBar {
return self
}

@discardableResult
public func reportButtonAction(_ closure: (() -> Void)? = nil) -> Self {
self.reportButtonClosure = closure
self.reportButton.addTarget(self, action: #selector(tappedReportButton), for: .touchUpInside)
return self
}

@discardableResult
public func resetLeftButtonAction(_ closure: (() -> Void)? = nil) -> Self {
self.leftButtonClosure = closure
Expand Down Expand Up @@ -201,6 +215,11 @@ extension STNavigationBar {
private func tappedLeftButton() {
self.leftButtonClosure?()
}

@objc
private func tappedReportButton() {
self.reportButtonClosure?()
}
}

// MARK: - UI & Layout
Expand Down