Skip to content

Commit

Permalink
chore: Prepare distribution
Browse files Browse the repository at this point in the history
  • Loading branch information
dodo849 committed Aug 22, 2024
1 parent 366e3cb commit f6bc658
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ final class _GetAnnouncementsByOrganizationUsecase {
.withUnretained(self)
.flatMap { owner, result -> Observable<Output> in
if let content = result.content {
owner.page += 1
// owner.page += 1 // TODO: v1.1.0에 페이징 로직 추가

let announcements = content.map {
AnnouncementSummaryEntity(
Expand Down
2 changes: 1 addition & 1 deletion Projects/Noffice/Noffice/Sources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>29</string>
<string>30</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundlePackageType</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import ReactorKit
class AnnouncementDetailReactor: Reactor {
// MARK: Action
enum Action {
case viewDidLoad(AnnouncementSummaryEntity, AnnouncementOrganizationEntity)
case viewWillAppear(AnnouncementSummaryEntity, AnnouncementOrganizationEntity)
case toggleTodoStatus(AnnouncementTodoEntity)
}

Expand Down Expand Up @@ -46,7 +46,7 @@ class AnnouncementDetailReactor: Reactor {
// MARK: Action operation
func mutate(action: Action) -> Observable<Mutation> {
switch action {
case let .viewDidLoad(announcement, organization):
case let .viewWillAppear(announcement, organization):
let detailObservable = fetchAnnouncementDetailUsecase
.execute(.init(announcementId: announcement.id))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ public class AnnouncementDetailViewController: BaseViewController<AnnouncementDe
}

// MARK: Life cycle
override public func viewDidLoad() {
super.viewDidLoad()
override public func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)

reactor.action
.onNext(.viewDidLoad(announcement, organization))
.onNext(.viewWillAppear(announcement, organization))
}

// MARK: Setup
Expand Down Expand Up @@ -135,8 +135,7 @@ public class AnnouncementDetailViewController: BaseViewController<AnnouncementDe
with: self,
onNext: { owner, _ in
if let placeURLString = owner.reactor.currentState.announcement?.place?.link,
let placeURL = URL(string: placeURLString)
{
let placeURL = URL(string: placeURLString) {
Router.shared.presentWebView(placeURL)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class AnnouncementPageViewController: BaseViewController<AnnouncementPageView> {
override func setupStateBind() {
reactor.state.map { $0.organizations }
.withUnretained(self)
.debug(":::")
.map { owner, organizations in
[
BannerSection(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public class MypageView: BaseView {
[
BaseVStack(spacing: 18) {
let menus = [
("앱 버전", "00.00.00"),
("앱 버전", "1.0.0")
// TODO: v1.1.0 추가 예정
// ("문의하기", nil),
// ("공지사항", nil),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public class MypageViewController: BaseViewController<MypageView> {
override public func setupStateBind() {
reactor.state.map { $0.member }
.compactMap { $0 }
.debug(":::")
.subscribe(with: self, onNext: { owner, member in
owner.baseView.userNameLabel.text = member.name
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class EditContentsPageView: BaseView, UIScrollViewDelegate {
// - Go edit page buttons
lazy var templateStack = BaseVStack(contents: [
editDateTime,
editLocation,
editLocation
// TODO: v1.1.0때 살리기
// editTodo,
// editNotification
Expand Down
8 changes: 7 additions & 1 deletion Projects/Present/NewOrganizationPresentModule/Project.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import ProjectDescription
import ProjectDescriptionHelpers

let project = Project.makePresentModule(.newOrganization)
let project = Project.makePresentModule(
.newOrganization,
dependencies: [
.usecase(.organization),
.entity(.organization)
]
)

0 comments on commit f6bc658

Please sign in to comment.