Skip to content

[Horizon] WrappingHStack Improvement #3514

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

Merged
merged 3 commits into from
Jul 23, 2025
Merged

[Horizon] WrappingHStack Improvement #3514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec1f6ad
Fixing the layout of the WrappingHStack. It was shifting the position…
reabbotted Jul 18, 2025
0aa056f
Merge branch 'feature/horizon' into CLX-2308-i-os-overlapping-items-i…
reabbotted Jul 21, 2025
5d94eeb
Update WrappingHStack.swift
reabbotted Jul 23, 2025
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
4 changes: 3 additions & 1 deletion Core/Core/Features/Inbox/ComposeMessage/View/WrappingHStack.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public struct WrappingHStack<Model, V>: View where Model: Hashable, V: View {
private func generateContent(in geometry: GeometryProxy) -> some View {
var width = CGFloat.zero
var height = CGFloat.zero
var previousHight = CGFloat.zero

return ZStack(alignment: .topLeading) {
ForEach(self.models, id: \.self) { models in
Expand All @@ -60,14 +61,15 @@ public struct WrappingHStack<Model, V>: View where Model: Hashable, V: View {
.alignmentGuide(.leading, computeValue: { dimension in
if (abs(width - dimension.width) > geometry.size.width) {
width = 0
height -= dimension.height
height -= previousHight
}
let result = width
if models == self.models.last! {
width = 0
} else {
width -= dimension.width
}
previousHight = dimension.height
return result
})
.alignmentGuide(.top, computeValue: { _ in
Expand Down
2 changes: 1 addition & 1 deletion Horizon/Horizon/Resources/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
"Hello, Career!" : {

},
"Hello! Which course you'd like to discuss today?" : {
"Hello! Which course would you like to discuss today?" : {

},
"Helsinki (+02:00/+03:00)" : {
Expand Down
2 changes: 1 addition & 1 deletion Horizon/Horizon/Sources/Features/Assist/AssistChat/Domain/Goal/AssistSelectCourseGoal.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class AssistSelectCourseGoal: AssistGoal {
}

private func initialPrompt(history: [AssistChatMessage]) -> AnyPublisher<AssistChatMessage?, any Error> {
let promptFirstTime = String(localized: "Hello! Which course you'd like to discuss today?", bundle: .horizon)
let promptFirstTime = String(localized: "Hello! Which course would you like to discuss today?", bundle: .horizon)
let promptAgain = String(localized: "Sorry, can we try that again? Which course is it you'd like to discuss?", bundle: .horizon)
let didIJustAskThis = history.count > 1 && history[history.count - 2].text?.contains(promptFirstTime) == true
let prompt = didIJustAskThis ? promptAgain : promptFirstTime
Expand Down