feat(creator): 답글 상세 컴포넌트를 추가한다
This commit is contained in:
21
SodaLive/Resources/Assets.xcassets/v2/ic_arrow_up_gray.imageset/Contents.json
vendored
Normal file
21
SodaLive/Resources/Assets.xcassets/v2/ic_arrow_up_gray.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"filename" : "ic_arrow_up_gray.png",
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
SodaLive/Resources/Assets.xcassets/v2/ic_arrow_up_gray.imageset/ic_arrow_up_gray.png
vendored
Normal file
BIN
SodaLive/Resources/Assets.xcassets/v2/ic_arrow_up_gray.imageset/ic_arrow_up_gray.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 293 B |
21
SodaLive/Resources/Assets.xcassets/v2/ic_arrow_up_white.imageset/Contents.json
vendored
Normal file
21
SodaLive/Resources/Assets.xcassets/v2/ic_arrow_up_white.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"filename" : "ic_arrow_up_white.png",
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
SodaLive/Resources/Assets.xcassets/v2/ic_arrow_up_white.imageset/ic_arrow_up_white.png
vendored
Normal file
BIN
SodaLive/Resources/Assets.xcassets/v2/ic_arrow_up_white.imageset/ic_arrow_up_white.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 243 B |
@@ -3431,6 +3431,13 @@ If you block this user, the following features will be restricted.
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
enum CreatorChannelReplyDetail {
|
||||||
|
static var replyPlaceholder: String {
|
||||||
|
pick(ko: "답글을 입력하세요", en: "Enter a reply", ja: "返信を入力してください")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
enum CreatorChannelFanTalk {
|
enum CreatorChannelFanTalk {
|
||||||
static var send: String { pick(ko: "보내기", en: "Send", ja: "送信") }
|
static var send: String { pick(ko: "보내기", en: "Send", ja: "送信") }
|
||||||
static var exitModalTitle: String { pick(ko: "입력 종료", en: "Discard input", ja: "入力終了") }
|
static var exitModalTitle: String { pick(ko: "입력 종료", en: "Discard input", ja: "入力終了") }
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
struct CreatorChannelReplyDetailActionPopup: View {
|
||||||
|
let canEdit: Bool
|
||||||
|
let canDelete: Bool
|
||||||
|
let onTapEdit: () -> Void
|
||||||
|
let onTapDelete: () -> Void
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
VStack(alignment: .leading, spacing: 0) {
|
||||||
|
if canEdit {
|
||||||
|
actionButton(title: I18n.Explorer.edit, action: onTapEdit)
|
||||||
|
}
|
||||||
|
|
||||||
|
if canDelete {
|
||||||
|
actionButton(title: I18n.Common.delete, action: onTapDelete)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.background(Color.gray900)
|
||||||
|
.cornerRadius(14)
|
||||||
|
.overlay(
|
||||||
|
RoundedRectangle(cornerRadius: 14, style: .continuous)
|
||||||
|
.stroke(Color.gray700, lineWidth: 1)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
private func actionButton(title: String, action: @escaping () -> Void) -> some View {
|
||||||
|
Button(action: action) {
|
||||||
|
Text(title)
|
||||||
|
.appFont(size: 14, weight: .medium)
|
||||||
|
.foregroundColor(.white)
|
||||||
|
.lineLimit(1)
|
||||||
|
.frame(minWidth: 80, alignment: .leading)
|
||||||
|
.padding(.horizontal, SodaSpacing.s12)
|
||||||
|
.padding(.vertical, SodaSpacing.s8)
|
||||||
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,214 @@
|
|||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
struct CreatorChannelReplyDetailFeedView: View {
|
||||||
|
let parentItem: CreatorChannelReplyDetailDisplayItem
|
||||||
|
let replies: [CreatorChannelReplyDetailDisplayItem]
|
||||||
|
let selectedActionItem: CreatorChannelReplyDetailDisplayItem?
|
||||||
|
let canEdit: (CreatorChannelReplyDetailDisplayItem) -> Bool
|
||||||
|
let canDelete: (CreatorChannelReplyDetailDisplayItem) -> Bool
|
||||||
|
let onTapAction: (CreatorChannelReplyDetailDisplayItem) -> Void
|
||||||
|
let onTapEdit: (CreatorChannelReplyDetailDisplayItem) -> Void
|
||||||
|
let onTapDelete: (CreatorChannelReplyDetailDisplayItem) -> Void
|
||||||
|
let onReplyAppear: (CreatorChannelReplyDetailDisplayItem) -> Void
|
||||||
|
|
||||||
|
@State private var itemFrames = [CreatorChannelReplyDetailItemKey: CGRect]()
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
ZStack(alignment: .topTrailing) {
|
||||||
|
ScrollView(.vertical, showsIndicators: false) {
|
||||||
|
VStack(alignment: .leading, spacing: 0) {
|
||||||
|
parentView
|
||||||
|
|
||||||
|
if replies.isEmpty == false {
|
||||||
|
repliesView
|
||||||
|
.padding(.top, SodaSpacing.s12)
|
||||||
|
.padding(.leading, 50)
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(minLength: SodaSpacing.s20)
|
||||||
|
}
|
||||||
|
.padding(.horizontal, SodaSpacing.s14)
|
||||||
|
.padding(.top, SodaSpacing.s16)
|
||||||
|
.padding(.bottom, SodaSpacing.s20)
|
||||||
|
}
|
||||||
|
|
||||||
|
actionPopupLayer
|
||||||
|
.zIndex(1)
|
||||||
|
}
|
||||||
|
.coordinateSpace(name: Self.coordinateSpaceName)
|
||||||
|
.onPreferenceChange(CreatorChannelReplyDetailItemFramePreferenceKey.self) { frames in
|
||||||
|
itemFrames.merge(frames) { _, new in new }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@ViewBuilder
|
||||||
|
private var actionPopupLayer: some View {
|
||||||
|
if let selectedActionItem,
|
||||||
|
let itemFrame = itemFrames[CreatorChannelReplyDetailItemKey(item: selectedActionItem)] {
|
||||||
|
CreatorChannelReplyDetailActionPopup(
|
||||||
|
canEdit: canEdit(selectedActionItem),
|
||||||
|
canDelete: canDelete(selectedActionItem),
|
||||||
|
onTapEdit: { onTapEdit(selectedActionItem) },
|
||||||
|
onTapDelete: { onTapDelete(selectedActionItem) }
|
||||||
|
)
|
||||||
|
.padding(.top, itemFrame.minY + 32)
|
||||||
|
.padding(.trailing, SodaSpacing.s14)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private var parentView: some View {
|
||||||
|
VStack(alignment: .leading, spacing: SodaSpacing.s12) {
|
||||||
|
itemHeader(item: parentItem, profileSize: 42, showsSecret: true)
|
||||||
|
|
||||||
|
Text(parentItem.content)
|
||||||
|
.appFont(size: 16, weight: .regular)
|
||||||
|
.foregroundColor(.white)
|
||||||
|
.fixedSize(horizontal: false, vertical: true)
|
||||||
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
|
.padding(.leading, 50)
|
||||||
|
.background(alignment: .topLeading) {
|
||||||
|
if replies.isEmpty == false {
|
||||||
|
GeometryReader { proxy in
|
||||||
|
CreatorChannelReplyDetailConnector()
|
||||||
|
.stroke(Color.gray800, style: StrokeStyle(lineWidth: 2, lineCap: .round, lineJoin: .round))
|
||||||
|
.frame(height: proxy.size.height + SodaSpacing.s12 + SodaSpacing.s20)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private var repliesView: some View {
|
||||||
|
VStack(alignment: .leading, spacing: SodaSpacing.s8) {
|
||||||
|
ForEach(replies) { reply in
|
||||||
|
replyCard(reply)
|
||||||
|
.onAppear { onReplyAppear(reply) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private func replyCard(_ item: CreatorChannelReplyDetailDisplayItem) -> some View {
|
||||||
|
VStack(alignment: .leading, spacing: SodaSpacing.s8) {
|
||||||
|
itemHeader(item: item, profileSize: 20, showsSecret: false)
|
||||||
|
|
||||||
|
Text(item.content)
|
||||||
|
.appFont(size: 16, weight: .regular)
|
||||||
|
.foregroundColor(.white)
|
||||||
|
.fixedSize(horizontal: false, vertical: true)
|
||||||
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
|
}
|
||||||
|
.padding(SodaSpacing.s12)
|
||||||
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
|
.background(Color.gray900)
|
||||||
|
.clipShape(RoundedRectangle(cornerRadius: SodaSpacing.s14, style: .continuous))
|
||||||
|
}
|
||||||
|
|
||||||
|
private func itemHeader(
|
||||||
|
item: CreatorChannelReplyDetailDisplayItem,
|
||||||
|
profileSize: CGFloat,
|
||||||
|
showsSecret: Bool
|
||||||
|
) -> some View {
|
||||||
|
HStack(alignment: .center, spacing: SodaSpacing.s8) {
|
||||||
|
DownsampledKFImage(
|
||||||
|
url: URL(string: item.profileImageUrl),
|
||||||
|
size: CGSize(width: profileSize, height: profileSize)
|
||||||
|
)
|
||||||
|
.background(Color.white.opacity(0.6))
|
||||||
|
.clipShape(Circle())
|
||||||
|
|
||||||
|
Text(item.nickname)
|
||||||
|
.appFont(size: profileSize > 20 ? 14 : 13, weight: .medium)
|
||||||
|
.foregroundColor(.white)
|
||||||
|
.lineLimit(1)
|
||||||
|
|
||||||
|
Text(item.relativeTimeText)
|
||||||
|
.appFont(size: 14, weight: .regular)
|
||||||
|
.foregroundColor(Color.gray500)
|
||||||
|
.lineLimit(1)
|
||||||
|
|
||||||
|
if showsSecret && item.isSecret {
|
||||||
|
Text(I18n.Explorer.secretComment)
|
||||||
|
.appFont(size: 11, weight: .medium)
|
||||||
|
.foregroundColor(Color.grayee)
|
||||||
|
.padding(.horizontal, 4)
|
||||||
|
.padding(.vertical, 2)
|
||||||
|
.background(Color.soda400.opacity(0.2))
|
||||||
|
.cornerRadius(3)
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(minLength: 0)
|
||||||
|
|
||||||
|
if canEdit(item) || canDelete(item) {
|
||||||
|
Button(action: { onTapAction(item) }) {
|
||||||
|
Image("ic_new_more")
|
||||||
|
.resizable()
|
||||||
|
.frame(width: 24, height: 24)
|
||||||
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.trackReplyDetailItemFrame(item)
|
||||||
|
}
|
||||||
|
|
||||||
|
fileprivate static let coordinateSpaceName = "CreatorChannelReplyDetailFeedView"
|
||||||
|
}
|
||||||
|
|
||||||
|
private struct CreatorChannelReplyDetailItemKey: Hashable {
|
||||||
|
let id: Int
|
||||||
|
let source: Int
|
||||||
|
|
||||||
|
init(item: CreatorChannelReplyDetailDisplayItem) {
|
||||||
|
id = item.id
|
||||||
|
switch item.source {
|
||||||
|
case .community:
|
||||||
|
source = 0
|
||||||
|
case .fanTalk:
|
||||||
|
source = 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private struct CreatorChannelReplyDetailItemFramePreferenceKey: PreferenceKey {
|
||||||
|
static var defaultValue: [CreatorChannelReplyDetailItemKey: CGRect] = [:]
|
||||||
|
|
||||||
|
static func reduce(
|
||||||
|
value: inout [CreatorChannelReplyDetailItemKey: CGRect],
|
||||||
|
nextValue: () -> [CreatorChannelReplyDetailItemKey: CGRect]
|
||||||
|
) {
|
||||||
|
value.merge(nextValue()) { _, new in new }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private extension View {
|
||||||
|
func trackReplyDetailItemFrame(_ item: CreatorChannelReplyDetailDisplayItem) -> some View {
|
||||||
|
background {
|
||||||
|
GeometryReader { proxy in
|
||||||
|
Color.clear.preference(
|
||||||
|
key: CreatorChannelReplyDetailItemFramePreferenceKey.self,
|
||||||
|
value: [CreatorChannelReplyDetailItemKey(item: item): proxy.frame(in: .named(CreatorChannelReplyDetailFeedView.coordinateSpaceName))]
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private struct CreatorChannelReplyDetailConnector: Shape {
|
||||||
|
func path(in rect: CGRect) -> Path {
|
||||||
|
var path = Path()
|
||||||
|
let avatarCenterX: CGFloat = 21
|
||||||
|
let replyCardStartX: CGFloat = 50
|
||||||
|
let connectorGap: CGFloat = 14
|
||||||
|
let connectorEndX = replyCardStartX - connectorGap
|
||||||
|
let startY: CGFloat = 0
|
||||||
|
let endY = rect.height - 8
|
||||||
|
let bendY = max(startY, endY - 14)
|
||||||
|
|
||||||
|
path.move(to: CGPoint(x: avatarCenterX, y: startY))
|
||||||
|
path.addLine(to: CGPoint(x: avatarCenterX, y: bendY))
|
||||||
|
path.addQuadCurve(
|
||||||
|
to: CGPoint(x: connectorEndX, y: endY),
|
||||||
|
control: CGPoint(x: avatarCenterX, y: endY)
|
||||||
|
)
|
||||||
|
return path
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
struct CreatorChannelReplyDetailInputBar: View {
|
||||||
|
@Binding var text: String
|
||||||
|
let isSendEnabled: Bool
|
||||||
|
let isEditing: Bool
|
||||||
|
let onTapSend: () -> Void
|
||||||
|
let onTapCancelEditing: () -> Void
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
VStack(spacing: 0) {
|
||||||
|
Rectangle()
|
||||||
|
.fill(Color.gray700)
|
||||||
|
.frame(height: 1)
|
||||||
|
|
||||||
|
HStack(spacing: SodaSpacing.s8) {
|
||||||
|
if isEditing {
|
||||||
|
Button(action: onTapCancelEditing) {
|
||||||
|
Image("ic_close_white")
|
||||||
|
.resizable()
|
||||||
|
.scaledToFit()
|
||||||
|
.frame(width: 20, height: 20)
|
||||||
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
}
|
||||||
|
|
||||||
|
TextField(I18n.CreatorChannelReplyDetail.replyPlaceholder, text: $text)
|
||||||
|
.autocapitalization(.none)
|
||||||
|
.disableAutocorrection(true)
|
||||||
|
.appFont(size: 15, weight: .regular)
|
||||||
|
.foregroundColor(.white)
|
||||||
|
.accentColor(Color.soda400)
|
||||||
|
.padding(.horizontal, SodaSpacing.s14)
|
||||||
|
.frame(height: 40)
|
||||||
|
.background(Color.gray900)
|
||||||
|
.clipShape(RoundedRectangle(cornerRadius: 20, style: .continuous))
|
||||||
|
|
||||||
|
Button(action: {
|
||||||
|
guard isSendEnabled else { return }
|
||||||
|
onTapSend()
|
||||||
|
}) {
|
||||||
|
Image(isSendEnabled ? "ic_arrow_up_white" : "ic_arrow_up_gray")
|
||||||
|
.resizable()
|
||||||
|
.scaledToFit()
|
||||||
|
.frame(width: 20, height: 20)
|
||||||
|
.frame(width: 36, height: 36)
|
||||||
|
.background(isSendEnabled ? Color.soda400 : Color.gray900)
|
||||||
|
.clipShape(Circle())
|
||||||
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
.disabled(isSendEnabled == false)
|
||||||
|
}
|
||||||
|
.padding(.horizontal, SodaSpacing.s14)
|
||||||
|
.frame(height: 60)
|
||||||
|
.background(Color.black)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
struct CreatorChannelReplyDetailTitleBar: View {
|
||||||
|
let onTapBack: () -> Void
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
TitleBar {
|
||||||
|
Button(action: onTapBack) {
|
||||||
|
Image("ic_new_bar_back")
|
||||||
|
.resizable()
|
||||||
|
.scaledToFit()
|
||||||
|
.frame(width: 24, height: 24)
|
||||||
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
} trailing: {
|
||||||
|
EmptyView()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user