Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
7 changes: 7 additions & 0 deletions WooCommerce/Classes/Extensions/UIImage+Woo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,12 @@ extension UIImage {
return UIImage.gridicon(.comment)
}

/// Comment Content Icon
///
static var commentContent: UIImage {
return UIImage(named: "icon-comment-content") ?? UIImage.gridicon(.comment)
}

/// Credit Card Icon
///
static var creditCardImage: UIImage {
Expand Down Expand Up @@ -1174,6 +1180,7 @@ extension UIImage {
static var builtInReaderError: UIImage {
return UIImage(named: "built-in-reader-error")!
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a blocker, empty line here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed 3993a92

}

private extension UIImage {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ private extension OrderListViewController {
let viewModel = TopBannerViewModel(
title: bannerTitle,
infoText: bannerText,
icon: UIImage.gridicon(.comment),
icon: UIImage.commentContent,
isExpanded: true,
topButton: .dismiss(handler: {
self.showIPPFeedbackDismissAlert()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ private extension TopBannerView {

zip(viewModel.actionButtons, actionButtons).forEach { buttonInfo, button in
button.setTitle(buttonInfo.title, for: .normal)
// Overrides the general .applyLinkButtonStyle() with pink color
// pecCkj-fa-p2
button.setTitleColor(UIColor.withColorStudio(.pink), for: .normal)
button.on(.touchUpInside, call: { _ in buttonInfo.action(button) })
}
}
Expand Down Expand Up @@ -141,7 +144,7 @@ private extension TopBannerView {

func createMainStackView(with viewModel: TopBannerViewModel) -> UIStackView {
let iconInformationStackView = createIconInformationStackView(with: viewModel)
let mainStackView = UIStackView(arrangedSubviews: [iconInformationStackView, createBorderView()])
let mainStackView = UIStackView(arrangedSubviews: [createBorderView(), iconInformationStackView, createBorderView()])
if isActionEnabled {
configureActionStackView(with: viewModel)
mainStackView.addArrangedSubview(actionStackView)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps you can apply here a single scale with the pdf file

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right! Switched from SVG to PDF and universal size here: 26d3d06

"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "comment-content.svg",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.