Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ public struct StickerEntity: Equatable, Codable {
public let frame: CGRect
public let owner: String?
public let latestUpdated: Date
public private(set) var frame: CGRect
public private(set) var owner: String?
public private(set) var latestUpdated: Date

enum CodingKeys: String, CodingKey {
case id, image, frame, owner, latestUpdated
Expand Down Expand Up @@ -65,6 +68,16 @@ public struct StickerEntity: Equatable, Codable {
]
try container.encode(frameDict, forKey: .frame)
}

public mutating func updateOwner(to owner: String?) {
self.owner = owner
self.latestUpdated = Date()
}

public mutating func updateFrame(to frame: CGRect) {
self.frame = frame
self.latestUpdated = Date()
}
}

extension Array where Element == StickerEntity {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ final class CanvasScrollView: UIScrollView {
bouncesZoom = true
showsHorizontalScrollIndicator = false
showsVerticalScrollIndicator = false

imageView.isUserInteractionEnabled = true
}

func updateFrameImage(to image: UIImage) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,39 +146,25 @@ public class EditPhotoRoomGuestViewController: BaseViewController, ViewControlle
at index: Int,
with sticker: StickerEntity
) {
guard
let stickerImageView = canvasScrollView.imageView.subviews[index]
as? UIImageView
guard let stickerImageView = canvasScrollView
.imageView
.subviews[index] as? StickerView
else { return }

guard let url = URL(string: sticker.image) else { return }
Task {
guard let (data, _) = try? await URLSession.shared.data(from: url)
else { return }
stickerImageView.image = UIImage(data: data)
stickerImageView.frame = sticker.frame
}
stickerImageView.update(with: sticker)
}

private func addNewSticker(to sticker: StickerEntity, isLocal: Bool) {
registerSticker(for: sticker)

guard let url = URL(string: sticker.image) else { return }
Task {
guard let (data, _) = try? await URLSession.shared.data(from: url)
else { return }

let stickerImageView = UIImageView(frame: sticker.frame)
stickerImageView.image = await UIImage(data: data)?.byPreparingForDisplay()
canvasScrollView.imageView.addSubview(stickerImageView)

if isLocal {
print("DEBUG: ADD NEW STICKER By Local, \(sticker.id)")
input.send(.createSticker(sticker))
} else {
print("DEBUG: ADD NEW STICKER By Host, \(sticker.id)")
}
let stickerView = StickerView(sticker: sticker)
stickerView.tapHandler { [weak self] stickerID in
self?.input.send(.stickerViewDidTap(stickerID))
}

canvasScrollView.imageView.addSubview(stickerView)
stickerView.update(with: sticker)
input.send(.createSticker(sticker))
}

// MARK: 원래는 Data가 아니라 imageURL 및 Image의 MetaData가 와야함.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,39 +173,25 @@ public class EditPhotoRoomHostViewController: BaseViewController, ViewController
at index: Int,
with sticker: StickerEntity
) {
guard
let stickerImageView = canvasScrollView.imageView.subviews[index]
as? UIImageView
guard let stickerImageView = canvasScrollView
.imageView
.subviews[index] as? StickerView
else { return }

guard let url = URL(string: sticker.image) else { return }
Task {
guard let (data, _) = try? await URLSession.shared.data(from: url)
else { return }
stickerImageView.image = UIImage(data: data)
stickerImageView.frame = sticker.frame
}
stickerImageView.update(with: sticker)
}

private func addNewSticker(to sticker: StickerEntity, isLocal: Bool) {
registerSticker(for: sticker)

guard let url = URL(string: sticker.image) else { return }
Task {
guard let (data, _) = try? await URLSession.shared.data(from: url)
else { return }

let stickerImageView = UIImageView(frame: sticker.frame)
stickerImageView.image = await UIImage(data: data)?.byPreparingForDisplay()
canvasScrollView.imageView.addSubview(stickerImageView)

if isLocal {
print("DEBUG: ADD NEW STICKER By Local, \(sticker.id)")
input.send(.createSticker(sticker))
} else {
print("DEBUG: ADD NEW STICKER By Server, \(sticker.id)")
}
let stickerView = StickerView(sticker: sticker)
stickerView.tapHandler { [weak self] stickerID in
self?.input.send(.stickerViewDidTap(stickerID))
}

canvasScrollView.imageView.addSubview(stickerView)
stickerView.update(with: sticker)
input.send(.createSticker(sticker))
}

// MARK: 원래는 Data가 아니라 imageURL 및 Image의 MetaData가 와야함.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
import Combine
import DesignSystem
import PhotoGetherDomainInterface
import UIKit

final class StickerView: UIImageView {
private let tapPublisher = PassthroughSubject<Void, Never>()
private let nicknameLabel = UILabel()

private var sticker: StickerEntity

private var cancellables = Set<AnyCancellable>()

init(sticker: StickerEntity) {
self.sticker = sticker
super.init(frame: sticker.frame)
setupTapGesture()
addViews()
setupConstraints()
configureUI()
}

@available(*, unavailable)
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

private func addViews() {
addSubview(nicknameLabel)
}

private func setupConstraints() {
nicknameLabel.snp.makeConstraints {
$0.top.equalTo(snp.bottom)
$0.trailing.equalTo(snp.trailing)
}
}

private func configureUI() {
layer.borderColor = PTGColor.primaryGreen.color.cgColor
setImage(to: sticker.image)

sticker.owner != nil
? (layer.borderWidth = 1)
: (layer.borderWidth = 0)
}

private func setupTapGesture() {
isUserInteractionEnabled = true

let tapGesture = UITapGestureRecognizer(target: self, action: #selector(handleTap))
addGestureRecognizer(tapGesture)
}

private func updateFrame(to frame: CGRect) {
guard sticker.frame != frame else { return }

sticker.updateFrame(to: frame)
self.frame = frame
}

private func updateOwner(to owner: String?) {
guard sticker.owner != owner else { return }

sticker.updateOwner(to: owner)
if let owner = owner {
nicknameLabel.text = owner
layer.borderWidth = 1
} else {
nicknameLabel.text = nil
layer.borderWidth = 0
}
}

private func setImage(to urlString: String) {
guard let url = URL(string: urlString) else { return }

Task { [weak self] in
guard let (data, _) = try? await URLSession.shared.data(from: url)
else { return }

self?.image = UIImage(data: data)
}
}

@objc private func handleTap() {
tapPublisher.send(())
}

func tapHandler(_ completion: @escaping (UUID) -> Void) {
tapPublisher
.sink { [weak self] _ in
guard let self else { return }
completion(sticker.id)
}
.store(in: &cancellables)
}

func update(with sticker: StickerEntity) {
updateOwner(to: sticker.owner)
updateFrame(to: sticker.frame)
}
}