Skip to content
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

Feat/1.0.6 대비 디자인 시스템 변경사항 반영 #165

Merged
merged 11 commits into from
Nov 28, 2024
Merged

Feat/1.0.6 대비 디자인 시스템 변경사항 반영 #165

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2b4275f
[design] #157 버튼 컴포넌트 패딩, 사이즈 수정
ShapeKim98 Nov 26, 2024
da754f8
[design] #157 팝업 메세지 변경사항 반영
ShapeKim98 Nov 26, 2024
9011e9f
[design] #157 링크 미리보기 스켈레톤 ui 추가
ShapeKim98 Nov 27, 2024
25fa5f7
[fix] #157 링크 미리보기 썸네일 MainActor 추가
ShapeKim98 Nov 27, 2024
5dfac28
[design] #157 포킷 리스트 항목 디자인 변경사항 반영
ShapeKim98 Nov 27, 2024
ead2ee6
[design] #157 새로운 아이콘 추가
ShapeKim98 Nov 27, 2024
389daa5
[design] #157 포킷 뱃지 디자인 변경사항 반영
ShapeKim98 Nov 27, 2024
43b0e25
[chore] #157 BaseContentItem 속성값 추가
ShapeKim98 Nov 28, 2024
78ddfd8
[design] #157 PokitBookmark 추가
ShapeKim98 Nov 28, 2024
fc11067
[design] #157 링크카드 디자인 변경사항 반영
ShapeKim98 Nov 28, 2024
8e59ce6
[chore] #157 1.0.6으로 버전 변경
ShapeKim98 Nov 28, 2024
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
Next Next commit
[design] #157 버튼 컴포넌트 패딩, 사이즈 수정
  • Loading branch information
@ShapeKim98
ShapeKim98 committed Nov 26, 2024
commit 2b4275f23c0df51b6dd53e67ca965e72126d9e92
27 changes: 3 additions & 24 deletions Projects/DSKit/Sources/Components/PoKitIconRButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ public struct PokitIconRButton: View {
.frame(width: self.size.iconSize.width, height: self.size.iconSize.height)
.foregroundStyle(self.state.iconColor)
}
.padding(.leading, self.lPadding)
.padding(.trailing, self.tPadding)
.padding(.leading, self.size.hPadding + 4)
.padding(.trailing, self.size.hPadding)
.padding(.vertical, self.size.vPadding)
.background {
RoundedRectangle(cornerRadius: shape.radius(size: self.size), style: .continuous)
Expand All @@ -61,27 +61,6 @@ public struct PokitIconRButton: View {
.stroke(self.state.backgroundStrokeColor, lineWidth: 1)
}
}
}

private var tPadding: CGFloat {
switch self.size {
case .small:
return 8
case .medium:
return 16
case .large:
return 20
}
}

private var lPadding: CGFloat {
switch self.size {
case .small:
return 12
case .medium:
return 20
case .large:
return 24
}
.frame(minWidth: self.size.minWidth)
}
}
27 changes: 3 additions & 24 deletions Projects/DSKit/Sources/Components/PokitIconLButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ public struct PokitIconLButton: View {
.pokitFont(self.size.font)
.foregroundStyle(self.state.textColor)
}
.padding(.leading, self.lPadding)
.padding(.trailing, self.tPadding)
.padding(.leading, self.size.hPadding)
.padding(.trailing, self.size.hPadding + 4)
.padding(.vertical, self.size.vPadding)
.background {
RoundedRectangle(cornerRadius: shape.radius(size: self.size), style: .continuous)
Expand All @@ -60,27 +60,6 @@ public struct PokitIconLButton: View {
.stroke(self.state.backgroundStrokeColor, lineWidth: 1)
}
}
}

private var lPadding: CGFloat {
switch self.size {
case .small:
return 8
case .medium:
return 16
case .large:
return 20
}
}

private var tPadding: CGFloat {
switch self.size {
case .small:
return 12
case .medium:
return 20
case .large:
return 24
}
.frame(minWidth: self.size.minWidth)
}
}
14 changes: 2 additions & 12 deletions Projects/DSKit/Sources/Components/PokitTextButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public struct PokitTextButton: View {
Text(self.labelText)
.pokitFont(self.size.font)
.foregroundStyle(self.state.textColor)
.padding(.horizontal, self.hPadding)
.padding(.horizontal, self.size.hPadding)
.padding(.vertical, self.size.vPadding)
.background {
RoundedRectangle(cornerRadius: shape.radius(size: self.size), style: .continuous)
Expand All @@ -49,16 +49,6 @@ public struct PokitTextButton: View {
.stroke(self.state.backgroundStrokeColor, lineWidth: 1)
}
}
}

private var hPadding: CGFloat {
switch self.size {
case .small:
return 12.5
case .medium:
return 26
case .large:
return 34.5
}
.frame(minWidth: self.size.minWidth)
}
}
16 changes: 16 additions & 0 deletions Projects/DSKit/Sources/Foundation/PokitButtonStyle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,22 @@ extension PokitButtonStyle.Size {
case .large: return 13
}
}

var hPadding: CGFloat {
switch self {
case .small: return 8
case .medium: return 16
case .large: return 20
}
}

var minWidth: CGFloat {
switch self {
case .small: return 50
case .medium: return 80
case .large: return 100
}
}
}

extension PokitButtonStyle.Shape {
Expand Down