From ab9fafeb190ae0cd81022d93698e163f4a32eda1 Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Wed, 10 Aug 2022 16:35:55 +0300 Subject: [PATCH] fix: review notes --- .../Models/BaseFilterCellAppearance.swift | 0 .../Models/FilterCellViewModelProtocol.swift | 0 .../ViewModels/DefaultFilterCellViewModel.swift | 0 .../Views/DefaultFilterCollectionCell.swift | 0 .../UICollectionViewLayout+DefaultLayout.swift | 0 .../Models/DefaultFilterPropertyValue.swift | 0 .../Models/FiltersLayoutConfiguration.swift | 0 .../Protocols/FilterPropertyValueRepresenter.swift | 0 .../Protocols/FilterViewModelProtocol.swift | 0 .../ViewModels/BaseFilterViewModel.swift | 0 .../ViewModels/DefaultFilterViewModel.swift | 0 .../Views/BaseFiltersCollectionView.swift | 2 +- .../Views/DefaultFiltersCollectionView.swift | 0 .../Sources/Protocols/ReuseIdentifierProtocol.swift | 12 ++---------- 14 files changed, 3 insertions(+), 11 deletions(-) rename TIEcommerce/Sources/Filters/{ => FiltersCollectionCell}/Models/BaseFilterCellAppearance.swift (100%) rename TIEcommerce/Sources/Filters/{ => FiltersCollectionCell}/Models/FilterCellViewModelProtocol.swift (100%) rename TIEcommerce/Sources/Filters/{ => FiltersCollectionCell}/ViewModels/DefaultFilterCellViewModel.swift (100%) rename TIEcommerce/Sources/Filters/{ => FiltersCollectionCell}/Views/DefaultFilterCollectionCell.swift (100%) rename TIEcommerce/Sources/Filters/{ => FiltersCollectionView}/Helpers/UICollectionViewLayout+DefaultLayout.swift (100%) rename TIEcommerce/Sources/Filters/{ => FiltersCollectionView}/Models/DefaultFilterPropertyValue.swift (100%) rename TIEcommerce/Sources/Filters/{ => FiltersCollectionView}/Models/FiltersLayoutConfiguration.swift (100%) rename TIEcommerce/Sources/Filters/{ => FiltersCollectionView}/Protocols/FilterPropertyValueRepresenter.swift (100%) rename TIEcommerce/Sources/Filters/{ => FiltersCollectionView}/Protocols/FilterViewModelProtocol.swift (100%) rename TIEcommerce/Sources/Filters/{ => FiltersCollectionView}/ViewModels/BaseFilterViewModel.swift (100%) rename TIEcommerce/Sources/Filters/{ => FiltersCollectionView}/ViewModels/DefaultFilterViewModel.swift (100%) rename TIEcommerce/Sources/Filters/{ => FiltersCollectionView}/Views/BaseFiltersCollectionView.swift (98%) rename TIEcommerce/Sources/Filters/{ => FiltersCollectionView}/Views/DefaultFiltersCollectionView.swift (100%) diff --git a/TIEcommerce/Sources/Filters/Models/BaseFilterCellAppearance.swift b/TIEcommerce/Sources/Filters/FiltersCollectionCell/Models/BaseFilterCellAppearance.swift similarity index 100% rename from TIEcommerce/Sources/Filters/Models/BaseFilterCellAppearance.swift rename to TIEcommerce/Sources/Filters/FiltersCollectionCell/Models/BaseFilterCellAppearance.swift diff --git a/TIEcommerce/Sources/Filters/Models/FilterCellViewModelProtocol.swift b/TIEcommerce/Sources/Filters/FiltersCollectionCell/Models/FilterCellViewModelProtocol.swift similarity index 100% rename from TIEcommerce/Sources/Filters/Models/FilterCellViewModelProtocol.swift rename to TIEcommerce/Sources/Filters/FiltersCollectionCell/Models/FilterCellViewModelProtocol.swift diff --git a/TIEcommerce/Sources/Filters/ViewModels/DefaultFilterCellViewModel.swift b/TIEcommerce/Sources/Filters/FiltersCollectionCell/ViewModels/DefaultFilterCellViewModel.swift similarity index 100% rename from TIEcommerce/Sources/Filters/ViewModels/DefaultFilterCellViewModel.swift rename to TIEcommerce/Sources/Filters/FiltersCollectionCell/ViewModels/DefaultFilterCellViewModel.swift diff --git a/TIEcommerce/Sources/Filters/Views/DefaultFilterCollectionCell.swift b/TIEcommerce/Sources/Filters/FiltersCollectionCell/Views/DefaultFilterCollectionCell.swift similarity index 100% rename from TIEcommerce/Sources/Filters/Views/DefaultFilterCollectionCell.swift rename to TIEcommerce/Sources/Filters/FiltersCollectionCell/Views/DefaultFilterCollectionCell.swift diff --git a/TIEcommerce/Sources/Filters/Helpers/UICollectionViewLayout+DefaultLayout.swift b/TIEcommerce/Sources/Filters/FiltersCollectionView/Helpers/UICollectionViewLayout+DefaultLayout.swift similarity index 100% rename from TIEcommerce/Sources/Filters/Helpers/UICollectionViewLayout+DefaultLayout.swift rename to TIEcommerce/Sources/Filters/FiltersCollectionView/Helpers/UICollectionViewLayout+DefaultLayout.swift diff --git a/TIEcommerce/Sources/Filters/Models/DefaultFilterPropertyValue.swift b/TIEcommerce/Sources/Filters/FiltersCollectionView/Models/DefaultFilterPropertyValue.swift similarity index 100% rename from TIEcommerce/Sources/Filters/Models/DefaultFilterPropertyValue.swift rename to TIEcommerce/Sources/Filters/FiltersCollectionView/Models/DefaultFilterPropertyValue.swift diff --git a/TIEcommerce/Sources/Filters/Models/FiltersLayoutConfiguration.swift b/TIEcommerce/Sources/Filters/FiltersCollectionView/Models/FiltersLayoutConfiguration.swift similarity index 100% rename from TIEcommerce/Sources/Filters/Models/FiltersLayoutConfiguration.swift rename to TIEcommerce/Sources/Filters/FiltersCollectionView/Models/FiltersLayoutConfiguration.swift diff --git a/TIEcommerce/Sources/Filters/Protocols/FilterPropertyValueRepresenter.swift b/TIEcommerce/Sources/Filters/FiltersCollectionView/Protocols/FilterPropertyValueRepresenter.swift similarity index 100% rename from TIEcommerce/Sources/Filters/Protocols/FilterPropertyValueRepresenter.swift rename to TIEcommerce/Sources/Filters/FiltersCollectionView/Protocols/FilterPropertyValueRepresenter.swift diff --git a/TIEcommerce/Sources/Filters/Protocols/FilterViewModelProtocol.swift b/TIEcommerce/Sources/Filters/FiltersCollectionView/Protocols/FilterViewModelProtocol.swift similarity index 100% rename from TIEcommerce/Sources/Filters/Protocols/FilterViewModelProtocol.swift rename to TIEcommerce/Sources/Filters/FiltersCollectionView/Protocols/FilterViewModelProtocol.swift diff --git a/TIEcommerce/Sources/Filters/ViewModels/BaseFilterViewModel.swift b/TIEcommerce/Sources/Filters/FiltersCollectionView/ViewModels/BaseFilterViewModel.swift similarity index 100% rename from TIEcommerce/Sources/Filters/ViewModels/BaseFilterViewModel.swift rename to TIEcommerce/Sources/Filters/FiltersCollectionView/ViewModels/BaseFilterViewModel.swift diff --git a/TIEcommerce/Sources/Filters/ViewModels/DefaultFilterViewModel.swift b/TIEcommerce/Sources/Filters/FiltersCollectionView/ViewModels/DefaultFilterViewModel.swift similarity index 100% rename from TIEcommerce/Sources/Filters/ViewModels/DefaultFilterViewModel.swift rename to TIEcommerce/Sources/Filters/FiltersCollectionView/ViewModels/DefaultFilterViewModel.swift diff --git a/TIEcommerce/Sources/Filters/Views/BaseFiltersCollectionView.swift b/TIEcommerce/Sources/Filters/FiltersCollectionView/Views/BaseFiltersCollectionView.swift similarity index 98% rename from TIEcommerce/Sources/Filters/Views/BaseFiltersCollectionView.swift rename to TIEcommerce/Sources/Filters/FiltersCollectionView/Views/BaseFiltersCollectionView.swift index 1bda546d..c62a6552 100644 --- a/TIEcommerce/Sources/Filters/Views/BaseFiltersCollectionView.swift +++ b/TIEcommerce/Sources/Filters/FiltersCollectionView/Views/BaseFiltersCollectionView.swift @@ -24,7 +24,7 @@ import TIUIKitCore import UIKit @available(iOS 13.0, *) -open class BaseFiltersCollectionView: UICollectionView, InitializableViewProtocol, UpdatableView, diff --git a/TIEcommerce/Sources/Filters/Views/DefaultFiltersCollectionView.swift b/TIEcommerce/Sources/Filters/FiltersCollectionView/Views/DefaultFiltersCollectionView.swift similarity index 100% rename from TIEcommerce/Sources/Filters/Views/DefaultFiltersCollectionView.swift rename to TIEcommerce/Sources/Filters/FiltersCollectionView/Views/DefaultFiltersCollectionView.swift diff --git a/TIUIKitCore/Sources/Protocols/ReuseIdentifierProtocol.swift b/TIUIKitCore/Sources/Protocols/ReuseIdentifierProtocol.swift index 88fa665f..a7442509 100644 --- a/TIUIKitCore/Sources/Protocols/ReuseIdentifierProtocol.swift +++ b/TIUIKitCore/Sources/Protocols/ReuseIdentifierProtocol.swift @@ -22,17 +22,9 @@ import UIKit -/// Protocol which ensures that specific type can return reuse identifier for view -public protocol AbstractReuseIdentifierProtocol { - associatedtype IdentifierType - - static var reuseIdentifier: IdentifierType { get } -} - /// Protocol which ensures that specific type can return string reuse identifier for view -public protocol ReuseIdentifierProtocol: AbstractReuseIdentifierProtocol { - +public protocol ReuseIdentifierProtocol { static var reuseIdentifier: String { get } } -public typealias IdentifiableCollectionCell = UICollectionViewCell & ReuseIdentifierProtocol +public typealias ReuseIdentifiableCollectionCell = UICollectionViewCell & ReuseIdentifierProtocol