Revert "FXIOS-708 ⁃ [iOS14 Widgets] : iOS14 Quick Action Widgets (Med…

…ium/Small) Versions (#7051)" This reverts commit 1d6ca56.
mozilla-mobile · Aug 26, 2020 · c91e958 · c91e958
1 parent 1d6ca56
commit c91e958
Show file tree

Hide file tree

Showing 41 changed files with 11 additions and 1,908 deletions.
diff --git a/Client.xcodeproj/project.pbxproj b/Client.xcodeproj/project.pbxproj
diff --git a/Client/Application/NavigationRouter.swift b/Client/Application/NavigationRouter.swift
@@ -100,19 +100,6 @@ enum NavigationPath {
             self = .text(text ?? "")
         } else if urlString.starts(with: "\(scheme)://glean") {
             self = .glean(url: url)
-        } else if urlString.starts(with: "\(scheme)://open-copied") {
-            if !UIPasteboard.general.hasURLs {
-                guard let searchText = UIPasteboard.general.string else {
-                    return nil
-                }
-                self = .text(searchText)
-            } else {
-                guard let url = UIPasteboard.general.url else {
-                    return nil
-                }
-                let isPrivate = UserDefaults.standard.bool(forKey: "wasLastSessionPrivate")
-                self = .url(webURL: url, isPrivate: isPrivate)
-            }
         } else if urlString.starts(with: "\(scheme)://close-private-tabs") {
             self = .closePrivateTabs
         } else {
@@ -127,7 +114,7 @@ enum NavigationPath {
         case .url(let url, let isPrivate): NavigationPath.handleURL(url: url, isPrivate: isPrivate, with: bvc)
         case .text(let text): NavigationPath.handleText(text: text, with: bvc)
         case .glean(let url): NavigationPath.handleGlean(url: url)
-        case .closePrivateTabs: NavigationPath.handleClosePrivateTabs(with: bvc, tray: tray)
+        case .closePrivateTabs : NavigationPath.handleClosePrivateTabs(with: bvc, tray: tray)
         }
     }
 
@@ -150,16 +137,16 @@ enum NavigationPath {
     private static func handleFxA(params: FxALaunchParams, with bvc: BrowserViewController) {
         bvc.presentSignInViewController(params)
     }
-
+    
     private static func handleClosePrivateTabs(with bvc: BrowserViewController, tray: TabTrayControllerV1) {
         bvc.tabManager.removeTabs(bvc.tabManager.privateTabs)
-         guard let tab = mostRecentTab(inTabs: bvc.tabManager.normalTabs) else {
-             bvc.tabManager.selectTab(bvc.tabManager.addTab())
-             return
-         }
-         bvc.tabManager.selectTab(tab)
+        guard let tab = mostRecentTab(inTabs: bvc.tabManager.normalTabs) else {
+            bvc.tabManager.selectTab(bvc.tabManager.addTab())
+            return
+        }
+        bvc.tabManager.selectTab(tab)
     }
-
+    
     private static func handleGlean(url: URL) {
         Glean.shared.handleCustomUrl(url: url)
     }

diff --git a/Client/Frontend/Browser/TabManager.swift b/Client/Frontend/Browser/TabManager.swift
@@ -194,6 +194,7 @@ class TabManager: NSObject {
         } else {
             _selectedIndex = -1
         }
+        assert(_selectedIndex > -1, "Tab expected to be in `tabs`")
 
         store.preserveTabs(tabs, selectedTab: selectedTab)
 

diff --git a/...s/smallPrivateMask.imageset/Contents.json → ...on_new_private_tab.imageset/Contents.json b/...s/smallPrivateMask.imageset/Contents.json → ...on_new_private_tab.imageset/Contents.json
diff --git a/...sets/search-button.imageset/Contents.json → ...es.xcassets/search.imageset/Contents.json b/...sets/search-button.imageset/Contents.json → ...es.xcassets/search.imageset/Contents.json
@@ -10,7 +10,6 @@
     "version" : 1
   },
   "properties" : {
-    "preserves-vector-representation" : true,
-    "template-rendering-intent" : "template"
+    "preserves-vector-representation" : true
   }
 }
diff --git a/WidgetKit/Assets.xcassets/AccentColor.colorset/Contents.json b/WidgetKit/Assets.xcassets/AccentColor.colorset/Contents.json
diff --git a/WidgetKit/Assets.xcassets/AppIcon.appiconset/Contents.json b/WidgetKit/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/WidgetKit/Assets.xcassets/Background Gradients/Contents.json b/WidgetKit/Assets.xcassets/Background Gradients/Contents.json
diff --git a/WidgetKit/Assets.xcassets/Background Gradients/goToCopiedLinkColorOne.colorset/Contents.json b/WidgetKit/Assets.xcassets/Background Gradients/goToCopiedLinkColorOne.colorset/Contents.json
diff --git a/WidgetKit/Assets.xcassets/Background Gradients/goToCopiedLinkColorTwo.colorset/Contents.json b/WidgetKit/Assets.xcassets/Background Gradients/goToCopiedLinkColorTwo.colorset/Contents.json
diff --git a/WidgetKit/Assets.xcassets/Background Gradients/goToCopiedLinkSolid.colorset/Contents.json b/WidgetKit/Assets.xcassets/Background Gradients/goToCopiedLinkSolid.colorset/Contents.json