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.

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

Sabrina/sync setup update #2198

Merged
merged 29 commits into from
Dec 1, 2023
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
8c9a3ee
implement new flow
SabrinaTardio Nov 24, 2023
9e554ab
clean up Sync set up and sync enabled page
SabrinaTardio Nov 24, 2023
6dcd4bc
clean up connect with server sheet
SabrinaTardio Nov 24, 2023
5a08ba3
clean up preparing to sync sheetgit status
SabrinaTardio Nov 24, 2023
d27f862
clean up preparing to sync sheet
SabrinaTardio Nov 24, 2023
d4bf7b1
clean up save recovery key view
SabrinaTardio Nov 27, 2023
fdac074
clean up device connected view
SabrinaTardio Nov 27, 2023
56cc912
clean up recover synced data view
SabrinaTardio Nov 27, 2023
4760be6
recover code camera view clean up
SabrinaTardio Nov 27, 2023
5d45bc6
clean manually enter code view
SabrinaTardio Nov 27, 2023
c041451
clean up scan or view code
SabrinaTardio Nov 27, 2023
a2785c1
fix connect two unsynced devices path
SabrinaTardio Nov 27, 2023
92c9b3e
remove unwanted changes
SabrinaTardio Nov 27, 2023
acfa3b3
clean up some more
SabrinaTardio Nov 27, 2023
09738ac
fix tests
SabrinaTardio Nov 27, 2023
a5b1a1e
handle better a negative scenario
SabrinaTardio Nov 28, 2023
fce6b0d
fix lint issue
SabrinaTardio Nov 28, 2023
9d47a8f
address comments
SabrinaTardio Nov 30, 2023
28fe773
fix headers
SabrinaTardio Nov 30, 2023
1572ac5
Merge branch 'develop' into sabrina/sync-setup-update
SabrinaTardio Nov 30, 2023
61239b2
fix copy
SabrinaTardio Nov 30, 2023
904587b
fix alignment
SabrinaTardio Nov 30, 2023
83d0e00
show invalid code error
SabrinaTardio Nov 30, 2023
ed135bb
fix bug when QR code is not shown
SabrinaTardio Nov 30, 2023
35c46e8
remove unwanted change
SabrinaTardio Nov 30, 2023
5e12d37
kind of fix racing condition
SabrinaTardio Nov 30, 2023
519cb4f
fix pipeline
SabrinaTardio Nov 30, 2023
16c1ec7
fix pipeline hopefully
SabrinaTardio Nov 30, 2023
46f3b2e
update file name
SabrinaTardio Dec 1, 2023
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
8 changes: 6 additions & 2 deletions Core/UIViewControllerExtension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,15 @@ extension UIViewController {
present(controller: shareController, fromButtonItem: buttonItem)
}

public func presentShareSheet(withItems activityItems: [Any], fromView sourceView: UIView, atPoint point: Point? = nil, completion: UIActivityViewController.CompletionWithItemsHandler? = nil) {
public func presentShareSheet(withItems activityItems: [Any], fromView sourceView: UIView, atPoint point: Point? = nil, overrideInterfaceStyle: UIUserInterfaceStyle? = nil, completion: UIActivityViewController.CompletionWithItemsHandler? = nil) {
let activities = buildActivities()
let shareController = UIActivityViewController(activityItems: activityItems, applicationActivities: activities)
shareController.completionWithItemsHandler = completion
shareController.overrideUserInterfaceStyle()
if let overrideInterfaceStyle {
shareController.overrideUserInterfaceStyle = overrideInterfaceStyle
} else {
shareController.overrideUserInterfaceStyle()
}
shareController.excludedActivityTypes = [.markupAsPDF]
present(controller: shareController, fromView: sourceView, atPoint: point)
}
Expand Down
42 changes: 21 additions & 21 deletions DuckDuckGo/Base.lproj/Settings.storyboard

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions DuckDuckGo/SettingsViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class SettingsViewController: UITableViewController {
}

private var shouldShowSyncCell: Bool {
return featureFlagger.isFeatureOn(.sync)
return true
SabrinaTardio marked this conversation as resolved.
Show resolved Hide resolved
}

private var shouldShowTextSizeCell: Bool {
Expand Down Expand Up @@ -258,9 +258,9 @@ class SettingsViewController: UITableViewController {
}

private func configureSyncCell() {
syncCell.textLabel?.text = "Sync & Back Up"
syncCell.textLabel?.text = "Sync & Backup"
if SyncBookmarksAdapter.isSyncBookmarksPaused || SyncCredentialsAdapter.isSyncCredentialsPaused {
syncCell.textLabel?.text = "⚠️ " + "Sync & Back Up"
syncCell.textLabel?.text = "⚠️ " + "Sync & Backup"
}
syncCell.isHidden = !shouldShowSyncCell
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "Arrow-Circle-Right-12.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
21 changes: 21 additions & 0 deletions DuckDuckGo/SyncAssets.xcassets/Sync-128.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "Sync-128.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
9 changes: 9 additions & 0 deletions DuckDuckGo/SyncAssets.xcassets/Sync-128.imageset/Sync-128.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "Sync-Recover-128.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "Sync-Server-128.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
Loading
Loading