diff --git a/Projects/Core/DesignSystem/Sources/View/ListHeaderView.swift b/Projects/Core/DesignSystem/Sources/View/ListHeaderView.swift index 1beeae8..7bb3ab3 100644 --- a/Projects/Core/DesignSystem/Sources/View/ListHeaderView.swift +++ b/Projects/Core/DesignSystem/Sources/View/ListHeaderView.swift @@ -18,15 +18,16 @@ public struct ListHeaderView: View { } public var body: some View { - HStack { + HStack(spacing: 8) { icon .resizable() .frame(width: 20, height: 20, alignment: .center) - .padding(.leading, 20) Text(title) .font(Font.Heading.Small.semiBold) Spacer() } + .padding(.vertical, 18) + .padding(.horizontal, 20) } } diff --git a/Projects/Core/DesignSystem/Sources/View/Meme/MemeItemView.swift b/Projects/Core/DesignSystem/Sources/View/Meme/MemeItemView.swift index 2a3b4e7..ab0c93d 100644 --- a/Projects/Core/DesignSystem/Sources/View/Meme/MemeItemView.swift +++ b/Projects/Core/DesignSystem/Sources/View/Meme/MemeItemView.swift @@ -50,7 +50,10 @@ struct MemeItemViewWithButton: View { var body: some View { ZStack(alignment: .bottomLeading) { VStack { - ResizableMemeImageView(imageUrlString: memeDetail.imageUrlString, imageHeight: $imageHeight) + ResizableMemeImageView( + imageUrlString: memeDetail.imageUrlString, + imageHeight: $imageHeight + ) } .frame(height: imageHeight) HStack { @@ -60,10 +63,10 @@ struct MemeItemViewWithButton: View { height: 42, image: ResourceKitAsset.Icon.copy.swiftUIImage, action: { - print("Copy~~") + memeCopyHandler?(memeDetail) } ) - .padding(20) + .padding(10) } } } @@ -82,7 +85,14 @@ struct ResizableMemeImageView: View { .cacheMemoryOnly() .onSuccess { result in let ratio = geometry.size.width / result.image.size.width - imageHeight = result.image.size.height * ratio + let newHeight = result.image.size.height * ratio + if newHeight < 80 { + imageHeight = 80 + } else if newHeight > 300 { + imageHeight = 300 + } else { + imageHeight = newHeight + } } .cornerRadius(12) .frame(height: imageHeight) @@ -115,8 +125,9 @@ struct MemeItemInfoView: View { var memeReactionView: some View { HStack { Text("ㅋㅋ") - .font(Font.Family2.outLine) + .font(Font.Family2.xlarge) Text("\(reaction)") + .font(Font.Body.Small.medium) } .foregroundStyle(Color.Text.tertiary) } diff --git a/Projects/ResourceKit/Sources/Font.swift b/Projects/ResourceKit/Sources/Font.swift index 0f69bf8..57e5b42 100644 --- a/Projects/ResourceKit/Sources/Font.swift +++ b/Projects/ResourceKit/Sources/Font.swift @@ -70,5 +70,6 @@ public struct Font { public struct Family2 { public static let outLine = ResourceKitFontFamily.SandollSamliphopangche.outline.swiftUIFont(size: 24) + public static let xlarge = ResourceKitFontFamily.SandollSamliphopangche.outline.swiftUIFont(size: 20) } }