fixes

Artem Talko
1 parent 5545d0b4
Showing 27 changed files with 266 additions and 225 deletions
Pro-Seecurity-VPN.xcodeproj/project.pbxproj
Pro-Seecurity-VPN.xcodeproj/project.xcworkspace/xcuserdata/artemtalko.xcuserdatad/UserInterfaceState.xcuserstate
browser/Common/DataBases/HistoryDataBase.swift
browser/Common/Extentions/BinaryFloatingPoint.swift
browser/Common/Managers/DateManager.swift
browser/Common/Managers/HistoryDBManager.swift
browser/Common/Managers/SubscriptionManager.swift
browser/Common/Resources/Constants/StringConstants.swift
browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOffState.imageset/Contents.json
browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOffState.imageset/Play.pdf
browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOnState.imageset/Contents.json
browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOnState.imageset/Group 1.png
browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOnState.imageset/Play.png
browser/Common/Resources/Images/Assets.xcassets/remove advert screen/backgroundGradient.imageset/Contents.json
browser/Common/Services/SnapshotService.swift
browser/Modules/Home/Controller/BrowserHomeViewController.swift
browser/Modules/Home/View/BrowserHomeView.swift
browser/Modules/Home/View/Components/SearchBarView.swift
browser/Modules/Payload/Controller/PayloadViewController.swift
browser/Modules/RemoveAdvert/Controller/RemoveAdvertViewController.swift
--- a/Pro-Seecurity-VPN.xcodeproj/project.pbxproj
View file @a66b8be
+++ b/Pro-Seecurity-VPN.xcodeproj/project.pbxproj
View file @a66b8be
@@ -43,7 +43,6 @@
 		197534762B10968E000818D3 /* SubscriptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197534752B10968E000818D3 /* SubscriptionViewController.swift */; };
 		197534782B1096A7000818D3 /* SubscriptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197534772B1096A7000818D3 /* SubscriptionView.swift */; };
 		1975347B2B109A37000818D3 /* SubscriptionTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1975347A2B109A37000818D3 /* SubscriptionTableViewCell.swift */; };
-		197C2A242B0E3A7B0010B386 /* AdBlockButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197C2A232B0E3A7B0010B386 /* AdBlockButton.swift */; };
 		197C2A282B0F65840010B386 /* OpenBrowserHomeTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197C2A272B0F65830010B386 /* OpenBrowserHomeTransition.swift */; };
 		197C2A2D2B0F9EEB0010B386 /* SubscriptionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197C2A2C2B0F9EEB0010B386 /* SubscriptionManager.swift */; };
 		197FC3EF2AC21E1F007F429C /* PayloadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197FC3EE2AC21E1F007F429C /* PayloadViewController.swift */; };
@@ -146,7 +145,6 @@
 		197534752B10968E000818D3 /* SubscriptionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionViewController.swift; sourceTree = "<group>"; };
 		197534772B1096A7000818D3 /* SubscriptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionView.swift; sourceTree = "<group>"; };
 		1975347A2B109A37000818D3 /* SubscriptionTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionTableViewCell.swift; sourceTree = "<group>"; };
-		197C2A232B0E3A7B0010B386 /* AdBlockButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdBlockButton.swift; sourceTree = "<group>"; };
 		197C2A272B0F65830010B386 /* OpenBrowserHomeTransition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenBrowserHomeTransition.swift; sourceTree = "<group>"; };
 		197C2A2C2B0F9EEB0010B386 /* SubscriptionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionManager.swift; sourceTree = "<group>"; };
 		197FC3EE2AC21E1F007F429C /* PayloadViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PayloadViewController.swift; sourceTree = "<group>"; };
@@ -223,7 +221,6 @@
 			isa = PBXGroup;
 			children = (
 				194206C62B10DFAF000C1263 /* Cell */,
-				197C2A222B0E3A420010B386 /* Components */,
 				191BB8802AC6FF6600A2DEB9 /* RemoveAdvertView.swift */,
 			);
 			path = View;
@@ -468,14 +465,6 @@
 			path = Cell;
 			sourceTree = "<group>";
 		};
-		197C2A222B0E3A420010B386 /* Components */ = {
-			isa = PBXGroup;
-			children = (
-				197C2A232B0E3A7B0010B386 /* AdBlockButton.swift */,
-			);
-			path = Components;
-			sourceTree = "<group>";
-		};
 		197FC3F02AC2AF8A007F429C /* Cell */ = {
 			isa = PBXGroup;
 			children = (
@@ -973,7 +962,6 @@
 				191BB8692AC6A66900A2DEB9 /* SearchingTableViewCell.swift in Sources */,
 				1990C69C2AEFDF89004AF856 /* UICollectionViewCell+convertFrameToScreenCoordinates.swift in Sources */,
 				19FCBF222AC1727800F83A7F /* AppDelegate.swift in Sources */,
-				197C2A242B0E3A7B0010B386 /* AdBlockButton.swift in Sources */,
 				197C2A282B0F65840010B386 /* OpenBrowserHomeTransition.swift in Sources */,
 				19D1F2E02AC1EF3200510506 /* PayloadView.swift in Sources */,
 				19FFD6BF2AE64A7B00D0F768 /* SnapshotService.swift in Sources */,
--- a/Pro-Seecurity-VPN.xcodeproj/project.xcworkspace/xcuserdata/artemtalko.xcuserdatad/UserInterfaceState.xcuserstate
View file @a66b8be
+++ b/Pro-Seecurity-VPN.xcodeproj/project.xcworkspace/xcuserdata/artemtalko.xcuserdatad/UserInterfaceState.xcuserstate
View file @a66b8be
--- a/browser/Common/DataBases/HistoryDataBase.swift
View file @a66b8be
+++ b/browser/Common/DataBases/HistoryDataBase.swift
View file @a66b8be
@@ -23,4 +23,3 @@ final class HistoryDataBase: Object {
         self.lastVisit = lastVisit
     }
 }
-
--- a/browser/Common/Extentions/BinaryFloatingPoint.swift
View file @a66b8be
+++ b/browser/Common/Extentions/BinaryFloatingPoint.swift
View file @a66b8be
@@ -7,7 +7,6 @@
 import UIKit
-
 extension BinaryFloatingPoint {
     private var size: CGSize {
         return CGSize(width: 375, height: 812)
--- a/browser/Common/Managers/DateManager.swift
View file @a66b8be
+++ b/browser/Common/Managers/DateManager.swift
View file @a66b8be
@@ -45,6 +45,3 @@ final class DateManager {
         }
     }
 }
-
-
-
--- a/browser/Common/Managers/HistoryDBManager.swift
View file @a66b8be
+++ b/browser/Common/Managers/HistoryDBManager.swift
View file @a66b8be
@@ -21,7 +21,6 @@ final class HistoryDBManager {
         }
     }
-    //MARK: ADDING
     func saveToHistory(siteTitle: String, siteUrl: String, lastVisit: Date) {
         let historyCell = HistoryDataBase(siteTitle: siteTitle, siteUrl: siteUrl, lastVisit: lastVisit)
         do {
@@ -34,7 +33,6 @@ final class HistoryDBManager {
         }
     }
-    //MARK: GETTING
     func getHistory(sorted: Bool = false) -> [HistoryDataBase] {
         if sorted {
             let history = realm.objects(HistoryDataBase.self).sorted(byKeyPath: "lastVisit", ascending: false)
@@ -74,7 +72,6 @@ final class HistoryDBManager {
         return createHistoryData(elements: filteredHistory)
     }
-    //MARK: DELETING
     func cleanHistory() {
         do {
             let history = realm.objects(HistoryDataBase.self)
@@ -111,7 +108,5 @@ final class HistoryDBManager {
             }
         }
     }
-    
-  
 }
--- a/browser/Common/Managers/SubscriptionManager.swift
View file @a66b8be
+++ b/browser/Common/Managers/SubscriptionManager.swift
View file @a66b8be
@@ -35,7 +35,7 @@ final class SubscriptionManager: ObservableObject {
         updateListenerTask?.cancel()
     }
-    func listenForTransactions() -> Task<Void, Error> {
+    private func listenForTransactions() -> Task<Void, Error> {
         return Task.detached {
             for await result in Transaction.updates {
                 do {
@@ -49,7 +49,7 @@ final class SubscriptionManager: ObservableObject {
         }
     }
-    func requestProducts() async {
+    private func requestProducts() async {
         do {
             storeProducts = try await Product.products(for: productDict.values)
@@ -58,7 +58,7 @@ final class SubscriptionManager: ObservableObject {
         }
     }
-    func checkVerified<T>(_ result: VerificationResult<T>) throws -> T {
+    private func checkVerified<T>(_ result: VerificationResult<T>) throws -> T {
         switch result {
         case .unverified:
             throw StoreError.failedVerification
@@ -68,7 +68,7 @@ final class SubscriptionManager: ObservableObject {
     }
     @MainActor
-    func updateCustomerProductStatus() async {
+    private func updateCustomerProductStatus() async {
         var purchasedCourses: [Product] = []
         for await result in Transaction.currentEntitlements {
@@ -101,10 +101,6 @@ final class SubscriptionManager: ObservableObject {
         }
     }
-    func isPurchased(_ product: Product) async throws -> Bool {
-        return purchasedSubscriptions.contains(product)
-    }
-    
     func restorePurchase() async throws {
         try await AppStore.sync()
     }
--- a/browser/Common/Resources/Constants/StringConstants.swift
View file @a66b8be
+++ b/browser/Common/Resources/Constants/StringConstants.swift
View file @a66b8be
@@ -31,7 +31,6 @@ struct StringConstants {
     static let removeAdvertTableViewData = ["Unlimited blocks & uploads", "Enhanced User Experience", "Faster Page Load Times", "Privacy and Security"]
     static let search = "Search"
-    
     ///RemoveAdvertView
     static let yourDiscount = "You save 91% - normally US $9,99"
     static let freeTrial = "3-day free trial"
@@ -45,10 +44,8 @@ struct StringConstants {
     ///setting cell detail info
     static let settingPolicy = "GoToWeb Safe Browser  Privacy Policy\nCreative Tech LLC built the GoToWeb Safe Browser  app as a Commercial app. This SERVICE is provided by Creative Tech LLC and is intended for use as is.\n\nThis page is used to inform visitors regarding our policies with the collection, use, and disclosure of Personal Information if anyone decided to use our Service.\n\nIf you choose to use our Service, then you agree to the collection and use of information in relation to this policy. The Personal Information that we collect is used for providing and improving the Service. We will not use or share your information with anyone except as described in this Privacy Policy.\n\nThe terms used in this Privacy Policy have the same meanings as in our Terms and Conditions, which are accessible at GoToWeb Safe Browser  unless otherwise defined in this Privacy Policy.\n\nInformation Collection and Use\n\nFor a better experience, while using our Service, we may require you to provide us with certain personally identifiable information. The information that we request will be retained by us and used as described in this privacy policy.\n\nThe app does use third-party services that may collect information used to identify you.\n\nLink to the privacy policy of third-party service providers used by the app\n\nGoogle Analytics for Firebase\nFirebase Crashlytics\nFacebook\nUnity\nAppLovin\n\nLog Data\n\nWe want to inform you that whenever you use our Service, in a case of an error in the app we collect data and information (through third-party products) on your phone called Log Data. This Log Data may include information such as your device Internet Protocol (“IP”) address, device name, operating system version, the configuration of the app when utilizing our Service, the time and date of your use of the Service, and other statistics.\n\nCookies\n\nCookies are files with a small amount of data that are commonly used as anonymous unique identifiers. These are sent to your browser from the websites that you visit and are stored on your device's internal memory.\n\nThis Service does not use these “cookies” explicitly. However, the app may use third-party code and libraries that use “cookies” to collect information and improve their services. You have the option to either accept or refuse these cookies and know when a cookie is being sent to your device. If you choose to refuse our cookies, you may not be able to use some portions of this Service.\n\nService Providers\n\nWe may employ third-party companies and individuals due to the following reasons:\n\nTo facilitate our Service;\nTo provide the Service on our behalf;\nTo perform Service-related services; or\nTo assist us in analyzing how our Service is used.\nWe want to inform users of this Service that these third parties have access to their Personal Information. The reason is to perform the tasks assigned to them on our behalf. However, they are obligated not to disclose or use the information for any other purpose.\n\nSecurity\n\nWe value your trust in providing us your Personal Information, thus we are striving to use commercially acceptable means of protecting it. But remember that no method of transmission over the internet, or method of electronic storage is 100% secure and reliable, and we cannot guarantee its absolute security.\n\nLinks to Other Sites\n\nThis Service may contain links to other sites. If you click on a third-party link, you will be directed to that site. Note that these external sites are not operated by us. Therefore, we strongly advise you to review the Privacy Policy of these websites. We have no control over and assume no responsibility for the content, privacy policies, or practices of any third-party sites or services.\n\nChildren’s Privacy\n\nThese Services do not address anyone under the age of 13. We do not knowingly collect personally identifiable information from children under 13 years of age. In the case we discover that a child under 13 has provided us with personal information, we immediately delete this from our servers. If you are a parent or guardian and you are aware that your child has provided us with personal information, please contact us so that we will be able to do the necessary actions.\n\nChanges to This Privacy Policy\n\nWe may update our Privacy Policy from time to time. Thus, you are advised to review this page periodically for any changes. We will notify you of any changes by posting the new Privacy Policy on this page.\n\nThis policy is effective as of 2023-11-24\n\nContact Us\n\nIf you have any questions or suggestions about our Privacy Policy, do not hesitate to contact us at creattechllc@gmail.com.\n\n\n"
-    
     static let settingTerms = "GoToWeb safe browser Terms & Conditions\nBy downloading or using the app, these terms will automatically apply to you – you should make sure therefore that you read them carefully before using the app. You’re not allowed to copy or modify the app, any part of the app, or our trademarks in any way. You’re not allowed to attempt to extract the source code of the app, and you also shouldn’t try to translate the app into other languages or make derivative versions. The app itself, and all the trademarks, copyright, database rights, and other intellectual property rights related to it, still belong to Creative Tech LLC.\n\nCreative Tech LLC is committed to ensuring that the app is as useful and efficient as possible. For that reason, we reserve the right to make changes to the app or to charge for its services, at any time and for any reason. We will never charge you for the app or its services without making it very clear to you exactly what you’re paying for.\n\nThe GoToWeb safe browser app stores and processes personal data that you have provided to us, to provide our Service. It’s your responsibility to keep your phone and access to the app secure. We therefore recommend that you do not jailbreak or root your phone, which is the process of removing software restrictions and limitations imposed by the official operating system of your device. It could make your phone vulnerable to malware/viruses/malicious programs, compromise your phone’s security features and it could mean that the GoToWeb safe browser app won’t work properly or at all.\n\nThe app does use third-party services that declare their Terms and Conditions.\n\nLink to Terms and Conditions of third-party service providers used by the app\n\nGoogle Analytics for Firebase\nFirebase Crashlytics\nFacebook\nUnity\nAppLovin\n\nYou should be aware that there are certain things that Creative Tech LLC will not take responsibility for. Certain functions of the app will require the app to have an active internet connection. The connection can be Wi-Fi or provided by your mobile network provider, but Creative Tech LLC cannot take responsibility for the app not working at full functionality if you don’t have access to Wi-Fi, and you don’t have any of your data allowance left.\n\nIf you’re using the app outside of an area with Wi-Fi, you should remember that the terms of the agreement with your mobile network provider will still apply. As a result, you may be charged by your mobile provider for the cost of data for the duration of the connection while accessing the app, or other third-party charges. In using the app, you’re accepting responsibility for any such charges, including roaming data charges if you use the app outside of your home territory (i.e. region or country) without turning off data roaming. If you are not the bill payer for the device on which you’re using the app, please be aware that we assume that you have received permission from the bill payer for using the app.\n\nAlong the same lines, Creative Tech LLC cannot always take responsibility for the way you use the app i.e. You need to make sure that your device stays charged – if it runs out of battery and you can’t turn it on to avail the Service, Creative Tech LLC cannot accept responsibility.\n\nWith respect to Creative Tech LLC’s responsibility for your use of the app, when you’re using the app, it’s important to bear in mind that although we endeavor to ensure that it is updated and correct at all times, we do rely on third parties to provide information to us so that we can make it available to you. Creative Tech LLC accepts no liability for any loss, direct or indirect, you experience as a result of relying wholly on this functionality of the app.\n\nAt some point, we may wish to update the app. The app is currently available on iOS – the requirements for the system(and for any additional systems we decide to extend the availability of the app to) may change, and you’ll need to download the updates if you want to keep using the app. Creative Tech LLC does not promise that it will always update the app so that it is relevant to you and/or works with the iOS version that you have installed on your device. However, you promise to always accept updates to the application when offered to you, We may also wish to stop providing the app, and may terminate use of it at any time without giving notice of termination to you. Unless we tell you otherwise, upon any termination, (a) the rights and licenses granted to you in these terms will end; (b) you must stop using the app, and (if needed) delete it from your device.\n\nChanges to This Terms and Conditions\n\nWe may update our Terms and Conditions from time to time. Thus, you are advised to review this page periodically for any changes. We will notify you of any changes by posting the new Terms and Conditions on this page.\n\nThese terms and conditions are effective as of 2023-11-24\n\nContact Us\n\nIf you have any questions or suggestions about our Terms and Conditions, do not hesitate to contact us at creattechllc@gmail.com \n\n\n"
-    
     static let settingHeader = "Terms\nand conditions"
     static let settingAgreeButtonText = "Agree & Continue"
     static let privacyHeaderText = "Your Privacy\n is our top priority"
@@ -73,5 +70,8 @@ struct StringConstants {
     ]
     static let notificationTitle = "Gotoweb Notification"
     static let notificationIdentifier = "browser-notification"
+    
+    static let segmentedControlItems = ["AdBlock", "Browser"]
+    
 }
--- a/browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOffState.imageset/Contents.json
View file @a66b8be
+++ b/browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOffState.imageset/Contents.json
View file @a66b8be
 {
   "images" : [
     {
-      "filename" : "Group 1adBlockButtonOff.pdf",
+      "filename" : "Play.pdf",
       "idiom" : "universal"
     }
   ],
--- a/browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOffState.imageset/Play.pdf 0 → 100644
View file @a66b8be
+++ b/browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOffState.imageset/Play.pdf 0 → 100644
View file @a66b8be
--- a/browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOnState.imageset/Contents.json
View file @a66b8be
+++ b/browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOnState.imageset/Contents.json
View file @a66b8be
 {
   "images" : [
     {
-      "filename" : "Group 1.png",
+      "filename" : "Play.png",
       "idiom" : "universal"
     }
   ],
--- a/browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOnState.imageset/Group 1.png deleted 100644 → 0
View file @5545d0b
+++ b/browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOnState.imageset/Group 1.png deleted 100644 → 0
View file @5545d0b
--- a/browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOnState.imageset/Play.png 0 → 100644
View file @a66b8be
+++ b/browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOnState.imageset/Play.png 0 → 100644
View file @a66b8be
--- a/browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOffState.imageset/Group 1adBlockButtonOff.pdf → browser/Common/Resources/Images/Assets.xcassets/remove advert screen/backgroundGradient.imageset/Back-arrow-for-dark-theme.pdf
View file @a66b8be
+++ b/browser/Common/Resources/Images/Assets.xcassets/remove advert screen/adBlockOffState.imageset/Group 1adBlockButtonOff.pdf → browser/Common/Resources/Images/Assets.xcassets/remove advert screen/backgroundGradient.imageset/Back-arrow-for-dark-theme.pdf
View file @a66b8be
--- a/browser/Common/Resources/Images/Assets.xcassets/remove advert screen/backgroundGradient.imageset/Contents.json 0 → 100644
View file @a66b8be
+++ b/browser/Common/Resources/Images/Assets.xcassets/remove advert screen/backgroundGradient.imageset/Contents.json 0 → 100644
View file @a66b8be
+{
+  "images" : [
+    {
+      "filename" : "Back-arrow-for-dark-theme.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/browser/Common/Services/SnapshotService.swift
View file @a66b8be
+++ b/browser/Common/Services/SnapshotService.swift
View file @a66b8be
@@ -10,7 +10,6 @@ import WebKit
 final class SnapshotService {
     static let shared = SnapshotService()
-    let snapshotConfiguration = WKSnapshotConfiguration()
     private init() {}
--- a/browser/Modules/Home/Controller/BrowserHomeViewController.swift
View file @a66b8be
+++ b/browser/Modules/Home/Controller/BrowserHomeViewController.swift
View file @a66b8be
@@ -20,7 +20,7 @@ final class BrowserHomeViewController: UIViewController {
     private var subscriptions: Set<AnyCancellable>
     private var searchRequestURL: String
-    private let images = StringConstants.browserHomeVCImages
+    private let frequentlyVisitedTabsImages: [String]
     private var currentTabId: Int?
     private var url: String? {
@@ -33,57 +33,56 @@ final class BrowserHomeViewController: UIViewController {
     init(url: String?, currentTabId: Int?) {
         searchResultViewController = SearchResultViewController(searchLink: String())
         searchingViewController = SearchingViewController(dataForReq: [])
-        subscriptions = []
         searchRequestURL = URLConstants.googleURL
+        frequentlyVisitedTabsImages = StringConstants.browserHomeVCImages
+        subscriptions = []
-        super.init(nibName: nil, bundle: nil)
         self.url = url
         self.currentTabId = currentTabId
+        
+        super.init(nibName: nil, bundle: nil)
     }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+    override func loadView() {
+        view = mainView
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
-        view.backgroundColor = ColorConstants.lightGray
+        
         initViewController()
     }
     override func viewWillAppear(_ animated: Bool) {
-        keyboardObserver()
-    }
-    
-    private func initViewController() {
-        setupCollectionView()
-        addTargets()
-        setupSearchBarComponentsAction()
-        setupSearchingViewController()
-        progressObserver()
-    }
-    
-    override func viewIsAppearing(_ animated: Bool) {
         navigationController?.isNavigationBarHidden = true
         tabsViewController = getTabsViewController()
+        keyboardObserver()
     }
-    
-    override func loadView() {
-        view = mainView
-    }
-    
+
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
+        
         NotificationCenter.default.removeObserver(self)
     }
+    
+    private func initViewController() {
+        setupSearchBarComponentsAction()
+        setupSearchingViewController()
+        setupCollectionView()
+        progressObserver()
+        addTargets()
+    }
 }
-
 //MARK: CollectionView Setup
 extension BrowserHomeViewController: UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        images.count
+        frequentlyVisitedTabsImages.count
     }
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
@@ -96,7 +95,7 @@ extension BrowserHomeViewController: UICollectionViewDataSource, UICollectionVie
     }
     func setupCellForCollectionView(_ cell: TabCollectionViewCell, _ indexPath: IndexPath) -> TabCollectionViewCell {
-        let imageName = images[indexPath.item]
+        let imageName = frequentlyVisitedTabsImages[indexPath.item]
         cell.tabCellImage.image = UIImage(named: imageName)
         cell.tabCellLabel.text = imageName
@@ -113,7 +112,6 @@ extension BrowserHomeViewController: UICollectionViewDataSource, UICollectionVie
     }
 }
-
 //MARK: - Keyboard extention
 extension BrowserHomeViewController {
     private func keyboardObserver() {
@@ -122,7 +120,6 @@ extension BrowserHomeViewController {
     }
 }
-
 //MARK: - Action
 extension BrowserHomeViewController {
     @objc
@@ -177,6 +174,8 @@ extension BrowserHomeViewController {
     private func removeSearchingViewController(_ sender: UIButton) {
         searchResultAction()
     }
+    
+
 }
 //MARK: - Helpers
@@ -217,7 +216,7 @@ extension BrowserHomeViewController {
         if !sitesFromSearch.isEmpty {
             searchingViewController.searchRequestData = sitesFromSearch
         }
-        addingSearchingViewController(searchingViewController)
+        childViewControllerHandler(searchingViewController)
     }
     private func setupCollectionView() {
@@ -230,7 +229,8 @@ extension BrowserHomeViewController {
         mainView.settingButton.addTarget(self, action:  #selector(settingButtonTapped(_ :)), for: .touchUpInside)
         mainView.removeAdvertSegmentControl.addTarget(self, action: #selector(advertSegmantControlStateHandler), for: .valueChanged)
         mainView.searchBarContainer.searchBarView.searchTextFieldView.addTarget(self, action: #selector(searchBarTextChanged), for: .editingChanged)
-        searchingViewController.mainView.searchingButton.addTarget(self, action: #selector(removeSearchingViewController(_ :)), for: .touchUpInside)
+        
+        searchingViewControllerAction()
         addToolbarTargets()
     }
@@ -238,6 +238,10 @@ extension BrowserHomeViewController {
         mainView.toolbarView.action = didTabButtonTapped
     }
+    private func searchingViewControllerAction() {
+        searchingViewController.mainView.searchingButton.addTarget(self, action: #selector(removeSearchingViewController(_ :)), for: .touchUpInside)
+    }
+    
     private func openAdditionViewController(_ viewController: UIViewController) {
         viewController.modalPresentationStyle = .fullScreen
         present(viewController, animated: true, completion: nil)
@@ -249,8 +253,8 @@ extension BrowserHomeViewController {
                 return
             }
             searchRequestURL = "https://www.google.com/search?q=" + (cell.searchLabel.text ?? "")
-            openSearchResult()
             mainView.searchBarContainer.searchBarView.searchTextFieldView.endEditing(true)
+            openSearchResult()
         }
     }
@@ -261,7 +265,10 @@ extension BrowserHomeViewController {
             let request = URLRequest(url: localUrl)
             searchResultViewController.mainView.searchResultView.load(request)
         }
-        addingSearchingViewController(searchResultViewController)
+        searchResultViewController.onCloseButtonTapped = { [weak self] in
+            self?.removeChildViewController()
+        }
+        childViewControllerHandler(searchResultViewController)
     }
     private func tabsButtonHandler() {
@@ -283,18 +290,17 @@ extension BrowserHomeViewController {
             let finalUrl = siteUrl.absoluteString
             let lastVisit = DateManager.shared.currentDate
             let homeViewSnapshot = SnapshotService.shared.makeSnapshot(mainView)
-            navigationController?.popViewController(animated: true)
             TabManager.shared.saveTab(tabTitle: siteTitle, snapshotImage: homeViewSnapshot, tabUrl: finalUrl)
+            HistoryDBManager.shared.saveToHistory(siteTitle: siteTitle, siteUrl: finalUrl, lastVisit: lastVisit)
             self.currentTabId = tabsViewController?.getCellIndex().row
-            HistoryDBManager.shared.saveToHistory(siteTitle: siteTitle, siteUrl: finalUrl, lastVisit: lastVisit)
-           
+            navigationController?.popViewController(animated: true)
         } else {
             let homeViewSnapshot = SnapshotService.shared.makeSnapshot(mainView)
-            navigationController?.popViewController(animated: true)
             TabManager.shared.saveTab(tabTitle: "Start Page", snapshotImage: homeViewSnapshot, tabUrl: "homeUrl")
-    
             currentTabId = tabsViewController?.getCellIndex().row
+            
+            navigationController?.popViewController(animated: true)
         }
     }
@@ -325,10 +331,9 @@ extension BrowserHomeViewController {
     }
 }
-
 //MARK: - ChildVC actions
 extension BrowserHomeViewController {
-    private func addingSearchingViewController(_ childViewController: UIViewController) {
+    private func childViewControllerHandler(_ childViewController: UIViewController) {
         if self.children.isEmpty {
             addNewChildViewController(childViewController)
         } else {
@@ -345,12 +350,7 @@ extension BrowserHomeViewController {
     }
     private func removeChildViewController() {
-        if let childViewController = self.children.first as? SearchingViewController {
-            childViewController.view.removeFromSuperview()
-            childViewController.willMove(toParent: nil)
-            childViewController.removeFromParent()
-        }
-        if let childViewController = self.children.first as? SearchResultViewController {
+        if let childViewController = self.children.first {
             childViewController.view.removeFromSuperview()
             childViewController.willMove(toParent: nil)
             childViewController.removeFromParent()
@@ -358,7 +358,6 @@ extension BrowserHomeViewController {
     }
 }
-
 //MARK: - SearchBar extention
 extension BrowserHomeViewController: UITextFieldDelegate {
     func textFieldDidBeginEditing(_ textField: UITextField) {
@@ -368,7 +367,6 @@ extension BrowserHomeViewController: UITextFieldDelegate {
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         textField.resignFirstResponder()
-        
         searchRequestURL = "https://www.google.com/search?q=" + (textField.text ?? "")
         openSearchResult()
@@ -379,11 +377,11 @@ extension BrowserHomeViewController: UITextFieldDelegate {
         mainView.searchBarContainer.searchBarView.searchTextFieldView.autocorrectionType = .no
         mainView.searchBarContainer.searchBarView.searchTextFieldView.delegate = self
         mainView.searchBarContainer.searchBarView.cleanTextFieldButton.addTarget(self, action: #selector(searchResultAction), for: .touchUpInside)
+        
         buttonObserver()
     }
 }
-
 //MARK: - WebView extention
 extension BrowserHomeViewController {
     private func buttonObserver() {
--- a/browser/Modules/Home/View/BrowserHomeView.swift
View file @a66b8be
+++ b/browser/Modules/Home/View/BrowserHomeView.swift
View file @a66b8be
@@ -10,7 +10,8 @@ import SnapKit
 final class BrowserHomeView: GradientView {
     let removeAdvertSegmentControl: UISegmentedControl = {
-        let items = ["AdBlock", "Browser"]
+        let items = StringConstants.segmentedControlItems
+        
         let obj = UISegmentedControl(items: items)
         obj.selectedSegmentIndex = 1
         obj.backgroundColor = ColorConstants.segmentControlBackground
@@ -86,32 +87,37 @@ final class BrowserHomeView: GradientView {
     }
     private func setupConstraints() {
-        removeAdvertSegmentControl.snp.makeConstraints { make in
+       removeAdvertSegmentControl.snp.makeConstraints { make in
             make.top.equalTo(safeAreaLayoutGuide.snp.top).offset(16.sizeH)
             make.leading.equalToSuperview().offset(54.sizeW)
             make.trailing.equalTo(settingButton.snp.leading).offset(-15.sizeW)
             make.height.equalTo(34.sizeH)
         }
+        
         settingButton.snp.makeConstraints { make in
             make.trailing.equalToSuperview().offset(-16.sizeW)
             make.height.equalTo(24.sizeH)
             make.width.equalTo(24.sizeH)
             make.centerY.equalTo(removeAdvertSegmentControl)
         }
+        
         titleLabel.snp.makeConstraints { make in
             make.top.equalTo(removeAdvertSegmentControl.snp.bottom).offset(64.sizeH)
             make.leading.equalTo(safeAreaLayoutGuide.snp.leading).offset(16.sizeW)
         }
+        
         frequentlyVisitedCollectionView.snp.makeConstraints { make in
             make.top.equalTo(titleLabel.snp.bottom).offset(8.sizeH)
             make.leading.trailing.equalToSuperview().inset(24.sizeW)
             make.height.equalTo(120.sizeH)
         }
+        
         toolbarView.snp.makeConstraints { make in
             make.leading.equalToSuperview()
             make.bottom.equalToSuperview()
             make.trailing.equalToSuperview()
         }
+        
         searchBarContainer.snp.makeConstraints { make in
             make.leading.equalToSuperview()
             make.bottom.equalToSuperview().offset(-90.sizeH)
--- a/browser/Modules/Home/View/Components/SearchBarView.swift
View file @a66b8be
+++ b/browser/Modules/Home/View/Components/SearchBarView.swift
View file @a66b8be
@@ -19,7 +19,7 @@ final class SearchBarView: UIView {
     let searchTextFieldView: UITextField = {
         let obj = UITextField()
         obj.text = "Search"
-        obj.textColor =  ColorConstants.SearchbarTintBlue
+        obj.textColor = ColorConstants.SearchbarTintBlue
         return obj
     }()
--- a/browser/Modules/Payload/Controller/PayloadViewController.swift
View file @a66b8be
+++ b/browser/Modules/Payload/Controller/PayloadViewController.swift
View file @a66b8be
@@ -9,9 +9,10 @@ import UIKit
 final class PayloadViewController: UIViewController {
     private let mainView = PayloadView()
+    
     private let payloadTableViewData: [String]
-    init(){
+    init() {
         payloadTableViewData = StringConstants.payloadViewControllerData
         super.init(nibName: nil, bundle: nil)
@@ -21,6 +22,10 @@ final class PayloadViewController: UIViewController {
         fatalError("init(coder:) has not been implemented")
     }
+    override func loadView() {
+        view = mainView
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -34,10 +39,6 @@ final class PayloadViewController: UIViewController {
         addTargets()
     }
-    override func loadView() {
-        view = mainView
-    }
-    
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
--- a/browser/Modules/RemoveAdvert/Controller/RemoveAdvertViewController.swift
View file @a66b8be
+++ b/browser/Modules/RemoveAdvert/Controller/RemoveAdvertViewController.swift
View file @a66b8be
@@ -26,16 +26,16 @@ final class RemoveAdvertViewController: UIViewController {
         fatalError("init(coder:) has not been implemented")
     }
+    override func loadView() {
+        view = mainView
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         initViewController()
     }
-    override func loadView() {
-        view = mainView
-    }
-    
     private func initViewController() {
         addTargets()
         setupTableView()
@@ -51,7 +51,6 @@ extension RemoveAdvertViewController {
         } else {
             subscriptionHandler()
         }
-       
     }
     @objc
@@ -128,6 +127,7 @@ extension RemoveAdvertViewController {
         let okAction = UIAlertAction(title: "OK", style: .default)
         alert.addAction(okAction)
         present(alert, animated: true)
+        
         turnOnAdBlocker()
     }
@@ -138,7 +138,7 @@ extension RemoveAdvertViewController {
     }
     private func turnOnAdBlocker() {
-        mainView.adBlockButton.buttonImageView.image = .adBlockOnState
+        mainView.adBlockButton.setImage(.adBlockOnState, for: .normal)
         mainView.tapActionLabel.textColor = ColorConstants.SearchbarTintBlue
         mainView.tapActionLabel.text = StringConstants.turnOff
@@ -146,7 +146,7 @@ extension RemoveAdvertViewController {
     }
     private func turnOffAdBlocker() {
-        mainView.adBlockButton.buttonImageView.image = .adBlockOffState
+        mainView.adBlockButton.setImage(.adBlockOffState, for: .normal)
         mainView.tapActionLabel.textColor = ColorConstants.customPink
         mainView.tapActionLabel.text = StringConstants.turnOn
--- a/browser/Modules/RemoveAdvert/View/Components/AdBlockButton.swift deleted 100644 → 0
View file @5545d0b
+++ b/browser/Modules/RemoveAdvert/View/Components/AdBlockButton.swift deleted 100644 → 0
View file @5545d0b
-//
-//  AdBlockButton.swift
-//  browser
-//
-//  Created by Artem Talko on 22.11.2023.
-//
-
-import UIKit
-
-final class AdBlockButton: UIButton {
-    var buttonImageView: UIImageView = {
-        let obj = UIImageView()
-        let userDefaultsAdBlockingValue = CachingManager.shared.adBlockerState
-        
-        if userDefaultsAdBlockingValue {
-            obj.image = .adBlockOnState
-        } else {
-            obj.image = .adBlockOffState
-        }
-        obj.contentMode = .scaleAspectFit
-        
-        return obj
-    }()
-    
-    override init (frame: CGRect) {
-        super.init(frame: frame)
-        
-        setup()
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    private func setup() {
-        addSubview(buttonImageView)
-        
-        setupConstraints()
-    }
-    
-    private func setupConstraints() {
-        buttonImageView.snp.makeConstraints { make in
-            make.top.equalToSuperview()
-            make.leading.equalToSuperview()
-            make.bottom.equalToSuperview()
-            make.trailing.equalToSuperview()
-        }
-    }
-}
--- a/browser/Modules/RemoveAdvert/View/RemoveAdvertView.swift
View file @a66b8be
+++ b/browser/Modules/RemoveAdvert/View/RemoveAdvertView.swift
View file @a66b8be
@@ -18,22 +18,33 @@ final class RemoveAdvertView: GradientView {
         return obj
     }()
-    let adBlockButton: AdBlockButton = {
-        let obj = AdBlockButton()
+    let adBlockButton: UIButton = {
+        let obj = UIButton()
+        let userDefaultsAdBlockingValue = CachingManager.shared.adBlockerState
+        obj.layer.cornerRadius = 0.5 * 171.sizeH
+        obj.layer.masksToBounds = true
+        obj.layer.borderWidth = 2.0
+        obj.setBackgroundImage(.backgroundGradient, for: .normal)
+        obj.layer.borderColor = UIColor.white.cgColor
+        if userDefaultsAdBlockingValue {
+            obj.setImage(.adBlockOnState, for: .normal)
+        } else {
+            obj.setImage(.adBlockOffState, for: .normal)
+        }
         return obj
     }()
     let removeAdvertSegmentControl: UISegmentedControl = {
-        let items = ["AdBlock", "Browser"]
+        let items = StringConstants.segmentedControlItems
         let obj = UISegmentedControl(items: items)
         obj.selectedSegmentIndex = 0
-        obj.backgroundColor = ColorConstants.segmentControlBackground
         obj.layer.cornerRadius = 10
+        obj.backgroundColor = ColorConstants.segmentControlBackground
         obj.selectedSegmentTintColor = UIColor(red: 0.349, green: 0.565, blue: 1, alpha: 1)
         obj.setTitleTextAttributes([.foregroundColor: UIColor.black], for: .normal)
         obj.setTitleTextAttributes([.foregroundColor: UIColor.white], for: .selected)
-        
+       
         return obj
     }()
@@ -54,13 +65,13 @@ final class RemoveAdvertView: GradientView {
     let tapActionLabel: UILabel = {
         let obj = UILabel()
         let userDefaultsAdBlockerValue = CachingManager.shared.adBlockerState
-        
-        obj.text = StringConstants.turnOn
         obj.font = FontConstants.semiboldFont_24
         if userDefaultsAdBlockerValue {
             obj.textColor = ColorConstants.SearchbarTintBlue
+            obj.text = StringConstants.turnOff
         } else {
             obj.textColor = ColorConstants.customPink
+            obj.text = StringConstants.turnOn
         }
         return obj
@@ -92,7 +103,7 @@ final class RemoveAdvertView: GradientView {
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
+
     private func setup() {
         addSubview(appLogoImageView)
         addSubview(adBlockButton)
@@ -102,7 +113,7 @@ final class RemoveAdvertView: GradientView {
         addSubview(rightDecorativeSquareImageView)
         addSubview(protectFromLabel)
         addSubview(adBlockTableView)
-        
+    
         setupConstraints()
     }
@@ -130,9 +141,10 @@ final class RemoveAdvertView: GradientView {
         }
         adBlockButton.snp.makeConstraints { make in
-            make.top.equalTo(removeAdvertSegmentControl.snp.bottom).offset(84.sizeH)
-            make.leading.trailing.equalToSuperview().inset(47.sizeW)
+            make.centerY.equalToSuperview()
+            make.centerX.equalToSuperview()
             make.height.equalTo(171.sizeH)
+            make.width.equalTo(171.sizeH)
         }
         tapActionLabel.snp.makeConstraints { make in
--- a/browser/Modules/SearchResult/Controller/SearchResultViewController.swift
View file @a66b8be
+++ b/browser/Modules/SearchResult/Controller/SearchResultViewController.swift
View file @a66b8be
@@ -5,13 +5,14 @@
 //  Created by Artem Talko on 05.10.2023.
 //
-
 import UIKit
 import WebKit
 final class SearchResultViewController: UIViewController {
     let mainView = SearchResultView()
+    
     var searchLink: String
+    var onCloseButtonTapped: (() -> Void)?
     init(searchLink: String) {
         self.searchLink = searchLink
@@ -34,10 +35,9 @@ final class SearchResultViewController: UIViewController {
     }
     private func initViewController() {
-        view.backgroundColor = ColorConstants.lightGray
-        
         urlChecker(searchLink)
         setupAdBlocker()
+        addTargets()
     }
     override func viewIsAppearing(_ animated: Bool) {
@@ -45,14 +45,26 @@ final class SearchResultViewController: UIViewController {
     }
 }
-//MARK: URL handling
+//MARK: Helper
 extension SearchResultViewController {
+    private func addTargets() {
+        mainView.closeWebViewButton.addTarget(self, action: #selector(closeWebViewTapped(_ :)), for: .touchUpInside)
+    }
+    
     private func urlChecker(_ url: String) {
         let request = URLRequest(url: URL(string: url) ?? URL(fileURLWithPath: ""))
         mainView.searchResultView.load(request)
     }
 }
+//MARK: Action
+extension SearchResultViewController {
+    @objc
+    private func closeWebViewTapped(_ sender: UIButton) {
+        onCloseButtonTapped?()
+    }
+}
+
 //MARK: AdBlocker
 extension SearchResultViewController {
--- a/browser/Modules/SearchResult/View/SearchResultView.swift
View file @a66b8be
+++ b/browser/Modules/SearchResult/View/SearchResultView.swift
View file @a66b8be
@@ -9,6 +9,17 @@ import UIKit
 import WebKit
 final class SearchResultView: UIView {
+    let closeWebViewButton: UIButton = {
+        let obj = UIButton()
+        obj.backgroundColor = .white.withAlphaComponent(0.2)
+        obj.layer.borderWidth = 1
+        obj.layer.borderColor = UIColor.blue.withAlphaComponent(0.3).cgColor
+        obj.layer.cornerRadius = 10
+        obj.setImage(UIImage(systemName: "arrow.backward"), for: .normal)
+        
+        return obj
+    }()
+    
     let searchResultView: WKWebView = {
         let obj = WKWebView()
         obj.allowsBackForwardNavigationGestures = true
@@ -30,11 +41,18 @@ final class SearchResultView: UIView {
     private func setup() {
         backgroundColor = .white
         addSubview(searchResultView)
+        addSubview(closeWebViewButton)
         setupConstaraints()
     }
     private func setupConstaraints() {
+        closeWebViewButton.snp.makeConstraints { make in
+            make.height.width.equalTo(24.sizeH)
+            make.top.equalTo(safeAreaLayoutGuide).offset(16.sizeH)
+            make.leading.equalToSuperview().offset(16.sizeW)
+        }
+        
         searchResultView.snp.makeConstraints { make in
             make.top.equalTo(safeAreaLayoutGuide.snp.top)
             make.leading.trailing.equalToSuperview()
--- a/browser/Modules/Settings/Controller/SettingViewController.swift
View file @a66b8be
+++ b/browser/Modules/Settings/Controller/SettingViewController.swift
View file @a66b8be
@@ -112,17 +112,9 @@ extension SettingViewController {
             break
         }
     }
-}
-
-//MARK: - Action
-extension SettingViewController {
-    func addTargets() {
-        mainView.backButton.addTarget(self, action: #selector(closeViewController(_ :)), for: .touchUpInside)
-    }
-    @objc
-    private func closeViewController(_ sender: UIButton) {
-        dismiss(animated: true, completion: nil)
+    private func addTargets() {
+        mainView.backButton.addTarget(self, action: #selector(closeViewController(_ :)), for: .touchUpInside)
     }
     private func shareButtonPressed() {
@@ -139,6 +131,14 @@ extension SettingViewController {
     }
 }
+//MARK: - Action
+extension SettingViewController {
+    @objc
+    private func closeViewController(_ sender: UIButton) {
+        dismiss(animated: true, completion: nil)
+    }
+}
+
 //MARK: Mail helper
 extension SettingViewController: MFMailComposeViewControllerDelegate {
     func mailComposeController(_ controller: MFMailComposeViewController, didFinishWith result: MFMailComposeResult, error: Error?) {
--- a/browser/Navigation/NavigationViewController.swift
View file @a66b8be
+++ b/browser/Navigation/NavigationViewController.swift
View file @a66b8be
@@ -27,10 +27,9 @@ extension NavigationViewController {
     private func setStartControllers() {
         let payloadViewController = PayloadViewController()
         let removeAdvertViewController = RemoveAdvertViewController()
-        
         let cachingManager = CachingManager.shared
-        if cachingManager.isFirstAppLoad == false {
+        if !cachingManager.isFirstAppLoad {
             setViewControllers([removeAdvertViewController, payloadViewController], animated: true)
             cachingManager.isFirstAppLoad.toggle()
         } else {