Skip to content

set tint color for button's image #93

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
merged 2 commits into from
May 8, 2025
Merged

set tint color for button's image #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02030be
set tint color for button's image
mikhailChelbaev May 7, 2025
198cbb8
enable user interaction for images in buttons
mikhailChelbaev May 7, 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
3 changes: 3 additions & 0 deletions Examples/DemosApp/DemosApp/Assets.xcassets/avatar_placeholder.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,8 @@
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
2 changes: 1 addition & 1 deletion Sources/ComponentsKit/Components/Avatar/Models/AvatarVM.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ extension AvatarVM {
self.placeholderBackgroundColor.setFill()
UIBezierPath(rect: CGRect(origin: .zero, size: size)).fill()

icon?.withTintColor(self.placeholderForegroundColor, renderingMode: .alwaysOriginal).draw(in: CGRect(
icon?.withTintColor(self.placeholderForegroundColor).draw(in: CGRect(
x: (size.width - iconSize.width) / 2,
y: (size.height - iconSize.height) / 2,
width: iconSize.width,
Expand Down
32 changes: 24 additions & 8 deletions Sources/ComponentsKit/Components/Button/SUButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,31 @@ public struct SUButton: View {
SULoading(model: self.model.preferredLoadingVM)
Text(self.model.title)
case (false, let uiImage?, .leading) where self.model.title.isEmpty:
ButtonImageView(image: uiImage)
.frame(width: self.model.imageSide, height: self.model.imageSide)
ButtonImageView(
image: uiImage,
tintColor: self.model.foregroundColor.uiColor
)
.frame(width: self.model.imageSide, height: self.model.imageSide)
case (false, let uiImage?, .leading):
ButtonImageView(image: uiImage)
.frame(width: self.model.imageSide, height: self.model.imageSide)
ButtonImageView(
image: uiImage,
tintColor: self.model.foregroundColor.uiColor
)
.frame(width: self.model.imageSide, height: self.model.imageSide)
Text(self.model.title)
case (false, let uiImage?, .trailing) where self.model.title.isEmpty:
ButtonImageView(image: uiImage)
.frame(width: self.model.imageSide, height: self.model.imageSide)
ButtonImageView(
image: uiImage,
tintColor: self.model.foregroundColor.uiColor
)
.frame(width: self.model.imageSide, height: self.model.imageSide)
case (false, let uiImage?, .trailing):
Text(self.model.title)
ButtonImageView(image: uiImage)
.frame(width: self.model.imageSide, height: self.model.imageSide)
ButtonImageView(
image: uiImage,
tintColor: self.model.foregroundColor.uiColor
)
.frame(width: self.model.imageSide, height: self.model.imageSide)
case (false, _, _):
Text(self.model.title)
}
Expand All @@ -88,16 +100,20 @@ private struct ButtonImageView: UIViewRepresentable {
}

let image: UIImage
let tintColor: UIColor

func makeUIView(context: Context) -> UIImageView {
let imageView = InternalImageView()
imageView.image = self.image
imageView.tintColor = self.tintColor
imageView.contentMode = .scaleAspectFit
imageView.isUserInteractionEnabled = true
return imageView
}

func updateUIView(_ imageView: UIImageView, context: Context) {
imageView.image = self.image
imageView.tintColor = self.tintColor
}
}

Expand Down
2 changes: 2 additions & 0 deletions Sources/ComponentsKit/Components/Button/UKButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ extension UKButton {
imageView.image = model.image
imageView.contentMode = .scaleAspectFit
imageView.isHidden = model.isLoading || model.imageSrc.isNil
imageView.tintColor = model.foregroundColor.uiColor
imageView.isUserInteractionEnabled = true
}
}
}