Merge pull request #5246 from oa-s/#5234-2

remove dependency from resources #5234

AlphaWallet/Accounts/Coordinators/AccountsCoordinator.swift

@@ -3,6 +3,7 @@
 import Foundation
 import UIKit
 import Combine
+import AlphaWalletFoundation
 
 protocol AccountsCoordinatorDelegate: AnyObject {
     func didCancel(in coordinator: AccountsCoordinator)

AlphaWallet/Accounts/ViewControllers/AccountsViewController.swift

@@ -2,6 +2,7 @@
 
 import UIKit
 import Combine
+import AlphaWalletFoundation
 
 protocol AccountsViewControllerDelegate: AnyObject {
     func didSelectAccount(account: Wallet, in viewController: AccountsViewController)

AlphaWallet/Accounts/ViewModels/AccountViewModel.swift

@@ -2,6 +2,7 @@
 
 import UIKit
 import Combine
+import AlphaWalletFoundation
 
 class AccountViewModel {
     private let getWalletName: GetWalletName

AlphaWallet/Accounts/ViewModels/AccountsViewModel.swift

@@ -3,6 +3,7 @@
 import Foundation
 import Combine 
 import UIKit
+import AlphaWalletFoundation
 
 struct AccountsViewModelInput {
     let appear: AnyPublisher<Void, Never>

AlphaWallet/Accounts/ViewModels/WalletSummaryViewModel.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import Combine
+import AlphaWalletFoundation
 
 struct WalletSummaryViewModel {
     private let alignment: NSTextAlignment

AlphaWallet/Accounts/Views/AccountViewCell.swift

@@ -2,6 +2,7 @@
 
 import UIKit
 import Combine
+import AlphaWalletFoundation
 
 class AccountViewCell: UITableViewCell {
     private let addressOrEnsName = UILabel()

AlphaWallet/ActiveWalletCoordinator.swift

@@ -4,6 +4,7 @@ import PromiseKit
 import RealmSwift
 import Result
 import Combine
+import AlphaWalletFoundation
 
 // swiftlint:disable file_length
 protocol ActiveWalletCoordinatorDelegate: AnyObject {

AlphaWallet/Activities/Coordinators/ActivitiesCoordinator.swift

@@ -2,6 +2,7 @@
 
 import UIKit
 import Combine
+import AlphaWalletFoundation
 
 protocol ActivitiesCoordinatorDelegate: AnyObject {
     func didPressTransaction(transaction: TransactionInstance, in viewController: ActivitiesViewController)

AlphaWallet/Activities/ViewControllers/ActivitiesViewController.swift

@@ -3,6 +3,7 @@
 import UIKit
 import BigInt
 import StatefulViewController
+import AlphaWalletFoundation
 
 protocol ActivitiesViewControllerDelegate: AnyObject {
     func didPressActivity(activity: Activity, in viewController: ActivitiesViewController)

AlphaWallet/Activities/ViewControllers/ActivityViewController.swift

@@ -2,6 +2,7 @@
 
 import UIKit
 import Combine
+import AlphaWalletFoundation
 
 protocol ActivityViewControllerDelegate: AnyObject {
     func reinject(viewController: ActivityViewController)

AlphaWallet/Activities/ViewModels/ActivitiesViewModel.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import AlphaWalletFoundation
 
 struct ActivitiesViewModel {
     var collection: ActivityCollection

AlphaWallet/Activities/ViewModels/ActivityCellViewModel.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import BigInt
+import AlphaWalletFoundation
 
 struct ActivityCellViewModel {
     private var server: RPCServer {

AlphaWallet/Activities/ViewModels/ActivityStateViewViewModel.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import AlphaWalletFoundation
 
 struct ActivityStateViewViewModel {
     var stateImage: UIImage? {

AlphaWallet/Activities/ViewModels/ActivityViewModel.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import BigInt
+import AlphaWalletFoundation
 
 struct ActivityViewModel {
     let activity: Activity
@@ -159,10 +160,10 @@ struct ActivityViewModel {
 
 extension HasTokenImage {
 
-    func icon(withSize size: GoogleContentSize) -> Subscribable<TokenImage> {
+    public func icon(withSize size: GoogleContentSize) -> Subscribable<TokenImage> {
         let name = symbol.nilIfEmpty ?? name
         let colors = [R.color.radical()!, R.color.cerulean()!, R.color.emerald()!, R.color.indigo()!, R.color.azure()!, R.color.pumpkin()!]
         let blockChainNameColor = server.blockChainNameColor
-        return TokenImageFetcher.instance.image(contractAddress: contractAddress, server: server, name: name, type: type, balance: firstNftAsset, size: size, contractDefinedImage: contractAddress.tokenImage, colors: colors, staticOverlayIcon: server.staticOverlayIcon, blockChainNameColor: blockChainNameColor)
+        return TokenImageFetcher.instance.image(contractAddress: contractAddress, server: server, name: name, type: type, balance: firstNftAsset, size: size, contractDefinedImage: contractAddress.tokenImage, colors: colors, staticOverlayIcon: server.staticOverlayIcon, blockChainNameColor: blockChainNameColor, serverIconImage: server.iconImage)
     }
 }

AlphaWallet/Activities/ViewModels/DefaultActivityCellViewModel.swift

@@ -2,6 +2,7 @@
 
 import UIKit
 import BigInt
+import AlphaWalletFoundation
 
 struct DefaultActivityCellViewModel {
     private var server: RPCServer {

AlphaWallet/Activities/ViewModels/DefaultActivityViewModel.swift

@@ -2,6 +2,7 @@
 
 import UIKit
 import BigInt
+import AlphaWalletFoundation
 
 struct DefaultActivityViewModel {
     private var server: RPCServer {

AlphaWallet/Activities/Views/ActivitiesView.swift

@@ -8,6 +8,7 @@
 import UIKit
 import BigInt
 import StatefulViewController
+import AlphaWalletFoundation
 
 protocol ActivitiesViewDelegate: class {
     func didPressActivity(activity: Activity, in view: ActivitiesView)

AlphaWallet/Activities/Views/ActivityPageView.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import StatefulViewController
+import AlphaWalletFoundation
 
 struct ActivityPageViewModel {
     var title: String {

AlphaWallet/Activities/Views/ActivityViewCell.swift

@@ -2,6 +2,7 @@
 
 import UIKit
 import BigInt
+import AlphaWalletFoundation
 
 class ActivityViewCell: UITableViewCell {
     private let background = UIView()

AlphaWallet/AddMultipleCustomRpc/AddMultipleCustomRpcModel.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import AlphaWalletFoundation
 
 class AddMultipleCustomRpcModel: NSObject {
 

AlphaWallet/AddMultipleCustomRpc/AddMultipleCustomRpcViewController.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import PromiseKit
+import AlphaWalletFoundation
 
 @objc protocol AddMultipleCustomRpcViewControllerResponse: AnyObject {
     @objc func addMultipleCustomRpcCompleted()

AlphaWallet/Alerts/Coordinators/EditPriceAlertCoordinator.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import AlphaWalletFoundation
 
 protocol EditPriceAlertCoordinatorDelegate: class {
     func didClose(in coordinator: EditPriceAlertCoordinator)

AlphaWallet/Alerts/ViewControllers/EditPriceAlertViewController.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import Combine
+import AlphaWalletFoundation
 
 protocol EditPriceAlertViewControllerDelegate: class {
     func didUpdateAlert(in viewController: EditPriceAlertViewController)

AlphaWallet/Alerts/ViewModels/EditPriceAlertViewModel.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import AlphaWalletFoundation
 
 enum EdiPricetAlertViewModelConfiguration {
     case create

AlphaWallet/Alerts/ViewModels/PriceAlertsPageViewModel.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import AlphaWalletFoundation
 
 struct PriceAlertsPageViewModel {
     var title: String { return R.string.localizable.priceAlertNavigationTitle() }

AlphaWallet/Alerts/Views/PriceAlertsPageView.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import AlphaWalletFoundation
 
 protocol PriceAlertsPageViewDelegate: class {
     func editAlertSelected(in view: PriceAlertsPageView, alert: PriceAlert)

AlphaWallet/AlphaWalletHelp/Views/ContactUsBannerView.swift

@@ -2,6 +2,7 @@
 
 import UIKit
 import MessageUI
+import AlphaWalletFoundation
 
 protocol ContactUsBannerViewDelegate: AnyObject {
     func present(_ viewController: UIViewController, for view: ContactUsBannerView)

AlphaWallet/AppCoordinator.swift

@@ -4,13 +4,21 @@ import Combine
 import UIKit
 import PromiseKit
 import AlphaWalletCore
+import AlphaWalletFoundation
+
+extension TokenScript {
+    static let baseTokenScriptFiles: [TokenType: String] = [
+        .erc20: (try! String(contentsOf: R.file.erc20TokenScriptTsml()!)),
+        .erc721: (try! String(contentsOf: R.file.erc721TokenScriptTsml()!)),
+    ]
+}
 
 class AppCoordinator: NSObject, Coordinator {
     private let config = Config()
     private let legacyFileBasedKeystore: LegacyFileBasedKeystore
     private let lock = Lock()
     private var keystore: Keystore
-    private let assetDefinitionStore = AssetDefinitionStore()
+    private let assetDefinitionStore = AssetDefinitionStore(baseTokenScriptFiles: TokenScript.baseTokenScriptFiles)
     private let window: UIWindow
     private var appTracker = AppTracker()
     //TODO rename and replace type? Not Initializer but similar as of writing

AlphaWallet/AppDelegate.swift

@@ -5,6 +5,7 @@ import AWSCore
 import PromiseKit
 import UserNotifications
 import AlphaWalletAddress
+import AlphaWalletFoundation 
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDelegate {

AlphaWallet/Browser/Coordinators/DappBrowserCoordinator.swift

@@ -8,6 +8,7 @@ import JSONRPCKit
 import PromiseKit
 import RealmSwift
 import Result
+import AlphaWalletFoundation
 
 protocol DappBrowserCoordinatorDelegate: CanOpenURL, RequestAddCustomChainProvider, RequestSwitchChainProvider, BuyCryptoDelegate {
     func didSentTransaction(transaction: SentTransaction, inCoordinator coordinator: DappBrowserCoordinator)

AlphaWallet/Browser/Coordinators/DappRequestSwitchCustomChainCoordinator.swift

@@ -2,6 +2,7 @@
 
 import UIKit
 import PromiseKit
+import AlphaWalletFoundation
 
 protocol DappRequestSwitchCustomChainCoordinatorDelegate: AnyObject {
     func notifySuccessful(withCallbackId callbackId: SwitchCustomChainCallbackId, inCoordinator coordinator: DappRequestSwitchCustomChainCoordinator)

AlphaWallet/Browser/Coordinators/DappRequestSwitchExistingChainCoordinator.swift

@@ -2,6 +2,7 @@
 
 import UIKit
 import PromiseKit
+import AlphaWalletFoundation
 
 protocol DappRequestSwitchExistingChainCoordinatorDelegate: AnyObject {
     func notifySuccessful(withCallbackId callbackId: SwitchCustomChainCallbackId, inCoordinator coordinator: DappRequestSwitchExistingChainCoordinator)

AlphaWallet/Browser/Coordinators/QRCodeResolutionCoordinator.swift

@@ -8,6 +8,7 @@
 import Foundation
 import BigInt
 import PromiseKit
+import AlphaWalletFoundation
 
 protocol QRCodeResolutionCoordinatorDelegate: AnyObject {
     func coordinator(_ coordinator: QRCodeResolutionCoordinator, didResolveAddress address: AlphaWallet.Address, action: ScanQRCodeAction)

AlphaWallet/Browser/Coordinators/ScanQRCodeCoordinator.swift

@@ -4,6 +4,7 @@ import Foundation
 import QRCodeReaderViewController
 import BigInt
 import PromiseKit
+import AlphaWalletFoundation
 
 protocol ScanQRCodeCoordinatorDelegate: AnyObject {
     func didCancel(in coordinator: ScanQRCodeCoordinator)

AlphaWallet/Browser/ViewControllers/BrowserHistoryViewController.swift

@@ -5,6 +5,7 @@
 import Foundation
 import UIKit
 import StatefulViewController
+import AlphaWalletFoundation
 
 protocol BrowserHistoryViewControllerDelegate: AnyObject {
     func didSelect(history: History, inViewController controller: BrowserHistoryViewController)

AlphaWallet/Browser/ViewControllers/BrowserViewController.swift

@@ -5,6 +5,7 @@ import UIKit
 import WebKit
 import JavaScriptCore
 import Result
+import AlphaWalletFoundation
 
 protocol BrowserViewControllerDelegate: AnyObject {
     func didCall(action: DappAction, callbackID: Int, inBrowserViewController viewController: BrowserViewController)

AlphaWallet/Browser/ViewControllers/DappsAutoCompletionViewController.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 protocol DappsAutoCompletionViewControllerDelegate: AnyObject {
     func didTap(dapp: Dapp, inViewController viewController: DappsAutoCompletionViewController)

AlphaWallet/Browser/ViewControllers/DappsHomeViewController.swift

@@ -4,6 +4,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 protocol DappsHomeViewControllerDelegate: AnyObject {
     func didTapShowMyDappsViewController(inViewController viewController: DappsHomeViewController)

AlphaWallet/Browser/ViewControllers/DiscoverDappsViewController.swift

@@ -4,6 +4,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 protocol DiscoverDappsViewControllerDelegate: AnyObject {
     func didTap(dapp: Dapp, inViewController viewController: DiscoverDappsViewController)

AlphaWallet/Browser/ViewControllers/EditMyDappViewController.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 protocol EditMyDappViewControllerDelegate: AnyObject {
     func didTapSave(dapp: Bookmark, withTitle title: String, url: String, inViewController viewController: EditMyDappViewController)

AlphaWallet/Browser/ViewControllers/MyDappsViewController.swift

@@ -5,6 +5,7 @@
 import Foundation
 import UIKit
 import StatefulViewController
+import AlphaWalletFoundation
 
 protocol MyDappsViewControllerDelegate: AnyObject {
     func didTapToEdit(dapp: Bookmark, inViewController viewController: MyDappsViewController)

AlphaWallet/Browser/ViewControllers/SwitchChainRequestViewController.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import PromiseKit
+import AlphaWalletFoundation
 
 protocol SwitchChainRequestViewControllerDelegate: class {
     func didClose(in viewController: SwitchChainRequestViewController)

AlphaWallet/Browser/ViewModel/BrowserHistoryCellViewModel.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 struct BrowserHistoryCellViewModel {
     let history: History

AlphaWallet/Browser/ViewModel/DappViewCellViewModel.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 class DappViewCellViewModel {
     let dapp: Bookmark

AlphaWallet/Browser/ViewModel/DappsAutoCompletionCellViewModel.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 struct DappsAutoCompletionCellViewModel {
     let dapp: Dapp

AlphaWallet/Browser/ViewModel/DappsAutoCompletionViewControllerViewModel.swift

@@ -1,6 +1,7 @@
 // Copyright © 2018 Stormbird PTE. LTD.
 
 import Foundation
+import AlphaWalletFoundation
 
 struct DappsAutoCompletionViewControllerViewModel {
     var dappSuggestions = [Dapp]()

AlphaWallet/Browser/ViewModel/DappsHomeViewControllerViewModel.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 struct DappsHomeViewControllerViewModel {
     var bookmarksStore: BookmarksStore
@@ -17,4 +18,4 @@ struct DappsHomeViewControllerViewModel {
     var backgroundColor: UIColor {
         return Colors.appWhite
     }
-}
+}

AlphaWallet/Browser/ViewModel/DiscoverDappCellViewModel.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 struct DiscoverDappCellViewModel {
     let bookmarksStore: BookmarksStore

AlphaWallet/Browser/ViewModel/DiscoverDappsViewControllerViewModel.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 struct DiscoverDappsViewControllerViewModel {
 

AlphaWallet/Browser/ViewModel/EditMyDappViewControllerViewModel.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 struct EditMyDappViewControllerViewModel {
     let dapp: Bookmark

AlphaWallet/Browser/ViewModel/HistoriesViewModel.swift

@@ -1,6 +1,7 @@
 // Copyright DApps Platform Inc. All rights reserved.
 
 import Foundation
+import AlphaWalletFoundation
 
 struct HistoriesViewModel {
     private let store: HistoryStore

AlphaWallet/Browser/ViewModel/MyDappCellViewModel.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 struct MyDappCellViewModel {
     let dapp: Bookmark

AlphaWallet/Browser/ViewModel/MyDappsViewControllerViewModel.swift

@@ -1,6 +1,7 @@
 // Copyright © 2018 Stormbird PTE. LTD.
 
 import Foundation
+import AlphaWalletFoundation
 
 struct MyDappsViewControllerViewModel {
     var bookmarksStore: BookmarksStore

AlphaWallet/Browser/ViewModel/SwitchChainRequestViewModel.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import AlphaWalletFoundation
 
 struct SwitchChainRequestViewModel {
     let title: String = R.string.localizable.switchChainRequestTitle()

AlphaWallet/Browser/Views/DappBrowserNavigationBar.swift

@@ -1,6 +1,7 @@
 // Copyright © 2018 Stormbird PTE. LTD.
 
 import UIKit
+import AlphaWalletFoundation
 
 protocol DappBrowserNavigationBarDelegate: AnyObject {
     func didTyped(text: String, inNavigationBar navigationBar: DappBrowserNavigationBar)

AlphaWallet/Browser/Views/DappViewCell.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 protocol DappViewCellDelegate: AnyObject {
     func didTapDelete(dapp: Bookmark, inCell cell: DappViewCell)

AlphaWallet/Browser/Views/DiscoverDappCell.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 protocol DiscoverDappCellDelegate: AnyObject {
     func onAdd(dapp: Dapp, inCell cell: DiscoverDappCell)

AlphaWallet/BuyCrypto/BuyCryptoUsingThirdPartyCoordinator.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import AlphaWalletFoundation
 
 protocol BuyCryptoUsingThirdPartyCoordinatorDelegate: AnyObject, CanOpenURL {
 }

AlphaWallet/BuyCrypto/SelectServiceToBuyCryptoCoordinator.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import AlphaWalletFoundation
 
 protocol SelectServiceToBuyCryptoCoordinatorDelegate: AnyObject, CanOpenURL {
     func selectBuyService(_ result: Result<Void, BuyCryptoError>, in coordinator: SelectServiceToBuyCryptoCoordinator)

AlphaWallet/Common/Coordinators/AcceptProposalCoordinator.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import PromiseKit
+import AlphaWalletFoundation
 
 protocol AcceptProposalCoordinatorDelegate: AnyObject {
     func coordinator(_ coordinator: AcceptProposalCoordinator, didComplete result: ProposalResult)

AlphaWallet/Common/Coordinators/CheckDeviceCoordinator.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 class CheckDeviceCoordinator: Coordinator {
     private let navigationController: UINavigationController

AlphaWallet/Common/Coordinators/ServerUnavailableCoordinator.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import PromiseKit
+import AlphaWalletFoundation
 
 protocol ServerUnavailableCoordinatorDelegate: AnyObject {
     func didDismiss(in coordinator: ServerUnavailableCoordinator)

AlphaWallet/Common/Coordinators/WalletApiCoordinator.swift

@@ -8,6 +8,7 @@
 import UIKit
 import Combine
 import PromiseKit
+import AlphaWalletFoundation
 
 protocol WalletApiCoordinatorDelegate: AnyObject {
     func didOpenUrl(in service: WalletApiCoordinator, redirectUrl: URL)

AlphaWallet/Common/Services/DappRequestHandler.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import AlphaWalletFoundation
 
 protocol DappRequestHandlerDelegate: class {
     func processRestartQueueAndRestartUI()

AlphaWallet/Common/Services/FirebaseReportService.swift

@@ -6,6 +6,7 @@
 //
 
 import Firebase
+import AlphaWalletFoundation
 
 extension AlphaWallet {
     final class FirebaseReportService: ReportService {
@@ -126,3 +127,9 @@ extension AlphaWallet {
         }
     }
 }
+
+extension Constants {
+    public static let googleServiceInfoPlistContent: String? = {
+        R.file.googleServiceInfoPlist()?.path
+    }()
+}

AlphaWallet/Common/Services/KeyboardChecker.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import AlphaWalletFoundation
 
 class KeyboardChecker: NSObject {
 

AlphaWallet/Common/Services/LocalNotificationService.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import UserNotifications
+import AlphaWalletFoundation
 
 class LocalNotificationService: ScheduledNotificationService {
 

AlphaWallet/Common/Services/PushNotificationsService.swift

@@ -3,6 +3,7 @@
 import Foundation
 import UIKit
 import UserNotifications
+import AlphaWalletFoundation
 
 final class UNUserNotificationsService: NSObject, PushNotificationsService {
     private var notificationCenter: UNUserNotificationCenter {

AlphaWallet/Common/Types/AppStyle.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 func applyStyle() {
     UIBarButtonItem.appearance(whenContainedInInstancesOf: [UIDocumentBrowserViewController.self]).tintColor = Configuration.Color.Semantic.navigationbarButtonItemTint

AlphaWallet/Common/Types/CanOpenContractWebPage.swift

@@ -1,6 +1,7 @@
 //Copyright © 2018 Stormbird PTE. LTD.
 
 import UIKit
+import AlphaWalletFoundation
 
 protocol CanOpenURL {
     func didPressViewContractWebPage(forContract contract: AlphaWallet.Address, server: RPCServer, in viewController: UIViewController)

AlphaWallet/Common/Types/SwitchCustomChainCallbackId.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import AlphaWalletFoundation
 
 enum SwitchCustomChainCallbackId {
     case dapp(requestId: Int)

AlphaWallet/Common/ViewControllers/ModalViewController.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import AlphaWalletFoundation
 
 protocol ModalViewControllerDelegate: class {
     func didDismiss(_ controller: ModalViewController)

AlphaWallet/Common/ViewModels/AcceptDeepLinkViewModel.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import AlphaWalletAddress
+import AlphaWalletFoundation
 
 final class AcceptDeepLinkViewModel: SectionProtocol {
 

AlphaWallet/Common/ViewModels/AcceptProposalViewModel.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import AlphaWalletFoundation
 
 enum ProposalType {
     case walletConnect(AcceptWalletConnectSessionViewModel)

AlphaWallet/Common/ViewModels/AcceptWalletConnectSessionViewModel.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import AlphaWalletFoundation
 
 final class AcceptWalletConnectSessionViewModel: SectionProtocol {
     private let config: Config

AlphaWallet/Common/ViewModels/DappRequesterViewModel.swift

@@ -0,0 +1,38 @@
+//
+//  DappRequesterViewModel.swift
+//  AlphaWallet
+//
+//  Created by Vladyslav Shepitko on 31.08.2022.
+//
+
+import Foundation
+import AlphaWalletFoundation
+
+struct DappRequesterViewModel: RequesterViewModel {
+    let requester: Requester
+
+    var viewModels: [Any] {
+        var viewModels: [SignatureConfirmationViewModel.ViewType] = []
+
+        var dappNameHeader: String { R.string.localizable.walletConnectDappName() }
+        viewModels += [
+            .header(.init(title: .normal(requester.shortName), headerName: dappNameHeader, configuration: .init(section: 0)))
+        ]
+
+        if let dappUrl = requester.url {
+            var dappWebsiteHeader: String { R.string.localizable.walletConnectDappWebsite() }
+            viewModels += [
+                .header(.init(title: .normal(dappUrl.absoluteString), headerName: dappWebsiteHeader, configuration: .init(section: 0))),
+            ]
+        }
+
+        if let server = requester.server {
+            var dappServerHeader: String { R.string.localizable.settingsNetworkButtonTitle() }
+            viewModels += [
+                .header(.init(title: .normal(server.name), headerName: dappServerHeader, configuration: .init(section: 0)))
+            ]
+        }
+
+        return viewModels
+    }
+}

AlphaWallet/Common/ViewModels/DeepLinkRequesterViewModel.swift

@@ -0,0 +1,38 @@
+//
+//  DeepLinkRequesterViewModel.swift
+//  AlphaWallet
+//
+//  Created by Vladyslav Shepitko on 31.08.2022.
+//
+
+import Foundation
+import AlphaWalletFoundation
+
+struct DeepLinkRequesterViewModel: RequesterViewModel {
+    let requester: Requester
+
+    var viewModels: [Any] {
+        var viewModels: [SignatureConfirmationViewModel.ViewType] = []
+
+        var dappNameHeader: String { R.string.localizable.walletConnectDappName() }
+        viewModels += [
+            .header(.init(title: .normal(requester.shortName), headerName: dappNameHeader, configuration: .init(section: 0)))
+        ]
+
+        if let dappUrl = requester.url {
+            var dappWebsiteHeader: String { R.string.localizable.requesterFieldUrl() }
+            viewModels += [
+                .header(.init(title: .normal(dappUrl.absoluteString), headerName: dappWebsiteHeader, configuration: .init(section: 0))),
+            ]
+        }
+
+        if let server = requester.server {
+            var dappServerHeader: String { R.string.localizable.settingsNetworkButtonTitle() }
+            viewModels += [
+                .header(.init(title: .normal(server.name), headerName: dappServerHeader, configuration: .init(section: 0)))
+            ]
+        }
+
+        return viewModels
+    }
+}

AlphaWallet/Common/ViewModels/DropDownViewModel.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import AlphaWalletFoundation
 
 protocol DropDownItemType: Equatable {
     var title: String { get }

AlphaWallet/Common/ViewModels/GasViewModel.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import BigInt
+import AlphaWalletFoundation
 
 struct GasViewModel {
     private let fee: BigInt

AlphaWallet/Common/ViewModels/RequesterViewModel.swift

@@ -1,76 +0,0 @@
-//
-//  RequesterViewModel.swift
-//  AlphaWallet
-//
-//  Created by Vladyslav Shepitko on 16.06.2022.
-//
-
-import Foundation
-
-protocol RequesterViewModel {
-    var requester: Requester { get }
-
-    var viewModels: [SignatureConfirmationViewModel.ViewType] { get }
-}
-
-extension RequesterViewModel {
-    var iconUrl: URL? { return requester.iconUrl }
-}
-
-struct DeepLinkRequesterViewModel: RequesterViewModel {
-    let requester: Requester
-
-    var viewModels: [SignatureConfirmationViewModel.ViewType] {
-        var viewModels: [SignatureConfirmationViewModel.ViewType] = []
-
-        var dappNameHeader: String { R.string.localizable.walletConnectDappName() }
-        viewModels += [
-            .header(.init(title: .normal(requester.shortName), headerName: dappNameHeader, configuration: .init(section: 0)))
-        ]
-
-        if let dappUrl = requester.url {
-            var dappWebsiteHeader: String { R.string.localizable.requesterFieldUrl() }
-            viewModels += [
-                .header(.init(title: .normal(dappUrl.absoluteString), headerName: dappWebsiteHeader, configuration: .init(section: 0))),
-            ]
-        }
-
-        if let server = requester.server {
-            var dappServerHeader: String { R.string.localizable.settingsNetworkButtonTitle() }
-            viewModels += [
-                .header(.init(title: .normal(server.name), headerName: dappServerHeader, configuration: .init(section: 0)))
-            ]
-        }
-
-        return viewModels
-    }
-}
-
-struct DappRequesterViewModel: RequesterViewModel {
-    let requester: Requester
-
-    var viewModels: [SignatureConfirmationViewModel.ViewType] {
-        var viewModels: [SignatureConfirmationViewModel.ViewType] = []
-
-        var dappNameHeader: String { R.string.localizable.walletConnectDappName() }
-        viewModels += [
-            .header(.init(title: .normal(requester.shortName), headerName: dappNameHeader, configuration: .init(section: 0)))
-        ]
-
-        if let dappUrl = requester.url {
-            var dappWebsiteHeader: String { R.string.localizable.walletConnectDappWebsite() }
-            viewModels += [
-                .header(.init(title: .normal(dappUrl.absoluteString), headerName: dappWebsiteHeader, configuration: .init(section: 0))),
-            ]
-        }
-
-        if let server = requester.server {
-            var dappServerHeader: String { R.string.localizable.settingsNetworkButtonTitle() }
-            viewModels += [
-                .header(.init(title: .normal(server.name), headerName: dappServerHeader, configuration: .init(section: 0)))
-            ]
-        }
-
-        return viewModels
-    }
-}

AlphaWallet/Common/Views/AddressOrEnsNameLabel.swift

@@ -9,6 +9,7 @@ import UIKit
 import PromiseKit
 import CryptoSwift
 import Combine
+import AlphaWalletFoundation
 
 class AddressOrEnsNameLabel: UILabel {
 

AlphaWallet/Common/Views/AddressTextField.swift

@@ -1,6 +1,7 @@
 // Copyright © 2018 Stormbird PTE. LTD.
 
 import UIKit
+import AlphaWalletFoundation
 
 protocol AddressTextFieldDelegate: AnyObject {
     func displayError(error: Error, for textField: AddressTextField)
@@ -416,7 +417,7 @@ extension String {
 }
 
 extension SendInputErrors {
-    var errorDescription: String? {
+    public var errorDescription: String? {
         switch self {
         case .emptyClipBoard:
             return R.string.localizable.sendErrorEmptyClipBoard()

AlphaWallet/Common/Views/AmountTextField.swift

@@ -1,6 +1,7 @@
 // Copyright © 2018 Stormbird PTE. LTD.
 
 import UIKit
+import AlphaWalletFoundation
 
 protocol AmountTextFieldDelegate: AnyObject {
     func changeAmount(in textField: AmountTextField)

AlphaWallet/Common/Views/AmountTextField_v2.swift

@@ -2,6 +2,7 @@
 
 import UIKit
 import Combine
+import AlphaWalletFoundation
 
 protocol AmountTextField_v2Delegate: AnyObject {
     func changeAmount(in textField: AmountTextField_v2)

AlphaWallet/Common/Views/BlockieImageView.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import AlphaWalletFoundation
 
 class BlockieImageView: UIView {
     private lazy var imageView: WebImageView = {

AlphaWallet/Common/Views/ButtonsBar/ButtonsBar.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import UIKit
+import AlphaWalletFoundation
 
 enum HorizontalButtonsBarConfiguration {
     case empty

AlphaWallet/Common/Views/NavigationController.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import AlphaWalletFoundation
 
 protocol PushNotifiable {
     func didPushViewController(animated: Bool)