Skip to content

Enlarge BG text and add optional display name #441

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
marionbarker merged 3 commits into from
Jul 21, 2025
Merged

Enlarge BG text and add optional display name #441

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8ba3e0
Enlarge BG text and add optional display name
bjorkert Jul 19, 2025
b32c85f
Size adjustment
bjorkert Jul 19, 2025
77b90fc
Increase display name font size and show above glucose in portrait
bjorkert Jul 21, 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
69 changes: 48 additions & 21 deletions LoopFollow/Snoozer/SnoozerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import SwiftUI
struct SnoozerView: View {
@StateObject private var vm = SnoozerViewModel()

@ObservedObject var showDisplayName = Storage.shared.showDisplayName
@ObservedObject var minAgoText = Observable.shared.minAgoText
@ObservedObject var bgText = Observable.shared.bgText
@ObservedObject var bgTextColor = Observable.shared.bgTextColor
Expand All @@ -22,18 +23,18 @@ struct SnoozerView: View {
Color.black
.edgesIgnoringSafeArea(.all)

let isLandscape = geo.size.width > geo.size.height

Group {
if geo.size.width > geo.size.height {
// Landscape: two columns
if isLandscape {
HStack(spacing: 0) {
leftColumn
rightColumn
leftColumn(isLandscape: true)
rightColumn(isLandscape: true)
}
} else {
// Portrait: single column
VStack(spacing: 0) {
leftColumn
rightColumn
leftColumn(isLandscape: false)
rightColumn(isLandscape: false)
}
}
}
Expand All @@ -44,46 +45,72 @@ struct SnoozerView: View {

// MARK: - Left Column (BG / Direction / Delta / Age)

private var leftColumn: some View {
private func leftColumn(isLandscape: Bool) -> some View {
VStack(spacing: 0) {
if !isLandscape && showDisplayName.value {
Text(Bundle.main.displayName)
.font(.system(size: 50, weight: .bold))
.foregroundColor(.white.opacity(0.9))
}

Text(bgText.value)
.font(.system(size: 220, weight: .black))
.font(.system(size: 300, weight: .black))
.minimumScaleFactor(0.5)
.foregroundColor(bgTextColor.value)
.strikethrough(
bgStale.value,
pattern: .solid,
color: bgStale.value ? .red : .clear
)
.frame(maxWidth: .infinity, maxHeight: 167)
.frame(maxWidth: .infinity, maxHeight: 240)

Text(directionText.value)
.font(.system(size: 110, weight: .black))
if isLandscape {
HStack(alignment: .firstTextBaseline, spacing: 20) {
Text(directionText.value)
.font(.system(size: 90, weight: .black))

Text(deltaText.value)
.font(.system(size: 70))
}
.minimumScaleFactor(0.5)
.foregroundColor(.white)
.frame(maxWidth: .infinity, maxHeight: 96)
.frame(maxWidth: .infinity, maxHeight: 80)

Text(deltaText.value)
.font(.system(size: 70))
.minimumScaleFactor(0.5)
.foregroundColor(.white.opacity(0.8))
.frame(maxWidth: .infinity, maxHeight: 78)
} else {
Text(directionText.value)
.font(.system(size: 110, weight: .black))
.minimumScaleFactor(0.5)
.foregroundColor(.white)
.frame(maxWidth: .infinity, maxHeight: 80)

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

Text(minAgoText.value)
.font(.system(size: 70))
.font(.system(size: 60))
.minimumScaleFactor(0.5)
.foregroundColor(.white.opacity(0.6))
.frame(maxWidth: .infinity, maxHeight: 48)
.frame(maxWidth: .infinity, maxHeight: 40)
}
.padding(.top, 16)
.padding(.horizontal, 16)
}

// MARK: - Right Column (Clock/Alert + Snooze Controls)

private var rightColumn: some View {
private func rightColumn(isLandscape: Bool) -> some View {
VStack(spacing: 0) {
Spacer()
if showDisplayName.value && isLandscape {
Text(Bundle.main.displayName)
.font(.system(size: 50, weight: .bold))
.foregroundColor(.white.opacity(0.9))
.padding(.bottom, 8)
}

if let alarm = vm.activeAlarm {
VStack(spacing: 16) {
Expand Down