Skip to content

Larger Snoozer text #749

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

Open
bjorkert wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Larger Snoozer text #749

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1a1417
Larger Snoozer text
bjorkert Sep 17, 2026
9eba111
Keep the Snoozer emoji and clock above the tab bar on small phones
bjorkert Oct 10, 2026
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
102 changes: 63 additions & 39 deletions LoopFollow/Snoozer/SnoozerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,16 @@ struct SnoozerView: View {
rightColumn(isLandscape: true)
}
} else {
VStack(spacing: 0) {
leftColumn(isLandscape: false, barShowing: barShowing)
rightColumn(isLandscape: false)
GeometryReader { content in
VStack(spacing: 0) {
leftColumn(
isLandscape: false,
barShowing: barShowing,
availableHeight: content.size.height - portraitRightColumnMinHeight
)
.layoutPriority(1)
rightColumn(isLandscape: false)
}
}
}
}
Expand Down Expand Up @@ -155,23 +162,49 @@ struct SnoozerView: View {

// MARK: - Columns

private func leftColumn(isLandscape: Bool, barShowing: Bool) -> some View {
private let portraitEmojiMinHeight: CGFloat = 70
private let portraitClockMinHeight: CGFloat = 80
private let portraitClockBottomSpace: CGFloat = 16
private let displayNameHeight: CGFloat = 60

/// Height the emoji and clock need below the left column in portrait.
private var portraitRightColumnMinHeight: CGFloat {
let emoji = snoozerEmoji.value ? portraitEmojiMinHeight + 4 : 0
return emoji + portraitClockMinHeight + portraitClockBottomSpace + 8
}

/// The left column's heights are scaled down together when `availableHeight`
/// is smaller than their combined maximum, so the column never pushes the
/// emoji and clock off screen.
private func leftColumn(isLandscape: Bool, barShowing: Bool, availableHeight: CGFloat? = nil) -> some View {
let topPad: CGFloat = barShowing ? 0 : 16
let bigMaxH: CGFloat = barShowing ? (isLandscape ? 210 : 220) : 240
let dirMaxH: CGFloat = barShowing ? (isLandscape ? 72 : 72) : 80
let deltaMaxH: CGFloat = barShowing ? (isLandscape ? 60 : 60) : 68
let ageMaxH: CGFloat = barShowing ? 36 : 40
let nameH: CGFloat = (!isLandscape && showDisplayName.value) ? displayNameHeight : 0
let maxHeights: [CGFloat] = [
barShowing ? (isLandscape ? 210 : 200) : 240,
barShowing ? (isLandscape ? 72 : 90) : (isLandscape ? 80 : 110),
barShowing ? (isLandscape ? 60 : 80) : (isLandscape ? 68 : 100),
barShowing ? (isLandscape ? 36 : 60) : (isLandscape ? 40 : 80),
]
let fit: CGFloat = availableHeight.map {
min(1, max(0, $0 - topPad - nameH) / maxHeights.reduce(0, +))
} ?? 1
let bigMaxH = maxHeights[0] * fit
let dirMaxH = maxHeights[1] * fit
let deltaMaxH = maxHeights[2] * fit
let ageMaxH = maxHeights[3] * fit
let minScale: CGFloat = isLandscape ? 0.5 : 0.3

return VStack(spacing: 0) {
if !isLandscape && showDisplayName.value {
Text(Bundle.main.displayName)
.font(.system(size: 50, weight: .bold))
.foregroundColor(.white.opacity(0.9))
.frame(height: displayNameHeight)
}

Text(bgText.value)
.font(.system(size: 300, weight: .black))
.minimumScaleFactor(0.5)
.minimumScaleFactor(minScale)
.foregroundColor(bgTextColor.value)
.strikethrough(
bgStale.value,
Expand All @@ -185,29 +218,29 @@ struct SnoozerView: View {
Text(directionText.value)
.font(.system(size: 90, weight: .black))
Text(deltaText.value)
.font(.system(size: 70))
.font(.system(size: 70).monospacedDigit())
}
.minimumScaleFactor(0.5)
.minimumScaleFactor(minScale)
.foregroundColor(.white)
.frame(maxWidth: .infinity, maxHeight: dirMaxH)
} else {
Text(directionText.value)
.font(.system(size: 110, weight: .black))
.minimumScaleFactor(0.5)
.font(.system(size: 160, weight: .black))
.minimumScaleFactor(minScale)
.foregroundColor(.white)
.frame(maxWidth: .infinity, maxHeight: dirMaxH)

Text(deltaText.value)
.font(.system(size: 70))
.minimumScaleFactor(0.5)
.foregroundColor(.white.opacity(0.8))
.font(.system(size: 140).monospacedDigit())
.minimumScaleFactor(minScale)
.foregroundColor(.white)
.frame(maxWidth: .infinity, maxHeight: deltaMaxH)
}

Text(minAgoText.value)
.font(.system(size: 60))
.minimumScaleFactor(0.5)
.foregroundColor(.white.opacity(0.6))
.font(.system(size: isLandscape ? 60 : 80).monospacedDigit())
.minimumScaleFactor(minScale)
.foregroundColor(.white)
.frame(maxWidth: .infinity, maxHeight: ageMaxH)
}
.padding(.top, topPad)
Expand All @@ -224,32 +257,23 @@ struct SnoozerView: View {
.padding(.bottom, 8)
}

if snoozerEmoji.value {
TimelineView(.periodic(from: .now, by: 1)) { context in
VStack(spacing: 4) {
TimelineView(.periodic(from: .now, by: 1)) { context in
VStack(spacing: 4) {
if snoozerEmoji.value {
Text(bgEmoji)
.font(.system(size: 128))
.minimumScaleFactor(0.5)

Text(context.date, format: Date.FormatStyle(date: .omitted, time: .shortened))
.font(.system(size: 70))
.minimumScaleFactor(0.5)
.foregroundColor(.white)
.frame(height: 78)
}
}
} else {
TimelineView(.periodic(from: .now, by: 1)) { context in
VStack(spacing: 4) {
Text(context.date, format: Date.FormatStyle(date: .omitted, time: .shortened))
.font(.system(size: 70))
.minimumScaleFactor(0.5)
.foregroundColor(.white)
.frame(height: 78)
.frame(minHeight: isLandscape ? nil : portraitEmojiMinHeight)
}

Text(context.date, format: Date.FormatStyle(date: .omitted, time: .shortened))
.font(.system(size: isLandscape ? 70 : 100).monospacedDigit())
.minimumScaleFactor(0.5)
.foregroundColor(.white)
.frame(minHeight: isLandscape ? 78 : portraitClockMinHeight, maxHeight: isLandscape ? 78 : 100)
}
}
Spacer()
Spacer(minLength: isLandscape ? nil : portraitClockBottomSpace)
}
}

Expand Down