Fix accented Widgets

rrroyal · Oct 19, 2024 · fb76ac3 · fb76ac3
1 parent 57ffb0c
commit fb76ac3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/HarbourWidgets/UI/View Modifiers/InsetViewModifier.swift b/HarbourWidgets/UI/View Modifiers/InsetViewModifier.swift
@@ -11,12 +11,17 @@ import SwiftUI
 // MARK: - InsetViewModifier
 
 struct InsetViewModifier: ViewModifier {
+	@Environment(\.widgetRenderingMode) private var widgetRenderingMode
+
+	private var shouldUseTransparentBackground: Bool {
+		widgetRenderingMode == .accented
+	}
+
 	func body(content: Content) -> some View {
 		content
-			.clipShape(ContainerRelativeShape())
 			.background(
 				ContainerRelativeShape()
-					.fill(Color.widgetBackground)
+					.fill(Color.widgetBackground.opacity(shouldUseTransparentBackground ? 0.04 : 1))
 					.shadow(color: .black.opacity(0.04), radius: 6, x: 0, y: 0)
 			)
 	}

diff --git a/...rWidgets/Widgets/ContainerStatus/Views/Subviews/ContainerStatusWidget+ContainerView.swift b/...rWidgets/Widgets/ContainerStatus/Views/Subviews/ContainerStatusWidget+ContainerView.swift
@@ -65,13 +65,15 @@ extension ContainerStatusWidget {
 				#endif
 				.foregroundStyle(.tint)
 				.minimumScaleFactor(minimumScaleFactor)
+				.widgetAccentable()
 		}
 
 		@ViewBuilder @MainActor
 		private var stateIcon: some View {
 			Circle()
 				.fill(redactionReasons.isEmpty ? AnyShapeStyle(.tint) : AnyShapeStyle(.tint.secondary))
 				.frame(width: circleSize, height: circleSize)
+				.widgetAccentable()
 		}
 
 		@ViewBuilder @MainActor
@@ -126,9 +128,7 @@ extension ContainerStatusWidget {
 			VStack(spacing: 0) {
 				HStack {
 					stateHeadline
-
 					Spacer()
-
 					stateIcon
 				}
 
@@ -149,7 +149,6 @@ extension ContainerStatusWidget {
 			.tint(container?.state.color ?? Container.State?.none.color)
 			.contentTransition(.opacity)
 			.modifier(LinkWrappedViewModifier(url: url))
-			.background(Color.widgetBackground)
 			.id("ContainerStatusWidgetView.ContainerView:\(container?.id ?? intentContainer._id)")
 		}
 	}