Skip to content

Commit 043a350

Browse files
committed
Margin adjustment
1 parent d07b671 commit 043a350

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

LoopFollow/Snoozer/SnoozerView.swift

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,11 @@ struct SnoozerView: View {
103103
// MARK: - Columns
104104

105105
private func leftColumn(isLandscape: Bool, barShowing: Bool) -> some View {
106-
let topPad: CGFloat = (isLandscape && barShowing) ? 4 : 16
107-
let bigMaxH: CGFloat = (isLandscape && barShowing) ? 210 : 240
106+
let topPad: CGFloat = barShowing ? 0 : 16
107+
let bigMaxH: CGFloat = barShowing ? (isLandscape ? 210 : 220) : 240
108+
let dirMaxH: CGFloat = barShowing ? (isLandscape ? 72 : 72) : 80
109+
let deltaMaxH: CGFloat = barShowing ? (isLandscape ? 60 : 60) : 68
110+
let ageMaxH: CGFloat = barShowing ? 36 : 40
108111

109112
return VStack(spacing: 0) {
110113
if !isLandscape && showDisplayName.value {
@@ -133,26 +136,26 @@ struct SnoozerView: View {
133136
}
134137
.minimumScaleFactor(0.5)
135138
.foregroundColor(.white)
136-
.frame(maxWidth: .infinity, maxHeight: 80)
139+
.frame(maxWidth: .infinity, maxHeight: dirMaxH)
137140
} else {
138141
Text(directionText.value)
139142
.font(.system(size: 110, weight: .black))
140143
.minimumScaleFactor(0.5)
141144
.foregroundColor(.white)
142-
.frame(maxWidth: .infinity, maxHeight: 80)
145+
.frame(maxWidth: .infinity, maxHeight: dirMaxH)
143146

144147
Text(deltaText.value)
145148
.font(.system(size: 70))
146149
.minimumScaleFactor(0.5)
147150
.foregroundColor(.white.opacity(0.8))
148-
.frame(maxWidth: .infinity, maxHeight: 68)
151+
.frame(maxWidth: .infinity, maxHeight: deltaMaxH)
149152
}
150153

151154
Text(minAgoText.value)
152155
.font(.system(size: 60))
153156
.minimumScaleFactor(0.5)
154157
.foregroundColor(.white.opacity(0.6))
155-
.frame(maxWidth: .infinity, maxHeight: 40)
158+
.frame(maxWidth: .infinity, maxHeight: ageMaxH)
156159
}
157160
.padding(.top, topPad)
158161
.padding(.horizontal, 16)

0 commit comments

Comments
 (0)