Skip to content

Repository navigation

카테고리 추가·수정 시트에 Figma 디자인을 적용한다 #935

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 2 commits into from
Oct 5, 2026
Merged

카테고리 추가·수정 시트에 Figma 디자인을 적용한다 #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53d4fd9
feat: 카테고리 이름 중복 여부와 안내 문구 상태 추가
opficdev Oct 5, 2026
90aecfa
ui: 카테고리 추가·수정 시트에 Figma 디자인 적용
opficdev Oct 5, 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
21 changes: 19 additions & 2 deletions Application/Presentation/HomeTab/Sources/Category/CategoryManageFeature.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ struct CategoryManageFeature {
var categoryNameCountText: String {
"\(category.name.count)/20"
}
var canSubmitUserCategory: Bool {
var isDuplicatedName: Bool {
let name = category.name.trimmingCharacters(in: .whitespacesAndNewlines)
if name.isEmpty {
return false
Expand All @@ -51,7 +51,7 @@ struct CategoryManageFeature {
if SystemTodoCategory.allCases.contains(where: {
$0.rawValue.caseInsensitiveCompare(name) == .orderedSame
}) {
return false
return true
}

if preferences.contains(where: { item in
Expand All @@ -61,6 +61,23 @@ struct CategoryManageFeature {

return userCategory.name.caseInsensitiveCompare(name) == .orderedSame
}) {
return true
}

return false
}
var nameMessage: String {
isDuplicatedName
? String(localized: "todo_manage_name_duplicate", bundle: PresentationResources.bundle)
: String(localized: "todo_manage_name_hint", bundle: PresentationResources.bundle)
}
var canSubmitUserCategory: Bool {
let name = category.name.trimmingCharacters(in: .whitespacesAndNewlines)
if name.isEmpty {
return false
}

if isDuplicatedName {
return false
}

Expand Down
258 changes: 197 additions & 61 deletions Application/Presentation/HomeTab/Sources/Category/CategoryManageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,8 @@ struct CategoryManageView: View {
}
.margins(.horizontal, 16)
.margins(.vertical, 8),
footer: UIHostingConfiguration {
Button {
store.send(.tapAddUserCategory)
} label: {
Label(
String(localized: "todo_manage_add_category_title", bundle: PresentationResources.bundle),
systemImage: "plus.circle.fill"
)
.font(.headline)
.foregroundStyle(Color.onPrimaryContainer)
.frame(maxWidth: .infinity)
.padding(.vertical, 10)
}
.adaptiveButtonStyle(shape: RoundedRectangle(cornerRadius: 16), color: .primaryContainer)
}
.margins(.horizontal, 16)
.margins(.vertical, 24),
footer: UIHostingConfiguration { EmptyView() }
.margins(.vertical, 8),
row: { item in
UIHostingConfiguration {
CategoryManageRow(
Expand All @@ -60,8 +45,25 @@ struct CategoryManageView: View {
}
)
}
.ignoresSafeArea(edges: .bottom)
.safeAreaInset(edge: .top, spacing: 0) { toolBar }
.safeAreaInset(edge: .bottom, spacing: 0) {
Button {
store.send(.tapAddUserCategory)
} label: {
Label(
String(localized: "todo_manage_add_category_title", bundle: PresentationResources.bundle),
systemImage: "plus.circle.fill"
)
.font(.headline)
.foregroundStyle(Color.white)
.frame(maxWidth: .infinity)
.padding(.vertical, 10)
}
.adaptiveButtonStyle(shape: RoundedRectangle(cornerRadius: 16), color: .accent)
.padding(.horizontal)
.padding(.vertical, 12)
.background(Color.surface, ignoresSafeAreaEdges: .bottom)
}
.background(Color.appBackground.ignoresSafeArea())
.sheet(
item: $store.scope(state: \.categorySheet, action: \.categorySheet)
Expand Down Expand Up @@ -110,7 +112,7 @@ private struct CategoryManageRow: View {

var body: some View {
if item.isUserCategory {
content
CategoryManageRowContent(item: item, onToggle: onToggle)
.background(Color.surface)
.itemActions {
ItemActionButton(
Expand All @@ -126,11 +128,16 @@ private struct CategoryManageRow: View {
)
}
} else {
content
CategoryManageRowContent(item: item, onToggle: onToggle)
}
}
}

private struct CategoryManageRowContent: View {
let item: TodoCategoryItem
let onToggle: () -> Void

private var content: some View {
var body: some View {
HStack(spacing: 12) {
Image(systemName: item.symbolName)
.font(.headline)
Expand All @@ -154,60 +161,189 @@ private struct CategoryManageRow: View {
}
}

private let categoryColorHexValues = [
"#FF3B30", "#FF9500", "#34C759", "#1EA0A6", "#007AFF", "#AF52DE", "#FF2D55", "#8E8E93"
]

private struct CategoryManageSheet: View {
@Bindable var store: Store<CategoryManageFeature.CategorySheetState, CategoryManageFeature.Action.CategorySheet>

var body: some View {
NavigationStack {
Form {
Section {
HStack(spacing: 8) {
TextField(
"",
text: $store.category.name,
prompt: Text(store.placeholder).foregroundStyle(.secondary)
)
.frame(height: UIFont.preferredFont(forTextStyle: .body).lineHeight)

Text(store.categoryNameCountText)
.font(.footnote)
.foregroundStyle(.secondary)
.monospacedDigit()
ScrollView {
LazyVStack(spacing: 24) {
nameCard
colorCard
previewCard
}
.padding(.horizontal, 16)
.padding(.bottom, 16)
}
.contentMargins(.top, 16, for: .scrollContent)
.safeAreaInset(edge: .top, spacing: 0) { toolBar }
.safeAreaInset(edge: .bottom, spacing: 0) {
Button {
store.send(.tapSaveButton)
} label: {
Text(store.submitTitle)
.font(.headline)
.foregroundStyle(Color.white)
.frame(maxWidth: .infinity)
.padding(.vertical, 10)
}
.adaptiveButtonStyle(shape: RoundedRectangle(cornerRadius: 16), color: .accent)
.disabled(!store.canSubmitUserCategory)
.padding(.horizontal)
.padding(.vertical, 12)
.background(Color.surface, ignoresSafeAreaEdges: .bottom)
}
.background(Color.appBackground.ignoresSafeArea())
.presentationDragIndicator(.visible)
}

private var toolBar: some View {
ZStack {
Text(store.navigationTitle)
.font(.headline)
HStack {
Button {
store.send(.tapCloseButton)
} label: {
if #available(iOS 26.0, *) {
Image(systemName: "xmark")
} else {
Text(String(localized: "common_close", bundle: PresentationResources.bundle))
}
}
.topBarButtonStyle()

Section {
ColorPicker(selection: $store.category.colorHex.colorValue, supportsOpacity: false) {
Text(store.category.colorHex.isEmpty ? "#" : store.category.colorHex)
.overlay(alignment: .bottom) {
Rectangle()
.frame(height: 1)
.offset(y: 1)
}
.foregroundStyle(store.category.colorHex.colorValue)
.onTapGesture {
store.send(.tapRandomColorButton)
}
}
.pickerStyle(.palette)
Spacer()
}
}
.padding(.horizontal, 16)
.padding(.vertical, 12)
.background(Color.appBackground, ignoresSafeAreaEdges: .top)
}

private var nameCard: some View {
VStack(alignment: .leading, spacing: 12) {
Text(String(localized: "todo_manage_name_placeholder", bundle: PresentationResources.bundle))
.font(.headline)
.padding(.horizontal, 16)

HStack(spacing: 8) {
TextField(
"",
text: $store.category.name,
prompt: Text(store.placeholder).foregroundStyle(.secondary)
)
.font(.body)

Text(store.categoryNameCountText)
.font(.footnote)
.foregroundStyle(Color.textSecondary)
.monospacedDigit()
}
.padding()
.background(Color.surface, in: .rect(cornerRadius: 16))
.tint(Color.accent)

Text(store.nameMessage)
.font(.footnote)
.foregroundStyle(store.isDuplicatedName ? Color.danger : Color.textSecondary)
.padding(.horizontal, 16)
}
}

private var colorCard: some View {
VStack(alignment: .leading, spacing: 12) {
HStack {
Text(String(localized: "todo_manage_color", bundle: PresentationResources.bundle))
.font(.headline)

Spacer()

Button {
store.send(.tapRandomColorButton)
} label: {
Label(
String(localized: "todo_manage_random_color", bundle: PresentationResources.bundle),
systemImage: "shuffle"
)
.font(.subheadline)
.foregroundStyle(Color.accent)
}
.buttonStyle(.plain)
}
.navigationTitle(store.navigationTitle)
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Button(String(localized: "common_close", bundle: PresentationResources.bundle)) {
store.send(.tapCloseButton)
.padding(.horizontal, 16)

VStack(spacing: 16) {
Image(systemName: store.todoCategoryItem.symbolName)
.font(.largeTitle)
.frame(width: 88, height: 88)
.iconStyle(color: store.todoCategoryItem.color, in: Circle())

HStack(spacing: 4) {
ForEach(categoryColorHexValues, id: \.self) { colorHex in
let color = Color(hexString: colorHex) ?? .gray
let isSelected = store.category.colorHex.caseInsensitiveCompare(colorHex) == .orderedSame

Button {
store.send(.binding(.set(\.category.colorHex, colorHex)))
} label: {
Circle()
.fill(color)
.padding(3)
.overlay {
if isSelected {
Image(systemName: "checkmark")
.font(.caption.bold())
.foregroundStyle(.white)
Circle()
.strokeBorder(color, lineWidth: 2)
}
}
.aspectRatio(1, contentMode: .fit)
}
.buttonStyle(.plain)
.frame(maxWidth: .infinity)
}

ColorPicker(
store.category.colorHex.isEmpty ? "#" : store.category.colorHex,
selection: $store.category.colorHex.colorValue,
supportsOpacity: false
)
.labelsHidden()
.frame(maxWidth: .infinity)
}
}
.padding(16)
.frame(maxWidth: .infinity)
.background(Color.surface, in: .rect(cornerRadius: 16))
}
}

ToolbarItem(placement: .navigationBarTrailing) {
Button(store.submitTitle) {
store.send(.tapSaveButton)
}
.disabled(!store.canSubmitUserCategory)
private var previewCard: some View {
VStack(alignment: .leading, spacing: 12) {
Text(String(localized: "todo_preview", bundle: PresentationResources.bundle))
.font(.headline)
.padding(.horizontal, 16)

VStack(alignment: .leading, spacing: 12) {
Text(String(localized: "todo_manage_preview_description", bundle: PresentationResources.bundle))
.font(.footnote)
.foregroundStyle(Color.textSecondary)

HStack(spacing: 12) {
CategoryManageRowContent(item: store.todoCategoryItem, onToggle: {})
Image(systemName: "line.3.horizontal")
.foregroundStyle(Color.textTertiary)
}
.allowsHitTesting(false)
}
.padding(16)
.frame(maxWidth: .infinity, alignment: .leading)
.background(Color.surface, in: .rect(cornerRadius: 16))
}
}
}
Expand Down
Loading
Loading