bukovinafilip/Atoll
1
0
Fork 0
mirror of https://github.com/FBukovina/Atoll.git synced 2026-10-27 15:14:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Atoll: Adjust LockScreen timer layout and fonts

Browse source 
Signed-off-by: Jis G Jacob <studiokeys@blissroms.org>
This commit is contained in:
Jis G Jacob 2026-03-12 23:24:23 +05:30
commit 8a60b0ede5
1 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

45
DynamicIsland/components/LockScreen/LockScreenTimerWidget.swift
View file

@ -46,7 +46,7 @@ struct LockScreenTimerWidget: View {
} }
private func displayFont(size: CGFloat) -> Font { private func displayFont(size: CGFloat) -> Font {
.custom("SF Pro Display", size: size) .system(size: size, weight: .semibold, design: .rounded)
} }
private var hasHoursComponent: Bool { private var hasHoursComponent: Bool {
@ -58,20 +58,20 @@ struct LockScreenTimerWidget: View {
} }
private var titleFrameWidth: CGFloat { private var titleFrameWidth: CGFloat {
if hasDoubleDigitHours { return 78 } if hasDoubleDigitHours { return 60 }
if hasHoursComponent { return 90 } if hasHoursComponent { return 80 }
return 130 return 110
} }
private var countdownFrameWidth: CGFloat { private var countdownFrameWidth: CGFloat {
if hasDoubleDigitHours { return 248 } if hasDoubleDigitHours { return 200 }
if hasHoursComponent { return 235 } if hasHoursComponent { return 185 }
return 205 return 160
} }
private var countdownFont: Font { private var countdownFont: Font {
let baseSize: CGFloat = hasDoubleDigitHours ? 52 : 56 let baseSize: CGFloat = hasDoubleDigitHours ? 42 : 46
return displayFont(size: baseSize) return .system(size: baseSize, weight: .bold, design: .rounded)
} }
private var timerLabel: String { private var timerLabel: String {
@ -191,17 +191,19 @@ struct LockScreenTimerWidget: View {
var body: some View { var body: some View {
VStack(spacing: 16) { VStack(spacing: 16) {
HStack(alignment: .center, spacing: 8) { HStack(alignment: .center, spacing: 0) {
controlButtons controlButtons
.padding(.trailing, 12)
titleSection titleSection
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)
countdownSection countdownSection
.padding(.leading, 12)
} }
} }
.padding(.horizontal, 12) .padding(.horizontal, 12)
.padding(.vertical, 18) .padding(.vertical, 12)
.frame(width: widgetSize.width, height: widgetSize.height) .frame(width: widgetSize.width, height: widgetSize.height)
.background(widgetBackground) .background(widgetBackground)
.clipShape(RoundedRectangle(cornerRadius: Self.cornerRadius, style: .continuous)) .clipShape(RoundedRectangle(cornerRadius: Self.cornerRadius, style: .continuous))
@ -260,18 +262,15 @@ struct LockScreenTimerWidget: View {
} }
private var titleSection: some View { private var titleSection: some View {
VStack(alignment: .center, spacing: 0) { MarqueeText(
MarqueeText( .constant(timerLabel),
.constant(timerLabel), font: displayFont(size: 15),
font: displayFont(size: 18), nsFont: .title3,
nsFont: .title3, textColor: accentColor,
textColor: accentColor, minDuration: 0.16,
minDuration: 0.16, frameWidth: titleFrameWidth
frameWidth: titleFrameWidth )
) .frame(maxWidth: .infinity, alignment: .center)
.frame(maxWidth: titleFrameWidth)
}
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
.layoutPriority(0) .layoutPriority(0)
} }