Skip to content

Fix bugs #53

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 3 commits into from
Jan 8, 2025
Merged

Fix bugs #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b28aeb0
fix: properly calculate progress height
mikhailChelbaev Jan 8, 2025
ed16a8d
fix: do not display stripes outside of the progress bar
mikhailChelbaev Jan 8, 2025
cffc156
fix: update a method to calculate a corner radius for the selected se…
mikhailChelbaev Jan 8, 2025
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
2 changes: 1 addition & 1 deletion Sources/ComponentsKit/Components/ProgressBar/Models/ProgressBarVM.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ extension ProgressBarVM {
}

var progressHeight: CGFloat {
return self.backgroundHeight - self.progressPadding
return self.backgroundHeight - self.progressPadding * 2
}

func cornerRadius(for height: CGFloat) -> CGFloat {
Expand Down
4 changes: 3 additions & 1 deletion Sources/ComponentsKit/Components/ProgressBar/SUProgressBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ public struct SUProgressBar: View {
StripesShape(model: self.model)
.foregroundStyle(self.model.color.main.color)
.cornerRadius(self.model.cornerRadius(for: self.model.progressHeight))
.clipped()
.frame(width: (geometry.size.width - self.model.progressPadding * 2) * self.progress)
.padding(.vertical, self.model.progressPadding)
.padding(.horizontal, self.model.progressPadding)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/ComponentsKit/Components/SegmentedControl/Models/SegmentedControlVM.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ extension SegmentedControlVM {
case .none, .full, .custom:
return componentRadius
case .small, .medium, .large:
return max(0, componentRadius - self.outerPaddings / 2)
return max(0, componentRadius - self.outerPaddings)
}
}
func preferredFont(for id: ID) -> UniversalFont {
Expand Down
Loading