diff --git a/DuckDuckGo/OnboardingExperiment/AddToDock/OnboardingView+AddToDockContent.swift b/DuckDuckGo/OnboardingExperiment/AddToDock/OnboardingView+AddToDockContent.swift index c1311dec7f..af74e72b42 100644 --- a/DuckDuckGo/OnboardingExperiment/AddToDock/OnboardingView+AddToDockContent.swift +++ b/DuckDuckGo/OnboardingExperiment/AddToDock/OnboardingView+AddToDockContent.swift @@ -22,32 +22,17 @@ import Onboarding extension OnboardingView { - struct AddToDockPromoContentState { - var animateTitle = true - var animateMessage = false - var showContent = false - } - struct AddToDockPromoContent: View { @State private var showAddToDockTutorial = false - private var animateTitle: Binding - private var animateMessage: Binding - private var showContent: Binding private let showTutorialAction: () -> Void private let dismissAction: (_ fromAddToDock: Bool) -> Void init( - animateTitle: Binding = .constant(true), - animateMessage: Binding = .constant(true), - showContent: Binding = .constant(false), showTutorialAction: @escaping () -> Void, dismissAction: @escaping (_ fromAddToDock: Bool) -> Void ) { - self.animateTitle = animateTitle - self.animateMessage = animateMessage - self.showContent = showContent self.showTutorialAction = showTutorialAction self.dismissAction = dismissAction } diff --git a/DuckDuckGo/OnboardingExperiment/AppIconPicker/AppIconPicker.swift b/DuckDuckGo/OnboardingExperiment/AppIconPicker/AppIconPicker.swift index 2d1dd5ea4d..6fbb17708a 100644 --- a/DuckDuckGo/OnboardingExperiment/AppIconPicker/AppIconPicker.swift +++ b/DuckDuckGo/OnboardingExperiment/AppIconPicker/AppIconPicker.swift @@ -30,8 +30,6 @@ private enum Metrics { } struct AppIconPicker: View { - @Environment(\.colorScheme) private var color - @StateObject private var viewModel = AppIconPickerViewModel() let layout = [GridItem(.adaptive(minimum: Metrics.iconSize), spacing: Metrics.spacing, alignment: .leading)] diff --git a/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingIntroViewModel+Copy.swift b/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingIntroViewModel+Copy.swift index 66db380641..f8e8c777ff 100644 --- a/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingIntroViewModel+Copy.swift +++ b/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingIntroViewModel+Copy.swift @@ -23,10 +23,6 @@ extension OnboardingIntroViewModel { struct Copy { let introTitle: String let browserComparisonTitle: String - let trackerBlockers: String - let cookiePopups: String - let creepyAds: String - let eraseBrowsingData: String } } @@ -34,11 +30,7 @@ extension OnboardingIntroViewModel.Copy { static let `default` = OnboardingIntroViewModel.Copy( introTitle: UserText.Onboarding.Intro.title, - browserComparisonTitle: UserText.Onboarding.BrowsersComparison.title, - trackerBlockers: UserText.Onboarding.BrowsersComparison.Features.trackerBlockers, - cookiePopups: UserText.Onboarding.BrowsersComparison.Features.cookiePopups, - creepyAds: UserText.Onboarding.BrowsersComparison.Features.creepyAds, - eraseBrowsingData: UserText.Onboarding.BrowsersComparison.Features.eraseBrowsingData + browserComparisonTitle: UserText.Onboarding.BrowsersComparison.title ) - + } diff --git a/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+AddressBarPositionContent.swift b/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+AddressBarPositionContent.swift index 7d7986397d..979593d0db 100644 --- a/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+AddressBarPositionContent.swift +++ b/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+AddressBarPositionContent.swift @@ -23,7 +23,6 @@ import Onboarding private enum Metrics { static let titleFont = Font.system(size: 20, weight: .semibold) - static let messageFont = Font.system(size: 16) } extension OnboardingView { diff --git a/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+AppIconPickerContent.swift b/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+AppIconPickerContent.swift index a5afc7f07c..5fd7a30be0 100644 --- a/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+AppIconPickerContent.swift +++ b/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+AppIconPickerContent.swift @@ -83,5 +83,4 @@ extension OnboardingView { private enum Metrics { static let titleFont = Font.system(size: 20, weight: .semibold) static let messageFont = Font.system(size: 16) - static let pickerLeadingOffset: CGFloat = -20 } diff --git a/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+IntroDialogContent.swift b/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+IntroDialogContent.swift index d99a495509..d4324609f6 100644 --- a/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+IntroDialogContent.swift +++ b/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+IntroDialogContent.swift @@ -39,7 +39,7 @@ extension OnboardingView { var body: some View { VStack(spacing: 24.0) { - AnimatableTypingText(title) { + AnimatableTypingText(title, startAnimating: animateText) { withAnimation { showCTA.wrappedValue = true } diff --git a/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView.swift b/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView.swift index e524498ad0..38d7d37a3b 100644 --- a/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView.swift +++ b/DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView.swift @@ -40,7 +40,6 @@ struct OnboardingView: View { @State private var appIconPickerContentState = AppIconPickerContentState() @State private var addressBarPositionContentState = AddressBarPositionContentState() - @State private var addToDockPromoContentState = AddToDockPromoContentState() init(model: OnboardingIntroViewModel) { self.model = model @@ -75,10 +74,6 @@ struct OnboardingView: View { case .browsersComparisonDialog: showComparisonButton = true animateComparisonText = false - case .addToDockPromoDialog: - addToDockPromoContentState.animateTitle = false - addToDockPromoContentState.animateMessage = false - addToDockPromoContentState.showContent = true case .chooseAppIconDialog: appIconPickerContentState.animateTitle = false appIconPickerContentState.animateMessage = false