Skip to content

Commit 44ed157

Browse files
committed
fix func stripesLayer
1 parent 463c3cb commit 44ed157

File tree

1 file changed

+20
-31
lines changed

1 file changed

+20
-31
lines changed

Sources/ComponentsKit/Components/CircularProgress/UKCircularProgress.swift

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ open class UKCircularProgress: UIView, UKComponent {
7575
self.layer.addSublayer(self.progressLayer)
7676
self.addSubview(self.label)
7777

78+
self.stripesLayer.mask = self.stripesMaskLayer
79+
7880
if #available(iOS 17.0, *) {
7981
self.registerForTraitChanges([UITraitUserInterfaceStyle.self]) { (view: Self, _: UITraitCollection) in
8082
view.handleTraitChanges()
@@ -88,7 +90,7 @@ open class UKCircularProgress: UIView, UKComponent {
8890
Self.Style.backgroundLayer(self.backgroundLayer, model: self.model)
8991
Self.Style.progressLayer(self.progressLayer, model: self.model)
9092
Self.Style.label(self.label, model: self.model)
91-
Self.Style.stripesLayer(self.stripesLayer, backgroundLayer: self.backgroundLayer, maskLayer: self.stripesMaskLayer, model: self.model)
93+
Self.Style.stripesLayer(self.stripesLayer, model: self.model)
9294
}
9395

9496
// MARK: - Update
@@ -192,12 +194,10 @@ open class UKCircularProgress: UIView, UKComponent {
192194
Self.Style.backgroundLayer(self.backgroundLayer, model: self.model)
193195
Self.Style.progressLayer(self.progressLayer, model: self.model)
194196
Self.Style.label(self.label, model: self.model)
195-
Self.Style.stripesLayer(
196-
self.stripesLayer,
197-
backgroundLayer: self.backgroundLayer,
198-
maskLayer: self.stripesMaskLayer,
199-
model: self.model
200-
)
197+
Self.Style.backgroundLayer(self.backgroundLayer, model: self.model)
198+
Self.Style.progressLayer(self.progressLayer, model: self.model)
199+
Self.Style.stripesLayer(self.stripesLayer, model: self.model)
200+
Self.Style.stripesMaskLayer(self.stripesMaskLayer, model: self.model)
201201
}
202202
}
203203

@@ -232,32 +232,21 @@ extension UKCircularProgress {
232232
}
233233

234234
static func stripesLayer(
235-
_ stripesLayer: CAShapeLayer,
236-
backgroundLayer: CAShapeLayer,
237-
maskLayer: CAShapeLayer,
235+
_ layer: CAShapeLayer,
238236
model: CircularProgressVM
239237
) {
240-
switch model.style {
241-
case .light:
242-
stripesLayer.isHidden = true
243-
stripesLayer.mask = nil
244-
245-
if backgroundLayer.superlayer == nil,
246-
let parentLayer = stripesLayer.superlayer {
247-
parentLayer.insertSublayer(backgroundLayer, below: stripesLayer)
248-
}
249-
250-
case .striped:
251-
stripesLayer.isHidden = false
252-
stripesLayer.fillColor = model.color.main.uiColor.cgColor
253-
254-
maskLayer.fillColor = UIColor.clear.cgColor
255-
maskLayer.strokeColor = UIColor.white.cgColor
256-
maskLayer.lineCap = .round
257-
maskLayer.lineWidth = model.circularLineWidth
258-
259-
stripesLayer.mask = maskLayer
260-
}
238+
layer.isHidden = model.isStripesLayerHidden
239+
layer.fillColor = model.color.main.uiColor.cgColor
240+
}
241+
242+
static func stripesMaskLayer(
243+
_ layer: CAShapeLayer,
244+
model: CircularProgressVM
245+
) {
246+
layer.fillColor = UIColor.clear.cgColor
247+
layer.strokeColor = model.color.background.uiColor.cgColor
248+
layer.lineCap = .round
249+
layer.lineWidth = model.circularLineWidth
261250
}
262251
}
263252
}

0 commit comments

Comments
 (0)