Skip to content

Commit

Permalink
Sabrina/sync setup update (#2198)
Browse files Browse the repository at this point in the history
  • Loading branch information
SabrinaTardio authored Dec 1, 2023
1 parent c73d7de commit 7c44458
Show file tree
Hide file tree
Showing 36 changed files with 1,137 additions and 923 deletions.
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.

4 changes: 2 additions & 2 deletions DuckDuckGo/SettingsViewController.swift
Original file line number Diff line number Diff line change
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

0 comments on commit 7c44458

Please sign in to comment.