Skip to content

Fix general #3916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marinofaggiana merged 8 commits into from
Dec 14, 2025
Merged

Fix general #3916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c412eef
Update UploadBannerView.swift
marinofaggiana Dec 12, 2025
9426298
color
marinofaggiana Dec 13, 2025
1f234ef
cod
marinofaggiana Dec 13, 2025
2ba9987
Update UploadBannerView.swift
marinofaggiana Dec 13, 2025
4bc72e4
cod
marinofaggiana Dec 13, 2025
cf9b3c7
code
marinofaggiana Dec 13, 2025
c7ba34e
fix
marinofaggiana Dec 14, 2025
6934eaf
cod
marinofaggiana Dec 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions iOSClient/GUI/Lucid Banner/ErrorBannerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ func showErrorBanner(scene: UIWindowScene?, errorDescription: String, errorCode:

struct ErrorBannerView: View {
@ObservedObject var state: LucidBannerState
let textColor = Color(.label)

var body: some View {
let showSubtitle = !(state.subtitle?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ?? true)
Expand All @@ -55,21 +56,21 @@ struct ErrorBannerView: View {
.font(.subheadline.weight(.bold))
.multilineTextAlignment(.leading)
.truncationMode(.tail)
.foregroundStyle(.white)
.foregroundStyle(textColor)

if showSubtitle, let subtitle = state.subtitle {
Text(subtitle)
.font(.subheadline)
.multilineTextAlignment(.leading)
.truncationMode(.tail)
.foregroundStyle(.white)
.foregroundStyle(textColor)
}
if showFootnote, let footnote = state.footnote {
Text(footnote)
.font(.caption)
.multilineTextAlignment(.leading)
.truncationMode(.tail)
.foregroundStyle(.white)
.foregroundStyle(textColor)
}
}
}
Expand All @@ -84,23 +85,26 @@ struct ErrorBannerView: View {

@ViewBuilder
func containerView<Content: View>(@ViewBuilder _ content: () -> Content) -> some View {
let cornerRadius: CGFloat = 22
let errorColor = Color.red.opacity(0.75)

let contentBase = content()
.contentShape(Rectangle())
.frame(maxWidth: 500)

if #available(iOS 26, *) {
contentBase
.background(
RoundedRectangle(cornerRadius: 22)
.fill(Color.red.opacity(1))
RoundedRectangle(cornerRadius: cornerRadius)
.fill(errorColor)
)
.glassEffect(.regular, in: RoundedRectangle(cornerRadius: 22))
.glassEffect(.clear, in: RoundedRectangle(cornerRadius: 22))
.frame(maxWidth: .infinity, alignment: .center)
} else {
contentBase
.background(.ultraThinMaterial, in: RoundedRectangle(cornerRadius: 22.0))
.background(.ultraThinMaterial, in: RoundedRectangle(cornerRadius: cornerRadius))
.overlay(
RoundedRectangle(cornerRadius: 22, style: .continuous)
RoundedRectangle(cornerRadius: cornerRadius, style: .continuous)
.stroke(.white.opacity(0.9), lineWidth: 0.6)
)
.shadow(color: .black.opacity(0.5), radius: 10, x: 0, y: 4)
Expand All @@ -113,11 +117,14 @@ struct ErrorBannerView: View {

#Preview {
ZStack {
LinearGradient(
colors: [.white, .gray.opacity(0.1)],
startPoint: .top,
endPoint: .bottom
)
Text(
Array(0...500)
.map(String.init)
.joined(separator: " ")
)
.font(.system(size: 16, design: .monospaced))
.foregroundStyle(.primary)
.padding()

ErrorBannerView(
state: LucidBannerState(
Expand Down
77 changes: 59 additions & 18 deletions iOSClient/GUI/Lucid Banner/HudBannerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ import SwiftUI
import LucidBanner

@MainActor
func showHudBanner(scene: UIWindowScene?, title: String? = nil, subtitle: String? = nil, onTap: ((_ token: Int?, _ stage: String?) -> Void)? = nil) -> Int? {
func showHudBanner(scene: UIWindowScene?,
title: String? = nil,
subtitle: String? = nil,
stage: LucidBanner.Stage? = nil,
onButtonTap: (() -> Void)? = nil) -> Int? {
var scene = scene
if scene == nil {
scene = UIApplication.shared.mainAppWindow?.windowScene
Expand All @@ -18,11 +22,9 @@ func showHudBanner(scene: UIWindowScene?, title: String? = nil, subtitle: String
subtitle: subtitle,
vPosition: .center,
blocksTouches: true,
onTap: { token, stage in
onTap?(token, stage)
}
stage: stage
) { state in
HudBannerView(state: state)
HudBannerView(state: state, onButtonTap: onButtonTap)
}
}

Expand Down Expand Up @@ -56,16 +58,25 @@ struct HudBannerView: View {
@ObservedObject var state: LucidBannerState
@State private var displayedProgress: Double = 0

let onButtonTap: (() -> Void)?

private let textColor = Color(.label)
private let circleSize: CGFloat = 90
private let lineWidth: CGFloat = 8

init(state: LucidBannerState,
onButtonTap: (() -> Void)? = nil) {
self.state = state
self.onButtonTap = onButtonTap
}

var body: some View {
let rawProgress = state.progress ?? 0
let clampedProgress = min(max(rawProgress, 0), 1)

let stage = state.stage?.lowercased()
let isSuccess = (stage == "success")
let isError = (stage == "error")
let isSuccess = (state.typedStage == .success)
let isError = (state.typedStage == .error)
let isButton = (state.typedStage == .button)

let visualProgress: Double = {
if isSuccess || isError {
Expand All @@ -88,15 +99,15 @@ struct HudBannerView: View {
if let title = state.title, !title.isEmpty {
Text(title)
.font(.headline.weight(.semibold))
.foregroundStyle(.primary)
.foregroundStyle(textColor)
.multilineTextAlignment(.center)
}

// SUBTITLE
if let subtitle = state.subtitle, !subtitle.isEmpty {
Text(subtitle)
.font(.subheadline)
.foregroundStyle(.primary.opacity(0.95))
.foregroundStyle(textColor)
.multilineTextAlignment(.center)
}

Expand All @@ -121,9 +132,6 @@ struct HudBannerView: View {
.frame(width: circleSize, height: circleSize)

// Center content:
// - checkmark for success
// - xmark for error
// - percentage for normal progress
Group {
if isSuccess {
Image(systemName: "checkmark")
Expand All @@ -136,11 +144,26 @@ struct HudBannerView: View {
} else {
Text("\(Int(visualProgress * 100))%")
.font(.headline.monospacedDigit())
.foregroundStyle(.primary)
.foregroundStyle(textColor)
}
}
}
.padding(.top, 4)

if isButton {
VStack {
Button("_cancel_") {
onButtonTap?()
}
.buttonStyle(.plain)
.padding(.horizontal, 20)
.padding(.vertical, 10)
.background(
Capsule()
.stroke(.gray, lineWidth: 1)
)
}
}
}
.padding(.horizontal, 22)
.padding(.vertical, 24)
Expand Down Expand Up @@ -189,14 +212,22 @@ struct HudBannerView: View {

@ViewBuilder
func containerView<Content: View>(@ViewBuilder _ content: () -> Content) -> some View {
let cornerRadius: CGFloat = 22
let opacity = 0.65
let backgroundColor = Color(.systemBackground).opacity(0.65)

if #available(iOS 26, *) {
content()
.glassEffect(.regular, in: RoundedRectangle(cornerRadius: 22))
.background(
RoundedRectangle(cornerRadius: cornerRadius)
.fill(backgroundColor)
)
.glassEffect(.clear, in: RoundedRectangle(cornerRadius: cornerRadius))
} else {
content()
.background(.ultraThinMaterial, in: RoundedRectangle(cornerRadius: 22.0))
.background(.ultraThinMaterial, in: RoundedRectangle(cornerRadius: cornerRadius))
.overlay(
RoundedRectangle(cornerRadius: 22, style: .continuous)
RoundedRectangle(cornerRadius: cornerRadius, style: .continuous)
.stroke(.white.opacity(0.9), lineWidth: 0.6)
)
.shadow(color: .black.opacity(0.5), radius: 10, x: 0, y: 4)
Expand All @@ -208,6 +239,15 @@ struct HudBannerView: View {

#Preview("HudBannerView") {
ZStack {
Text(
Array(0...500)
.map(String.init)
.joined(separator: " ")
)
.font(.system(size: 16, design: .monospaced))
.foregroundStyle(.primary)
.padding()

HudBannerPreviewWrapper()
}
}
Expand All @@ -217,7 +257,8 @@ private struct HudBannerPreviewWrapper: View {
title: "Uploading files",
subtitle: "Syncing your library…",
footnote: nil,
imageAnimation: .none
imageAnimation: .none,
stage: "button"
)

var body: some View {
Expand Down
Loading
Loading