Skip to content

Fix breaking layout in Countdown #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikhailChelbaev merged 1 commit into from
Jan 13, 2025
+6 −5
Merged

Fix breaking layout in Countdown #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions Sources/ComponentsKit/Components/Countdown/Helpers/CountdownWidthCalculator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@ struct CountdownWidthCalculator {
for attributedText: NSAttributedString,
model: CountdownVM
) -> CGFloat {
self.style(label, with: model)
self.style(self.label, with: model)
self.label.attributedText = attributedText

let estimatedSize = self.label.sizeThatFits(UIView.layoutFittingExpandedSize)

return estimatedSize.width
return estimatedSize.width + 2
}

private static func style(_ label: UILabel, with model: CountdownVM) {
label.textAlignment = .center
label.numberOfLines = 0
}
}
6 changes: 3 additions & 3 deletions Sources/ComponentsKit/Components/Countdown/SUCountdown.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ public struct SUCountdown: View {
switch (self.model.style, self.model.unitsStyle) {
case (.plain, .bottom):
self.styledTime(value: self.manager.days, unit: .days)
colonView
self.colonView
self.styledTime(value: self.manager.hours, unit: .hours)
colonView
self.colonView
self.styledTime(value: self.manager.minutes, unit: .minutes)
colonView
self.colonView
self.styledTime(value: self.manager.seconds, unit: .seconds)

case (.plain, .hidden), (.plain, .trailing):
Expand Down
Loading