Merge pull request #1270 from novasamatech/fix/warnings

fix warnings
novasamatech · Nov 8, 2024 · bb81ad0 · bb81ad0
2 parents 879fb06 + 6655ab1
commit bb81ad0
Show file tree

Hide file tree

Showing 11 changed files with 175 additions and 134 deletions.
diff --git a/novawallet/Common/IconRetrieve/KingfisherIconRetrieveOperationFactory.swift b/novawallet/Common/IconRetrieve/KingfisherIconRetrieveOperationFactory.swift
@@ -61,8 +61,6 @@ extension KingfisherIconRetrieveOperationFactory: IconRetrieveOperationFactoryPr
                     return
                 }
 
-                let sizeBeforeProcessing = resultImage.size
-
                 if case .remoteTransparent = iconInfo.type {
                     resultImage = resultImage.redrawWithBackground(
                         color: R.color.colorTextPrimaryOnWhite()!,

diff --git a/novawallet/Common/QRCreation/Logo/QRCodeWithLogoFactory.swift b/novawallet/Common/QRCreation/Logo/QRCodeWithLogoFactory.swift
@@ -91,7 +91,7 @@ private extension QRCodeWithLogoFactory {
         qrSize: CGSize,
         partialResultClosure: @escaping (Result<QRCreationResult, Error>) -> Void
     ) -> CompoundOperationWrapper<QRCreationResult> {
-        var checkCacheOperation = checkCacheOperation(using: logoInfo)
+        let checkCacheOperation = checkCacheOperation(using: logoInfo)
 
         let wrapper: CompoundOperationWrapper<QRCreationResult> = OperationCombiningService.compoundNonOptionalWrapper(
             operationManager: OperationManager(operationQueue: operationQueue)

diff --git a/novawallet/Modules/AssetDetails/View/AssetDetailsViewLayout.swift b/novawallet/Modules/AssetDetails/View/AssetDetailsViewLayout.swift
@@ -91,10 +91,7 @@ final class AssetDetailsViewLayout: UIView {
     }
 
     private func setupLayout() {
-        balanceTableView.addArrangedSubview(headerCell)
-        balanceTableView.addArrangedSubview(totalCell)
-        balanceTableView.addArrangedSubview(transferrableCell)
-        balanceTableView.addArrangedSubview(lockCell)
+        setupBalanceTableViewLayout()
 
         addSubview(backgroundView)
         backgroundView.snp.makeConstraints {
@@ -143,7 +140,6 @@ final class AssetDetailsViewLayout: UIView {
             $0.leading.greaterThanOrEqualTo(assetView.snp.trailing).offset(8)
             $0.centerY.equalTo(assetView.snp.centerY)
         }
-
         addSubview(containerView)
         containerView.snp.makeConstraints {
             $0.leading.trailing.bottom.equalToSuperview()
@@ -155,6 +151,13 @@ final class AssetDetailsViewLayout: UIView {
         containerView.stackView.addArrangedSubview(buttonsRow)
     }
 
+    private func setupBalanceTableViewLayout() {
+        balanceTableView.addArrangedSubview(headerCell)
+        balanceTableView.addArrangedSubview(totalCell)
+        balanceTableView.addArrangedSubview(transferrableCell)
+        balanceTableView.addArrangedSubview(lockCell)
+    }
+
     func set(locale: Locale) {
         let languages = locale.rLanguages
 

diff --git a/novawallet/Modules/AssetList/AssetListPresenter.swift b/novawallet/Modules/AssetList/AssetListPresenter.swift
@@ -42,8 +42,12 @@ final class AssetListPresenter {
         self.localizationManager = localizationManager
         self.appearanceFacade = appearanceFacade
     }
+}
+
+// MARK: Private
 
-    private func providePolkadotStakingPromotion() {
+private extension AssetListPresenter {
+    func providePolkadotStakingPromotion() {
         guard shouldShowPolkadotPromotion else {
             return
         }
@@ -53,7 +57,7 @@ final class AssetListPresenter {
         view?.didReceivePromotion(viewModel: viewModel)
     }
 
-    private func provideHeaderViewModel() {
+    func provideHeaderViewModel() {
         guard let walletType = walletType, let name = name else {
             return
         }
@@ -87,7 +91,7 @@ final class AssetListPresenter {
         )
     }
 
-    private func createAssetAccountPrice(
+    func createAssetAccountPrice(
         chainAssetId: ChainAssetId,
         priceData: PriceData
     ) -> Either<SuccessAssetListAssetAccountPrice, FailedAssetListAssetAccountPrice>? {
@@ -117,7 +121,7 @@ final class AssetListPresenter {
             ))
     }
 
-    private func createAssetAccountPriceLock(
+    func createAssetAccountPriceLock(
         chainAssetId: ChainAssetId,
         priceData: PriceData
     ) -> AssetListAssetAccountPrice? {
@@ -140,7 +144,7 @@ final class AssetListPresenter {
         )
     }
 
-    private func provideHeaderViewModel(
+    func provideHeaderViewModel(
         with priceMapping: [ChainAssetId: PriceData],
         walletIdenticon: Data?,
         walletType: MetaAccountModelType,
@@ -169,7 +173,7 @@ final class AssetListPresenter {
         view?.didReceiveHeader(viewModel: viewModel)
     }
 
-    private func createHeaderPriceState(
+    func createHeaderPriceState(
         from priceMapping: [ChainAssetId: PriceData],
         externalBalances: [AssetListAssetAccountPrice]
     ) -> LoadableViewModelState<[AssetListAssetAccountPrice]> {
@@ -209,7 +213,7 @@ final class AssetListPresenter {
         return priceState + externalBalances
     }
 
-    private func createHeaderLockState(
+    func createHeaderLockState(
         from priceMapping: [ChainAssetId: PriceData],
         externalBalances: [AssetListAssetAccountPrice]
     ) -> [AssetListAssetAccountPrice]? {
@@ -226,7 +230,7 @@ final class AssetListPresenter {
         return locks + externalBalances
     }
 
-    private func checkNonZeroLocks() -> Bool {
+    func checkNonZeroLocks() -> Bool {
         let locks = model.balances.map { (try? $0.value.get())?.locked ?? 0 }
 
         if locks.contains(where: { $0 > 0 }) {
@@ -242,7 +246,7 @@ final class AssetListPresenter {
         return false
     }
 
-    private func provideAssetViewModels() {
+    func provideAssetViewModels() {
         guard let hidesZeroBalances, let assetListStyle else {
             return
         }
@@ -266,7 +270,7 @@ final class AssetListPresenter {
         }
     }
 
-    private func externalBalanceModel(prices: [ChainAssetId: PriceData]) -> [AssetListAssetAccountPrice] {
+    func externalBalanceModel(prices: [ChainAssetId: PriceData]) -> [AssetListAssetAccountPrice] {
         switch model.externalBalanceResult {
         case .failure, .none:
             return []
@@ -296,7 +300,7 @@ final class AssetListPresenter {
         }
     }
 
-    private func createGroupViewModels() -> [AssetListGroupType] {
+    func createGroupViewModels() -> [AssetListGroupType] {
         guard let hidesZeroBalances, let assetListStyle else {
             return []
         }
@@ -323,7 +327,7 @@ final class AssetListPresenter {
         }
     }
 
-    private func filterZeroBalances(_ assets: [AssetListAssetModel]) -> [AssetListAssetModel] {
+    func filterZeroBalances(_ assets: [AssetListAssetModel]) -> [AssetListAssetModel] {
         let filteredAssets: [AssetListAssetModel]
 
         filteredAssets = assets.filter { asset in
@@ -337,7 +341,7 @@ final class AssetListPresenter {
         return filteredAssets
     }
 
-    private func createAssetGroupViewModel(
+    func createAssetGroupViewModel(
         from groupModel: AssetListAssetGroupModel,
         maybePrices: [ChainAssetId: PriceData]?,
         hidesZeroBalances: Bool
@@ -365,7 +369,7 @@ final class AssetListPresenter {
         }
     }
 
-    private func createNetworkGroupViewModel(
+    func createNetworkGroupViewModel(
         from groupModel: AssetListChainGroupModel,
         maybePrices: [ChainAssetId: PriceData]?,
         hidesZeroBalances: Bool
@@ -401,7 +405,7 @@ final class AssetListPresenter {
         )
     }
 
-    private func provideNftViewModel() {
+    func provideNftViewModel() {
         guard !model.nfts.isEmpty else {
             view?.didReceiveNft(viewModel: nil)
             return
@@ -411,20 +415,20 @@ final class AssetListPresenter {
         view?.didReceiveNft(viewModel: nftViewModel)
     }
 
-    private func updateAssetsView() {
+    func updateAssetsView() {
         provideHeaderViewModel()
         provideAssetViewModels()
     }
 
-    private func updateHeaderView() {
+    func updateHeaderView() {
         provideHeaderViewModel()
     }
 
-    private func updateNftView() {
+    func updateNftView() {
         provideNftViewModel()
     }
 
-    private func presentAssetDetails(for chainAssetId: ChainAssetId) {
+    func presentAssetDetails(for chainAssetId: ChainAssetId) {
         // get chain from interactor that includes also disabled assets
         let optChain = interactor.getFullChain(for: chainAssetId.chainId) ?? model.allChains[chainAssetId.chainId]
 
@@ -438,6 +442,8 @@ final class AssetListPresenter {
     }
 }
 
+// MARK: AssetListPresenterProtocol
+
 extension AssetListPresenter: AssetListPresenterProtocol {
     func setup() {
         interactor.setup()
@@ -556,6 +562,8 @@ extension AssetListPresenter: AssetListPresenterProtocol {
     }
 }
 
+// MARK: AssetListInteractorOutputProtocol
+
 extension AssetListPresenter: AssetListInteractorOutputProtocol {
     func didReceive(result: AssetListBuilderResult) {
         guard result.walletId != nil, result.walletId == walletId else {
@@ -638,6 +646,8 @@ extension AssetListPresenter: AssetListInteractorOutputProtocol {
     }
 }
 
+// MARK: Localizable
+
 extension AssetListPresenter: Localizable {
     func applyLocalization() {
         if let view = view, view.isSetup {

diff --git a/novawallet/Modules/AssetList/Models/AssetListAssetModelComparator.swift b/novawallet/Modules/AssetList/Models/AssetListAssetModelComparator.swift
@@ -28,7 +28,7 @@ enum AssetListAssetModelComparator {
             return nil
         }
     }
-    
+
     static func byChain(
         lhs: AssetListAssetModel,
         rhs: AssetListAssetModel

diff --git a/...wallet/Modules/AssetList/View/AssetListCollectionManager/AssetListCollectionManager.swift b/...wallet/Modules/AssetList/View/AssetListCollectionManager/AssetListCollectionManager.swift
@@ -17,6 +17,7 @@ final class AssetListCollectionManager {
     private var promotionBannerViewModel: PromotionBannerView.ViewModel?
 
     private let collectionViewDataSource: AssetListCollectionViewDataSource
+    // swiftlint:disable weak_delegate
     private let collectionViewDelegate: AssetListCollectionViewDelegate
 
     init(

diff --git a/...Modules/AssetList/View/AssetListCollectionManager/AssetListCollectionViewDataSource.swift b/...Modules/AssetList/View/AssetListCollectionManager/AssetListCollectionViewDataSource.swift
@@ -113,13 +113,11 @@ private extension AssetListCollectionViewDataSource {
             action: #selector(actionManage),
             for: .touchUpInside
         )
-
         settingsCell.searchButton.addTarget(
             self,
             action: #selector(actionSearch),
             for: .touchUpInside
         )
-
         settingsCell.styleSwitcher.addTarget(
             self,
             action: #selector(actionSwitchStyle),

diff --git a/novawallet/Modules/AssetList/View/AssetListStyleSwitcher/AssetListStyleSwitcherView.swift b/novawallet/Modules/AssetList/View/AssetListStyleSwitcher/AssetListStyleSwitcherView.swift
@@ -191,7 +191,7 @@ private extension AssetListStyleSwitcherView {
             newText: R.string.localizable.commonTokens(
                 preferredLanguages: locale.rLanguages
             ),
-            direction: .up
+            direction: .top
         )
         animateIndicators(
             squareColor: Constants.indicatorInactiveColor,
@@ -204,7 +204,7 @@ private extension AssetListStyleSwitcherView {
             newText: R.string.localizable.commonNetworks(
                 preferredLanguages: locale.rLanguages
             ),
-            direction: .down
+            direction: .bottom
         )
         animateIndicators(
             squareColor: Constants.indicatorActiveColor,
@@ -357,13 +357,13 @@ private extension AssetListStyleSwitcherView {
 
 private extension AssetListStyleSwitcherView {
     enum AnimationDirection {
-        case up
-        case down
+        case top
+        case bottom
 
         var yOffset: CGFloat {
             switch self {
-            case .up: return -1
-            case .down: return 1
+            case .top: return -1
+            case .bottom: return 1
             }
         }
     }