diff --git a/Classes/Issues/Labeled/IssueLabeledModel.swift b/Classes/Issues/Labeled/IssueLabeledModel.swift index 04b98595e..9a773e075 100644 --- a/Classes/Issues/Labeled/IssueLabeledModel.swift +++ b/Classes/Issues/Labeled/IssueLabeledModel.swift @@ -40,11 +40,10 @@ final class IssueLabeledModel: ListDiffable { ) { self.id = id self.actor = actor - self.title = title + self.title = title.replacingGithubEmoji self.color = color self.date = date self.type = type - let labelColor = color.color let actionString: String switch type { @@ -52,6 +51,7 @@ final class IssueLabeledModel: ListDiffable { case .removed: actionString = NSLocalizedString(" removed ", comment: "") } + let builder = StyledTextBuilder(styledText: StyledText( style: Styles.Text.secondary.with(foreground: Styles.Colors.Gray.medium.color) )) @@ -64,11 +64,11 @@ final class IssueLabeledModel: ListDiffable { .restore() .add(text: actionString) .save() - .add(styledText: StyledText(text: title, style: Styles.Text.smallTitle.with(attributes: [ + .add(styledText: StyledText(text: self.title, style: Styles.Text.smallTitle.with(attributes: [ .backgroundColor: labelColor, .foregroundColor: labelColor.textOverlayColor ?? .black, .baselineOffset: 1, // offset for better rounded background colors - MarkdownAttribute.label: LabelDetails(owner: repoOwner, repo: repoName, label: title) + MarkdownAttribute.label: LabelDetails(owner: repoOwner, repo: repoName, label: self.title) ] ))) .restore() diff --git a/Classes/Models/RepositoryLabel.swift b/Classes/Models/RepositoryLabel.swift index 43df40e0f..3052a01b6 100644 --- a/Classes/Models/RepositoryLabel.swift +++ b/Classes/Models/RepositoryLabel.swift @@ -12,11 +12,11 @@ import IGListKit final class RepositoryLabel: ListDiffable, Hashable, Equatable, ListSwiftDiffable { let color: String - let name: String + var name: String = "" init(color: String, name: String) { self.color = color - self.name = name + self.name = name.replacingGithubEmoji } // MARK: ListDiffable