Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3bf3e02
공용 플레이어 바·재생 표시·오류 배너를 Android 컴포넌트에 맞춤
Roy-wonji Nov 10, 2026
fd9c4e9
시나리오 청취 화면을 Android ScenarioScreen 에 맞춤
Roy-wonji Nov 10, 2026
33c46df
시나리오 청취 동작을 Android ScenarioViewModel 에 맞춤
Roy-wonji Nov 10, 2026
ce14b59
스켈레톤을 iOS 기존 구성으로 되돌림
Roy-wonji Nov 10, 2026
f87cee5
사전·최종투표 화면을 Android VoteScreen 에 맞춤
Roy-wonji Nov 10, 2026
d1a4b0d
투표 포인트 부족 안내를 Android 와 같게 추가
Roy-wonji Nov 10, 2026
a56fec1
오늘의 배틀 화면을 Android TodayBattleScreen 에 맞춤
Roy-wonji Nov 10, 2026
b8057c5
오늘의 배틀 입장 시 사전투표를 Android 와 같게 제출
Roy-wonji Nov 10, 2026
03fbd10
탐색 화면을 Android ExploreScreen 에 맞춤
Roy-wonji Nov 10, 2026
8989bdb
배틀 진입 판정과 투표 흐름 스택을 Android 와 같게 바꿈
Roy-wonji Nov 10, 2026
2e0d91d
최종투표·관점 삭제 확인창을 Android PickeConfirmDialog 모양으로 맞춤
Roy-wonji Nov 10, 2026
a6a303d
투표 흐름 스택을 iOS 기존 push 방식으로 되돌림
Roy-wonji Nov 11, 2026
36de0ca
배틀·투표 상단 바를 iOS 기존 PickeNavigationBar 로 되돌림
Roy-wonji Nov 11, 2026
f7ed061
홈 출석 체크를 Android 처럼 하루 1회로 맞춤
Roy-wonji Nov 11, 2026
d2cc116
홈 Best 댓글을 주간 베스트 관점 API 로 연동
Roy-wonji Nov 11, 2026
0cf0782
홈 Best 댓글 배틀 제목 굵기를 피그마에 맞춤
Roy-wonji Nov 11, 2026
08c9a60
클래스 결과 댓글을 하나 단 뒤에도 입력창을 유지
Roy-wonji Nov 11, 2026
00331c0
운영자가 참여하지 않은 클래스도 멤버 목록을 불러옴
Roy-wonji Nov 11, 2026
c4c0b69
배틀을 마치고 클래스 상세로 돌아오면 상세를 다시 불러옴
Roy-wonji Nov 11, 2026
5258094
운영자 클래스 수정 화면 추가 (이름·마감일)
Roy-wonji Nov 11, 2026
7b004d1
클래스 수정 화면을 Android ClassEditScreen 과 맞춤
Roy-wonji Nov 15, 2026
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
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ private extension BattleCoordinator {
state.routes.push(.chatRoom(.init(route: .init(battleId: battleId))))
return .none

case let .routeAction(_, action: .battle(.delegate(.openPerspective(battleId)))):
// Android: 이미 참여한 배틀은 관점 화면으로 바로 간다.
state.routes.push(.chat(.init(route: .comment(battleId: battleId))))
return .none

case .routeAction(_, action: .chatRoom(.delegate(.dismiss))):
return .send(.view(.backAction))

Expand Down
5 changes: 4 additions & 1 deletion Projects/App/Sources/Navigation/Chat/ChatCoordinator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@ extension ChatCoordinator {
}
return .none

case .routeAction(_, action: .preVote(.delegate(.openExplore))):
return .send(.delegate(.openExplore))

case .routeAction(_, action: .chatRoom(.delegate(.dismiss))):
return .send(.view(.backAction))

Expand Down Expand Up @@ -259,7 +262,7 @@ extension ChatCoordinator {
action: ChatDelegate
) -> Effect<Action> {
switch action {
case .dismiss, .popToRoot:
case .dismiss, .popToRoot, .openExplore:
.none
}
}
Expand Down
131 changes: 92 additions & 39 deletions Projects/App/Sources/Navigation/Class/ClassCoordinator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public struct ClassCoordinator {
requestID: UUID,
room: ClassRoom,
members: [ClassMember],
currentMemberID: Int
currentMemberID: Int?
)
case membersFailed(
routeID: Int,
Expand Down Expand Up @@ -243,6 +243,16 @@ private extension ClassCoordinator {
case .dismiss, .presented(.delegate(.dismiss)):
state.deadlineSelection = nil
case let .presented(.delegate(.confirmed(deadline, settingInstanceID: instanceID))):
if case var .classEdit(edit)? = state.routes.last?.screen {
guard state.deadlineSelection?.settingInstanceID == instanceID,
edit.instanceID == instanceID
else { return .none }
edit.deadline = deadline
edit.deadlineValidationMessage = nil
state.routes[screenAt: state.routes.count - 1] = .classEdit(edit)
state.deadlineSelection = nil
return .none
}
guard state.deadlineSelection?.settingInstanceID == instanceID,
case var .setting(setting)? = state.routes.last?.screen,
setting.instanceID == instanceID, setting.canEditDeadline
Expand Down Expand Up @@ -289,38 +299,7 @@ private extension ClassCoordinator {
editor.room.id == room.id,
editor.isSaving
else { return .none }
for (index, route) in state.routes.enumerated() {
switch route.screen {
case var .myClasses(list):
for roomIndex in list.rooms.indices where list.rooms[roomIndex].id == room.id {
list.rooms[roomIndex] = room
}
if list.viewState == .loaded || list.viewState == .empty {
list.viewState = list.visibleRooms.isEmpty ? .empty : .loaded
}
state.routes[screenAt: index] = .myClasses(list)
case var .detail(detail) where detail.room.id == room.id:
detail.room = room
state.routes[screenAt: index] = .detail(detail)
case var .ownerDashboard(dashboard) where dashboard.room.id == room.id:
dashboard.room = room
state.routes[screenAt: index] = .ownerDashboard(dashboard)
case var .closedBattle(closed) where closed.room.id == room.id:
closed.room = room
state.routes[screenAt: index] = .closedBattle(closed)
case var .members(member) where member.room.id == room.id:
member.room = room
state.routes[screenAt: index] = .members(member)
case var .report(report) where report.room.id == room.id:
report.room = room
state.routes[screenAt: index] = .report(report)
default:
break
}
}
for (battleID, cachedRoom) in state.chatRoomsByBattleID where cachedRoom.id == room.id {
state.chatRoomsByBattleID[battleID] = room
}
applyUpdatedRoom(state: &state, room: room)
state.deadlineEdit = nil
return .none

Expand All @@ -329,6 +308,45 @@ private extension ClassCoordinator {
}
}

/// 마감일·이름 변경 결과를 스택의 모든 화면과 채팅방 캐시에 반영한다.
func applyUpdatedRoom(
state: inout State,
room: ClassRoom
) {
for (index, route) in state.routes.enumerated() {
switch route.screen {
case var .myClasses(list):
for roomIndex in list.rooms.indices where list.rooms[roomIndex].id == room.id {
list.rooms[roomIndex] = room
}
if list.viewState == .loaded || list.viewState == .empty {
list.viewState = list.visibleRooms.isEmpty ? .empty : .loaded
}
state.routes[screenAt: index] = .myClasses(list)
case var .detail(detail) where detail.room.id == room.id:
detail.room = room
state.routes[screenAt: index] = .detail(detail)
case var .ownerDashboard(dashboard) where dashboard.room.id == room.id:
dashboard.room = room
state.routes[screenAt: index] = .ownerDashboard(dashboard)
case var .closedBattle(closed) where closed.room.id == room.id:
closed.room = room
state.routes[screenAt: index] = .closedBattle(closed)
case var .members(member) where member.room.id == room.id:
member.room = room
state.routes[screenAt: index] = .members(member)
case var .report(report) where report.room.id == room.id:
report.room = room
state.routes[screenAt: index] = .report(report)
default:
break
}
}
for (battleID, cachedRoom) in state.chatRoomsByBattleID where cachedRoom.id == room.id {
state.chatRoomsByBattleID[battleID] = room
}
}

func invalidateCompletingJoin(state: inout State) {
state.pendingJoinID = nil
state.completingJoinCodeInstanceID = nil
Expand Down Expand Up @@ -1034,9 +1052,36 @@ private extension ClassCoordinator {

case let .routeAction(routeID, action: .ownerDashboard(.delegate(.editClass))):
guard routeID == state.routes.count - 1,
case let .ownerDashboard(dashboard)? = state.routes.last?.screen
case let .ownerDashboard(dashboard)? = state.routes.last?.screen,
dashboard.room.role == .owner
else { return .none }
state.routes.push(.classEdit(.init(room: dashboard.room)))
return .none

case let .routeAction(routeID, action: .classEdit(.delegate(.editDeadline(instanceID)))):
guard routeID == state.routes.count - 1,
state.deadlineEdit == nil,
case let .classEdit(edit)? = state.routes.last?.screen,
edit.instanceID == instanceID, edit.hasDeadline
else { return .none }
var selection = ClassDeadlineSelectionFeature.State()
selection.settingInstanceID = instanceID
// Android ClassEdit: 기존 마감일 이후로만 연장할 수 있다.
selection.minimumDate = max(edit.room.deadline, date.now)
selection.draftDeadline = edit.deadline
state.deadlineSelection = selection
return .none

case .routeAction(_, action: .classEdit(.delegate(.dismiss))):
return .send(.view(.backAction))

case let .routeAction(routeID, action: .classEdit(.delegate(.saved(room)))):
guard routeID == state.routes.count - 1,
case .classEdit? = state.routes.last?.screen
else { return .none }
return openDeadlineEditor(state: &state, room: dashboard.room)
applyUpdatedRoom(state: &state, room: room)
state.routes.pop()
return .none

case .routeAction(_, action: .ownerDashboard(.delegate(.deleteClass))):
return returnToClassDetail(state: &state, action: .deleteTapped)
Expand Down Expand Up @@ -1099,8 +1144,14 @@ private extension ClassCoordinator {

case let .routeAction(routeID, action: .battleFlow(.delegate(.dismiss))):
guard routeID == state.routes.count - 1,
case .battleFlow? = state.routes.last?.screen else { return .none }
return .send(.view(.backAction))
case let .battleFlow(flow)? = state.routes.last?.screen else { return .none }
state.routes.goBack()
// 운영자 본인 참여처럼 배틀을 마치면 서버 인원 수가 바뀐다. 상세로 돌아오면 다시 받아 숫자를 맞춘다.
guard let roomID = flow.room?.id,
case let .detail(detail)? = state.routes.last?.screen,
detail.room.id == roomID
else { return .none }
return fetchDetail(state: &state, routeID: state.routes.count - 1)

case let .routeAction(routeID, action: .battleFlow(.delegate(.openReport(classID: classID)))):
guard routeID == state.routes.count - 1,
Expand Down Expand Up @@ -1286,8 +1337,9 @@ private extension ClassCoordinator {
else { return .none }
switch result {
case let .success(room):
guard room.id == roomID else { return .none }
return openDeadlineEditor(state: &state, room: room)
guard room.id == roomID, room.role == .owner else { return .none }
state.routes.push(.classEdit(.init(room: room)))
return .none
case let .failure(error):
list.customAlert = .alert(
title: "클래스 정보를 불러오지 못했어요",
Expand Down Expand Up @@ -1458,6 +1510,7 @@ extension ClassCoordinator {
case recommend(ClassRecommendFeature)
case battlePreview(ClassBattlePreviewFeature)
case setting(ClassSettingFeature)
case classEdit(ClassEditFeature)
case share(ClassShareFeature)
case ownerName(ClassJoinFeature)
case myClasses(MyClassFeature)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ public struct ClassCoordinatorView: View {
case let .setting(settingStore):
ClassSettingView(store: settingStore)

case let .classEdit(editStore):
ClassEditView(store: editStore)
.toolbar(.hidden, for: .tabBar)

case let .share(shareStore):
ClassShareView(store: shareStore)

Expand Down
30 changes: 29 additions & 1 deletion Projects/App/Sources/Navigation/MainTab/MainTabCoordinator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,27 @@ public struct MainTabCoordinator {
state.selectedTab = Tab.myPage.rawValue
return .none

// Android `navigateToTab(Explore)` — 투표 포인트 부족 안내에서 배틀 흐름을 닫고 탐색 탭으로 간다.
case .home(.router(.routeAction(_, action: .chat(.delegate(.openExplore))))):
state.homeState.routes.goBackToRoot()
return .send(.selectTab(Tab.explore.rawValue))

case .explore(.router(.routeAction(_, action: .chat(.delegate(.openExplore))))):
state.exploreState.routes.goBackToRoot()
return .none

case .quickBattle(.router(.routeAction(_, action: .chat(.delegate(.openExplore))))):
state.quickBattleState.routes.goBackToRoot()
return .send(.selectTab(Tab.explore.rawValue))

case .classroom(.router(.routeAction(_, action: .chat(.delegate(.openExplore))))):
state.classState.routes.goBackToRoot()
return .send(.selectTab(Tab.explore.rawValue))

case .myPage(.router(.routeAction(_, action: .chat(.delegate(.openExplore))))):
state.myPageState.routes.goBackToRoot()
return .send(.selectTab(Tab.explore.rawValue))

case .myPage(.router(.routeAction(_, action: .settings(.delegate(.sessionEnded))))):
return .send(.delegate(.sessionEnded))

Expand Down Expand Up @@ -249,7 +270,14 @@ private extension MainTabCoordinator {
action: .home(.view(.homeTabReselected))
))))
case .explore:
state.exploreState.routes.goBackToRoot()
guard state.exploreState.routes.count == 1 else {
state.exploreState.routes.goBackToRoot()
return .none
}
return .send(.explore(.router(.routeAction(
id: 0,
action: .hifi(.view(.exploreTabReselected))
))))
case .quickBattle:
state.quickBattleState.routes.goBackToRoot()
case .classroom:
Expand Down
55 changes: 39 additions & 16 deletions Projects/App/Tests/Sources/ClassCoordinatorTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ struct ClassCoordinatorTests {
}

@Test
func 일반_사전투표는_기참여시_기존처럼_자동직행하고_사후투표는_기존_선택을_요구한다() async throws {
func 일반_사전투표는_완료_단계면_자동직행하고_사후투표는_기존_선택을_요구한다() async throws {
let session = ClassMockChatSession()
let battleAPI: any BattleInterface = session
let battleID = await session.register(room: ClassRoom.mocks[0])
Expand All @@ -292,9 +292,29 @@ struct ClassCoordinatorTests {
content: "의견",
optionId: 1
))
let fetched = try await battleAPI.fetchBattle(battleId: battleID)
func detail(_ step: BattleStep) -> BattleDetail {
BattleDetail(
battleInfo: fetched.battleInfo,
description: fetched.description,
shareUrl: fetched.shareUrl,
userVoteStatus: fetched.userVoteStatus,
currentStep: step,
categoryTags: fetched.categoryTags,
philosopherTags: fetched.philosopherTags,
valueTags: fetched.valueTags
)
}
// Android BattleRouting: 관점이 있어도 단계가 COMPLETED 가 아니면 사전투표에 머문다.
let listeningStore = TestStore(initialState: PreVoteFeature.State(battleId: battleID)) { PreVoteFeature() }
listeningStore.exhaustivity = .off
await listeningStore.send(.inner(.myPerspectiveResponse(.success(perspective))))
await listeningStore.send(.inner(.battleDetailResponse(.success(detail(.postVote)))))
#expect(listeningStore.state.battle != nil)

let preStore = TestStore(initialState: PreVoteFeature.State(battleId: battleID)) { PreVoteFeature() }
preStore.exhaustivity = .off
await preStore.send(.inner(.myPerspectiveResponse(.success(perspective))))
await preStore.send(.inner(.battleDetailResponse(.success(detail(.completed)))))
await preStore.receive(\.delegate, .alreadyFinalVoted(battleId: battleID))
#expect(!preStore.state.isShowingParticipationResult)

Expand Down Expand Up @@ -514,12 +534,13 @@ struct ClassCoordinatorTests {
)))
await store.finish()

guard case let .ownerDashboard(current)? = store.state.routes.last?.screen else {
Issue.record("운영자 요약 화면이 유지되지 않았습니다.")
// Android ClassEdit 처럼 관리 메뉴 '수정'은 이름·마감일 수정 화면을 연다.
guard case let .classEdit(edit)? = store.state.routes.last?.screen else {
Issue.record("클래스 수정 화면이 열리지 않았습니다.")
return
}
#expect(current.instanceID == dashboard.instanceID)
#expect(store.state.deadlineEdit?.room == room)
#expect(edit.room == room)
#expect(store.state.deadlineEdit == nil)
}

@Test
Expand Down Expand Up @@ -727,8 +748,9 @@ struct ClassCoordinatorTests {
.success(room)
))
#expect(!store.state.showsTabBar)
await store.send(.deadlineEdit(.presented(.view(.backTapped))))
await store.receive(\.deadlineEdit.presented.delegate.dismiss)
await store.send(.router(.routeAction(id: 2, action: .classEdit(.view(.backTapped)))))
await store.receive(\.router.routeAction)
await store.receive(\.view.backAction)
#expect(store.state.showsTabBar)
}

Expand Down Expand Up @@ -1513,9 +1535,10 @@ struct ClassCoordinatorTests {
))))
if edit {
#expect(await useCase.cancelledRequestIDs.isEmpty)
#expect(store.state.deadlineEdit?.room == room)
guard case .ownerDashboard? = store.state.routes.last?.screen else {
Issue.record("마감일 편집 시 운영자 보고서가 유지되지 않음")
// 수정은 보고서 위에 클래스 수정 화면을 쌓으므로 보고서 로드는 그대로 둔다.
guard case .classEdit? = store.state.routes.last?.screen,
case .ownerDashboard? = store.state.routes.dropLast().last?.screen else {
Issue.record("클래스 수정 시 운영자 보고서가 유지되지 않음")
return
}
await store.send(.view(.backToRootAction))
Expand Down Expand Up @@ -2431,10 +2454,10 @@ struct ClassDeadlineSheetCoordinatorTests {
roomID: room.id,
.success(room)
))
#expect(store.state.routes.count == 2)
#expect(store.state.deadlineEdit?.room == room)
#expect(store.state.routes.count == 3)
#expect(store.state.routes.last.map { if case .classEdit = $0.screen { true } else { false } } == true)

await store.send(.deadlineEdit(.dismiss))
await store.send(.view(.backAction))
await store.send(.router(.routeAction(id: 1, action: .myClasses(.delegate(.openRoom(room))))))
await store.send(.router(.routeAction(id: 2, action: .detail(.delegate(.openDeadline(room))))))
#expect(store.state.routes.count == 3)
Expand All @@ -2443,8 +2466,8 @@ struct ClassDeadlineSheetCoordinatorTests {
await store.send(.deadlineEdit(.dismiss))
await store.send(.router(.routeAction(id: 2, action: .detail(.delegate(.openReport(room))))))
await store.send(.router(.routeAction(id: 3, action: .ownerDashboard(.delegate(.editClass)))))
#expect(store.state.routes.count == 4)
#expect(store.state.deadlineEdit?.room == room)
#expect(store.state.routes.count == 5)
#expect(store.state.routes.last.map { if case .classEdit = $0.screen { true } else { false } } == true)
}

@Test
Expand Down
8 changes: 8 additions & 0 deletions Projects/App/Tests/Sources/MainTabCoordinatorTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,16 @@ struct MainTabCoordinatorTests {
}
#expect(events.value == [.tabExplore])

// 탐색 재선택은 Android 처럼 목록을 맨 위로 올린다(탐색 화면 상태만 바뀐다).
store.exhaustivity = .off
await store.send(.tabTapped(MainTabCoordinator.Tab.explore.rawValue))
await store.receive(\.tabReselected, MainTabCoordinator.Tab.explore.rawValue)
await store.receive(\.explore.router.routeAction)
guard case let .hifi(explore) = store.state.exploreState.routes[0].screen else {
Issue.record("탐색 루트 화면이 HifiFeature 가 아님")
return
}
#expect(explore.scrollToTopRequest == 1)
await store.send(.tabTapped(-1))
await store.finish()
#expect(events.value == [.tabExplore])
Expand Down
Loading
Loading