Clean-up commit

This commit is contained in:
Hariharan Mudaliar 2026-04-13 13:54:53 +05:30
commit a03d361243
No known key found for this signature in database
GPG key ID: 025583EB0BE5640E
3 changed files with 7 additions and 40 deletions

View file

@ -124,17 +124,6 @@ struct ContentView: View {
return baseSize return baseSize
} }
if coordinator.currentView == .home && Defaults[.mediaController] == .all && !musicManager.secondarySources.isEmpty {
let toggleBarHeight: CGFloat = 34
let rowHeight: CGFloat = 58
let safetyPadding: CGFloat = 16
var extraHeight = toggleBarHeight + safetyPadding
if musicManager.isMultiSourceListExpanded {
extraHeight += CGFloat(musicManager.secondarySources.count) * rowHeight
}
return CGSize(width: baseSize.width, height: baseSize.height + extraHeight)
}
if enableMinimalisticUI, if enableMinimalisticUI,
coordinator.currentView == .home, coordinator.currentView == .home,
let preferredHeight = extensionMinimalisticPreferredHeight(baseSize: baseSize) { let preferredHeight = extensionMinimalisticPreferredHeight(baseSize: baseSize) {
@ -1680,13 +1669,10 @@ struct ContentView: View {
return false return false
} }
let horizontalPadding: CGFloat = 12 let horizontalPadding: CGFloat = 8
let activationWidth = vm.closedNotchSize.width + horizontalPadding * 2 let activationWidth = vm.closedNotchSize.width + horizontalPadding * 2
let activationHeight = max(vm.closedNotchSize.height + zeroHeightHoverPadding, 14)
// Hysteresis: Use a taller activation area when already hovering to prevent rapid flickering
let baseHeight = max(vm.closedNotchSize.height + zeroHeightHoverPadding, 16)
let activationHeight = isHovering ? baseHeight + 20 : baseHeight
let activationRect = CGRect( let activationRect = CGRect(
x: screen.frame.midX - activationWidth / 2, x: screen.frame.midX - activationWidth / 2,
y: screen.frame.maxY - activationHeight, y: screen.frame.maxY - activationHeight,

View file

@ -2314,7 +2314,6 @@
}, },
"±10 Seconds" : { "±10 Seconds" : {
"comment" : "Display name for the \"±10 Seconds\" music skip behavior option.", "comment" : "Display name for the \"±10 Seconds\" music skip behavior option.",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -3138,7 +3137,6 @@
}, },
"Accent" : { "Accent" : {
"comment" : "Display name for the caps lock indicator tint mode.", "comment" : "Display name for the caps lock indicator tint mode.",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -3696,7 +3694,6 @@
}, },
"Adaptive gradient" : { "Adaptive gradient" : {
"comment" : "Display name for the timer icon color mode: adaptive gradient.", "comment" : "Display name for the timer icon color mode: adaptive gradient.",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -6016,7 +6013,6 @@
}, },
"Apple Music" : { "Apple Music" : {
"comment" : "Media controller type for Apple Music", "comment" : "Media controller type for Apple Music",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -6920,7 +6916,6 @@
}, },
"Bar" : { "Bar" : {
"comment" : "Name of the timer progress style that shows a horizontal bar.", "comment" : "Name of the timer progress style that shows a horizontal bar.",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -14521,7 +14516,6 @@
}, },
"Digital" : { "Digital" : {
"comment" : "The display name for the \"Digital\" reminder presentation style.", "comment" : "The display name for the \"Digital\" reminder presentation style.",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -20829,7 +20823,6 @@
}, },
"Green" : { "Green" : {
"comment" : "Display name for the green caps lock indicator tint mode.", "comment" : "Display name for the green caps lock indicator tint mode.",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -26874,6 +26867,9 @@
} }
} }
} }
},
"Mirror Camera" : {
}, },
"Mirror macOS Clock timers" : { "Mirror macOS Clock timers" : {
"comment" : "A toggle that enables or disables the app's ability to mirror macOS Clock timers.", "comment" : "A toggle that enables or disables the app's ability to mirror macOS Clock timers.",
@ -29941,7 +29937,6 @@
}, },
"Now Playing" : { "Now Playing" : {
"comment" : "Name of the media controller type for the \"Now Playing\" option.", "comment" : "Name of the media controller type for the \"Now Playing\" option.",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -30687,7 +30682,6 @@
}, },
"Panel" : { "Panel" : {
"comment" : "Display name for the clipboard display mode \"Panel\".", "comment" : "Display name for the clipboard display mode \"Panel\".",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -34230,7 +34224,6 @@
}, },
"Ring" : { "Ring" : {
"comment" : "The name of the timer progress style that shows a ring shape.", "comment" : "The name of the timer progress style that shows a ring shape.",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -35752,7 +35745,6 @@
}, },
"Separate Tab" : { "Separate Tab" : {
"comment" : "Display name for the clipboard display mode option to open the clipboard in a separate tab.", "comment" : "Display name for the clipboard display mode option to open the clipboard in a separate tab.",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -38185,7 +38177,6 @@
}, },
"Shows screen assistant as a dropdown attached to the AI button" : { "Shows screen assistant as a dropdown attached to the AI button" : {
"comment" : "Description of the screen assistant display mode option that shows the screen assistant as a dropdown attached to the AI button.", "comment" : "Description of the screen assistant display mode option that shows the screen assistant as a dropdown attached to the AI button.",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -38210,7 +38201,6 @@
}, },
"Shows screen assistant in a floating panel near the notch" : { "Shows screen assistant in a floating panel near the notch" : {
"comment" : "Description of the screen assistant display mode option that shows the screen assistant in a floating panel near the notch.", "comment" : "Description of the screen assistant display mode option that shows the screen assistant in a floating panel near the notch.",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -38438,7 +38428,6 @@
}, },
"Skip forward or backward by ten seconds" : { "Skip forward or backward by ten seconds" : {
"comment" : "Description of a music skip behavior option.", "comment" : "Description of a music skip behavior option.",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -39162,7 +39151,6 @@
}, },
"Spotify" : { "Spotify" : {
"comment" : "Spotify media controller type.", "comment" : "Spotify media controller type.",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -39399,7 +39387,6 @@
}, },
"Standard previous/next track controls" : { "Standard previous/next track controls" : {
"comment" : "Description of the music skip behavior option to use standard previous/next track controls.", "comment" : "Description of the music skip behavior option to use standard previous/next track controls.",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -42227,7 +42214,6 @@
}, },
"Track Skip" : { "Track Skip" : {
"comment" : "Display name for the \"Track Skip\" music skip behavior.", "comment" : "Display name for the \"Track Skip\" music skip behavior.",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {
@ -45585,7 +45571,6 @@
}, },
"Youtube Music" : { "Youtube Music" : {
"comment" : "Spotify music service.", "comment" : "Spotify music service.",
"extractionState" : "stale",
"isCommentAutoGenerated" : true, "isCommentAutoGenerated" : true,
"localizations" : { "localizations" : {
"ko" : { "ko" : {

View file

@ -2487,11 +2487,7 @@ struct Media: View {
} header: { } header: {
Text("Media Source") Text("Media Source")
} footer: { } footer: {
if mediaController == .all { if MusicManager.shared.isNowPlayingDeprecated {
Text("All Music detects every active media source and shows them in a switchable list below the main player.")
.foregroundStyle(.secondary)
.font(.caption)
} else if MusicManager.shared.isNowPlayingDeprecated {
HStack { HStack {
Text("YouTube Music requires this third-party app to be installed: ") Text("YouTube Music requires this third-party app to be installed: ")
.foregroundStyle(.secondary) .foregroundStyle(.secondary)