signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Do not use blur background bubbles in chat when "reduce transparency" is on.

Browse Source
This commit is contained in:
Igor Solomennikov 2026-03-24 12:59:48 -07:00 committed by GitHub
parent 944c72b236
commit b64a48e6c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Signal/ConversationView/CellViews/CVWallpaperBlurView.swift
View File

@ -11,6 +11,7 @@ public class CVWallpaperBlurView: ManualLayoutViewWithLayer, CVDimmableView {
private weak var provider: WallpaperBlurProvider?
private var isPreview = false
private var state: WallpaperBlurState?
private var isReduceTransparencyMode = false
private let imageView = CVImageView()
private let imageViewMaskLayer = CAShapeLayer()
@ -30,9 +31,10 @@ public class CVWallpaperBlurView: ManualLayoutViewWithLayer, CVDimmableView {
imageView.contentMode = .scaleAspectFill
imageView.layer.mask = imageViewMaskLayer
imageView.layer.masksToBounds = true
imageView.layer.addSublayer(strokeLayer)
addSubview(imageView)
layer.addSublayer(strokeLayer)
owsAssertDebug(layer.delegate === self)
imageViewMaskLayer.disableAnimationsWithDelegate()
maskLayer.disableAnimationsWithDelegate()
@ -49,7 +51,7 @@ public class CVWallpaperBlurView: ManualLayoutViewWithLayer, CVDimmableView {
UIView.performWithoutAnimation {
imageView.frame = imageViewFrame
imageViewMaskLayer.frame = imageView.layer.bounds
strokeLayer.frame = imageView.layer.bounds
strokeLayer.frame = layer.bounds
if let bubbleConfig {
// Corners.
@ -60,7 +62,7 @@ public class CVWallpaperBlurView: ManualLayoutViewWithLayer, CVDimmableView {
// Stroke.
if
let stroke = bubbleConfig.stroke,
let strokePath = bubbleConfig.strokePath(for: maskFrame)
let strokePath = bubbleConfig.strokePath(for: strokeLayer.frame)
{
strokeLayer.lineWidth = stroke.width
strokeLayer.strokeColor = stroke.color.cgColor
@ -88,12 +90,13 @@ public class CVWallpaperBlurView: ManualLayoutViewWithLayer, CVDimmableView {
// TODO: Observe provider changes.
self.provider = provider
self.bubbleConfig = bubbleConfig
self.isReduceTransparencyMode = UIAccessibility.isReduceTransparencyEnabled
updateIfNecessary()
}
public func updateIfNecessary() {
guard !isPreview else {
guard isPreview == false, isReduceTransparencyMode == false else {
backgroundColor = Theme.backgroundColor
imageView.isHidden = true
return
@ -122,13 +125,13 @@ public class CVWallpaperBlurView: ManualLayoutViewWithLayer, CVDimmableView {
private var maskFrame: CGRect = .zero
private func ensurePositioning() {
guard !isPreview else {
return
}
guard isPreview == false, isReduceTransparencyMode == false else { return }
guard let state else {
resetContent()
return
}
let referenceView = state.referenceView
imageViewFrame = convert(referenceView.bounds, from: referenceView)
maskFrame = referenceView.convert(bounds, from: self)
@ -150,6 +153,7 @@ public class CVWallpaperBlurView: ManualLayoutViewWithLayer, CVDimmableView {
isPreview = false
provider = nil
bubbleConfig = nil
isReduceTransparencyMode = false
resetContent()
}

4
SignalUI/Appearance/ConversationStyle.swift
View File

@ -198,6 +198,7 @@ public struct ConversationStyle {
shouldDimWallpaperInDarkMode: Bool,
) -> UIVisualEffect? {
guard hasWallpaper else { return nil }
guard UIAccessibility.isReduceTransparencyEnabled == false else { return nil }
if isDarkThemeEnabled, shouldDimWallpaperInDarkMode {
return UIBlurEffect(style: .systemUltraThinMaterial)
}
@ -228,6 +229,9 @@ public struct ConversationStyle {
shouldDimWallpaperInDarkMode: Bool,
isDarkThemeEnabled: Bool,
) -> ColorOrGradientValue {
guard UIAccessibility.isReduceTransparencyEnabled == false else {
return .solidColor(color: Theme.backgroundColor)
}
if
let blurEffect = bubbleBackgroundBlurEffect(
hasWallpaper: hasWallpaper,