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.

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

drop TabPreview.storyboard #2222

Merged
merged 2 commits into from
Feb 20, 2024
Merged

drop TabPreview.storyboard #2222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ece0fd
drop TabPreview.storyboard
mallexxx Feb 19, 2024
1132052
Merge branch 'main' into alex/drop-tabpreviews-storyboard
mallexxx Feb 20, 2024
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: 0 additions & 8 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,6 @@
3706FCC0293F65D500E42796 /* FindInPage.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 85A0117325AF2EDF00FA6A0C /* FindInPage.storyboard */; };
3706FCC3293F65D500E42796 /* userscript.js in Resources */ = {isa = PBXBuildFile; fileRef = B31055BE27A1BA1D001AC618 /* userscript.js */; };
3706FCC4293F65D500E42796 /* fb-tds.json in Resources */ = {isa = PBXBuildFile; fileRef = EA4617EF273A28A700F110A2 /* fb-tds.json */; };
3706FCC5293F65D500E42796 /* TabPreview.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AAE8B101258A41C000E81239 /* TabPreview.storyboard */; };
3706FCC6293F65D500E42796 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = AA68C3D62490F821001B8783 /* README.md */; };
3706FCC8293F65D500E42796 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AA585D85248FD31400E9A3E2 /* Assets.xcassets */; };
3706FCC9293F65D500E42796 /* NavigationBar.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 85589E8C27BBBB870038AD11 /* NavigationBar.storyboard */; };
Expand Down Expand Up @@ -1950,7 +1949,6 @@
4B957BFD2AC7AE700062CA31 /* JSAlert.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EEC111E3294D06020086524F /* JSAlert.storyboard */; };
4B957C002AC7AE700062CA31 /* userscript.js in Resources */ = {isa = PBXBuildFile; fileRef = B31055BE27A1BA1D001AC618 /* userscript.js */; };
4B957C012AC7AE700062CA31 /* fb-tds.json in Resources */ = {isa = PBXBuildFile; fileRef = EA4617EF273A28A700F110A2 /* fb-tds.json */; };
4B957C022AC7AE700062CA31 /* TabPreview.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AAE8B101258A41C000E81239 /* TabPreview.storyboard */; };
4B957C032AC7AE700062CA31 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = AA68C3D62490F821001B8783 /* README.md */; };
4B957C042AC7AE700062CA31 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AA585D85248FD31400E9A3E2 /* Assets.xcassets */; };
4B957C052AC7AE700062CA31 /* NavigationBar.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 85589E8C27BBBB870038AD11 /* NavigationBar.storyboard */; };
Expand Down Expand Up @@ -2554,7 +2552,6 @@
AAE7527C263B056C00B973F8 /* HistoryStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE7527B263B056C00B973F8 /* HistoryStore.swift */; };
AAE7527E263B05C600B973F8 /* HistoryEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE7527D263B05C600B973F8 /* HistoryEntry.swift */; };
AAE75280263B0A4D00B973F8 /* HistoryCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE7527F263B0A4D00B973F8 /* HistoryCoordinator.swift */; };
AAE8B102258A41C000E81239 /* TabPreview.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AAE8B101258A41C000E81239 /* TabPreview.storyboard */; };
AAE8B110258A456C00E81239 /* TabPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE8B10F258A456C00E81239 /* TabPreviewViewController.swift */; };
AAE99B8927088A19008B6BD9 /* FirePopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE99B8827088A19008B6BD9 /* FirePopover.swift */; };
AAEC74B22642C57200C2EFBC /* HistoryCoordinatingMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAEC74B12642C57200C2EFBC /* HistoryCoordinatingMock.swift */; };
Expand Down Expand Up @@ -4098,7 +4095,6 @@
AAE7527B263B056C00B973F8 /* HistoryStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryStore.swift; sourceTree = "<group>"; };
AAE7527D263B05C600B973F8 /* HistoryEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryEntry.swift; sourceTree = "<group>"; };
AAE7527F263B0A4D00B973F8 /* HistoryCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryCoordinator.swift; sourceTree = "<group>"; };
AAE8B101258A41C000E81239 /* TabPreview.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = TabPreview.storyboard; sourceTree = "<group>"; };
AAE8B10F258A456C00E81239 /* TabPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabPreviewViewController.swift; sourceTree = "<group>"; };
AAE99B8827088A19008B6BD9 /* FirePopover.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirePopover.swift; sourceTree = "<group>"; };
AAEC74B12642C57200C2EFBC /* HistoryCoordinatingMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryCoordinatingMock.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -7656,7 +7652,6 @@
AAE8B0FD258A416F00E81239 /* TabPreview */ = {
isa = PBXGroup;
children = (
AAE8B101258A41C000E81239 /* TabPreview.storyboard */,
AAC82C5F258B6CB5009B6B42 /* TabPreviewWindowController.swift */,
AAE8B10F258A456C00E81239 /* TabPreviewViewController.swift */,
1DB67F272B6FE21D003DF243 /* Model */,
Expand Down Expand Up @@ -8873,7 +8868,6 @@
EEC8EB3F2982CA440065AA39 /* JSAlert.storyboard in Resources */,
3706FCC3293F65D500E42796 /* userscript.js in Resources */,
3706FCC4293F65D500E42796 /* fb-tds.json in Resources */,
3706FCC5293F65D500E42796 /* TabPreview.storyboard in Resources */,
3706FCC6293F65D500E42796 /* README.md in Resources */,
3706FCC8293F65D500E42796 /* Assets.xcassets in Resources */,
3706FCC9293F65D500E42796 /* NavigationBar.storyboard in Resources */,
Expand Down Expand Up @@ -9000,7 +8994,6 @@
4B957BFD2AC7AE700062CA31 /* JSAlert.storyboard in Resources */,
4B957C002AC7AE700062CA31 /* userscript.js in Resources */,
4B957C012AC7AE700062CA31 /* fb-tds.json in Resources */,
4B957C022AC7AE700062CA31 /* TabPreview.storyboard in Resources */,
4B957C032AC7AE700062CA31 /* README.md in Resources */,
4B957C042AC7AE700062CA31 /* Assets.xcassets in Resources */,
4B957C052AC7AE700062CA31 /* NavigationBar.storyboard in Resources */,
Expand Down Expand Up @@ -9096,7 +9089,6 @@
EEC111E4294D06020086524F /* JSAlert.storyboard in Resources */,
B31055C627A1BA1D001AC618 /* userscript.js in Resources */,
EA4617F0273A28A700F110A2 /* fb-tds.json in Resources */,
AAE8B102258A41C000E81239 /* TabPreview.storyboard in Resources */,
AA68C3D72490F821001B8783 /* README.md in Resources */,
AA585D86248FD31400E9A3E2 /* Assets.xcassets in Resources */,
85589E8D27BBBB870038AD11 /* NavigationBar.storyboard in Resources */,
Expand Down
6 changes: 1 addition & 5 deletions DuckDuckGo/TabBar/View/TabBarViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,11 +558,7 @@ final class TabBarViewController: NSViewController {

// MARK: - Tab Preview

private var tabPreviewWindowController: TabPreviewWindowController = {
let storyboard = NSStoryboard(name: "TabPreview", bundle: nil)
// swiftlint:disable:next force_cast
return storyboard.instantiateController(withIdentifier: "TabPreviewWindowController") as! TabPreviewWindowController
}()
private lazy var tabPreviewWindowController = TabPreviewWindowController()

private func showTabPreview(for tabBarViewItem: TabBarViewItem) {
guard let indexPath = collectionView.indexPath(for: tabBarViewItem),
Expand Down
127 changes: 0 additions & 127 deletions DuckDuckGo/TabPreview/TabPreview.storyboard
View file
Open in desktop

This file was deleted.

Loading
Loading