Merge branch 'graeme/turn-autofill-on-with-new-onboarding' into graem…

…e/turn-autofill-on-flag-and-pixels
duckduckgo · Aug 5, 2024 · 0559e11 · 0559e11
2 parents 7b5a48a + b57eb68
commit 0559e11
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/DuckDuckGo/Assets.xcassets/App-DDG-32.imageset/App-DDG-32.pdf b/DuckDuckGo/Assets.xcassets/App-DDG-32.imageset/App-DDG-32.pdf
diff --git a/DuckDuckGo/Assets.xcassets/App-DDG-32.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/App-DDG-32.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "App-DDG-32.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/AutofillViews.swift b/DuckDuckGo/AutofillViews.swift
@@ -58,8 +58,9 @@ struct AutofillViews {
 
     struct AppIconHeader: View {
         var body: some View {
-            Image.appIcon
-                .scaledToFit()
+            Image(.appDDG32)
+                .resizable()
+                .frame(width: 48, height: 48)
         }
     }
 

diff --git a/DuckDuckGo/SaveLoginView.swift b/DuckDuckGo/SaveLoginView.swift
@@ -88,7 +88,7 @@ struct SaveLoginView: View {
                 AutofillViews.AppIconHeader()
                 Spacer(minLength: Const.Size.contentSpacing)
                 AutofillViews.Headline(title: title)
-                Spacer(minLength: Const.Size.contentSpacing)
+                Spacer(minLength: 8)
                 contentView
                 Spacer(minLength: Const.Size.contentSpacing)
                 if case .newUser = layoutType {
@@ -148,7 +148,7 @@ struct SaveLoginView: View {
         VStack(alignment: .leading, spacing: 0) {
             HStack(alignment: .center, spacing: 10) {
                 Text(UserText.autofillOnboardingKeyFeaturesTitle)
-                    .font(Font.custom("SF Pro Text", size: 12))
+                    .font(Font.system(size: 12, weight: .semibold))
                     .multilineTextAlignment(.center)
                     .foregroundColor(Color(designSystemColor: .textSecondary))
                     .frame(width: 255, alignment: .top)

diff --git a/DuckDuckGo/SaveLoginViewModel.swift b/DuckDuckGo/SaveLoginViewModel.swift
@@ -211,6 +211,7 @@ final class SaveLoginViewModel: ObservableObject {
         if shouldShowDisableAutofillPrompt() {
             delegate?.saveLoginViewModelConfirmKeepUsing(self)
             autofillSaveModalDisablePromptShown = true
+            autofillFirstTimeUser = false
         }
     }
 }