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

BugFix: Janky Animation in the calendar view

Browse source
This commit is contained in:
Hariharan Mudaliar 2025-11-18 00:46:20 +05:30
commit c34cdfc864
6 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
DynamicIsland/ContentView.swift
View file

@ -40,12 +40,6 @@ struct ContentView: View {
// Dynamic sizing based on view type and graph count with smooth transitions
var dynamicNotchSize: CGSize {
var baseSize = Defaults[.enableMinimalisticUI] ? minimalisticOpenNotchSize : openNotchSize
if Defaults[.enableMinimalisticUI] && vm.notchState == .open {
let reminderCount = reminderManager.activeWindowReminders.count
let extraHeight = ReminderLiveActivityManager.additionalHeight(forRowCount: reminderCount)
baseSize.height += extraHeight
}
guard coordinator.currentView == .stats else {
return baseSize

6
DynamicIsland/DynamicIslandApp.swift
View file

@ -278,12 +278,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
// Use minimalistic or normal size based on settings
var baseSize = Defaults[.enableMinimalisticUI] ? minimalisticOpenNotchSize : openNotchSize
if Defaults[.enableMinimalisticUI] && vm.notchState == .open {
let reminderCount = ReminderLiveActivityManager.shared.activeWindowReminders.count
let extraHeight = ReminderLiveActivityManager.additionalHeight(forRowCount: reminderCount)
baseSize.height += extraHeight
}
// Only apply dynamic sizing when on stats tab and stats are enabled
guard coordinator.currentView == .stats && Defaults[.enableStatsFeature] else {

2
DynamicIsland/components/Notch/MinimalisticMusicPlayerView.swift
View file

@ -166,7 +166,7 @@ struct MinimalisticMusicPlayerView: View {
// Add lyrics height if enabled in settings (reserve space even while loading)
if enableLyrics {
let lyricsTopPadding: CGFloat = 10
let lyricsEstimatedHeight: CGFloat = 30
let lyricsEstimatedHeight: CGFloat = 34
height += lyricsTopPadding + lyricsEstimatedHeight
}

27
DynamicIsland/components/Notch/NotchHomeView.swift
View file

@ -162,16 +162,27 @@ struct MusicControlsView: View {
removal: .move(edge: .top).combined(with: .opacity)
)
Text(musicManager.currentLyrics)
.font(.headline)
.foregroundColor(.white.opacity(0.8))
.lineLimit(2)
.multilineTextAlignment(.leading)
.frame(maxWidth: .infinity, alignment: .leading)
let line = musicManager.currentLyrics.trimmingCharacters(in: .whitespacesAndNewlines)
if !line.isEmpty {
let lyricsBinding = Binding<String>(
get: { musicManager.currentLyrics },
set: { _ in }
)
MarqueeText(
lyricsBinding,
font: .headline,
nsFont: .headline,
textColor: .white.opacity(0.8),
minDuration: 0.35,
frameWidth: width
)
.padding(.top, 2)
.id(musicManager.currentLyrics)
.id(line)
.transition(transition)
.animation(.easeInOut(duration: 0.32), value: musicManager.currentLyrics)
.animation(.easeInOut(duration: 0.32), value: line)
}
}
}
}

9
DynamicIsland/models/DynamicIslandViewModel.swift
View file

@ -45,7 +45,6 @@ class DynamicIslandViewModel: NSObject, ObservableObject {
@Published var notchSize: CGSize = getClosedNotchSize()
@Published var closedNotchSize: CGSize = getClosedNotchSize()
private var minimalisticReminderRowCount: Int = 0
deinit {
destroy()
@ -77,9 +76,8 @@ class DynamicIslandViewModel: NSObject, ObservableObject {
ReminderLiveActivityManager.shared.$activeWindowReminders
.removeDuplicates()
.receive(on: RunLoop.main)
.sink { [weak self] entries in
.sink { [weak self] _ in
guard let self else { return }
self.minimalisticReminderRowCount = entries.count
let updatedTarget = self.calculateDynamicNotchSize()
guard self.notchState == .open else { return }
guard self.notchSize != updatedTarget else { return }
@ -195,11 +193,6 @@ class DynamicIslandViewModel: NSObject, ObservableObject {
// Use minimalistic size if minimalistic UI is enabled
var baseSize = Defaults[.enableMinimalisticUI] ? minimalisticOpenNotchSize : openNotchSize
if Defaults[.enableMinimalisticUI] {
let extraHeight = ReminderLiveActivityManager.additionalHeight(forRowCount: minimalisticReminderRowCount)
baseSize.height += extraHeight
}
// Only apply dynamic sizing when on stats tab and stats are enabled
guard DynamicIslandViewCoordinator.shared.currentView == .stats && Defaults[.enableStatsFeature] else {
return baseSize

11
DynamicIsland/sizing/matters.swift
View file

@ -16,14 +16,23 @@ let batterySneakSize: CGSize = .init(width: 160, height: 1)
let openNotchSize: CGSize = .init(width: 640, height: 190)
private let minimalisticBaseOpenNotchSize: CGSize = .init(width: 420, height: 180)
private let minimalisticLyricsExtraHeight: CGFloat = 30
private let minimalisticLyricsExtraHeight: CGFloat = 40
@MainActor
var minimalisticOpenNotchSize: CGSize {
var size = minimalisticBaseOpenNotchSize
if Defaults[.enableLyrics] {
size.height += minimalisticLyricsExtraHeight
}
let reminderCount = ReminderLiveActivityManager.shared.activeWindowReminders.count
if reminderCount > 0 {
let reminderHeight = ReminderLiveActivityManager.additionalHeight(forRowCount: reminderCount)
size.height += reminderHeight
size.height += ReminderLiveActivityManager.listTopPadding
size.height += ReminderLiveActivityManager.listBottomPadding - ReminderLiveActivityManager.baselineMinimalisticBottomPadding
}
return size
}