Skip to content

Commit 7bcd56f

Browse files
committed
Using Gridicons for rating stars
1 parent db1ef6f commit 7bcd56f

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

WooCommerce/Classes/ViewRelated/Notifications/Cells/NoteDetailsCommentTableViewCell.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,8 @@ private extension NoteDetailsCommentTableViewCell {
230230
starView.settings.fillMode = .full
231231
starView.settings.starSize = Star.size
232232
starView.settings.starMargin = Star.margin
233-
starView.settings.filledColor = StyleManager.goldStarColor
234-
starView.settings.filledBorderColor = StyleManager.goldStarColor
235-
starView.settings.emptyColor = StyleManager.wooGreyLight
236-
starView.settings.emptyBorderColor = StyleManager.wooGreyLight
233+
starView.settings.filledImage = Star.filledImage
234+
starView.settings.emptyImage = Star.emptyImage
237235
starViewContainer.isHidden = (starRating == nil)
238236
}
239237

@@ -317,7 +315,9 @@ private struct Approve {
317315
// MARK: - Star View: Defaults
318316
//
319317
private struct Star {
320-
static let totalStars = 5
321-
static let size = Double(18)
322-
static let margin = Double(2)
318+
static let totalStars = 5
319+
static let size = Double(18)
320+
static let margin = Double(2)
321+
static let filledImage = Gridicon.iconOfType(.star, withSize: CGSize(width: Star.size, height: Star.size)).imageWithTintColor(StyleManager.goldStarColor)
322+
static let emptyImage = Gridicon.iconOfType(.star, withSize: CGSize(width: Star.size, height: Star.size)).imageWithTintColor(StyleManager.wooGreyLight)
323323
}

WooCommerce/Classes/ViewRelated/Notifications/Cells/NoteTableViewCell.swift

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Foundation
22
import UIKit
3+
import Gridicons
34
import Cosmos
45

56

@@ -134,12 +135,10 @@ private extension NoteTableViewCell {
134135
starView.accessibilityLabel = NSLocalizedString("Star rating", comment: "VoiceOver accessibility label for a product review star rating ")
135136
starView.settings.updateOnTouch = false
136137
starView.settings.fillMode = .full
137-
starView.settings.starSize = Constants.starSize
138-
starView.settings.starMargin = Constants.starMargin
139-
starView.settings.filledColor = StyleManager.defaultTextColor
140-
starView.settings.filledBorderColor = StyleManager.defaultTextColor
141-
starView.settings.emptyColor = .clear
142-
starView.settings.emptyBorderColor = .clear
138+
starView.settings.starSize = Star.size
139+
starView.settings.starMargin = Star.margin
140+
starView.settings.filledImage = Star.filledImage
141+
starView.settings.emptyImage = Star.emptyImage
143142
starViewContainer.isHidden = (starRating == nil)
144143
}
145144
}
@@ -148,8 +147,11 @@ private extension NoteTableViewCell {
148147
// MARK: - Constants!
149148
//
150149
private extension NoteTableViewCell {
151-
enum Constants {
152-
static let starSize = Double(13)
153-
static let starMargin = Double(0)
150+
151+
enum Star {
152+
static let size = Double(13)
153+
static let margin = Double(0)
154+
static let filledImage = Gridicon.iconOfType(.star, withSize: CGSize(width: Star.size, height: Star.size)).imageWithTintColor(StyleManager.defaultTextColor)
155+
static let emptyImage = Gridicon.iconOfType(.star, withSize: CGSize(width: Star.size, height: Star.size)).imageWithTintColor(.clear)
154156
}
155157
}

0 commit comments

Comments
 (0)