diff --git a/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/OnboardingFlowView.swift b/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/OnboardingFlowView.swift index 45828c4c4c92..c512beec3670 100644 --- a/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/OnboardingFlowView.swift +++ b/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/OnboardingFlowView.swift @@ -116,7 +116,7 @@ struct OnboardingFlowView: View { case .push: OnboardingPushView() case .pairing: - OnboardingPairingView(isActive: stage == .pairing) + OnboardingPairingView() case .connect: OnboardingConnectionView( phase: connectionPhase, diff --git a/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/OnboardingPairingSettingsScreenshot.swift b/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/OnboardingPairingSettingsScreenshot.swift index ce8cdbbf93e4..7b7b7c700633 100644 --- a/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/OnboardingPairingSettingsScreenshot.swift +++ b/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/OnboardingPairingSettingsScreenshot.swift @@ -3,13 +3,9 @@ import CmuxMobileSupport import SwiftUI /// A real Mac Settings capture cropped to the Mobile pane. The asset catalog -/// selects the light or dark source to match the app appearance. +/// selects the light or dark source to match the app appearance. Keeping the +/// capture still makes the Mobile pairing setting easy to read. struct OnboardingPairingSettingsScreenshot: View { - let isActive: Bool - - @Environment(\.accessibilityReduceMotion) private var reduceMotion - @Environment(\.scenePhase) private var scenePhase - var body: some View { Color.clear .aspectRatio(1030.0 / 285.0, contentMode: .fit) @@ -17,18 +13,7 @@ struct OnboardingPairingSettingsScreenshot: View { Image("OnboardingPairingSettings", bundle: .module) .resizable() .interpolation(.high) - .scaledToFill() - .keyframeAnimator( - initialValue: CGFloat(1), - repeating: isActive && scenePhase == .active && !reduceMotion - ) { image, zoom in - image.scaleEffect(zoom, anchor: .topTrailing) - } keyframes: { _ in - LinearKeyframe(1, duration: 2) - CubicKeyframe(1.3, duration: 1.2) - LinearKeyframe(1.3, duration: 3) - CubicKeyframe(1, duration: 1.2) - } + .scaledToFit() } .clipShape(RoundedRectangle(cornerRadius: 12)) .accessibilityElement(children: .ignore) diff --git a/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/OnboardingPairingView.swift b/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/OnboardingPairingView.swift index b75f513623f6..5d3e0af9f91b 100644 --- a/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/OnboardingPairingView.swift +++ b/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/OnboardingPairingView.swift @@ -4,8 +4,6 @@ import SwiftUI /// Explains the Mac-side opt-in before onboarding starts discovery. struct OnboardingPairingView: View { - let isActive: Bool - var body: some View { ZStack { Color.clear @@ -35,7 +33,7 @@ struct OnboardingPairingView: View { private var pairingVisual: some View { VStack(spacing: 22) { - OnboardingPairingSettingsScreenshot(isActive: isActive) + OnboardingPairingSettingsScreenshot() Label { Text( diff --git a/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Resources/Images.xcassets/OnboardingPairingSettings.imageset/MacSettings-dark.png b/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Resources/Images.xcassets/OnboardingPairingSettings.imageset/MacSettings-dark.png index da850a2ca8d4..d0c3c1fdb59e 100644 Binary files a/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Resources/Images.xcassets/OnboardingPairingSettings.imageset/MacSettings-dark.png and b/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Resources/Images.xcassets/OnboardingPairingSettings.imageset/MacSettings-dark.png differ diff --git a/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Resources/Images.xcassets/OnboardingPairingSettings.imageset/MacSettings-light.png b/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Resources/Images.xcassets/OnboardingPairingSettings.imageset/MacSettings-light.png index 88b8a6b9fc96..2e086efedc5f 100644 Binary files a/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Resources/Images.xcassets/OnboardingPairingSettings.imageset/MacSettings-light.png and b/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Resources/Images.xcassets/OnboardingPairingSettings.imageset/MacSettings-light.png differ diff --git a/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Resources/MacSettingsMobilePairing-dark.png b/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Resources/MacSettingsMobilePairing-dark.png index da850a2ca8d4..d0c3c1fdb59e 100644 Binary files a/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Resources/MacSettingsMobilePairing-dark.png and b/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Resources/MacSettingsMobilePairing-dark.png differ diff --git a/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Resources/MacSettingsMobilePairing-light.png b/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Resources/MacSettingsMobilePairing-light.png index 88b8a6b9fc96..2e086efedc5f 100644 Binary files a/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Resources/MacSettingsMobilePairing-light.png and b/Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Resources/MacSettingsMobilePairing-light.png differ