From f962b1552392f0e7599c25d861b71a764dd092b8 Mon Sep 17 00:00:00 2001 From: opficdev Date: Tue, 3 Mar 2026 12:37:19 +0900 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=EC=A3=BC=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=ED=94=BD=EC=8A=A4=20=EB=B0=8F=20=EB=A9=94=EB=89=B4=EB=A1=9C=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=ED=95=98=EB=8A=94=20=EA=B2=83=EC=9D=80=20che?= =?UTF-8?q?vron.down=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DevLog/Resource/Localizable.xcstrings | 2 +- .../PushNotificationListView.swift | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/DevLog/Resource/Localizable.xcstrings b/DevLog/Resource/Localizable.xcstrings index d93cdcf..fdae106 100644 --- a/DevLog/Resource/Localizable.xcstrings +++ b/DevLog/Resource/Localizable.xcstrings @@ -359,7 +359,7 @@ "완료 상태" : { }, - "완료 시점" : { + "완료일" : { }, "읽지 않음" : { diff --git a/DevLog/UI/PushNotification/PushNotificationListView.swift b/DevLog/UI/PushNotification/PushNotificationListView.swift index e2dfb05..d588b25 100644 --- a/DevLog/UI/PushNotification/PushNotificationListView.swift +++ b/DevLog/UI/PushNotification/PushNotificationListView.swift @@ -114,14 +114,17 @@ struct PushNotificationListView: View { Image(systemName: "line.3.horizontal.decrease") filterBadge } + .adaptiveButtonStyle() } - .adaptiveButtonStyle() } Button { viewModel.send(.toggleSortOption) } label: { - Text("정렬: \(viewModel.state.query.sortOrder.title)") + HStack { + Text("정렬: \(viewModel.state.query.sortOrder.title)") + Image(systemName: "chevron.down") + } } .adaptiveButtonStyle(color: viewModel.state.query.sortOrder == .oldest ? .blue : .clear) @@ -142,17 +145,20 @@ struct PushNotificationListView: View { } } } label: { - Text("기간") + HStack { + Text("기간") + Image(systemName: "chevron.down") + } + .adaptiveButtonStyle(color: viewModel.state.query.timeFilter == .none ? .clear : .blue) } - .adaptiveButtonStyle(color: viewModel.state.query.timeFilter == .none ? .clear : .blue) Button { viewModel.send(.toggleUnreadOnly) } label: { Text("읽지 않음") .foregroundStyle(viewModel.state.query.unreadOnly ? .white : Color(.label)) + .adaptiveButtonStyle(color: viewModel.state.query.unreadOnly ? .blue : .clear) } - .adaptiveButtonStyle(color: viewModel.state.query.unreadOnly ? .blue : .clear) } } .scrollIndicators(.never) From 2f53ed7fa9382639901cae96a724deb8f5a7c22b Mon Sep 17 00:00:00 2001 From: opficdev Date: Tue, 3 Mar 2026 12:45:26 +0900 Subject: [PATCH 2/5] =?UTF-8?q?chore:=20adaptiveButtonStyle=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DevLog/UI/Home/TodoEditorView.swift | 12 ++++++------ DevLog/UI/Home/TodoListView.swift | 8 ++++---- .../PushNotification/PushNotificationListView.swift | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/DevLog/UI/Home/TodoEditorView.swift b/DevLog/UI/Home/TodoEditorView.swift index b716611..23f674c 100644 --- a/DevLog/UI/Home/TodoEditorView.swift +++ b/DevLog/UI/Home/TodoEditorView.swift @@ -138,8 +138,8 @@ struct TodoEditorView: View { Image(systemName: "tag") .foregroundStyle(.gray) } + .adaptiveButtonStyle() } - .adaptiveButtonStyle() DueDatePicker(selection: Binding( get: { viewModel.state.dueDate ?? Date() }, set: { viewModel.send(.setDueDate($0)) } @@ -161,8 +161,8 @@ struct TodoEditorView: View { viewModel.send(.setDueDate(viewModel.state.hasDueDate ? nil : Date())) } } + .adaptiveButtonStyle() } - .adaptiveButtonStyle() } } @@ -317,11 +317,11 @@ private struct TagEditor: View { Image(systemName: "plus") .font(.largeTitle) .foregroundStyle(Color.white) + .adaptiveButtonStyle( + shape: .circle, + color: (!tag.isEmpty && !tags.contains(tag)) ? Color.blue : .gray.opacity(0.4) + ) } - .adaptiveButtonStyle( - shape: .circle, - color: (!tag.isEmpty && !tags.contains(tag)) ? Color.blue : .gray.opacity(0.4) - ) .disabled(tag.isEmpty || tags.contains(tag)) } } diff --git a/DevLog/UI/Home/TodoListView.swift b/DevLog/UI/Home/TodoListView.swift index e30fc6e..742fdaf 100644 --- a/DevLog/UI/Home/TodoListView.swift +++ b/DevLog/UI/Home/TodoListView.swift @@ -248,10 +248,10 @@ struct TodoListView: View { Text("필터 옵션") Image(systemName: "chevron.down") } - .adaptiveButtonStyle( - color: viewModel.state.query.isPinned == true || - viewModel.state.query.completionFilter != .all ? .blue : .clear - ) + .adaptiveButtonStyle( + color: viewModel.state.query.isPinned == true || + viewModel.state.query.completionFilter != .all ? .blue : .clear + ) } } diff --git a/DevLog/UI/PushNotification/PushNotificationListView.swift b/DevLog/UI/PushNotification/PushNotificationListView.swift index d588b25..a01854d 100644 --- a/DevLog/UI/PushNotification/PushNotificationListView.swift +++ b/DevLog/UI/PushNotification/PushNotificationListView.swift @@ -125,8 +125,8 @@ struct PushNotificationListView: View { Text("정렬: \(viewModel.state.query.sortOrder.title)") Image(systemName: "chevron.down") } + .adaptiveButtonStyle(color: viewModel.state.query.sortOrder == .oldest ? .blue : .clear) } - .adaptiveButtonStyle(color: viewModel.state.query.sortOrder == .oldest ? .blue : .clear) Menu { ForEach(PushNotificationQuery.TimeFilter.availableOptions, id: \.id) { option in From 8119873b702efd5e2072f95e761f65abc0a9b1a6 Mon Sep 17 00:00:00 2001 From: opficdev Date: Tue, 3 Mar 2026 12:51:25 +0900 Subject: [PATCH 3/5] =?UTF-8?q?ui:=20=ED=95=84=ED=84=B0=EA=B0=80=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=EB=90=98=EC=97=88=EC=9D=84=20=EB=95=8C=20?= =?UTF-8?q?=ED=9D=B0=EC=83=89=20=ED=85=8D=EC=8A=A4=ED=8A=B8=EB=A1=9C=20?= =?UTF-8?q?=EB=B0=98=EC=98=81=ED=95=98=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DevLog/UI/Home/TodoListView.swift | 14 ++++++-------- .../PushNotificationListView.swift | 13 +++++++++---- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/DevLog/UI/Home/TodoListView.swift b/DevLog/UI/Home/TodoListView.swift index 742fdaf..983aac4 100644 --- a/DevLog/UI/Home/TodoListView.swift +++ b/DevLog/UI/Home/TodoListView.swift @@ -207,14 +207,13 @@ struct TodoListView: View { Text("정렬 순서") } } label: { + let condition = viewModel.state.query.sortTarget == .createdAt && viewModel.state.query.sortOrder == .latest HStack { Text("정렬: \(viewModel.state.query.sortTarget.title) / \(viewModel.state.query.sortOrder.title)") Image(systemName: "chevron.down") } - .adaptiveButtonStyle( - color: viewModel.state.query.sortTarget == .createdAt && - viewModel.state.query.sortOrder == .latest ? .clear : .blue - ) + .foregroundStyle(condition ? Color(.label) : .white) + .adaptiveButtonStyle(color: condition ? .clear : .blue) } } @@ -244,14 +243,13 @@ struct TodoListView: View { Text("완료 상태") } } label: { + let condition = viewModel.state.query.isPinned == true || viewModel.state.query.completionFilter != .all HStack { Text("필터 옵션") Image(systemName: "chevron.down") } - .adaptiveButtonStyle( - color: viewModel.state.query.isPinned == true || - viewModel.state.query.completionFilter != .all ? .blue : .clear - ) + .foregroundStyle(condition ? Color(.label) : .white) + .adaptiveButtonStyle(color: condition ? .blue : .clear) } } diff --git a/DevLog/UI/PushNotification/PushNotificationListView.swift b/DevLog/UI/PushNotification/PushNotificationListView.swift index a01854d..518bc6f 100644 --- a/DevLog/UI/PushNotification/PushNotificationListView.swift +++ b/DevLog/UI/PushNotification/PushNotificationListView.swift @@ -121,11 +121,13 @@ struct PushNotificationListView: View { Button { viewModel.send(.toggleSortOption) } label: { + let condition = viewModel.state.query.sortOrder == .oldest HStack { Text("정렬: \(viewModel.state.query.sortOrder.title)") Image(systemName: "chevron.down") } - .adaptiveButtonStyle(color: viewModel.state.query.sortOrder == .oldest ? .blue : .clear) + .foregroundStyle(condition ? .white : Color(.label)) + .adaptiveButtonStyle(color: condition ? .blue : .clear) } Menu { @@ -145,19 +147,22 @@ struct PushNotificationListView: View { } } } label: { + let condition = viewModel.state.query.timeFilter == .none HStack { Text("기간") Image(systemName: "chevron.down") } - .adaptiveButtonStyle(color: viewModel.state.query.timeFilter == .none ? .clear : .blue) + .foregroundStyle(condition ? Color(.label) : .white) + .adaptiveButtonStyle(color: condition ? .clear : .blue) } Button { viewModel.send(.toggleUnreadOnly) } label: { + let condition = viewModel.state.query.unreadOnly Text("읽지 않음") - .foregroundStyle(viewModel.state.query.unreadOnly ? .white : Color(.label)) - .adaptiveButtonStyle(color: viewModel.state.query.unreadOnly ? .blue : .clear) + .foregroundStyle(condition ? .white : Color(.label)) + .adaptiveButtonStyle(color: condition ? .blue : .clear) } } } From 20ad8a0d8beba4f4bf516a823da457b92ee0eb04 Mon Sep 17 00:00:00 2001 From: opficdev Date: Tue, 3 Mar 2026 13:56:13 +0900 Subject: [PATCH 4/5] =?UTF-8?q?ui:=20chevron.down=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/PushNotification/PushNotificationListView.swift | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/DevLog/UI/PushNotification/PushNotificationListView.swift b/DevLog/UI/PushNotification/PushNotificationListView.swift index 518bc6f..4411a6a 100644 --- a/DevLog/UI/PushNotification/PushNotificationListView.swift +++ b/DevLog/UI/PushNotification/PushNotificationListView.swift @@ -122,12 +122,9 @@ struct PushNotificationListView: View { viewModel.send(.toggleSortOption) } label: { let condition = viewModel.state.query.sortOrder == .oldest - HStack { - Text("정렬: \(viewModel.state.query.sortOrder.title)") - Image(systemName: "chevron.down") - } - .foregroundStyle(condition ? .white : Color(.label)) - .adaptiveButtonStyle(color: condition ? .blue : .clear) + Text("정렬: \(viewModel.state.query.sortOrder.title)") + .foregroundStyle(condition ? .white : Color(.label)) + .adaptiveButtonStyle(color: condition ? .blue : .clear) } Menu { From 637df08d59ab9653f82424315327bae2980f1270 Mon Sep 17 00:00:00 2001 From: opficdev Date: Tue, 3 Mar 2026 13:56:34 +0900 Subject: [PATCH 5/5] =?UTF-8?q?ui:=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=83=89=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DevLog/UI/Common/TodoInfoSheetView.swift | 2 +- DevLog/UI/Home/TodoListView.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DevLog/UI/Common/TodoInfoSheetView.swift b/DevLog/UI/Common/TodoInfoSheetView.swift index 05e430c..af8ca64 100644 --- a/DevLog/UI/Common/TodoInfoSheetView.swift +++ b/DevLog/UI/Common/TodoInfoSheetView.swift @@ -24,10 +24,10 @@ struct TodoInfoSheetView: View { .foregroundStyle(.white) HStack(spacing: 8) { Image(systemName: "calendar") - .foregroundStyle(.white) Text(createdAt.formatted(date: .abbreviated, time: .omitted)) Spacer() } + .foregroundStyle(.white) .padding(.vertical, 10) .padding(.horizontal, 12) .background( diff --git a/DevLog/UI/Home/TodoListView.swift b/DevLog/UI/Home/TodoListView.swift index 983aac4..4dff961 100644 --- a/DevLog/UI/Home/TodoListView.swift +++ b/DevLog/UI/Home/TodoListView.swift @@ -248,7 +248,7 @@ struct TodoListView: View { Text("필터 옵션") Image(systemName: "chevron.down") } - .foregroundStyle(condition ? Color(.label) : .white) + .foregroundStyle(condition ? .white : Color(.label)) .adaptiveButtonStyle(color: condition ? .blue : .clear) } }