Skip to content

✨ [feat] 특수 아이템 카테고리 추가 (#57) #128

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

Closed
geeksbaek wants to merge 2 commits into from
Closed

✨ [feat] 특수 아이템 카테고리 추가 (#57) #128

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
0caddc4
✨ [feat] 특수 아이템 카테고리 추가 (#57)
beans-go Dec 31, 2025
9b83868
refactor: self-review 개선 - 특수 아이템 카테고리 개선
beans-go Dec 31, 2025
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
1 change: 1 addition & 0 deletions Animal-Crossing-Wiki/Projects/App/Resources/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ Find the villagers you have visited and tap the home icon on the villager's page
"Gyroids" = "Gyroids";
"Villager" = "Villager";
"Tools" = "Tools";
"Special Items" = "Special Items";

// MARK: - ItemsViewController
"To catch now" = "To catch now";
Expand Down
1 change: 1 addition & 0 deletions Animal-Crossing-Wiki/Projects/App/Resources/ko.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@
"Gyroids" = "토용";
"Villager" = "마을주민";
"Tools" = "도구";
"Special Items" = "특수 아이템";

// MARK: - ItemsViewController
"To catch now" = "아직 늦지 않았어요!";
Expand Down
65 changes: 32 additions & 33 deletions Animal-Crossing-Wiki/Projects/App/Sources/Models/Items/Category.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ enum Category: String, CaseIterable {
case reactions = "Reactions"
case gyroids = "Gyroids"
case tools = "Tools"
case specialItems = "Special Items"
case villager = "Villager"
case npc = "NPC"

Expand Down Expand Up @@ -73,6 +74,7 @@ enum Category: String, CaseIterable {
case .reactions: return "icon-reactions"
case .gyroids: return "icon-gyroids"
case .tools: return "icon-tool"
case .specialItems: return "icon-present"
case .villager: return "icon-raymond"
case .npc: return "icon-kk"
}
Expand Down Expand Up @@ -110,6 +112,7 @@ enum Category: String, CaseIterable {
case .reactions: return "icon-reactions"
case .gyroids: return "icon-gyroids"
case .tools: return "icon-tool"
case .specialItems: return "icon-present"
case .villager: return "icon-raymond"
case .npc: return "icon-kk"
}
Expand All @@ -118,7 +121,7 @@ enum Category: String, CaseIterable {
static func items() -> [Category] {
[
.fishes, .seaCreatures, .bugs,
.fossils, .art, .tools, .housewares,
.fossils, .art, .tools, .specialItems, .housewares,
.miscellaneous, .wallMounted, .ceilingDecor,
.wallpaper, .floors, .rugs,
.other, .recipes, .songs, .photos, .fencing,
Expand All @@ -137,7 +140,7 @@ enum Category: String, CaseIterable {

static func furniture() -> [Category] {
[
.tools, .housewares, .miscellaneous, .wallMounted,
.tools, .specialItems, .housewares, .miscellaneous, .wallMounted,
.ceilingDecor, .wallpaper, .floors,
.rugs, .other, .songs, .photos, .fencing,
.tops, .bottoms, .dressUp, .headwear, .accessories, .socks, .shoes, .bags, .umbrellas, .wetSuit,
Expand All @@ -160,40 +163,36 @@ extension Category: Comparable {
case .fossils: return 3
case .art: return 4
case .tools: return 5
case .housewares: return 6
case .miscellaneous: return 7
case .wallMounted: return 8
case .wallpaper: return 9
case .floors: return 10
case .rugs: return 11
case .other: return 12
case .ceilingDecor: return 13
case .recipes: return 14
case .songs: return 15
case .fencing: return 16
case .photos: return 17
case .tops: return 18
case .bottoms: return 19
case .dressUp: return 20
case .headwear: return 21
case .accessories: return 22
case .socks: return 23
case .shoes: return 24
case .bags: return 25
case .umbrellas: return 26
case .wetSuit: return 27
case .reactions: return 28
case .gyroids: return 29

case .villager: return 0
case .npc: return 1
case .specialItems: return 6
case .housewares: return 7
case .miscellaneous: return 8
case .wallMounted: return 9
case .wallpaper: return 10
case .floors: return 11
case .rugs: return 12
case .other: return 13
case .ceilingDecor: return 14
case .recipes: return 15
case .songs: return 16
case .fencing: return 17
case .photos: return 18
case .tops: return 19
case .bottoms: return 20
case .dressUp: return 21
case .headwear: return 22
case .accessories: return 23
case .socks: return 24
case .shoes: return 25
case .bags: return 26
case .umbrellas: return 27
case .wetSuit: return 28
case .reactions: return 29
case .gyroids: return 30
case .villager: return 31
case .npc: return 32
}
}

static func == (lhs: Self, rhs: Self) -> Bool {
return lhs.sortOrder == rhs.sortOrder
}

static func < (lhs: Self, rhs: Self) -> Bool {
return lhs.sortOrder < rhs.sortOrder
}
Expand Down