mirror of
https://github.com/FBukovina/Atoll.git
synced 2026-10-27 15:14:33 +00:00
Finally fixed: Stats two row
This commit is contained in:
parent
c1703abcfc
commit
7578ccae60
2 changed files with 7 additions and 6 deletions
|
|
@ -180,7 +180,7 @@ struct ContentView: View {
|
||||||
}
|
}
|
||||||
|
|
||||||
private let zeroHeightHoverPadding: CGFloat = 10
|
private let zeroHeightHoverPadding: CGFloat = 10
|
||||||
private let statsAdditionalRowHeight: CGFloat = 110
|
private let statsAdditionalRowHeight: CGFloat = statsSecondRowContentHeight + statsGridSpacingHeight
|
||||||
private let musicControlPauseGrace: TimeInterval = 5
|
private let musicControlPauseGrace: TimeInterval = 5
|
||||||
private let musicControlResumeDelay: TimeInterval = 0.24
|
private let musicControlResumeDelay: TimeInterval = 0.24
|
||||||
|
|
||||||
|
|
@ -398,6 +398,8 @@ struct ContentView: View {
|
||||||
maxHeight: dynamicNotchSize.height + currentShadowPadding,
|
maxHeight: dynamicNotchSize.height + currentShadowPadding,
|
||||||
alignment: .top
|
alignment: .top
|
||||||
)
|
)
|
||||||
|
.frame(maxHeight: .infinity, alignment: .top)
|
||||||
|
.animation(nil, value: coordinator.currentView)
|
||||||
.environmentObject(privacyManager)
|
.environmentObject(privacyManager)
|
||||||
.onChange(of: dynamicNotchSize) { oldSize, newSize in
|
.onChange(of: dynamicNotchSize) { oldSize, newSize in
|
||||||
guard oldSize != newSize else { return }
|
guard oldSize != newSize else { return }
|
||||||
|
|
|
||||||
|
|
@ -110,12 +110,10 @@ struct TabSelectionView: View {
|
||||||
let isSelected = isSelected(tab)
|
let isSelected = isSelected(tab)
|
||||||
let activeAccent = tab.accentColor ?? .white
|
let activeAccent = tab.accentColor ?? .white
|
||||||
TabButton(label: tab.label, icon: tab.icon, selected: isSelected) {
|
TabButton(label: tab.label, icon: tab.icon, selected: isSelected) {
|
||||||
withAnimation(.smooth) {
|
if tab.view == .extensionExperience {
|
||||||
if tab.view == .extensionExperience {
|
coordinator.selectedExtensionExperienceID = tab.experienceID
|
||||||
coordinator.selectedExtensionExperienceID = tab.experienceID
|
|
||||||
}
|
|
||||||
coordinator.currentView = tab.view
|
|
||||||
}
|
}
|
||||||
|
coordinator.currentView = tab.view
|
||||||
}
|
}
|
||||||
.frame(height: 26)
|
.frame(height: 26)
|
||||||
.foregroundStyle(isSelected ? activeAccent : .gray)
|
.foregroundStyle(isSelected ? activeAccent : .gray)
|
||||||
|
|
@ -134,6 +132,7 @@ struct TabSelectionView: View {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.animation(.smooth, value: coordinator.currentView)
|
||||||
.clipShape(Capsule())
|
.clipShape(Capsule())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue