mirror of
https://github.com/FBukovina/Atoll.git
synced 2026-10-29 08:04:32 +00:00
Icon Size Parity
This commit is contained in:
parent
574a64ef34
commit
afda162c1f
2 changed files with 6 additions and 3 deletions
|
|
@ -117,7 +117,7 @@ struct ContentView: View {
|
||||||
private let extendedHoverPadding: CGFloat = 30
|
private let extendedHoverPadding: CGFloat = 30
|
||||||
private let zeroHeightHoverPadding: CGFloat = 10
|
private let zeroHeightHoverPadding: CGFloat = 10
|
||||||
private let statsAdditionalRowHeight: CGFloat = 110
|
private let statsAdditionalRowHeight: CGFloat = 110
|
||||||
private let musicControlPauseGrace: TimeInterval = 10
|
private let musicControlPauseGrace: TimeInterval = 5
|
||||||
private let musicControlResumeDelay: TimeInterval = 0.24
|
private let musicControlResumeDelay: TimeInterval = 0.24
|
||||||
|
|
||||||
// Use minimalistic corner radius ONLY when opened, keep normal when closed
|
// Use minimalistic corner radius ONLY when opened, keep normal when closed
|
||||||
|
|
|
||||||
|
|
@ -82,6 +82,8 @@ struct MusicControlOverlay: View {
|
||||||
}
|
}
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
|
let verticalPadding = max(8, notchHeight * 0.12)
|
||||||
|
|
||||||
HStack(spacing: 18) {
|
HStack(spacing: 18) {
|
||||||
FloatingMediaButton(
|
FloatingMediaButton(
|
||||||
icon: backwardConfig.icon,
|
icon: backwardConfig.icon,
|
||||||
|
|
@ -116,12 +118,13 @@ struct MusicControlOverlay: View {
|
||||||
action: forwardConfig.action
|
action: forwardConfig.action
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
.padding(.vertical, verticalPadding)
|
||||||
.padding(.horizontal, 18)
|
.padding(.horizontal, 18)
|
||||||
.frame(height: notchHeight)
|
.frame(height: notchHeight)
|
||||||
.frame(minWidth: buttonSide * 3.2)
|
.frame(minWidth: buttonSide * 3.2)
|
||||||
.background {
|
.background {
|
||||||
RoundedRectangle(cornerRadius: windowCornerRadius, style: .continuous)
|
RoundedRectangle(cornerRadius: windowCornerRadius, style: .continuous)
|
||||||
.fill(Color.black.opacity(0.88))
|
.fill(Color.black)
|
||||||
}
|
}
|
||||||
.compositingGroup()
|
.compositingGroup()
|
||||||
.animation(.smooth(duration: 0.2), value: musicManager.isPlaying)
|
.animation(.smooth(duration: 0.2), value: musicManager.isPlaying)
|
||||||
|
|
@ -179,7 +182,7 @@ private struct FloatingMediaButton: View {
|
||||||
|
|
||||||
private var iconView: some View {
|
private var iconView: some View {
|
||||||
let image = Image(systemName: icon)
|
let image = Image(systemName: icon)
|
||||||
.font(.system(size: min(frameSize.width, frameSize.height) * 0.42, weight: .semibold))
|
.font(.system(size: min(frameSize.width, frameSize.height) * 0.48, weight: .semibold))
|
||||||
.foregroundColor(foregroundColor)
|
.foregroundColor(foregroundColor)
|
||||||
|
|
||||||
switch symbolEffectStyle {
|
switch symbolEffectStyle {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue