Skip to content
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

Jump to bottom

Stats Subscribers: Dynamic type support improvements #23141

Merged
merged 5 commits into from
May 3, 2024
Merged

Stats Subscribers: Dynamic type support improvements #23141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76da214
Limit maximum label size for view more button
staskus May 2, 2024
60b86f5
Limit maximum label sizes for all the column labels in Stats cells rows
staskus May 2, 2024
fcb390b
Limit maximum Stats cell header label size
staskus May 2, 2024
a7abeda
Limit maximum label size of Stats columns headers labels
staskus May 2, 2024
409a687
Limit maximum label size of Stats Total count
staskus May 2, 2024
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
2 changes: 2 additions & 0 deletions WordPress/Classes/ViewRelated/Stats/Extensions/WPStyleGuide+Stats.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ extension WPStyleGuide {
static func configureLabelAsSubtitle(_ label: UILabel) {
label.textColor = .DS.Foreground.secondary
label.font = .DS.font(.footnote)
label.adjustsFontSizeToFitWidth = true
label.maximumContentSizeCategory = .accessibilityLarge
}

static func configureLabelAsLink(_ label: UILabel) {
Expand Down
2 changes: 2 additions & 0 deletions WordPress/Classes/ViewRelated/Stats/Insights/StatsBaseCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ class StatsBaseCell: UITableViewCell {
let label = UILabel()
label.translatesAutoresizingMaskIntoConstraints = false
label.font = UIFont.preferredFont(forTextStyle: .headline)
label.maximumContentSizeCategory = .extraExtraExtraLarge
label.adjustsFontForContentSizeCategory = true
label.adjustsFontSizeToFitWidth = true
label.numberOfLines = 0
return label
Expand Down
1 change: 1 addition & 0 deletions WordPress/Classes/ViewRelated/Stats/Insights/StatsTotalInsightsCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ class StatsTotalInsightsCell: StatsBaseCell {
countLabel.adjustsFontSizeToFitWidth = true
countLabel.setContentHuggingPriority(.defaultLow, for: .horizontal)
countLabel.setContentHuggingPriority(.required, for: .vertical)
countLabel.maximumContentSizeCategory = .accessibilityLarge

comparisonLabel.font = .preferredFont(forTextStyle: .subheadline)
comparisonLabel.textColor = .textSubtle
Expand Down
5 changes: 5 additions & 0 deletions WordPress/Classes/ViewRelated/Stats/Shared Views/StatsTotalRow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,11 @@ private extension StatsTotalRow {
Style.configureViewAsSeparator(topExpandedSeparatorLine)
Style.configureViewAsDataBar(dataBar)

[itemLabel, itemDetailLabel, dataLabel, secondDataLabel].forEach {
$0?.adjustsFontForContentSizeCategory = true
$0?.maximumContentSizeCategory = .extraExtraLarge
}

[itemLabel, itemDetailLabel].forEach {
$0?.numberOfLines = rowData.multiline ? 0 : 1
}
Expand Down
1 change: 1 addition & 0 deletions WordPress/Classes/ViewRelated/Stats/Shared Views/ViewMoreRow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ private extension ViewMoreRow {
backgroundColor = .listForeground
viewMoreLabel.text = NSLocalizedString("View more", comment: "Label for viewing more stats.")
viewMoreLabel.textColor = WPStyleGuide.Stats.actionTextColor
viewMoreLabel.maximumContentSizeCategory = .extraExtraExtraLarge
if statSection == .insightsFollowersWordPress ||
statSection == .insightsFollowersEmail ||
statSection == .subscribersList ||
Expand Down
Loading