Skip to content

New data import: build v3 design fixes #2692

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

Merged
merged 8 commits into from
Dec 1, 2025
Merged

New data import: build v3 design fixes #2692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
186793e
Improve dropdown chevron positioning
frosty Nov 28, 2025
9bd87a6
Fix background colour of sync area
frosty Nov 28, 2025
52ba9a6
Standardize dropdown button styles
frosty Nov 28, 2025
be2a145
Fix password explainer spacing
frosty Nov 28, 2025
2407e2e
Tweak show more button title
frosty Nov 28, 2025
ace341d
Update order of import sources (CSV / HTML before password managers)
frosty Nov 28, 2025
8cdc1e7
Fix scroll indicator positioning for import summary detail screen
frosty Nov 28, 2025
d17aaaa
Add constant value for padding
frosty Nov 28, 2025
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
4 changes: 2 additions & 2 deletions SharedPackages/BrowserServicesKit/Sources/BrowserServicesKit/DataImport/DataImport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@
case tor
case vivaldi
case yandex
case csv
case bookmarksHTML
case onePassword8
case onePassword7
case bitwarden
case lastPass
case csv
case bookmarksHTML

static let preferredSources: [Self] = [.chrome, .safari]

Expand Down Expand Up @@ -148,7 +148,7 @@
}
}

public protocol DataImportError: Error, CustomNSError, ErrorWithPixelParameters, LocalizedError {

Check warning on line 151 in SharedPackages/BrowserServicesKit/Sources/BrowserServicesKit/DataImport/DataImport.swift

View workflow job for this annotation

GitHub Actions / Run unit tests (iOS) 

'ErrorWithPixelParameters' is deprecated: Consider refactoring using DDGError underlyingError chain
associatedtype OperationType: RawRepresentable where OperationType.RawValue == Int

var action: DataImportAction { get }
Expand Down
2 changes: 1 addition & 1 deletion macOS/DuckDuckGo/Common/Localizables/UserText.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,7 +1188,7 @@ struct UserText {
// MARK: - Login Import & Export

static let importChooseSourceTitle = NSLocalizedString("import.choose-source.title", value: "Choose where to import from", comment: "Title text for the import dialog, before the user selects a source")
static let importChooseSourceShowMoreButtonTitle = NSLocalizedString("import.choose-source.show-more-button.title", value: "Show More", comment: "Button text for showing more import options in the data import view")
static let importChooseSourceShowMoreButtonTitle = NSLocalizedString("import.choose-source.more-button.title", value: "More", comment: "Button text for showing more import options in the data import view")
static let importChooseSourceSyncButtonTitle = NSLocalizedString("import.choose-source.sync-button.title", value: "Using DuckDuckGo on another device?", comment: "Button text for syncing from the data import view")
static let importChooseSourceSyncButtonAction = NSLocalizedString("import.choose-source.sync-button.action", value: "Sync", comment: "Action text for syncing data with another device from the data import view")

Expand Down
2 changes: 1 addition & 1 deletion macOS/DuckDuckGo/DataImport/View/DataImportView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ struct DataImportView: ModalView {
@State private var showPasswordsExplainerPopover = false

private func passwordsExplainerView() -> some View {
HStack(spacing: 4) {
HStack(spacing: 8) {
Image(nsImage: DesignSystemImages.Glyphs.Size16.lock)
.renderingMode(.template)
.foregroundColor(Color(designSystemColor: showPasswordsExplainerPopover ? .iconsPrimary : .iconsTertiary))
Expand Down
8 changes: 6 additions & 2 deletions macOS/DuckDuckGo/DataImport/View/New/DataImportSummaryDetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ struct DataImportSummaryDetailView: View {
var body: some View {
VStack(spacing: 0) {
headerView
.padding(.horizontal, Metrics.outerPadding)
.padding(.top, Metrics.outerPadding)
.padding(.bottom, 16)

ScrollView {
Expand All @@ -50,9 +52,10 @@ struct DataImportSummaryDetailView: View {
}
}
}
.padding(.horizontal, Metrics.outerPadding)
}
.padding(.bottom, Metrics.outerPadding)
}
.padding(20)
.frame(maxHeight: 600)
}

Expand Down Expand Up @@ -112,7 +115,7 @@ struct DataImportSummaryDetailView: View {

@ViewBuilder
private func duplicateRow(item: ImportItem) -> some View {
if case .password(let _, let domain, let username, _) = item {
if case .password(_, let domain, let username, _) = item {
duplicateRowContent(
icon: DesignSystemImages.Glyphs.Size16.globe,
content: {
Expand Down Expand Up @@ -273,6 +276,7 @@ struct DataImportSummaryDetailView: View {
private enum Metrics {
static let sectionInnerPadding: CGFloat = 10
static let mainStackViewSpacing: CGFloat = 20
static let outerPadding: CGFloat = 20
static let iconSize: CGFloat = 16.0
static let sectionHeaderHeight: CGFloat = 44.0
static let innerRowSpacing: CGFloat = 8.0
Expand Down
7 changes: 4 additions & 3 deletions macOS/DuckDuckGo/DataImport/View/New/ImportSourcePickerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,15 @@ struct ImportSourcePickerView: View {
HoverButtonView {
viewModel.showTypeSelectionSheet()
} content: {
HStack(alignment: .lastTextBaseline, spacing: 1) {
HStack(alignment: .center, spacing: 4) {
Text(viewModel.typeButtonTitle)
.font(.system(size: 13, weight: .semibold))
Image(nsImage: DesignSystemImages.Glyphs.Size16.chevronRight)
.renderingMode(.template)
.resizable()
.frame(width: 10, height: 10)
.rotationEffect(.degrees(90))
.offset(y: 1)
}
}
}
Expand All @@ -100,7 +101,7 @@ struct ImportSourcePickerView: View {
viewModel.toggleExpansion()
} content: {
Text(UserText.importChooseSourceShowMoreButtonTitle)
.font(.system(size: 11, weight: .semibold))
.font(.system(size: 13, weight: .semibold))
.multilineTextAlignment(.center)
}
.padding(.top, 10)
Expand All @@ -125,7 +126,7 @@ struct ImportSourcePickerView: View {
.padding(.horizontal, 12)
.padding(.vertical, 14)
.frame(width: 380, alignment: .center)
.background((Color(designSystemColor: .surfacePrimary)))
.background((Color(designSystemColor: .surfaceSecondary)))
.cornerRadius(10)
}
.buttonStyle(.plain)
Expand Down
4 changes: 2 additions & 2 deletions macOS/DuckDuckGo/Localization/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"sourceLanguage" : "en",
"strings" : {
Expand Down Expand Up @@ -42515,14 +42515,14 @@
}
}
},
"import.choose-source.show-more-button.title" : {
"import.choose-source.more-button.title" : {
"comment" : "Button text for showing more import options in the data import view",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "Show More"
"value" : "More"
}
}
}
Expand Down
Loading