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 Numeric Text transition

Browse source
This commit is contained in:
Hariharan Mudaliar 2025-12-23 01:52:05 +05:30
commit 8942e1f8a5
No known key found for this signature in database
GPG key ID: 025583EB0BE5640E
3 changed files with 61 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
DynamicIsland/components/OSD/CircularHUDView.swift
View file

@ -74,11 +74,12 @@ struct CircularHUDView: View {
if showValue {
VStack {
Spacer()
Text("\(Int(value * 100))")
.font(.system(size: size * 0.15, weight: .bold, design: .rounded))
.foregroundStyle(.white.opacity(0.65))
.contentTransition(.numericText())
.padding(.bottom, size * 0.03)
HUDNumericLabel(
value: value,
font: .system(size: size * 0.15, weight: .bold, design: .rounded),
color: .white.opacity(0.65)
)
.padding(.bottom, size * 0.03)
}
}

40
DynamicIsland/components/OSD/HUDNumericLabel.swift Normal file
View file

@ -0,0 +1,40 @@
#if os(macOS)
import SwiftUI
/// Shared numeric label for HUD/OSD styles with rolling value animation.
struct HUDNumericLabel: View {
let value: CGFloat
var font: Font
var color: Color
var alignment: Alignment = .center
var width: CGFloat? = nil
var minimumDigits: Int = 3
var animation: Animation = .interactiveSpring(response: 0.35, dampingFraction: 0.75, blendDuration: 0.15)
@State private var animatedValue: CGFloat = 0
var body: some View {
Text(formattedValue)
.font(font)
.monospacedDigit()
.foregroundStyle(color)
.contentTransition(.numericText())
.frame(width: width, alignment: alignment)
.onAppear {
animatedValue = value
}
.onChange(of: value) { newValue in
withAnimation(animation) {
animatedValue = newValue
}
}
}
private var formattedValue: String {
let clamped = max(0, min(100, Int(round(animatedValue * 100))))
let digits = max(1, minimumDigits)
let format = "%\(digits)d"
return String(format: format, clamped)
}
}
#endif

20
DynamicIsland/components/OSD/VerticalHUDView.swift
View file

@ -73,11 +73,14 @@ struct VerticalHUDView: View {
// Icon & Text overlay
VStack {
if showValue {
Text("\(Int(state.value * 100))%")
.font(.system(size: 10, weight: .bold))
.foregroundStyle(state.value > 0.85 ? (useAccentColor ? .white : .black) : .secondary)
.padding(.top, 8 + (stretchOffset < 0 ? abs(stretchOffset/4) : 0))
.contentTransition(.numericText())
HUDNumericLabel(
value: state.value,
font: .system(size: 10, weight: .bold),
color: valueLabelColor,
alignment: .center,
width: hudWidth * 0.8
)
.padding(.top, 8 + (stretchOffset < 0 ? abs(stretchOffset/4) : 0))
}
Spacer()
@ -225,5 +228,12 @@ struct VerticalHUDView: View {
return AnyShapeStyle(useAccentColor ? Color.accentColor : Color.white)
}
private var valueLabelColor: Color {
if state.value > 0.85 {
return useAccentColor ? .white : .black
}
return .secondary
}
}
#endif