-
Notifications
You must be signed in to change notification settings - Fork 1
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
feat: 1.0.8 버전 업데이트에 따른 기능 추가 및 수정 #175
Merged
Merged
Changes from all commits
Commits
Show all changes
33 commits
Select commit
Hold shift + click to select a range
60a1018
[fix] #173 카테고리 타입 별 버튼 수정
stealmh 708300b
[fix] #173 애니메이션 버그 수정
stealmh 35aac43
[feat] #173 편집하기 로직 연결
stealmh 67c1f36
[fix] #173 편집하기 조건 수정
stealmh 00a1372
[feat] navigationBar View Modifier autoclosure 버전 추가
stealmh 8460670
[fix] 미분류 카테고리 편집에서 card action 받지 못하게 수정
stealmh d090866
[feat] #173 편집하기 버튼 액션 추가
stealmh 1c7cb18
[feat] #173 편집하기 체크기능 및 화면리스트 구성
stealmh 53706b3
[feat] #173 편집하기 뷰 구성
stealmh ec08b3b
[feat] 버전업
stealmh dd7c0ce
[feat] #173 뒤로가기 액션 추가
stealmh 4b97cde
[feat] #173 편집하기 float button 구성
stealmh c9b67c0
[fix] print 제거
stealmh 426a251
[fix] 레이아웃 수정
stealmh 0671f7d
[feat] #173 Float Button Delegate 연결
stealmh 5e682a7
[feat] #173 카테고리 추가 시트 구성
stealmh f168d3a
[feat] #173 포킷이동을 위한 시트 연결
stealmh 19ec4cd
[feat] #173 미분류 링크 이동 로직 추가
stealmh 91b37b4
[feat] #173 미분류 링크 삭제 API 추가
stealmh f3a36ad
[feat] #173 미분류 로직 수정
stealmh 9331748
[feat] #173 편집하기 로직 구성
stealmh 59911dd
[refactor] #173 PokitSelect에 PokitSelectSheet 적용
ShapeKim98 82935a1
[fix] Perception Error 수정
stealmh 088fa68
[fix] #173 Perception Error 수정 @ShapeKim98
stealmh fc0cdcb
[feat] #173 버전 체크 로직 추가
stealmh 6b81488
[style] 컨벤션 수정
stealmh a014b08
[feat] 앱 아이콘 수정
stealmh 5fa1b2c
[feat] #173 편집할 링크가 없을 시 종료 로직 추가
stealmh 735db31
[fix] 링크 비어있을 때 로직 종료 수정
stealmh e17b3ac
[refactor] #173 링크 편집 개선
stealmh 0f60b85
[feat] #173 버전 체크 검증 테스트 케이스 추가
stealmh e884ac6
[fix] 불필요 코드 삭제
stealmh 89594ce
[feat] Dependency openURL 리팩토링
stealmh 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
Binary file modified
BIN
-2.47 KB
(85%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-10.8 KB
(99%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/1024.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.92 KB
(86%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/114.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-3.2 KB
(85%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-4.03 KB
(86%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-4.62 KB
(86%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-5.7 KB
(85%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/167.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-5.71 KB
(87%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-149 Bytes
(88%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/20.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-388 Bytes
(83%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/29.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-712 Bytes
(81%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-933 Bytes
(83%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/50.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-1.08 KB
(84%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/57.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-1.03 KB
(85%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/58.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-1.15 KB
(84%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/60.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-1.51 KB
(84%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-1.54 KB
(85%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/76.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-1.73 KB
(85%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/80.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.03 KB
(85%)
Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/87.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains 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
20 changes: 20 additions & 0 deletions
20
Projects/CoreKit/Sources/Data/DTO/Content/ContentDeleteRequest.swift
This file contains 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,20 @@ | ||
// | ||
// ContentDeleteRequest.swift | ||
// CoreKit | ||
// | ||
// Created by asobi on 12/30/24. | ||
// | ||
|
||
import Foundation | ||
/// 미분류 링크 삭제 | ||
public struct ContentDeleteRequest: Encodable { | ||
let contentId: [Int] | ||
|
||
public init(contentId: [Int]) { | ||
self.contentId = contentId | ||
} | ||
} | ||
|
||
extension ContentDeleteRequest { | ||
public static let mock: Self = Self(contentId: [551321312,4333333]) | ||
} |
21 changes: 21 additions & 0 deletions
21
Projects/CoreKit/Sources/Data/DTO/Content/ContentMoveRequest.swift
This file contains 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,21 @@ | ||
// | ||
// ContentMoveRequest.swift | ||
// CoreKit | ||
// | ||
// Created by 김민호 on 12/29/24. | ||
// | ||
import Foundation | ||
/// 미분류 링크를 카테고리로 이동 | ||
public struct ContentMoveRequest: Encodable { | ||
let contentIds: [Int] | ||
let categoryId: Int | ||
|
||
public init(contentIds: [Int], categoryId: Int) { | ||
self.contentIds = contentIds | ||
self.categoryId = categoryId | ||
} | ||
} | ||
|
||
extension ContentMoveRequest { | ||
public static let mock: Self = Self(contentIds: [123,456], categoryId: 444) | ||
} |
This file contains 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 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 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 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 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 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 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 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 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,87 @@ | ||
// | ||
// PokitSelectSheet.swift | ||
// DSKit | ||
// | ||
// Created by 김민호 on 12/27/24. | ||
// | ||
|
||
import SwiftUI | ||
import Util | ||
|
||
|
||
public struct PokitSelectSheet<Item: PokitSelectItem>: View { | ||
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. 시트가 |
||
@Binding | ||
private var selectedItem: Item? | ||
|
||
private let list: [Item]? | ||
private let itemSelected: (Item) -> Void | ||
private let pokitAddAction: (() -> Void)? | ||
|
||
public init( | ||
list: [Item]?, | ||
selectedItem: Binding<Item?> = .constant(nil), | ||
itemSelected: @escaping (Item) -> Void, | ||
pokitAddAction: (() -> Void)? | ||
) { | ||
self.list = list | ||
self._selectedItem = selectedItem | ||
self.itemSelected = itemSelected | ||
self.pokitAddAction = pokitAddAction | ||
} | ||
|
||
|
||
public var body: some View { | ||
Group { | ||
if let list { | ||
VStack(spacing: 0) { | ||
if let pokitAddAction { | ||
addButton { | ||
pokitAddAction() | ||
} | ||
} | ||
PokitList( | ||
selectedItem: selectedItem, | ||
list: list | ||
) { item in | ||
itemSelected(item) | ||
} | ||
} | ||
.padding(.top, 12) | ||
.padding(.bottom, 20) | ||
} else { | ||
PokitLoading() | ||
} | ||
} | ||
} | ||
} | ||
extension PokitSelectSheet { | ||
@ViewBuilder | ||
private func addButton( | ||
action: @escaping () -> Void | ||
) -> some View { | ||
Button(action: action) { | ||
HStack(spacing: 20) { | ||
PokitIconButton( | ||
.icon(.plusR), | ||
state: .default(.secondary), | ||
size: .medium, | ||
shape: .round, | ||
action: action | ||
) | ||
|
||
Text("포킷 추가하기") | ||
.pokitFont(.b1(.b)) | ||
.foregroundStyle(.pokit(.text(.primary))) | ||
|
||
Spacer() | ||
} | ||
.padding(.vertical, 22) | ||
.padding(.horizontal, 30) | ||
.background(alignment: .bottom) { | ||
Rectangle() | ||
.fill(.pokit(.border(.tertiary))) | ||
.frame(height: 1) | ||
} | ||
} | ||
} | ||
} |
This file contains 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
Oops, something went wrong.
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.
저희 서버에 버전 체크 api 있지 않나여?
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.
써봤는데 최신 버전이랍시고 1.0.1 리턴되던데 버려진 api느낌같아서 만들었습니다
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.
어라..ㅋㅋㅋㅋㅋㅋㅋㅋ