Skip to content

Commit ea3c6dc

Browse files
joshavantjoshavant
committed
fix(ios): align branded typography licenses
1 parent 9184a68 commit ea3c6dc

46 files changed

Lines changed: 578 additions & 387 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/.i18n/native-source.json‎

Lines changed: 262 additions & 214 deletions
Large diffs are not rendered by default.

apps/ios/Resources/Licenses/DM Sans.txt renamed to apps/ios/Resources/Licenses/Inter.txt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
DM Sans
1+
Inter
22

3-
Copyright 2014 The DM Sans Project Authors
3+
Copyright 2016 The Inter Project Authors
44

5-
Source: https://github.com/google/fonts/tree/main/ofl/dmsans
6-
Version: 2.100, static instances extracted from variable fonts
5+
Source: https://github.com/google/fonts/tree/main/ofl/inter
6+
Version: Google Fonts variable release
77
License: SIL Open Font License 1.1
88

99
Bundled files:
10-
- DMSans-Light.ttf
11-
- DMSans-Regular.ttf
12-
- DMSans-Italic.ttf
13-
- DMSans-Medium.ttf
14-
- DMSans-SemiBold.ttf
10+
- Inter[opsz,wght].ttf
11+
- Inter-Italic[opsz,wght].ttf
1512

1613
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
1714

apps/ios/Resources/Licenses/Plus Jakarta Sans.txt renamed to apps/ios/Resources/Licenses/Red Hat Display.txt

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
1-
Plus Jakarta Sans
1+
Red Hat Display
22

3-
Copyright 2020 The Plus Jakarta Sans Project Authors
3+
Copyright 2024 The Red Hat Project Authors (https://github.com/RedHatOfficial/RedHatFont)
44

5-
Source: https://github.com/tokotype/PlusJakartaSans
6-
Version: 2.7.1
5+
Source: https://github.com/google/fonts/tree/main/ofl/redhatdisplay
6+
Version: Google Fonts variable release
77
License: SIL Open Font License 1.1
88

99
Bundled files:
10-
- PlusJakartaSans-Light.ttf
11-
- PlusJakartaSans-Regular.ttf
12-
- PlusJakartaSans-Medium.ttf
13-
- PlusJakartaSans-SemiBold.ttf
14-
- PlusJakartaSans-Bold.ttf
15-
- PlusJakartaSans-ExtraBold.ttf
10+
- RedHatDisplay[wght].ttf
1611

1712
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
1813

‎apps/ios/Sources/Design/AgentProTab+Overview.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ extension AgentProTab {
7777
}
7878
} label: {
7979
Image(systemName: "xmark.circle.fill")
80-
.font(OpenClawType.title3)
80+
.font(.title3)
8181
.foregroundStyle(.secondary)
8282
.frame(width: 44, height: 44)
8383
.contentShape(Circle())
@@ -313,7 +313,7 @@ extension AgentProTab {
313313
func agentAvatar(_ agent: AgentSummary, state: AgentRosterState) -> some View {
314314
ZStack(alignment: .bottomTrailing) {
315315
Text(self.agentBadge(for: agent))
316-
.font(.system(size: self.agentBadge(for: agent).count > 2 ? 14 : 18, weight: .bold, design: .rounded))
316+
.font(OpenClawType.avatar(size: self.agentBadge(for: agent).count > 2 ? 14 : 18))
317317
.foregroundStyle(.white)
318318
.minimumScaleFactor(0.62)
319319
.lineLimit(1)

‎apps/ios/Sources/Design/AgentProTab+Skills.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ extension AgentProTab {
540540
self.detailMetric(label: "Source", value: self.normalized(skill.source) ?? "unknown")
541541
if let filePath = self.normalized(skill.filePath) {
542542
Text(filePath)
543-
.font(OpenClawType.monoSmall)
543+
.font(OpenClawType.monoCaption2)
544544
.foregroundStyle(.secondary)
545545
.textSelection(.enabled)
546546
}

‎apps/ios/Sources/Design/ChatProTab.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ struct ChatProTab: View {
129129
private var headerIdentityBadge: some View {
130130
if self.showsAgentBadge {
131131
Text(self.agentBadge)
132-
.font(.system(size: self.agentBadge.count > 2 ? 13 : 16, weight: .bold, design: .rounded))
132+
.font(OpenClawType.avatar(size: self.agentBadge.count > 2 ? 13 : 16))
133133
.foregroundStyle(.white)
134134
.minimumScaleFactor(0.6)
135135
.lineLimit(1)

‎apps/ios/Sources/Design/CommandCenterSupport.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ struct CommandSessionRow: View {
9797
struct CommandViewMoreRow: View {
9898
var body: some View {
9999
Label("View More", systemImage: "chevron.right")
100-
.font(OpenClawType.subheadSemiBold)
100+
.font(OpenClawType.subheadBold)
101101
.foregroundStyle(OpenClawBrand.accent)
102102
.frame(maxWidth: .infinity)
103103
.padding(.vertical, 10)
@@ -113,7 +113,7 @@ struct CommandEmptyStateRow: View {
113113
var body: some View {
114114
HStack(spacing: 10) {
115115
Image(systemName: self.icon)
116-
.font(OpenClawType.captionSemiBold)
116+
.font(OpenClawType.captionBold)
117117
.foregroundStyle(OpenClawBrand.ok)
118118
.frame(width: 30, height: 30)
119119
.background {

‎apps/ios/Sources/Design/CommandCenterTab.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ struct CommandSessionsScreen: View {
673673
VStack(spacing: 0) {
674674
HStack(spacing: 8) {
675675
Text("Recent sessions")
676-
.font(OpenClawType.subheadSemiBold)
676+
.font(OpenClawType.subheadBold)
677677
Spacer(minLength: 8)
678678
if self.isLoading {
679679
ProgressView()

‎apps/ios/Sources/Design/IPadSidebarFeaturePreviews.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ private struct IPadWorkboardCompactRowsPreview: View {
103103
private var previewHeader: some View {
104104
VStack(alignment: .leading, spacing: 4) {
105105
Text("Phone queue")
106-
.font(.headline)
106+
.font(OpenClawType.headline)
107107
Text("Tap for detail, swipe or long-press for card actions.")
108-
.font(.caption)
108+
.font(OpenClawType.caption)
109109
.foregroundStyle(.secondary)
110110
}
111111
}
@@ -161,9 +161,9 @@ private struct IPadSkillWorkshopCompactRowsPreview: View {
161161
private var previewHeader: some View {
162162
VStack(alignment: .leading, spacing: 4) {
163163
Text("Phone proposals")
164-
.font(.headline)
164+
.font(OpenClawType.headline)
165165
Text("Tap for detail, swipe or long-press for proposal actions.")
166-
.font(.caption)
166+
.font(OpenClawType.caption)
167167
.foregroundStyle(.secondary)
168168
}
169169
}
@@ -277,7 +277,7 @@ private struct IPadActivityStatesPreview: View {
277277

278278
private func previewHeader(_ title: String) -> some View {
279279
Text(title)
280-
.font(.caption.weight(.semibold))
280+
.font(OpenClawType.captionSemiBold)
281281
.foregroundStyle(.secondary)
282282
.textCase(.uppercase)
283283
}
@@ -423,7 +423,7 @@ private struct IPadWorkboardStatesPreview: View {
423423

424424
private func previewHeader(_ title: String) -> some View {
425425
Text(title)
426-
.font(.caption.weight(.semibold))
426+
.font(OpenClawType.captionSemiBold)
427427
.foregroundStyle(.secondary)
428428
.textCase(.uppercase)
429429
}
@@ -525,7 +525,7 @@ private struct IPadSkillWorkshopStatesPreview: View {
525525

526526
private func previewHeader(_ title: String) -> some View {
527527
Text(title)
528-
.font(.subheadline.weight(.semibold))
528+
.font(OpenClawType.subheadSemiBold)
529529
.foregroundStyle(.secondary)
530530
}
531531

@@ -593,9 +593,9 @@ private struct IPadSkillWorkshopKanbanPreview: View {
593593
private var previewHeader: some View {
594594
VStack(alignment: .leading, spacing: 4) {
595595
Text("iPad kanban")
596-
.font(.headline)
596+
.font(OpenClawType.headline)
597597
Text("Wide layout with populated, empty, held, and custom proposal lanes.")
598-
.font(.caption)
598+
.font(OpenClawType.caption)
599599
.foregroundStyle(.secondary)
600600
}
601601
.padding(.horizontal, OpenClawProMetric.pagePadding)

‎apps/ios/Sources/Design/IPadSidebarScreenChrome.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct IPadSidebarScreenChrome<Content: View>: View {
3434
OpenClawAdaptiveHeaderRow(
3535
title: self.title,
3636
subtitle: self.subtitle,
37-
titleFont: self.isCompactHeight ? .headline.weight(.semibold) : .title2.weight(.semibold),
37+
titleFont: self.isCompactHeight ? OpenClawType.headline : OpenClawType.title2SemiBold,
3838
subtitleLineLimit: self.isCompactHeight ? 1 : 2)
3939
{
4040
if let headerLeadingAction {

0 commit comments

Comments
 (0)