-
Notifications
You must be signed in to change notification settings - Fork 0
feat: [키링 만들기] 말 템플릿 1차 구현 #79
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.
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
The head ref may contain hidden characters: "feat/\uD0A4\uB9C1-\uB9CC\uB4E4\uAE30-\uB9D0-\uD15C\uD50C\uB9BF-\uBF08\uB300-\uAD6C\uD604"
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
e6c1d3f
feat: 말 템플릿 기반 파일 생성 및 기반 코드 추가
jini-coding b63d8f2
feat: 말 템플릿 라우터 연결
jini-coding 23c076a
feat: 말 템플릿 프레임 관련 기반 파일 및 코드 추가
jini-coding b71555d
feat: 말 템플릿용 키링 스케일 추가
jini-coding df9e6e6
feat: 안장 및 갈기 데이터 모델 추가
jini-coding d8ab813
feat: 이미지 합성 코드 추가
jini-coding 2918312
feat: 안장 및 갈기 fetch 함수 추가
jini-coding 60b9112
feat: 데이터 패치 함수 추가
jini-coding fe1acc8
style: Selector UI 디자인 반영
jini-coding e0e32a2
feat: 안장 및 갈기 반영 및 합성
jini-coding c41192d
refactor: 색상 관련 중복 코드 제거
jini-coding 8b6d974
style: 바디 크기 설정
jini-coding 314cf3d
Merge remote-tracking branch 'refs/remotes/origin/develop'
jini-coding File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
Keychy/Keychy/Presentation/KeyringMaker/Templates/WishHorse26/Models/Mane.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // | ||
| // Mane.swift | ||
| // Keychy | ||
| // | ||
| // Created by Jini on 2/11/26. | ||
| // | ||
|
|
||
| import SwiftUI | ||
| import Foundation | ||
| import FirebaseFirestore | ||
|
|
||
| struct Mane: Identifiable, Codable, Hashable { | ||
| @DocumentID var id: String? | ||
| var imageURL: String | ||
| var color: String | ||
| var order: Int? // 정렬 순서 | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. order도 필요하네요! 싱싱한테 순서 물어보면될듯 |
||
|
|
||
| enum CodingKeys: String, CodingKey { | ||
| case id | ||
| case imageURL | ||
| case color | ||
| case order | ||
| } | ||
| } | ||
|
|
||
| enum ManeColorType: String, CaseIterable { | ||
| case gray = "#4D4D4D" | ||
| case darkRed = "#810A15" | ||
| case red = "#FF383C" | ||
| case yellow = "#FDF1BC" | ||
| case pink = "#FFBAE7" | ||
| case purple = "#C2BCFE" | ||
|
|
||
| /// SwiftUI Color 반환 | ||
| var color: Color { | ||
| Color(hex: self.rawValue) | ||
| } | ||
|
|
||
| /// 모든 프리셋 색상 배열 | ||
| static var allColors: [Color] { | ||
| allCases.map { $0.color } | ||
| } | ||
|
|
||
| /// hex 코드로 ManeColorType 찾기 | ||
| static func from(hex: String) -> ManeColorType? { | ||
| let normalizedHex = hex.uppercased() | ||
| return allCases.first { $0.rawValue.uppercased() == normalizedHex } | ||
| } | ||
| } | ||
23 changes: 23 additions & 0 deletions
23
Keychy/Keychy/Presentation/KeyringMaker/Templates/WishHorse26/Models/Saddle.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| // | ||
| // Saddle.swift | ||
| // Keychy | ||
| // | ||
| // Created by Jini on 2/11/26. | ||
| // | ||
|
|
||
| import Foundation | ||
| import FirebaseFirestore | ||
|
|
||
| struct Saddle: Identifiable, Codable, Hashable { | ||
| @DocumentID var id: String? | ||
| var imageURL: String | ||
| var thumbnailURL: String | ||
| var order: Int? // 정렬 순서 | ||
|
|
||
| enum CodingKeys: String, CodingKey { | ||
| case id | ||
| case imageURL | ||
| case thumbnailURL | ||
| case order | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
구굳굳