Skip to content

[#504] ProfileView 탭 모드를 content, detail로 수정한다 #509

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
opficdev merged 4 commits into from
Jun 1, 2026
+253 −193
Merged

[#504] ProfileView 탭 모드를 content, detail로 수정한다 #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43c918d
ui: ProfileView에서 활동을 선택하면 detail 탭에서 볼 수 있도록 수정
opficdev Jun 1, 2026
2d1ffd9
fix: 프로필 상세 패널 라우팅 조정
opficdev Jun 1, 2026
3f33c87
ui: .navigationSplitViewColumnWidth(min:ideal:max) 적용
opficdev Jun 1, 2026
b9f156b
fix: 프로필 상세 패널 내비게이션 일원화
opficdev Jun 1, 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
19 changes: 18 additions & 1 deletion Application/DevLogApp/Sources/Resource/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,23 @@
}
}
},
"profile_select_detail" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Select an activity."
}
},
"ko" : {
"stringUnit" : {
"state" : "translated",
"value" : "활동을 선택해주세요."
}
}
}
},
"profile_select_quarter" : {
"extractionState" : "manual",
"localizations" : {
Expand Down Expand Up @@ -3451,4 +3468,4 @@
}
},
"version" : "1.0"
}
}
180 changes: 99 additions & 81 deletions Application/DevLogPresentation/Sources/Main/MainView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,65 +106,62 @@ struct MainView: View {

@ViewBuilder
private func sidebarView(for selectedTab: MainTab) -> some View {
switch selectedTab.mainTabSplitStyle {
case .detailOnly:
switch selectedTab {
case .home:
NavigationSplitView {
mainSidebar
} content: {
homeView
.navigationSplitViewColumnWidth(min: 350, ideal: 450, max: nil)
} detail: {
selectedTabView(for: selectedTab)
homeRegularDetailView
}
case .contentDetail:
switch selectedTab {
case .home:
NavigationSplitView {
mainSidebar
} content: {
homeView
} detail: {
homeRegularDetailView
}
.environment(homeViewCoordinator.router)
case .today:
NavigationSplitView {
mainSidebar
} content: {
todayView
} detail: {
todayRegularDetailView
}
case .notification:
NavigationSplitView {
mainSidebar
} content: {
PushNotificationListView(
coordinator: pushNotificationListViewCoordinator,
isCompactLayout: isCompactLayout
)
} detail: {
Group {
if let todoId = pushNotificationListViewCoordinator.todoIdToPresent?.id {
TodoDetailView(
viewModel: pushNotificationListViewCoordinator.makeTodoDetailViewModel(
todoId: todoId
)
)
.id(todoId)
} else {
ContentUnavailableView(
String(localized: "push_notifications_select_detail"),
systemImage: "bell.badge"
.environment(homeViewCoordinator.router)
case .today:
NavigationSplitView {
mainSidebar
} content: {
todayView
.navigationSplitViewColumnWidth(min: 350, ideal: 450, max: nil)
} detail: {
todayRegularDetailView
}
case .notification:
NavigationSplitView {
mainSidebar
} content: {
PushNotificationListView(
coordinator: pushNotificationListViewCoordinator,
isCompactLayout: isCompactLayout
)
.navigationSplitViewColumnWidth(min: 350, ideal: 450, max: nil)
} detail: {
Group {
if let todoId = pushNotificationListViewCoordinator.todoIdToPresent?.id {
TodoDetailView(
viewModel: pushNotificationListViewCoordinator.makeTodoDetailViewModel(
todoId: todoId
)
}
)
.id(todoId)
} else {
ContentUnavailableView(
String(localized: "push_notifications_select_detail"),
systemImage: "bell.badge"
)
}
.background(Color(.secondarySystemBackground).ignoresSafeArea())
}
case .profile:
NavigationSplitView {
mainSidebar
} detail: {
selectedTabView(for: selectedTab)
}
}
.background(Color(.secondarySystemBackground).ignoresSafeArea())
case .profile:
NavigationSplitView {
mainSidebar
} content: {
profileView
.navigationSplitViewColumnWidth(min: 350, ideal: 450, max: nil)
} detail: {
profileRegularDetailView
}
}
}

Expand All @@ -178,20 +175,6 @@ struct MainView: View {
.listStyle(.sidebar)
}

@ViewBuilder
private func selectedTabView(for selectedTab: MainTab) -> some View {
switch selectedTab {
case .home:
homeView
case .today:
todayView
case .notification:
notificationView
case .profile:
profileView
}
}

@ViewBuilder
private func sidebarRow(_ tab: MainTab) -> some View {
if tab == .notification {
Expand Down Expand Up @@ -341,7 +324,57 @@ struct MainView: View {
}

private var profileView: some View {
ProfileView(coordinator: profileViewCoordinator)
ProfileView(
coordinator: profileViewCoordinator,
isCompactLayout: isCompactLayout
)
}

private var profileRegularDetailView: some View {
NavigationStack(path: Binding(
get: { profileViewCoordinator.router.detailPath },
set: { profileViewCoordinator.router.detailPath = $0 }
)) {
Group {
if let profileRoute = profileViewCoordinator.router.root {
profileRegularDestinationView(profileRoute)
} else {
ContentUnavailableView(
String(localized: "profile_select_detail"),
systemImage: "person.crop.circle"
)
}
}
.navigationDestination(for: ProfileRoute.self) { route in
profileRegularDestinationView(route)
}
}
.background(Color(.secondarySystemBackground).ignoresSafeArea())
}
Comment thread
opficdev marked this conversation as resolved.

@ViewBuilder
private func profileRegularDestinationView(_ route: ProfileRoute) -> some View {
switch route {
case .activity(let todoId):
TodoDetailView(viewModel: profileViewCoordinator.makeTodoDetailViewModel(todoId: todoId))
.id(todoId)
case .settings:
SettingView(viewModel: profileViewCoordinator.settingViewModel)
.environment(profileViewCoordinator.router)
case .theme:
ThemeView(
theme: Binding(
get: { profileViewCoordinator.settingViewModel.state.theme },
set: { profileViewCoordinator.settingViewModel.send(.setTheme($0)) }
)
)
case .pushNotification:
PushNotificationSettingsView(
viewModel: profileViewCoordinator.makePushNotificationSettingsViewModel()
)
case .account:
AccountView(viewModel: profileViewCoordinator.makeAccountViewModel())
}
}
}

Expand Down Expand Up @@ -397,22 +430,7 @@ private extension MainView {
}

}

private enum MainTabSplitStyle {
case detailOnly
case contentDetail
}

private extension MainTab {
var mainTabSplitStyle: MainTabSplitStyle {
switch self {
case .home, .today, .notification:
.contentDetail
case .profile:
.detailOnly
}
}

var title: String {
switch self {
case .home:
Expand Down
Loading