feat: update to new purple tint color
This commit is contained in:
parent
f3bec1e15d
commit
0c8e7d2cea
|
@ -114,7 +114,7 @@
|
||||||
<key>MastodonIntent.xcscheme_^#shared#^_</key>
|
<key>MastodonIntent.xcscheme_^#shared#^_</key>
|
||||||
<dict>
|
<dict>
|
||||||
<key>orderHint</key>
|
<key>orderHint</key>
|
||||||
<integer>23</integer>
|
<integer>22</integer>
|
||||||
</dict>
|
</dict>
|
||||||
<key>MastodonIntents.xcscheme_^#shared#^_</key>
|
<key>MastodonIntents.xcscheme_^#shared#^_</key>
|
||||||
<dict>
|
<dict>
|
||||||
|
@ -129,12 +129,12 @@
|
||||||
<key>NotificationService.xcscheme_^#shared#^_</key>
|
<key>NotificationService.xcscheme_^#shared#^_</key>
|
||||||
<dict>
|
<dict>
|
||||||
<key>orderHint</key>
|
<key>orderHint</key>
|
||||||
<integer>22</integer>
|
<integer>24</integer>
|
||||||
</dict>
|
</dict>
|
||||||
<key>ShareActionExtension.xcscheme_^#shared#^_</key>
|
<key>ShareActionExtension.xcscheme_^#shared#^_</key>
|
||||||
<dict>
|
<dict>
|
||||||
<key>orderHint</key>
|
<key>orderHint</key>
|
||||||
<integer>24</integer>
|
<integer>23</integer>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
<key>SuppressBuildableAutocreation</key>
|
<key>SuppressBuildableAutocreation</key>
|
||||||
|
|
|
@ -496,7 +496,7 @@ private extension SceneCoordinator {
|
||||||
}
|
}
|
||||||
let _viewController = SFSafariViewController(url: url)
|
let _viewController = SFSafariViewController(url: url)
|
||||||
_viewController.preferredBarTintColor = ThemeService.shared.currentTheme.value.navigationBarBackgroundColor
|
_viewController.preferredBarTintColor = ThemeService.shared.currentTheme.value.navigationBarBackgroundColor
|
||||||
_viewController.preferredControlTintColor = Asset.Colors.brandBlue.color
|
_viewController.preferredControlTintColor = Asset.Colors.brand.color
|
||||||
viewController = _viewController
|
viewController = _viewController
|
||||||
|
|
||||||
case .alertController(let alertController):
|
case .alertController(let alertController):
|
||||||
|
|
|
@ -17,7 +17,7 @@ extension Mastodon.Entity.Notification.NotificationType {
|
||||||
var color: UIColor
|
var color: UIColor
|
||||||
switch self {
|
switch self {
|
||||||
case .follow:
|
case .follow:
|
||||||
color = Asset.Colors.brandBlue.color
|
color = Asset.Colors.brand.color
|
||||||
case .favourite:
|
case .favourite:
|
||||||
color = Asset.Colors.Notification.favourite.color
|
color = Asset.Colors.Notification.favourite.color
|
||||||
case .reblog:
|
case .reblog:
|
||||||
|
@ -25,9 +25,9 @@ extension Mastodon.Entity.Notification.NotificationType {
|
||||||
case .mention:
|
case .mention:
|
||||||
color = Asset.Colors.Notification.mention.color
|
color = Asset.Colors.Notification.mention.color
|
||||||
case .poll:
|
case .poll:
|
||||||
color = Asset.Colors.brandBlue.color
|
color = Asset.Colors.brand.color
|
||||||
case .followRequest:
|
case .followRequest:
|
||||||
color = Asset.Colors.brandBlue.color
|
color = Asset.Colors.brand.color
|
||||||
default:
|
default:
|
||||||
color = .clear
|
color = .clear
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,7 +35,7 @@ extension UITableView {
|
||||||
let backgroundColor = cell.backgroundColor
|
let backgroundColor = cell.backgroundColor
|
||||||
|
|
||||||
UIView.animate(withDuration: 0.3) {
|
UIView.animate(withDuration: 0.3) {
|
||||||
cell.backgroundColor = Asset.Colors.brandBlue.color.withAlphaComponent(0.5)
|
cell.backgroundColor = Asset.Colors.brand.color.withAlphaComponent(0.5)
|
||||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
|
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
|
||||||
UIView.animate(withDuration: 0.3) {
|
UIView.animate(withDuration: 0.3) {
|
||||||
cell.backgroundColor = backgroundColor
|
cell.backgroundColor = backgroundColor
|
||||||
|
|
|
@ -25,7 +25,7 @@ final class ComposeStatusPollExpiresOptionCollectionViewCell: UICollectionViewCe
|
||||||
button.titleLabel?.font = UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: 12))
|
button.titleLabel?.font = UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: 12))
|
||||||
button.expandEdgeInsets = UIEdgeInsets(top: 0, left: -10, bottom: -20, right: -20)
|
button.expandEdgeInsets = UIEdgeInsets(top: 0, left: -10, bottom: -20, right: -20)
|
||||||
button.setTitle(L10n.Scene.Compose.Poll.durationTime(L10n.Scene.Compose.Poll.thirtyMinutes), for: .normal)
|
button.setTitle(L10n.Scene.Compose.Poll.durationTime(L10n.Scene.Compose.Poll.thirtyMinutes), for: .normal)
|
||||||
button.setTitleColor(Asset.Colors.brandBlue.color, for: .normal)
|
button.setTitleColor(Asset.Colors.brand.color, for: .normal)
|
||||||
return button
|
return button
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ final class ComposeStatusPollOptionAppendEntryCollectionViewCell: UICollectionVi
|
||||||
override var isHighlighted: Bool {
|
override var isHighlighted: Bool {
|
||||||
didSet {
|
didSet {
|
||||||
pollOptionView.roundedBackgroundView.backgroundColor = isHighlighted ? ThemeService.shared.currentTheme.value.tertiarySystemGroupedBackgroundColor.withAlphaComponent(0.6) : ThemeService.shared.currentTheme.value.tertiarySystemGroupedBackgroundColor
|
pollOptionView.roundedBackgroundView.backgroundColor = isHighlighted ? ThemeService.shared.currentTheme.value.tertiarySystemGroupedBackgroundColor.withAlphaComponent(0.6) : ThemeService.shared.currentTheme.value.tertiarySystemGroupedBackgroundColor
|
||||||
pollOptionView.plusCircleImageView.tintColor = isHighlighted ? Asset.Colors.brandBlue.color.withAlphaComponent(0.5) : Asset.Colors.brandBlue.color
|
pollOptionView.plusCircleImageView.tintColor = isHighlighted ? Asset.Colors.brand.color.withAlphaComponent(0.5) : Asset.Colors.brand.color
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ final class ComposeStatusContentTableViewCell: UITableViewCell {
|
||||||
]
|
]
|
||||||
metaText.linkAttributes = [
|
metaText.linkAttributes = [
|
||||||
.font: UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: 17, weight: .semibold)),
|
.font: UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: 17, weight: .semibold)),
|
||||||
.foregroundColor: Asset.Colors.brandBlue.color,
|
.foregroundColor: Asset.Colors.brand.color,
|
||||||
]
|
]
|
||||||
return metaText
|
return metaText
|
||||||
}()
|
}()
|
||||||
|
|
|
@ -339,7 +339,7 @@ extension HomeTimelineViewController {
|
||||||
let button = HighlightDimmableButton()
|
let button = HighlightDimmableButton()
|
||||||
button.titleLabel?.font = UIFontMetrics(forTextStyle: .headline).scaledFont(for: .systemFont(ofSize: 15, weight: .semibold))
|
button.titleLabel?.font = UIFontMetrics(forTextStyle: .headline).scaledFont(for: .systemFont(ofSize: 15, weight: .semibold))
|
||||||
button.setTitle(L10n.Common.Controls.Actions.manuallySearch, for: .normal)
|
button.setTitle(L10n.Common.Controls.Actions.manuallySearch, for: .normal)
|
||||||
button.setTitleColor(Asset.Colors.brandBlue.color, for: .normal)
|
button.setTitleColor(Asset.Colors.brand.color, for: .normal)
|
||||||
button.addTarget(self, action: #selector(HomeTimelineViewController.manuallySearchButtonPressed(_:)), for: .touchUpInside)
|
button.addTarget(self, action: #selector(HomeTimelineViewController.manuallySearchButtonPressed(_:)), for: .touchUpInside)
|
||||||
return button
|
return button
|
||||||
}()
|
}()
|
||||||
|
|
|
@ -114,7 +114,7 @@ extension HomeTimelineNavigationBarTitleView {
|
||||||
configureButton(
|
configureButton(
|
||||||
title: L10n.Scene.HomeTimeline.NavigationBarState.newPosts,
|
title: L10n.Scene.HomeTimeline.NavigationBarState.newPosts,
|
||||||
textColor: .white,
|
textColor: .white,
|
||||||
backgroundColor: Asset.Colors.brandBlue.color
|
backgroundColor: Asset.Colors.brand.color
|
||||||
)
|
)
|
||||||
button.isHidden = false
|
button.isHidden = false
|
||||||
button.accessibilityLabel = L10n.Scene.HomeTimeline.NavigationBarState.newPosts
|
button.accessibilityLabel = L10n.Scene.HomeTimeline.NavigationBarState.newPosts
|
||||||
|
|
|
@ -65,7 +65,7 @@ extension PickServerCategoryView {
|
||||||
highlightedIndicatorView.translatesAutoresizingMaskIntoConstraints = false
|
highlightedIndicatorView.translatesAutoresizingMaskIntoConstraints = false
|
||||||
container.addArrangedSubview(highlightedIndicatorView)
|
container.addArrangedSubview(highlightedIndicatorView)
|
||||||
NSLayoutConstraint.activate([
|
NSLayoutConstraint.activate([
|
||||||
highlightedIndicatorView.heightAnchor.constraint(equalToConstant: UIView.separatorLineHeight(of: self) * 3).priority(.required - 1),
|
highlightedIndicatorView.heightAnchor.constraint(equalToConstant: 3).priority(.required - 1),
|
||||||
])
|
])
|
||||||
titleLabel.setContentHuggingPriority(.required - 1, for: .vertical)
|
titleLabel.setContentHuggingPriority(.required - 1, for: .vertical)
|
||||||
}
|
}
|
||||||
|
|
|
@ -204,7 +204,7 @@ final class ProfileHeaderView: UIView {
|
||||||
]
|
]
|
||||||
metaText.linkAttributes = [
|
metaText.linkAttributes = [
|
||||||
.font: UIFont.preferredFont(forTextStyle: .body),
|
.font: UIFont.preferredFont(forTextStyle: .body),
|
||||||
.foregroundColor: Asset.Colors.brandBlue.color,
|
.foregroundColor: Asset.Colors.brand.color,
|
||||||
]
|
]
|
||||||
return metaText
|
return metaText
|
||||||
}()
|
}()
|
||||||
|
|
|
@ -34,7 +34,7 @@ extension SidebarAddAccountCollectionViewCell {
|
||||||
|
|
||||||
// Customize the background color to use the tint color when the cell is highlighted or selected.
|
// Customize the background color to use the tint color when the cell is highlighted or selected.
|
||||||
if state.isSelected || state.isHighlighted {
|
if state.isSelected || state.isHighlighted {
|
||||||
newBackgroundConfiguration.backgroundColor = Asset.Colors.brandBlue.color
|
newBackgroundConfiguration.backgroundColor = Asset.Colors.brand.color
|
||||||
}
|
}
|
||||||
if state.isHighlighted {
|
if state.isHighlighted {
|
||||||
newBackgroundConfiguration.backgroundColorTransformer = .init { $0.withAlphaComponent(0.8) }
|
newBackgroundConfiguration.backgroundColorTransformer = .init { $0.withAlphaComponent(0.8) }
|
||||||
|
|
|
@ -31,7 +31,7 @@ class SearchRecommendCollectionHeader: UIView {
|
||||||
|
|
||||||
let seeAllButton: HighlightDimmableButton = {
|
let seeAllButton: HighlightDimmableButton = {
|
||||||
let button = HighlightDimmableButton(type: .custom)
|
let button = HighlightDimmableButton(type: .custom)
|
||||||
button.setTitleColor(Asset.Colors.brandBlue.color, for: .normal)
|
button.setTitleColor(Asset.Colors.brand.color, for: .normal)
|
||||||
button.setTitle(L10n.Scene.Search.Recommend.buttonText, for: .normal)
|
button.setTitle(L10n.Scene.Search.Recommend.buttonText, for: .normal)
|
||||||
button.titleLabel?.adjustsFontSizeToFitWidth = true
|
button.titleLabel?.adjustsFontSizeToFitWidth = true
|
||||||
button.titleLabel?.minimumScaleFactor = 0.8
|
button.titleLabel?.minimumScaleFactor = 0.8
|
||||||
|
|
|
@ -306,7 +306,7 @@ extension SearchDetailViewController {
|
||||||
|
|
||||||
private func setupBackgroundColor(theme: Theme) {
|
private func setupBackgroundColor(theme: Theme) {
|
||||||
navigationBarBackgroundView.backgroundColor = theme.navigationBarBackgroundColor
|
navigationBarBackgroundView.backgroundColor = theme.navigationBarBackgroundColor
|
||||||
navigationBar.tintColor = Asset.Colors.brandBlue.color
|
navigationBar.tintColor = Asset.Colors.brand.color
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ final class SearchHistoryTableHeaderView: UIView {
|
||||||
let clearSearchHistoryButton: HighlightDimmableButton = {
|
let clearSearchHistoryButton: HighlightDimmableButton = {
|
||||||
let button = HighlightDimmableButton(type: .custom)
|
let button = HighlightDimmableButton(type: .custom)
|
||||||
button.expandEdgeInsets = UIEdgeInsets(top: -10, left: -10, bottom: -10, right: -10)
|
button.expandEdgeInsets = UIEdgeInsets(top: -10, left: -10, bottom: -10, right: -10)
|
||||||
button.setTitleColor(Asset.Colors.brandBlue.color, for: .normal)
|
button.setTitleColor(Asset.Colors.brand.color, for: .normal)
|
||||||
button.setTitle(L10n.Scene.Search.Searching.clear, for: .normal)
|
button.setTitle(L10n.Scene.Search.Searching.clear, for: .normal)
|
||||||
return button
|
return button
|
||||||
}()
|
}()
|
||||||
|
|
|
@ -15,7 +15,7 @@ class NavigationBarProgressView: UIView {
|
||||||
|
|
||||||
let sliderView: UIView = {
|
let sliderView: UIView = {
|
||||||
let view = UIView()
|
let view = UIView()
|
||||||
view.backgroundColor = Asset.Colors.brandBlue.color
|
view.backgroundColor = Asset.Colors.brand.color
|
||||||
view.translatesAutoresizingMaskIntoConstraints = false
|
view.translatesAutoresizingMaskIntoConstraints = false
|
||||||
return view
|
return view
|
||||||
}()
|
}()
|
||||||
|
|
|
@ -5,9 +5,9 @@
|
||||||
"color-space" : "srgb",
|
"color-space" : "srgb",
|
||||||
"components" : {
|
"components" : {
|
||||||
"alpha" : "1.000",
|
"alpha" : "1.000",
|
||||||
"blue" : "55",
|
"blue" : "0x38",
|
||||||
"green" : "44",
|
"green" : "0x29",
|
||||||
"red" : "40"
|
"red" : "0x2B"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"idiom" : "universal"
|
"idiom" : "universal"
|
||||||
|
|
|
@ -23,9 +23,9 @@
|
||||||
"color-space" : "srgb",
|
"color-space" : "srgb",
|
||||||
"components" : {
|
"components" : {
|
||||||
"alpha" : "1.000",
|
"alpha" : "1.000",
|
||||||
"blue" : "0.216",
|
"blue" : "0x38",
|
||||||
"green" : "0.173",
|
"green" : "0x29",
|
||||||
"red" : "0.157"
|
"red" : "0x2B"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"idiom" : "universal"
|
"idiom" : "universal"
|
||||||
|
|
|
@ -5,9 +5,9 @@
|
||||||
"color-space" : "srgb",
|
"color-space" : "srgb",
|
||||||
"components" : {
|
"components" : {
|
||||||
"alpha" : "1.000",
|
"alpha" : "1.000",
|
||||||
"blue" : "133",
|
"blue" : "0x85",
|
||||||
"green" : "112",
|
"green" : "0x66",
|
||||||
"red" : "102"
|
"red" : "0x69"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"idiom" : "universal"
|
"idiom" : "universal"
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
{
|
||||||
|
"colors" : [
|
||||||
|
{
|
||||||
|
"color" : {
|
||||||
|
"color-space" : "srgb",
|
||||||
|
"components" : {
|
||||||
|
"alpha" : "1.000",
|
||||||
|
"blue" : "0xFF",
|
||||||
|
"green" : "0xC2",
|
||||||
|
"red" : "0xC2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"idiom" : "universal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"appearances" : [
|
||||||
|
{
|
||||||
|
"appearance" : "luminosity",
|
||||||
|
"value" : "dark"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"color" : {
|
||||||
|
"color-space" : "srgb",
|
||||||
|
"components" : {
|
||||||
|
"alpha" : "1.000",
|
||||||
|
"blue" : "1.000",
|
||||||
|
"green" : "0.761",
|
||||||
|
"red" : "0.761"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"idiom" : "universal"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,38 @@
|
||||||
|
{
|
||||||
|
"colors" : [
|
||||||
|
{
|
||||||
|
"color" : {
|
||||||
|
"color-space" : "srgb",
|
||||||
|
"components" : {
|
||||||
|
"alpha" : "1.000",
|
||||||
|
"blue" : "0.733",
|
||||||
|
"green" : "0.110",
|
||||||
|
"red" : "0.263"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"idiom" : "universal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"appearances" : [
|
||||||
|
{
|
||||||
|
"appearance" : "luminosity",
|
||||||
|
"value" : "dark"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"color" : {
|
||||||
|
"color-space" : "srgb",
|
||||||
|
"components" : {
|
||||||
|
"alpha" : "1.000",
|
||||||
|
"blue" : "0.733",
|
||||||
|
"green" : "0.110",
|
||||||
|
"red" : "0.263"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"idiom" : "universal"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,9 @@
|
||||||
|
{
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
},
|
||||||
|
"properties" : {
|
||||||
|
"provides-namespace" : true
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,38 @@
|
||||||
|
{
|
||||||
|
"colors" : [
|
||||||
|
{
|
||||||
|
"color" : {
|
||||||
|
"color-space" : "srgb",
|
||||||
|
"components" : {
|
||||||
|
"alpha" : "1.000",
|
||||||
|
"blue" : "0xBB",
|
||||||
|
"green" : "0x1C",
|
||||||
|
"red" : "0x43"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"idiom" : "universal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"appearances" : [
|
||||||
|
{
|
||||||
|
"appearance" : "luminosity",
|
||||||
|
"value" : "dark"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"color" : {
|
||||||
|
"color-space" : "srgb",
|
||||||
|
"components" : {
|
||||||
|
"alpha" : "1.000",
|
||||||
|
"blue" : "0.733",
|
||||||
|
"green" : "0.110",
|
||||||
|
"red" : "0.263"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"idiom" : "universal"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,9 @@
|
||||||
|
{
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
},
|
||||||
|
"properties" : {
|
||||||
|
"provides-namespace" : true
|
||||||
|
}
|
||||||
|
}
|
|
@ -46,6 +46,10 @@ public enum Asset {
|
||||||
public static let disabled = ColorAsset(name: "Colors/Button/disabled")
|
public static let disabled = ColorAsset(name: "Colors/Button/disabled")
|
||||||
public static let inactive = ColorAsset(name: "Colors/Button/inactive")
|
public static let inactive = ColorAsset(name: "Colors/Button/inactive")
|
||||||
}
|
}
|
||||||
|
public enum Deprecated {
|
||||||
|
public static let brandBlue = ColorAsset(name: "Colors/Deprecated/brand.blue")
|
||||||
|
public static let brandBlueDarken20 = ColorAsset(name: "Colors/Deprecated/brand.blue.darken.20")
|
||||||
|
}
|
||||||
public enum Icon {
|
public enum Icon {
|
||||||
public static let plus = ColorAsset(name: "Colors/Icon/plus")
|
public static let plus = ColorAsset(name: "Colors/Icon/plus")
|
||||||
}
|
}
|
||||||
|
@ -63,6 +67,10 @@ public enum Asset {
|
||||||
public enum Poll {
|
public enum Poll {
|
||||||
public static let disabled = ColorAsset(name: "Colors/Poll/disabled")
|
public static let disabled = ColorAsset(name: "Colors/Poll/disabled")
|
||||||
}
|
}
|
||||||
|
public enum Primary {
|
||||||
|
public static let _300 = ColorAsset(name: "Colors/Primary/300")
|
||||||
|
public static let _700 = ColorAsset(name: "Colors/Primary/700")
|
||||||
|
}
|
||||||
public enum Shadow {
|
public enum Shadow {
|
||||||
public static let searchCard = ColorAsset(name: "Colors/Shadow/SearchCard")
|
public static let searchCard = ColorAsset(name: "Colors/Shadow/SearchCard")
|
||||||
}
|
}
|
||||||
|
@ -77,8 +85,7 @@ public enum Asset {
|
||||||
public static let alertYellow = ColorAsset(name: "Colors/alert.yellow")
|
public static let alertYellow = ColorAsset(name: "Colors/alert.yellow")
|
||||||
public static let badgeBackground = ColorAsset(name: "Colors/badge.background")
|
public static let badgeBackground = ColorAsset(name: "Colors/badge.background")
|
||||||
public static let battleshipGrey = ColorAsset(name: "Colors/battleshipGrey")
|
public static let battleshipGrey = ColorAsset(name: "Colors/battleshipGrey")
|
||||||
public static let brandBlue = ColorAsset(name: "Colors/brand.blue")
|
public static let brand = ColorAsset(name: "Colors/brand")
|
||||||
public static let brandBlueDarken20 = ColorAsset(name: "Colors/brand.blue.darken.20")
|
|
||||||
public static let dangerBorder = ColorAsset(name: "Colors/danger.border")
|
public static let dangerBorder = ColorAsset(name: "Colors/danger.border")
|
||||||
public static let danger = ColorAsset(name: "Colors/danger")
|
public static let danger = ColorAsset(name: "Colors/danger")
|
||||||
public static let disabled = ColorAsset(name: "Colors/disabled")
|
public static let disabled = ColorAsset(name: "Colors/disabled")
|
||||||
|
|
|
@ -118,7 +118,7 @@ extension MetaLabel {
|
||||||
|
|
||||||
case .autoCompletion:
|
case .autoCompletion:
|
||||||
font = UIFontMetrics(forTextStyle: .headline).scaledFont(for: .systemFont(ofSize: 17, weight: .semibold), maximumPointSize: 22)
|
font = UIFontMetrics(forTextStyle: .headline).scaledFont(for: .systemFont(ofSize: 17, weight: .semibold), maximumPointSize: 22)
|
||||||
textColor = Asset.Colors.brandBlue.color
|
textColor = Asset.Colors.brand.color
|
||||||
|
|
||||||
case .accountListName:
|
case .accountListName:
|
||||||
font = UIFontMetrics(forTextStyle: .headline).scaledFont(for: .systemFont(ofSize: 17, weight: .regular), maximumPointSize: 22)
|
font = UIFontMetrics(forTextStyle: .headline).scaledFont(for: .systemFont(ofSize: 17, weight: .regular), maximumPointSize: 22)
|
||||||
|
@ -146,7 +146,7 @@ extension MetaLabel {
|
||||||
]
|
]
|
||||||
linkAttributes = [
|
linkAttributes = [
|
||||||
.font: font,
|
.font: font,
|
||||||
.foregroundColor: Asset.Colors.brandBlue.color
|
.foregroundColor: Asset.Colors.brand.color
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,8 +47,8 @@ extension PollOptionView {
|
||||||
@Published public var voteState: VoteState = .hidden
|
@Published public var voteState: VoteState = .hidden
|
||||||
|
|
||||||
@Published public var roundedBackgroundViewColor: UIColor = .clear
|
@Published public var roundedBackgroundViewColor: UIColor = .clear
|
||||||
@Published public var primaryStripProgressViewTintColor: UIColor = Asset.Colors.brandBlue.color
|
@Published public var primaryStripProgressViewTintColor: UIColor = Asset.Colors.brand.color
|
||||||
@Published public var secondaryStripProgressViewTintColor: UIColor = Asset.Colors.brandBlue.color.withAlphaComponent(0.5)
|
@Published public var secondaryStripProgressViewTintColor: UIColor = Asset.Colors.brand.color.withAlphaComponent(0.5)
|
||||||
|
|
||||||
@Published public var groupedAccessibilityLabel = ""
|
@Published public var groupedAccessibilityLabel = ""
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ public final class PollOptionView: UIView {
|
||||||
public let roundedBackgroundView = UIView()
|
public let roundedBackgroundView = UIView()
|
||||||
public let voteProgressStripView: StripProgressView = {
|
public let voteProgressStripView: StripProgressView = {
|
||||||
let view = StripProgressView()
|
let view = StripProgressView()
|
||||||
view.tintColor = Asset.Colors.brandBlue.color
|
view.tintColor = Asset.Colors.brand.color
|
||||||
return view
|
return view
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ public final class PollOptionView: UIView {
|
||||||
let imageView = UIImageView()
|
let imageView = UIImageView()
|
||||||
let image = UIImage(systemName: "checkmark", withConfiguration: UIImage.SymbolConfiguration(pointSize: 14, weight: .bold))!
|
let image = UIImage(systemName: "checkmark", withConfiguration: UIImage.SymbolConfiguration(pointSize: 14, weight: .bold))!
|
||||||
imageView.image = image.withRenderingMode(.alwaysTemplate)
|
imageView.image = image.withRenderingMode(.alwaysTemplate)
|
||||||
imageView.tintColor = Asset.Colors.brandBlue.color
|
imageView.tintColor = Asset.Colors.brand.color
|
||||||
return imageView
|
return imageView
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ public final class PollOptionView: UIView {
|
||||||
let imageView = UIImageView()
|
let imageView = UIImageView()
|
||||||
let image = Asset.Circles.plusCircle.image
|
let image = Asset.Circles.plusCircle.image
|
||||||
imageView.image = image.withRenderingMode(.alwaysTemplate)
|
imageView.image = image.withRenderingMode(.alwaysTemplate)
|
||||||
imageView.tintColor = Asset.Colors.brandBlue.color
|
imageView.tintColor = Asset.Colors.brand.color
|
||||||
return imageView
|
return imageView
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
|
|
@ -78,7 +78,7 @@ public final class ProfileCardView: UIView {
|
||||||
]
|
]
|
||||||
metaText.linkAttributes = [
|
metaText.linkAttributes = [
|
||||||
.font: UIFont.preferredFont(forTextStyle: .body),
|
.font: UIFont.preferredFont(forTextStyle: .body),
|
||||||
.foregroundColor: Asset.Colors.brandBlue.color,
|
.foregroundColor: Asset.Colors.brand.color,
|
||||||
]
|
]
|
||||||
return metaText
|
return metaText
|
||||||
}()
|
}()
|
||||||
|
|
|
@ -147,8 +147,8 @@ public final class StatusView: UIView {
|
||||||
.foregroundColor: Asset.Colors.Label.primary.color,
|
.foregroundColor: Asset.Colors.Label.primary.color,
|
||||||
]
|
]
|
||||||
metaText.linkAttributes = [
|
metaText.linkAttributes = [
|
||||||
.font: UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: 17, weight: .semibold)),
|
.font: UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: 17, weight: .regular)),
|
||||||
.foregroundColor: Asset.Colors.brandBlue.color,
|
.foregroundColor: Asset.Colors.brand.color,
|
||||||
]
|
]
|
||||||
return metaText
|
return metaText
|
||||||
}()
|
}()
|
||||||
|
@ -203,8 +203,8 @@ public final class StatusView: UIView {
|
||||||
let button = HitTestExpandedButton()
|
let button = HitTestExpandedButton()
|
||||||
button.titleLabel?.font = UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: 14, weight: .semibold))
|
button.titleLabel?.font = UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: 14, weight: .semibold))
|
||||||
button.setTitle(L10n.Common.Controls.Status.Poll.vote, for: .normal)
|
button.setTitle(L10n.Common.Controls.Status.Poll.vote, for: .normal)
|
||||||
button.setTitleColor(Asset.Colors.brandBlue.color, for: .normal)
|
button.setTitleColor(Asset.Colors.brand.color, for: .normal)
|
||||||
button.setTitleColor(Asset.Colors.brandBlue.color.withAlphaComponent(0.8), for: .highlighted)
|
button.setTitleColor(Asset.Colors.brand.color.withAlphaComponent(0.8), for: .highlighted)
|
||||||
button.setTitleColor(Asset.Colors.Button.disabled.color, for: .disabled)
|
button.setTitleColor(Asset.Colors.Button.disabled.color, for: .disabled)
|
||||||
button.isEnabled = false
|
button.isEnabled = false
|
||||||
return button
|
return button
|
||||||
|
|
|
@ -40,8 +40,8 @@ extension LineChartView {
|
||||||
layer.addSublayer(gradientLayer)
|
layer.addSublayer(gradientLayer)
|
||||||
|
|
||||||
gradientLayer.colors = [
|
gradientLayer.colors = [
|
||||||
Asset.Colors.brandBlue.color.withAlphaComponent(0.5).cgColor, // set the same alpha to fill
|
Asset.Colors.Primary._300.color.withAlphaComponent(0.5).cgColor, // set the same alpha to fill
|
||||||
Asset.Colors.brandBlue.color.withAlphaComponent(0.5).cgColor,
|
Asset.Colors.Primary._300.color.withAlphaComponent(0.5).cgColor,
|
||||||
]
|
]
|
||||||
gradientLayer.startPoint = CGPoint(x: 0.5, y: 0)
|
gradientLayer.startPoint = CGPoint(x: 0.5, y: 0)
|
||||||
gradientLayer.endPoint = CGPoint(x: 0.5, y: 1)
|
gradientLayer.endPoint = CGPoint(x: 0.5, y: 1)
|
||||||
|
@ -91,7 +91,7 @@ extension LineChartView {
|
||||||
}
|
}
|
||||||
|
|
||||||
lineShapeLayer.lineWidth = 1
|
lineShapeLayer.lineWidth = 1
|
||||||
lineShapeLayer.strokeColor = Asset.Colors.brandBlue.color.cgColor
|
lineShapeLayer.strokeColor = Asset.Colors.Primary._700.color.cgColor
|
||||||
lineShapeLayer.fillColor = UIColor.clear.cgColor
|
lineShapeLayer.fillColor = UIColor.clear.cgColor
|
||||||
lineShapeLayer.lineJoin = .round
|
lineShapeLayer.lineJoin = .round
|
||||||
lineShapeLayer.lineCap = .round
|
lineShapeLayer.lineCap = .round
|
||||||
|
@ -103,7 +103,7 @@ extension LineChartView {
|
||||||
maskPath.close()
|
maskPath.close()
|
||||||
let maskLayer = CAShapeLayer()
|
let maskLayer = CAShapeLayer()
|
||||||
maskLayer.path = maskPath.cgPath
|
maskLayer.path = maskPath.cgPath
|
||||||
maskLayer.fillColor = Asset.Colors.brandBlue.color.cgColor
|
maskLayer.fillColor = Asset.Colors.brand.color.cgColor
|
||||||
maskLayer.strokeColor = UIColor.clear.cgColor
|
maskLayer.strokeColor = UIColor.clear.cgColor
|
||||||
maskLayer.lineWidth = 0.0
|
maskLayer.lineWidth = 0.0
|
||||||
gradientLayer.mask = maskLayer
|
gradientLayer.mask = maskLayer
|
||||||
|
|
|
@ -25,8 +25,8 @@ class ShareViewController: UIViewController {
|
||||||
let button = RoundedEdgesButton(type: .custom)
|
let button = RoundedEdgesButton(type: .custom)
|
||||||
button.setTitle(L10n.Scene.Compose.composeAction, for: .normal)
|
button.setTitle(L10n.Scene.Compose.composeAction, for: .normal)
|
||||||
button.titleLabel?.font = .systemFont(ofSize: 14, weight: .bold)
|
button.titleLabel?.font = .systemFont(ofSize: 14, weight: .bold)
|
||||||
button.setBackgroundImage(.placeholder(color: Asset.Colors.brandBlue.color), for: .normal)
|
button.setBackgroundImage(.placeholder(color: Asset.Colors.brand.color), for: .normal)
|
||||||
button.setBackgroundImage(.placeholder(color: Asset.Colors.brandBlue.color.withAlphaComponent(0.5)), for: .highlighted)
|
button.setBackgroundImage(.placeholder(color: Asset.Colors.brand.color.withAlphaComponent(0.5)), for: .highlighted)
|
||||||
button.setBackgroundImage(.placeholder(color: Asset.Colors.Button.disabled.color), for: .disabled)
|
button.setBackgroundImage(.placeholder(color: Asset.Colors.Button.disabled.color), for: .disabled)
|
||||||
button.setTitleColor(.white, for: .normal)
|
button.setTitleColor(.white, for: .normal)
|
||||||
button.contentEdgeInsets = UIEdgeInsets(top: 6, left: 16, bottom: 5, right: 16) // set 28pt height
|
button.contentEdgeInsets = UIEdgeInsets(top: 6, left: 16, bottom: 5, right: 16) // set 28pt height
|
||||||
|
|
Loading…
Reference in New Issue