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

Update stuff for lock screen widget width

Browse source
This commit is contained in:
Hariharan Mudaliar 2026-01-22 21:09:05 +05:30
commit ab6877e59c
No known key found for this signature in database
GPG key ID: 025583EB0BE5640E
7 changed files with 200 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
DynamicIsland/components/LockScreen/LockScreenMusicPanel.swift
View file

@ -16,7 +16,11 @@ struct LockScreenMusicPanel: View {
let usesLiquidGlass: Bool
}
static let collapsedSize = CGSize(width: 420, height: 180)
static let collapsedHeight: CGFloat = 180
static let defaultCollapsedWidth: CGFloat = 420
static var collapsedSize: CGSize {
CGSize(width: CGFloat(Defaults[.lockScreenMusicPanelWidth]), height: collapsedHeight)
}
static let expandedSize = CGSize(width: 720, height: 340)
@ObservedObject var musicManager = MusicManager.shared
@ -45,6 +49,7 @@ struct LockScreenMusicPanel: View {
@Default(.musicSkipBehavior) private var musicSkipBehavior
@Default(.enableLyrics) private var enableLyrics
@Default(.lockScreenMusicAlbumParallaxEnabled) private var lockScreenParallaxEnabled
@Default(.lockScreenMusicPanelWidth) private var collapsedPanelWidth
init(animator: LockScreenPanelAnimator) {
_animator = ObservedObject(wrappedValue: animator)
@ -66,10 +71,14 @@ struct LockScreenMusicPanel: View {
}
private var currentSize: CGSize {
let base = isExpanded ? Self.expandedSize : Self.collapsedSize
let base = isExpanded ? Self.expandedSize : collapsedPanelSize
return CGSize(width: base.width, height: base.height + totalExtraHeight)
}
private var collapsedPanelSize: CGSize {
CGSize(width: CGFloat(collapsedPanelWidth), height: Self.collapsedHeight)
}
private var panelCornerRadius: CGFloat {
isExpanded ? expandedPanelCornerRadius : collapsedPanelCornerRadius
}
@ -95,7 +104,7 @@ struct LockScreenMusicPanel: View {
panelContent
} else {
Color.clear
.frame(width: Self.collapsedSize.width, height: Self.collapsedSize.height)
.frame(width: collapsedPanelSize.width, height: collapsedPanelSize.height)
}
}

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

@ -2,7 +2,11 @@ import SwiftUI
import Defaults
struct LockScreenTimerWidget: View {
static let preferredSize = CGSize(width: 420, height: 96)
static let defaultWidth: Double = 420
static let preferredHeight: CGFloat = 96
static var preferredSize: CGSize {
CGSize(width: CGFloat(Defaults[.lockScreenTimerWidgetWidth]), height: preferredHeight)
}
static let cornerRadius: CGFloat = 26
@ObservedObject private var animator: LockScreenTimerWidgetAnimator
@ -12,6 +16,7 @@ struct LockScreenTimerWidget: View {
@Default(.lockScreenTimerLiquidGlassVariant) private var timerGlassVariant
@Default(.lockScreenTimerWidgetUsesBlur) private var timerGlassModeIsGlass
@Default(.timerPresets) private var timerPresets
@Default(.lockScreenTimerWidgetWidth) private var widgetWidth
@MainActor
init(animator: LockScreenTimerWidgetAnimator? = nil) {
@ -146,6 +151,10 @@ struct LockScreenTimerWidget: View {
.fill(Color.black.opacity(0.65))
}
private var widgetSize: CGSize {
CGSize(width: CGFloat(widgetWidth), height: Self.preferredHeight)
}
private var pauseIcon: String {
timerManager.isPaused ? "play.fill" : "pause.fill"
}
@ -175,7 +184,7 @@ struct LockScreenTimerWidget: View {
}
.padding(.horizontal, 12)
.padding(.vertical, 18)
.frame(width: Self.preferredSize.width, height: Self.preferredSize.height)
.frame(width: widgetSize.width, height: widgetSize.height)
.background(widgetBackground)
.clipShape(RoundedRectangle(cornerRadius: Self.cornerRadius, style: .continuous))
.overlay {