Commit b60c3fc493f8d3f9a4ebce3f42985ac546bfe585

Authored by Artem Talko
1 parent f3e2af33

small changes

... ... @@ -23,22 +23,6 @@
23 23 <BreakpointProxy
24 24 BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
25 25 <BreakpointContent
26   - uuid = "2E2EC010-6906-4B8A-9667-CF365A133EA9"
27   - shouldBeEnabled = "No"
28   - ignoreCount = "0"
29   - continueAfterRunningActions = "No"
30   - filePath = "browser/Modules/SearchResult/View/SearchResultView.swift"
31   - startingColumnNumber = "9223372036854775807"
32   - endingColumnNumber = "9223372036854775807"
33   - startingLineNumber = "20"
34   - endingLineNumber = "20"
35   - landmarkName = "searchResultView"
36   - landmarkType = "24">
37   - </BreakpointContent>
38   - </BreakpointProxy>
39   - <BreakpointProxy
40   - BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
41   - <BreakpointContent
42 26 uuid = "AF29D2F2-0DE8-426B-B8C0-6E69F97CA3CA"
43 27 shouldBeEnabled = "No"
44 28 ignoreCount = "0"
... ... @@ -71,22 +55,6 @@
71 55 <BreakpointProxy
72 56 BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
73 57 <BreakpointContent
74   - uuid = "2DAFEA73-1A5C-412B-9CAB-F119AA59AC98"
75   - shouldBeEnabled = "No"
76   - ignoreCount = "0"
77   - continueAfterRunningActions = "No"
78   - filePath = "browser/Modules/SearchResult/Controller/SearchResultViewController.swift"
79   - startingColumnNumber = "9223372036854775807"
80   - endingColumnNumber = "9223372036854775807"
81   - startingLineNumber = "55"
82   - endingLineNumber = "55"
83   - landmarkName = "setupAdBlocker()"
84   - landmarkType = "7">
85   - </BreakpointContent>
86   - </BreakpointProxy>
87   - <BreakpointProxy
88   - BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
89   - <BreakpointContent
90 58 uuid = "3D9602FE-229B-4486-9E84-86F3385737CB"
91 59 shouldBeEnabled = "No"
92 60 ignoreCount = "0"
... ...
... ... @@ -19,7 +19,7 @@ final class HistoryToolbarView: UIView {
19 19 obj.setTitle("Clean", for: .normal)
20 20 obj.setTitleColor(.systemBlue, for: .normal)
21 21 let menuItems: [UIMenuElement] = menuCases.allCases.map { $0.action }
22   - obj.menu = UIMenu(title: "Clearing will remove history, cookies and other browsing data. History will be cleared from devices signed into your iCloud Account. Clear from:", children: menuItems)
  22 + obj.menu = UIMenu(title: StringConstants.menuTitle, children: menuItems)
23 23 obj.showsMenuAsPrimaryAction = true
24 24 return obj
25 25 }()
... ...
... ... @@ -71,7 +71,6 @@ extension PayloadViewController {
71 71
72 72 @objc
73 73 private func textPressed(_ sender: UITapGestureRecognizer) {
74   - // navigationController?.popViewController(animated: false)
75 74 let termsViewController = TermsViewController()
76 75 termsViewController.modalPresentationStyle = .fullScreen
77 76 present(termsViewController, animated: true)
... ...
... ... @@ -55,7 +55,6 @@ extension SearchResultViewController {
55 55 let userDefaultsValue = CachingManager.shared.isAdBlocking
56 56 if userDefaultsValue {
57 57 WKContentRuleListStore.default().getAvailableContentRuleListIdentifiers { res in
58   -// if res?.isEmpty ?? true {
59 58 if let url = Bundle.main.url(forResource: "blockerList", withExtension: "json"),
60 59 let str = try? String(contentsOf: url) {
61 60 WKContentRuleListStore.default().compileContentRuleList(forIdentifier: "blockerList", encodedContentRuleList: str) { list, error in
... ... @@ -64,7 +63,6 @@ extension SearchResultViewController {
64 63 }
65 64 }
66 65 }
67   -// }
68 66 }
69 67 } else {
70 68 WKContentRuleListStore.default().getAvailableContentRuleListIdentifiers { res in
... ...
... ... @@ -10,23 +10,10 @@ import WebKit
10 10
11 11 final class SearchResultView: UIView {
12 12 let searchResultView: WKWebView = {
13   -// let userDefaultsValue = CachingManager.shared.isAdBlocking
14   -// if userDefaultsValue {
15   -// let configuration = WKWebViewConfiguration()
16   -// let contentController = WKUserContentController()
17   -// let url = Bundle.main.url(forResource: "blockerList", withExtension: "json")?.absoluteString ?? ""
18   -// contentController.addUserScript(WKUserScript(source: url, injectionTime: .atDocumentStart, forMainFrameOnly: false))
19   -// configuration.userContentController = contentController
20   -// let obj = WKWebView(frame: .zero, configuration: configuration)
21   -// obj.allowsBackForwardNavigationGestures = true
22   -// obj.allowsLinkPreview = true
23   -// return obj
24   -// } else {
25   - let obj = WKWebView()
26   - obj.allowsBackForwardNavigationGestures = true
27   - obj.allowsLinkPreview = true
28   - return obj
29   - // }
  13 + let obj = WKWebView()
  14 + obj.allowsBackForwardNavigationGestures = true
  15 + obj.allowsLinkPreview = true
  16 + return obj
30 17 }()
31 18
32 19 override init(frame: CGRect) {
... ... @@ -34,7 +21,6 @@ final class SearchResultView: UIView {
34 21 setup()
35 22 }
36 23
37   -
38 24 required init?(coder: NSCoder) {
39 25 fatalError("init(coder:) has not been implemented")
40 26 }
... ...
... ... @@ -82,10 +82,5 @@ class SearchingTableViewCell: UITableViewCell {
82 82 extension SearchingTableViewCell {
83 83 private func handleUI() {
84 84 searchLabel.text = model
85   -// if model?.siteLogo != UIImage() {
86   -// siteLogoImage.image = model?.siteLogo
87   -// } else {
88   -// siteLogoImage.image = UIImage()
89   -// }
90 85 }
91 86 }
... ...
... ... @@ -61,7 +61,7 @@ final class SearchingView: UIView, UITextFieldDelegate {
61 61 searchTableView.snp.makeConstraints { make in
62 62 make.top.equalTo(searchingLabel.snp.bottom).offset(16.sizeH)
63 63 make.leading.trailing.equalToSuperview().inset(16.sizeW)
64   - make.bottom.equalToSuperview()/*.offset(-16.sizeH)*/
  64 + make.bottom.equalToSuperview()
65 65 }
66 66 }
67 67 }
... ...
... ... @@ -56,5 +56,7 @@ struct StringConstants {
56 56 static let settingHeader = "Terms\nand conditions"
57 57 static let settingAgreeButtonText = "Agree & Continue"
58 58 static let privacyHeaderText = "Your Privacy\n is our top priority"
  59 +
  60 + static let menuTitle = "Clearing will remove history, cookies and other browsing data. History will be cleared from devices signed into your iCloud Account. Clear from:"
59 61 }
60 62
... ...
... ... @@ -8,7 +8,6 @@
8 8 import UIKit
9 9 import WebKit
10 10
11   -
12 11 final class SnapshotService {
13 12 static let shared = SnapshotService()
14 13 let snapshotConfiguration = WKSnapshotConfiguration()
... ...
Please register or login to post a comment