diff --git a/SOPKATHON_33-iOS/SOPKATHON_33-iOS/Presentation/Main/View/ActivityCardView.swift b/SOPKATHON_33-iOS/SOPKATHON_33-iOS/Presentation/Main/View/ActivityCardView.swift index 50c17b9..c4577a9 100644 --- a/SOPKATHON_33-iOS/SOPKATHON_33-iOS/Presentation/Main/View/ActivityCardView.swift +++ b/SOPKATHON_33-iOS/SOPKATHON_33-iOS/Presentation/Main/View/ActivityCardView.swift @@ -13,8 +13,11 @@ final class ActivityCardView: UIView { //MARK: - set Properties let progressView1 = ProgressView(frame: .init(origin: .zero, size: .init(width: 187,height: 187))) + let progressView2 = ProgressView(frame: .init(origin: .zero, size: .init(width: 145,height: 145))) + let progressView3 = ProgressView(frame: .init(origin: .zero, size: .init(width: 105,height: 105))) + let activityStackView = ActivityStackView() private let divisionLine = UIView() private let showDetailButton = UIButton() @@ -27,6 +30,9 @@ final class ActivityCardView: UIView { self.setUI() self.setHierachy() self.setLayout() + progressView1.ringColor = .blue1 + progressView2.ringColor = .blue2 + progressView3.ringColor = .blue3 } @available(*, unavailable) diff --git a/SOPKATHON_33-iOS/SOPKATHON_33-iOS/Presentation/Main/View/ProgressView.swift b/SOPKATHON_33-iOS/SOPKATHON_33-iOS/Presentation/Main/View/ProgressView.swift index 4b413f7..63113fb 100644 --- a/SOPKATHON_33-iOS/SOPKATHON_33-iOS/Presentation/Main/View/ProgressView.swift +++ b/SOPKATHON_33-iOS/SOPKATHON_33-iOS/Presentation/Main/View/ProgressView.swift @@ -8,16 +8,19 @@ import UIKit class ProgressView: UIView { + var ringColor: UIColor? private var circleLayer = CAShapeLayer() private var progressLayer = CAShapeLayer() private var startPoint = CGFloat(-0.5 * Double.pi) private var endPoint = CGFloat(1.5 * Double.pi) + override func draw(_ rect: CGRect) { createCircularPath() } func createCircularPath() { + guard let ringColor else { return } self.backgroundColor = .white let circularPath = UIBezierPath(arcCenter: .init( x: self.frame.width / 2.0, @@ -43,7 +46,7 @@ class ProgressView: UIView { progressLayer.strokeStart = 0.0 // progressLayer.strokeEnd = 0.5 - progressLayer.strokeColor = UIColor.red.cgColor + progressLayer.strokeColor = ringColor.cgColor layer.addSublayer(progressLayer) }