Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion Tiny/Features/LiveListen/Views/OrbLiveListenView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ struct OrbLiveListenView: View {
if !viewModel.isListening && !viewModel.isPlaybackMode {
GeometryReader { proxy in
CoachMarkView()
.position(x: proxy.size.width / 2, y: proxy.size.height / 2 + 250)
.position(x: proxy.size.width / 2, y: proxy.size.height / 2 + 230)
}
.transition(.opacity)
}
Expand Down
45 changes: 26 additions & 19 deletions Tiny/Features/Onboarding/Views/OnboardingView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -103,25 +103,25 @@ struct OnBoardingView: View {

// 4. Calculate the required Vertical Offset for the path's position (375):
// This value places the heart's center at the path's start Y coordinate (375).
let yOffsetCorrection = 375 - (heartSize / 2)

Image("yellowHeart")
.resizable()
.frame(width: heartSize, height: heartSize)
.modifier(
FollowEffect(
pct: progress,
path: LinePath().path(in: pathRect),
rotate: false
)
)
// 🔥 The key is to shift the view so the initial center of the heart
// is placed at the path's visual start point (which is pathStartXRelative
// horizontally, and 375 vertically in the ZStack).
.offset(
x: xOffsetCorrection, // Uses the actual path start X point
y: yOffsetCorrection // Uses the fixed Y offset (375)
)
// let yOffsetCorrection = 375 - (heartSize / 2)
//
// Image("yellowHeart")
// .resizable()
// .frame(width: heartSize, height: heartSize)
// .modifier(
// FollowEffect(
// pct: progress,
// path: LinePath().path(in: pathRect),
// rotate: false
// )
// )
// // 🔥 The key is to shift the view so the initial center of the heart
// // is placed at the path's visual start point (which is pathStartXRelative
// // horizontally, and 375 vertically in the ZStack).
// .offset(
// x: xOffsetCorrection, // Uses the actual path start X point
// y: yOffsetCorrection // Uses the fixed Y offset (375)
// )
}

VStack(spacing: 0) {
Expand Down Expand Up @@ -238,6 +238,13 @@ private struct OnboardingPage1: View {
.fontWeight(.regular)
.multilineTextAlignment(.center)
.padding(.horizontal, 30)

Text("Tiny isn’t a medical app")
.font(.caption)
.foregroundStyle(.peryWinkle)
.fontWeight(.regular)
.italic()
.padding(.horizontal, 30)
}
}
}
Expand Down
38 changes: 38 additions & 0 deletions Tiny/Resources/Assets.xcassets/peryWinkle.colorset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFF",
"green" : "0xCC",
"red" : "0xCC"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFF",
"green" : "0xCC",
"red" : "0xCC"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
4 changes: 4 additions & 0 deletions Tiny/Resources/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,10 @@
"comment" : "A title displayed at the top of the page.",
"isCommentAutoGenerated" : true
},
"Tiny isn’t a medical app" : {
"comment" : "A footnote explaining that Tiny is not a medical app.",
"isCommentAutoGenerated" : true
},
"Tiny will need access to your microphone so you can hear every tiny beat clearly." : {
"comment" : "A description under the title of the second onboarding page.",
"isCommentAutoGenerated" : true
Expand Down