Skip to content
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

Revert old Dax icon for old onboarding #3085

Merged
merged 1 commit into from
Jul 16, 2024
Merged

Revert old Dax icon for old onboarding #3085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion DuckDuckGo/DaxOnboarding.xcassets/DaxIcon.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "DaxLogo.pdf",
"filename" : "new_dax_dialogs.pdf",
"idiom" : "universal"
}
],
Expand Down
Binary file added DuckDuckGo/DaxOnboarding.xcassets/DaxIcon.imageset/new_dax_dialogs.pdf
View file
Open in desktop
Binary file not shown.
12 changes: 12 additions & 0 deletions DuckDuckGo/DaxOnboarding.xcassets/DaxIconExperiment.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "DaxLogo.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
0 ...ing.xcassets/DaxIcon.imageset/DaxLogo.pdf → ...ts/DaxIconExperiment.imageset/DaxLogo.pdf
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion DuckDuckGo/OnboardingExperiment/DaxDialogs/DaxDialogView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ struct DaxDialogView<Content: View>: View {
}

private var daxLogo: some View {
Image(.daxIcon)
Image(.daxIconExperiment)
.resizable()
.matchedGeometryEffect(id: matchLogoAnimation.id, in: matchLogoAnimation.namespace)
.aspectRatio(contentMode: .fill)
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo/OnboardingExperiment/OnboardingIntro/OnboardingView+Landing.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ extension OnboardingView {
let iconSize = Metrics.iconSize.build(v: verticalSizeClass, h: horizontalSizeClass)

return VStack(alignment: .center, spacing: Metrics.welcomeMessageStackSpacing.build(v: verticalSizeClass, h: horizontalSizeClass)) {
Image(.daxIcon)
Image(.daxIconExperiment)
.resizable()
.matchedGeometryEffect(id: OnboardingView.daxGeometryEffectID, in: animationNamespace)
.frame(width: iconSize.width, height: iconSize.height)
Expand Down
Loading