Skip to content

Commit

Permalink
Merge pull request #273 from tangem/IOS-3496_resolve_ambigious_inits
Browse files Browse the repository at this point in the history
Resolve ambigious inits
  • Loading branch information
tureck1y authored Apr 20, 2023
2 parents c5aac89 + 55de33f commit 3e6d3a1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ struct ActivityIndicatorView: UIViewRepresentable {
private var style: UIActivityIndicatorView.Style
private var color: UIColor

init(isAnimating: Bool = true, style: UIActivityIndicatorView.Style = .medium, color: UIColor = .white) {
init(isAnimating: Bool = true, style: UIActivityIndicatorView.Style = .medium, color: UIColor) {
self.isAnimating = isAnimating
self.style = style
self.color = color
}

@available(iOS 14.0, *)
init(isAnimating: Bool = true, style: UIActivityIndicatorView.Style = .medium, color: Color = .white) {
init(isAnimating: Bool = true, style: UIActivityIndicatorView.Style = .medium, color: Color) {
self.isAnimating = isAnimating
self.style = style
self.color = UIColor(color)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ struct RoundedButton: ButtonStyle {
if #available(iOS 14.0, *) {
ActivityIndicatorView(color: colors.foregroundColor)
} else {
ActivityIndicatorView()
ActivityIndicatorView(color: UIColor.white)
}
}
} else {
Expand Down

0 comments on commit 3e6d3a1

Please sign in to comment.