Merge pull request 'HolderViewSkeletonsConfiguration, CALayer support for DashedBoundsLayer' (#29) from feature/skeletons_holder_configuration into master

Reviewed-on: #29

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_PATH: ".gem"

.githooks/prepare-commit-msg

@@ -0,0 +1,96 @@
+#!/usr/bin/env python3
+
+import sys, re, os
+from subprocess import check_output
+from sys import getdefaultencoding
+
+getdefaultencoding()  # utf-8
+
+valid_commit_style = '^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style)(\(\S+\))?\!?: .+'
+merge_commit_style = '^(m|M)erge .+'
+
+success_title = 'SUCCESS'
+success_color = '92m'
+
+error_title = 'ERROR'
+error_message = 'Incorrect commit message style!\nThe commit pattern:'
+error_commit_pattern = '    type(scope): message | type: message \n'
+error_color = '91m'
+
+breaking_changes_message = 'If commit include Breaking changes use ! after type or scope:' 
+colored_breaking_changes_message = 'If commit include \033[91mBreaking changes\033[00m use \033[91m!\033[00m after type or scope:' 
+breaking_changes_commit_pattern = '    type(scope)!: message | type!: message \n'
+
+available_types_message = 'Available commit types:'
+available_commit_types = ['build: Changes that affect the build system or external dependencies',
+ 'ci: Changes to our CI configuration files and scripts', 
+ 'docs: Documentation only changes', 
+ 'feat: A new feature. Correlates with MINOR in SemVer', 
+ 'fix: A bug fix. Correlates with PATCH in SemVer', 
+ 'perf: A code change that improves performance',
+ 'refactor: A code change that neither fixes', 
+ 'revert: A revert to previous commit', 
+ 'style: Changes that do not affect the meaning of the code (white-space, formatting, etc)']
+
+is_GUI_client = False
+
+def print_result_header(result_title, color): 
+    if not is_GUI_client:
+        print("[\033[96mcommit lint\033[00m] [\033[{}{}\033[00m]\n".format(color, result_title))
+
+def print_pattern(pattern):
+    if is_GUI_client:
+        print(pattern)
+    else:
+        print("\033[96m{}\033[00m".format(pattern))
+
+def print_error_message(): 
+    print_result_header(error_title, error_color)
+
+    print(error_message)
+    print_pattern(error_commit_pattern)
+
+    if is_GUI_client:
+        print(breaking_changes_message)
+    else:
+        print(colored_breaking_changes_message)
+
+    print_pattern(breaking_changes_commit_pattern)
+    print_available_commit_types()
+
+def print_available_commit_types():
+    print(available_types_message)
+
+    for commit_type in available_commit_types:
+        print("   - %s" %commit_type)
+
+def write_commit_message(fh, commit_msg):
+    fh.seek(0, 0)
+    fh.write(commit_msg)
+
+def lint_commit_message(fh, commit_msg):
+    is_merge_commit = re.findall(merge_commit_style, commit_msg)
+    is_valid_commit = re.findall(valid_commit_style, commit_msg)
+
+    if is_valid_commit or is_merge_commit:
+        print_result_header(success_title, success_color)
+        write_commit_message(fh, commit_msg)
+        sys.exit(os.EX_OK)
+    else:
+        print_error_message()
+        sys.exit(os.EX_DATAERR)
+
+def run_script():
+    commit_msg_filepath = sys.argv[1]
+
+    with open(commit_msg_filepath, 'r+') as fh:
+        commit_msg = fh.read()
+        lint_commit_message(fh, commit_msg)
+
+try:
+    sys.stdin = open("/dev/tty", "r")
+    is_GUI_client = False
+except:
+    is_GUI_client = True
+
+run_script()

.gitignore

@@ -1,16 +1,18 @@
-# ================
-# Swift.gitignore
-# ================
-
 # Xcode
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
-## Build generated
-build/
-DerivedData
+## User settings
+xcuserdata/
 
-## Various settings
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
+*.xcscmblueprint
+*.xccheckout
+
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
+build/
+DerivedData/
+*.moved-aside
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -19,17 +21,14 @@ DerivedData
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
-
-## Other
-*.xccheckout
-*.moved-aside
-*.xcuserstate
-*.xcscmblueprint
 
 ## Obj-C/Swift specific
 *.hmap
+
+## App packaging
 *.ipa
+*.dSYM.zip
+*.dSYM
 
 ## Playgrounds
 timeline.xctimeline
@@ -39,6 +38,14 @@ playground.xcworkspace
 #
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 # Packages/
+# Package.pins
+# Package.resolved
+# *.xcodeproj
+#
+# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
+# hence it is not needed unless you have added a package configuration file to your project
+.swiftpm
+
 .build/
 
 # CocoaPods
@@ -48,33 +55,56 @@ playground.xcworkspace
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
 Pods/
+#
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
 
 # Carthage
 #
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
 Carthage/Checkouts
 
-Carthage/Build
+Carthage/Build/
+
+# Accio dependency management
+Dependencies/
+.accio/
 
 # fastlane
 #
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
-# screenshots whenever they are needed.
+# It is recommended to not store the screenshots in the git repo.
+# Instead, use fastlane to re-generate the screenshots whenever they are needed.
 # For more information about the recommended setup visit:
-# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
 
 fastlane/report.xml
-fastlane/screenshots
+fastlane/Preview.html
+fastlane/screenshots/**/*.png
+fastlane/test_output
 
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
 
-# AppCode
-# https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems
+iOSInjectionProject/
 
-.idea/workspace.xml
-.idea/tasks.xml
+# homebrew-bundle
+Brewfile.lock.json
 
-cpd-output.xml
+# Node.js
+# Dependency directories
+node_modules/
 
 # Touch Instinct custom
 Downloads/
+fastlane/README.md
+Templates/
+cpd-output.xml
+*.swp
+*IDEWorkspaceChecks.plist
 
+# Gem
+.gem/
+
+.DS_Store

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "build-scripts"]
 	path = build-scripts
-	url = https://github.com/TouchInstinct/BuildScripts.git
+	url = https://git.svc.touchin.ru/TouchInstinct/BuildScripts.git

.travis.yml

@@ -1,31 +0,0 @@
-
-language: swift
-osx_image: xcode10
-
-env:
-  global:
-    - LC_CTYPE=en_US.UTF-8
-    - LANG=en_US.UTF-8
-
-jdk:
-  - oraclejdk9
-
-before_install:
-    - env
-    - locale
-    - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
-    - xcpretty --version
-    - xcodebuild -version
-    - xcodebuild -showsdks
-    - pod install --repo-update
-    - brew install pmd
-
-script:
-    - set -o pipefail
-    - xcodebuild -enableCodeCoverage YES CODE_SIGNING_ALLOWED=YES -workspace LeadKit.xcworkspace -scheme 'LeadKit iOS' -destination 'platform=iOS Simulator,OS=12.0,name=iPhone 7' build test | xcpretty -c
-    - xcodebuild -enableCodeCoverage YES CODE_SIGNING_ALLOWED=YES -workspace LeadKit.xcworkspace -scheme 'LeadKit iOS Extensions' -destination 'platform=iOS Simulator,OS=12.0,name=iPhone 7' build test | xcpretty -c
-    - xcodebuild -enableCodeCoverage YES CODE_SIGNING_ALLOWED=YES -workspace LeadKit.xcworkspace -scheme 'LeadKit tvOS' -destination 'platform=tvOS Simulator,name=Apple TV 4K' -sdk appletvsimulator build test | xcpretty -c
-
-after_success:
-    - sleep 5
-    - bash < (curl -s https://codecov.io/bash)

CHANGELOG.md

@@ -1,5 +1,443 @@
 # Changelog
 
+### 1.56.0
+- **Update**: `ViewSkeletonsConfiguration`. It's possible to enable or disable animation for specific skeletons now.
+- **Added**: `HolderViewSkeletonsConfiguration` for skeleton root view configuration
+- **Added**: `DashedBoundsLayer` can now be applied to `CALayer`
+
+### 1.55.1
+- **Update**: revert `TextSkeletonsConfiguration` line height calculation
+
+### 1.55.0
+
+- **Update**: use TouchInstinct `TableKit` fork instead of original one
+- **Update**: remove default value from `BoolValueDefaultsStorage`
+
+### 1.54.6
+
+- **Added**: `xcprivacy` files
+- **Update**: Correctly detect app reinstall in `AppInstallLifetimeSingleValueStorage`
+- **Update**: use `xHeight` instead of `pointSize` for default skeleton line height calculation
+- **Update**: update `linkTextAttributes` in `UITextView` when setting interactive url parts
+
+
+### 1.54.5
+
+- **Update**: Сhange `StatefulButton` event propogation avoidance method.
+
+### 1.54.4
+
+- **Update**: Fix `StatefulButton` state configuration for iOS 15+.
+
+### 1.54.3
+
+- **Update**: Set reasonable defaults for `SkeletonConfiguration`.
+
+### 1.54.2
+
+- **Update**: Changed access level from internal to public of title and subtitle view in `BaseTitleSubtitleView`.
+
+### 1.54.1
+
+- **Added**: `BaseTitleSubtitleView` which can be inherited for fine-tuning skeletons and other behavior.
+- **Update**: Changed lines number calculation method in `TextSkeletonsConfiguration`.
+
+
+### 1.54.0
+
+- **Added**: `maxWidth` parameter to `BaseViewSkeletonsConfiguration`.
+- **Added**: custom `SkeletonConfigurations` for nested `SkeletonPresenters`.
+- **Update**: Many fixes and improvenments to `TextSkeletonsConfiguration`.
+
+### 1.53.3
+
+- **Update**: `Skeletonable` can now control custom geometry change notification.
+- **Update**: Filter hidden views from skeletonable views by default.
+
+### 1.53.2
+
+- **Update**: `DefaultTitleSubtitleView` support for separated configuration of title and subtitle labels layout.
+- **Update**: `BaseListItemView` fixed trailing insets when trailing view is hidden.
+
+### 1.53.1
+
+- **Update**: Insets layout heuristics for `WrappedViewHodler` implementations
+
+### 1.53.0
+
+- **Added**: Custom string attributes to `BaseTextAttributes`
+- **Added**: Customizeable `UIViewBackground` and `UIViewBorder` for `UIView.Appearance`
+- **Added**: Keychain single value storage for codable models -`CodableSingleValueKeychainStorage`
+- **Update**: Renamed methods `startAnimation` and `stopAnimation` of `SkeletonPresenter`, so it won't conflict with `Animatable` protocol anymore
+
+### 1.52.0
+
+- **Added**: `TIApplication` module with core dependencies of main application and its extension targets
+- **Added**: `DefaultHomogeneousItemsCollectionView` default collection view implementation with configurable identical-type cells
+- **Update**: Changed implementation of `AppInstallLifetimeSingleValueStorage`. Now it uses `SingleValueStorage<Bool>` to be able to migrate stored UserDefaults values
+- **Added**: `UserLocationFetcher.OnLocationFetchFailureCallback` and `ItemDistanceTo` in `TIMapUtils`
+- **Added**: Tap handler closure to `DefaultConfigurableStatefulButton.ViewModel`
+- **Added**: Universal DSL
+
+
+### 1.51.0
+
+- **Added**: `BaseModalViewController` implementing `PanModalPresentable` with additional functionality
+- **Added**: `BaseModalWrapperViewController` for wrapping `UIViewController`s with `BaseModalViewController` functionality
+
+### 1.50.0
+
+- **Updated**: Fix activity indicator positioning for `StatefulButton` on iOS 15+ and disabled state touch handling
+- **Added**: iOS 15+ activity indicator placement support in `StatefulButton`
+- **Added**: `TICoreGraphicsUtils` module for drawing operations and other CoreGraphics related functionality
+- **Update**: `MarkerIconFactory` can now return optional `UIImage`. In this case MapManagers will show the default marker icon.
+
+### 1.49.0
+
+- **Added**: `BaseMigratingSingleValueKeychainStorage` and `BaseMigratingSingleValueDefaultsStorage` implementations for migrating keys from one storage to another.
+
+### 1.48.0
+
+- **Added**: `BaseStackView` with configurable items appearance
+- **Fixed**: `CollectionTableViewCell` self-sizing
+- **Added**: `ViewAppearance.WrappedViewLayout` support for all `WrappedViewHolders`
+- **Added**: `ViewCallbacks` support for all `BaseInitializeableViews`
+
+### 1.47.0
+
+- **Added**: `flatMap` operator for `AsyncOperation`
+- **Update**: `CodableKeyValueStorage` now returns `Swift.Result` with typed errors.
+- **Added**: `SingleValueExpirationStorage` for time aware entries (expirable api tokens, etc.)
+- **Added**: `AsyncOperation` variants of process methods in NetworkServices.
+
+### 1.46.0
+
+- **Added**: `AsyncSingleValueStorage` and  `SingleValueStorageAsyncWrapper<SingleValueStorage>` for async access to SingleValue storages wtih swift concurrency support
+- **Added**: `BaseMapUISettings` used to configure map view of different providers + user location icon rendering for yandex maps
+- **Added**: `UserLocationFetcher` helper that requests authorization and subscribes to user location updates
+- **Update**: add `DEVELOPMENT_INSTALL` support for all podspecs and fix playground compilation issues 
+
+### 1.45.0
+
+- **Added**: `SingleValueStorage` implementations + `AppInstallLifetimeSingleValueStorage` for automatically removing keychain items on app reinstall.
+- **Added**: `TILogging` with error logging types
+- **Update**: `DefaultRecoverableJsonNetworkService` supports iOS 12.
+- **Update**: `DefaultFingerprintsProvider` now uses `SingleValueStorage`
+
+### 1.44.0
+
+- **Added**: HTTP status codes to `EndpointErrorResult.apiError` responses
+- **Added**: SwiftLint pre-build SPM step to TINetworking module
+
+### 1.43.1
+
+- **Fixed**: build scripts submodule url
+
+### 1.43.0
+
+- **Added**: `TITextProcessing` for regex and text formatting added
+
+### 1.42.1
+
+- **Fixed**: Podspecs source and homepage urls
+
+### 1.42.0
+
+- **Added**: TIDeeplink to support deeplink API
+
+### 1.41.0
+
+- **Update**: added callbacks for views while skeletons change status to presented or hidden
+
+### 1.40.0
+
+- **Added**: `PlaceholderFactory` for creating `DefaultPlaceholderView` views
+- **Added**: `DefaultPlaceholderImageView`
+
+### 1.39.0
+
+- **Added**: UIButton Appearance model
+- **Added**: `SpacedWrappedViewLayout` for spacing configurations
+- **Update**: UIView appearance model with border configurations
+
+### 1.38.0
+
+- **Added**: Placemarks states for icon updating
+- **Added**: Selecting / deselecting markers through cluster manager
+
+### 1.37.0
+
+- **Added**: API for converting view hierarchy to skeletons
+
+### 1.36.1
+
+- **Update**: `YandexMapsMobile` version updated
+- **Fix**: Map manager memory leak removed
+
+### 1.36.0
+
+- **Removed**: `TILogger`module
+- **Updated**: moved `LoggingPresenter` to `TIDeveloperUtils` module.   
+
+### 1.35.1
+
+- **Added**: Auto documentation generation for `TIFoundationUtils` playground and compile checks for playground before release
+- **Updated**: `AsyncOperation` fixed ordering of chain operations execution
+
+### 1.35.0
+
+- **Added**: `TIDeveloperUtils` framework, that contains different utils for development
+- **Added**: `UIView` and `UIViewController` extensions for showing SwiftUI previews
+- **Added**: `DashedBoundsLayer` for debugging views' frames visually
+
+### 1.34.0
+
+- **Added**: `BaseListItemView` for displaying three views horizontally
+- **Added**: `DefaultTitleSubtitleView` for displaying one or two labels vertically
+- **Update**: `StatefulButton` now can be configured with `ViewAppearance` model for each state
+
+### 1.33.0
+
+- **Added**: `ViewAppearance` and `ViewLayout` models for setting up Views' appearance and layout
+- **Added**: `TableKit.Row` extension for configuration inner View's appearance and layout
+- **Added**: `WrappableView` with typealiases for creating wrapped in the container views
+- **Added**: `CollectionTableViewCell` and `ContainerView`
+- **Update**: Separator appearance configureation for table views
+
+### 1.32.0
+
+- **Added**: `BaseInitializableWebView` with navigation and error handling api.
+
+### 1.31.0
+
+- **Added**: `URLInteractiveTextView` for terms and conditions hints in login flow
+
+### 1.30.0
+
+- **Added**: Base classes for encryption and decryption user token with pin code or biometry
+- **Added**: Pin code validators
+
+### 1.29.1
+
+- **Updated**: `BaseTextAttributes` correct detection of the necessity of using attributed string
+
+### 1.29.0
+
+- **Added**: `BaseTextAttributes`can now measure text size and provides paragraph style configuration API.
+- **Removed**: `ViewText`. Was fully replaced with `BaseTextAttributes`
+- **Fixed**: `Operation.flattenDependencies` used in `Operation.add(to:waitUntilFinished:)` now works correctly.
+- **Added**: Now it's possible to add dependent operation to start of the queue.
+
+### 1.28.0
+
+- **Add**: `LoggingPresenter`to present list of logs with ability of sharing it
+- **Add**: `TILogger` wrapper object to log events.
+
+### 1.27.1
+
+- **Fix**: Weak target reference in `RefreshControl`
+
+### 1.27.0
+
+- **Add**: Tag like filter collection view
+- **Add**: List like filter table view
+- **Add**: Range like filter view
+
+### 1.26.3
+- **Update**: Add @escaping in `RequestExecutor.ExecutionClosure`
+
+### 1.26.2
+- **Update**: Add failureCompletion in `RequestExecutor`
+
+### 1.26.1
+- **Fix**: Use OperationQueue instead of NSLock in `DefaultTokenInterceptor`
+- **Update**: AsyncOperation refactoring
+
+### 1.26.0
+
+- **Add**: `TIEcommerce` module with Cart, products, promocodes, bonuses and other related actions.
+
+### 1.25.0
+
+- **Update**: `RequestError` cases now contain additional url assotiated value
+- **Update**: Network requests error catching now throws `RequestError` with url
+
+### 1.24.0
+
+- **Add**: `AlertFactory` for presenting alerts in SwiftUI and UIKit.
+
+### 1.23.0
+
+- **Update**: `UITextView` now support configuration with `BaseTextAttributes`
+- **Add**: `ReconfigurableView` & `ChangeableViewModel` for non-destructing state update
+- **Add**: `WrappedViewHolder` protocol with table/collection view cell implementations
+- **Add**: `UIViewPresenter` and `ReusableUIViewPresenter` protocols with default implementation for proper handling view/cells reuse
+
+### 1.22.0
+
+- **Update**: Asynchronous request preprocessing
+
+### 1.21.0
+
+- **Update**: `AsyncEventHandler` was replaced with `EndpointRequestRetrier`
+- **Add**: `FingerprintsTrustEvaluator` and `FingerprintsProvider` for fingerprint-based host trust evaluation
+- **Add**: `DefaultTokenInterceptor` for queue-based token refresh across all requests of single api interactor (network service).
+- **Update**: `DefaultRecoverableJsonNetworkService` now returns collection of errors in result
+- **Update**: `CancellableTask` was renamed to `Cancellable`. Cancellable implementations has been moved from `TIMoyaNetworking` to `TIFoundationUtils`.
+- **Add**: `ApiInteractor` protocol with basic request/response methods
+
+
+### 1.20.0
+
+- **Add**: OpenAPI security schemes support for EndpointRequest's.
+- **Update**: Replace `AdditionalHeadersPlugin` with `SecuritySchemePreprocessor` and `EndpointRequestPreprocessor` (with default implementations)
+
+### 1.19.0
+
+- **Add**: Add presenter protocols to `TISwiftUICore` and `TIUIKitCore` modules
+- **Add**: `CodeConfirmPresenter` protocol and `DefaultCodeConfirmPresenter` implementation in `TIAuth` module
+
+### 1.18.0
+
+- **Add**: add MapManagers for routine maps configuration
+
+### 1.17.0
+
+- **Add**: add smooth CameraUpdate actions for supported maps
+
+### 1.16.2
+
+- **Update**: `DefaultRecoverableJsonNetworkService` now supports error forwarding from its error handlers to initial requests.
+
+### 1.16.1
+
+- **Update**: `DateFormattersReusePool` and  `ISO8601DateFormattersReusePool` are now thread safe.
+
+### 1.16.0
+
+- **Add**: `TIMapUtils`, `TIAppleMapUtils`, `TIGoogleMapUtils` and `TIYandexMapUtils` modules for map items clustering and interacting with them.
+
+### 1.15.0
+
+- **Update**: Network services in TIMoyaNetworking now passes MoyaError in result of EnpointRequest execution.
+- **Add**: `TINetworkingCache` module - caching results of EndpointRequests.
+- **Important Note**: `TINetworkingCache` added via SPM may require you to add `DISABLE_DIAMOND_PROBLEM_DIAGNOSTIC=YES` flag to build settings of project target (see [probably related problem](https://forums.swift.org/t/adding-a-package-to-two-targets-in-one-projects-results-in-an-error/35007/18))
+
+### 1.14.3
+
+- **Fix**: Creating headerView and footerView when initializing a section with rows in `TITableKitUtils`.
+- **Add**: Empty table section initialization method in `TITableKitUtils`.
+
+### 1.14.2
+
+- **Update**: DateFormatters properties preset in reuse pools
+
+### 1.14.1
+
+- **Fix**: Array encoding for `QueryStringParameterEncoding`
+
+### 1.14.0
+
+- **Add**: [Date] coding methods
+
+### 1.13.0
+
+- **Update**: Change access modifiers in `DefaultJsonNetworkService` from `public` to `open`, added additional Moya plugins processing
+- **Add**: `DisplayDecodingErrorPlugin` for showing developer-frendly decoding error messages
+- **Add**: Gemfile for cocoapods versioning
+
+### 1.12.3
+
+- **Fix**: Try parse date in ISO8601 format appending `.withFractionalSeconds` if `.withInternetDateTime` fails
+
+### 1.12.2
+
+- **Fix**: HeaderParameterEncoding encodes array correctly 
+
+### 1.12.1
+
+- **Update**: DefaultRecoverableNetworkService `request` parameter was renamed to prevent ambgious reference
+
+### 1.12.0
+
+- **Update**: EndpointRequest Body can take a nil value
+- **Update**: Parameter value can be nil as well
+- **Update**: observe operator of AsyncOperation now accepts callback queue parameter
+
+### 1.11.1
+- **Fix**: `timeoutIntervalForRequest` parameter for `URLSessionConfiguration` in `NetworkServiceConfiguration` added.
+
+### 1.11.0
+- **Breaking changes**: many method signatures was changes in `TIMoyaNetworking`.
+- **Add**: `ISO8601DateFormattersReusePool` and codable helpers for ISO8601 date (de)coding.
+- **Add**: Moya plugin protocol for adding HTTP headers with default implementation.
+
+### 1.10.0
+- **Add**: `DefaultRecoverableJsonNetworkService` with error handling chain.
+
+
+### 1.9.0
+- **Add**: `TIMoyaNetworking` target - Moya + Swagger network service.
+- **Update**: `TISwiftUtils` - added async closure typealiases.
+- **Update**: `TIFoundationUtils` - added date formatting & decoding helpers.
+
+### 1.8.0
+- **Add**: `TIFoundationUtils.AsyncOperation` - generic subclass of Operation with chaining and result observation support
+
+### 1.7.0
+- **Add**: `TINetworking` - Swagger-frendly networking layer helpers
+
+### 1.6.0
+- **Add**: the pretty timer - TITimer.
+
+### 1.5.0
+- **Add**: `HeaderTransitionDelegate` - Helper for transition of TableView header and navigationBar title view
+
+### 1.4.0
+- **Update**: update minor dependencies.
+- **Fix**: project's scripts.
+
+### 1.3.0
+- **Add**: `TIPaginator` - realisation of paginating items from a data source.
+
+### 1.2.0
+- **Add**: `TIKeychainUtils` - Set of helpers for Keychain classes.
+
+### 1.1.1
+- **Fix**: `StatefullButton` propagation
+
+### 1.1.0
+- **Add**: `BaseInitializeableViewController`, `BaseCustomViewController` and `BaseViewController` to TIUIKitCore.
+- **Add**: `TableKitTableView` and `TableDirectorHolder` to TITableKitUtils.
+
+### 1.0.0
+- **API BreakingChanges**: up swift version to 5.1.
+- **Update**: build scripts.
+- **Update**: code with new swiftlint rules.
+- **Update**: RxSwift to 6.0.0.
+
+### 0.13.1
+- **Fix**: LeadKit.podspec file.
+
+### 0.13.0
+- **Add**: Githook `prepare-commit-msg` to check commit's style.
+- **Add**: Setup script.
+
+### 0.12.0
+- **Add**: StatefulButton & RoundedStatefulButton to TIUIElements.
+- **Add**: added CACornerMask rounding extension to TIUIElements.
+- **Add**: UIControl.State dictionary extensions to TIUIKitCore.
+- **Add**: UIFont and CTFont extensions to TIUIKitCore.
+- **Breaking change**: reworked BaseTextAttributes & ViewText. Removed ViewTextConfigurable protocol & conformances.
+
+### 0.11.0
+- **Add**: Cocoapods support for TI-family libraries.
+- **Add**: `SeparatorConfigurable` and all helper types for separator configuration.
+- **Add**: `BaseSeparatorCell` - `BaseInitializeableCell` subclass with separators support. 
+- **Add**: `TITableKitUtils` - set of helpers for TableKit classes.
+- **Add**: `BaseTextAttributes` and `ViewText` implementation form LeadKit.
+- **Update**: `BaseInitializableView` and `BaseInitializableControl` are moved to `TIUIElements` from `TIUIKitCore`.
+
 ### 0.10.9
 - **Fix**: `change presentedOrTopViewController to open`.
 

Cartfile

@@ -1,7 +1,7 @@
 github "malcommac/SwiftDate"
 github "Alamofire/Alamofire"
-github "RxSwiftCommunity/RxAlamofire" ~> 5.6.0
+github "RxSwiftCommunity/RxAlamofire" ~> 6.1
 github "TouchInstinct/TableKit"
-github "ReactiveX/RxSwift" ~> 5.1.0
-github "pronebird/UIScrollView-InfiniteScroll"
+github "ReactiveX/RxSwift" ~> 6.2
+github "pronebird/UIScrollView-InfiniteScroll" "1.1.0"
 github "SnapKit/SnapKit" ~> 5.0

Cartfile.resolved

@@ -1,7 +1,7 @@
-github "Alamofire/Alamofire" "5.2.2"
-github "ReactiveX/RxSwift" "5.1.1"
-github "RxSwiftCommunity/RxAlamofire" "v5.6.1"
+github "Alamofire/Alamofire" "5.4.3"
+github "ReactiveX/RxSwift" "6.2.0"
+github "RxSwiftCommunity/RxAlamofire" "v6.1.2"
 github "SnapKit/SnapKit" "5.0.1"
 github "TouchInstinct/TableKit" "2.10008.1"
-github "malcommac/SwiftDate" "6.1.0"
+github "malcommac/SwiftDate" "6.3.1"
 github "pronebird/UIScrollView-InfiniteScroll" "1.1.0"

Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "cocoapods", "~> 1.11"

Gemfile.lock

@@ -0,0 +1,98 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.5)
+      rexml
+    activesupport (6.1.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    atomos (0.1.3)
+    claide (1.1.0)
+    cocoapods (1.11.3)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.11.3)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 1.0, < 3.0)
+      xcodeproj (>= 1.21.0, < 2.0)
+    cocoapods-core (1.11.3)
+      activesupport (>= 5.0, < 7)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (1.6.2)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.1.10)
+    escape (0.0.4)
+    ethon (0.15.0)
+      ffi (>= 1.15.0)
+    ffi (1.15.5)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    httpclient (2.8.3)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.1)
+    minitest (5.15.0)
+    molinillo (0.8.0)
+    nanaimo (0.3.0)
+    nap (1.1.0)
+    netrc (0.11.0)
+    public_suffix (4.0.6)
+    rexml (3.2.5)
+    ruby-macho (2.5.1)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    xcodeproj (1.21.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    zeitwerk (2.5.4)
+
+PLATFORMS
+  x86_64-darwin-20
+  x86_64-darwin-21
+
+DEPENDENCIES
+  cocoapods (~> 1.11)
+
+BUNDLED WITH
+   2.3.26

LeadKit.podspec

@@ -1,18 +1,18 @@
 Pod::Spec.new do |s|
   s.name            = "LeadKit"
-  s.version         = "0.10.9"
+  s.version         = "1.35.0"
   s.summary         = "iOS framework with a bunch of tools for rapid development"
-  s.homepage        = "https://github.com/TouchInstinct/LeadKit"
+  s.homepage        = "https://git.svc.touchin.ru/TouchInstinct/LeadKit"
   s.license         = "Apache License, Version 2.0"
   s.author          = "Touch Instinct"
-  s.source          = { :git => "https://github.com/TouchInstinct/LeadKit.git", :tag => s.version }
+  s.source          = { :git => "https://git.svc.touchin.ru/TouchInstinct/LeadKit.git", :tag => s.version }
   s.platform        = :ios, '10.0'
-  s.swift_versions = ['5.0']
+  s.swift_versions = ['5.1']
 
   s.subspec 'UIColorHex' do |ss|
-    ss.ios.deployment_target = '8.0'
-    ss.tvos.deployment_target = '9.0'
-    ss.watchos.deployment_target = '2.0'
+    ss.ios.deployment_target = '10.0'
+    ss.tvos.deployment_target = '10.0'
+    ss.watchos.deployment_target = '3.0'
 
     ss.source_files = "Sources/Extensions/UIColor/UIColor+Hex.swift"
   end
@@ -68,7 +68,8 @@ Pod::Spec.new do |s|
       "Sources/Structures/DrawingOperations/CALayerDrawingOperation.swift",
       "Sources/Structures/DrawingOperations/RoundDrawingOperation.swift",
       "Sources/Structures/DrawingOperations/BorderDrawingOperation.swift",
-      "Sources/Structures/DataLoading/PaginationDataLoading/*"
+      "Sources/Structures/DataLoading/PaginationDataLoading/*",
+      "Sources/Extensions/UIInterfaceOrientation/*"
     ]
     ss.tvos.exclude_files = [
       "Sources/Classes/Controllers/BaseConfigurableController.swift",
@@ -101,16 +102,18 @@ Pod::Spec.new do |s|
       "Sources/Protocols/Views/SeparatorCell/*",
       "Sources/Protocols/TableKit/**/*",
       "Sources/Protocols/Controllers/SearchResultsViewController.swift",
-      "Sources/Structures/DataLoading/PaginationDataLoading/*"
+      "Sources/Structures/DataLoading/PaginationDataLoading/*",
+      "Sources/Extensions/UIInterfaceOrientation/*",
+      "Sources/Classes/Controllers/BaseOrientationController.swift"
     ]
 
-    ss.dependency "RxSwift", '~> 5.1.0'
-    ss.dependency "RxCocoa", '~> 5.1.0'
-    ss.dependency "RxAlamofire", '~> 5.6.0'
+    ss.dependency "RxSwift", '~> 6.2'
+    ss.dependency "RxCocoa", '~> 6.2'
+    ss.dependency "RxAlamofire", '~> 6.1'
     ss.dependency "SwiftDate", '~> 6'
 
-    ss.ios.dependency "TableKit", '~> 2.8'
-    ss.ios.dependency "SnapKit", '~> 5.0.0'
+    ss.ios.dependency "TableKit", '~> 2.11'
+    ss.ios.dependency "SnapKit", '~> 5.0.1'
     ss.ios.dependency "UIScrollView-InfiniteScroll", '~> 1.1.0'
   end
 

LeadKit.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -16,6 +16,39 @@
 		40F118471F8FEF97004AADAF /* AppearanceConfigurable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40F118461F8FEF97004AADAF /* AppearanceConfigurable.swift */; };
 		40F118491F8FF223004AADAF /* TableRow+AppearanceExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40F118481F8FF223004AADAF /* TableRow+AppearanceExtension.swift */; };
 		411073AF23466B41002DD9B9 /* UIViewController+PresentFullScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 411073AE23466B41002DD9B9 /* UIViewController+PresentFullScreen.swift */; };
+		4C4C7B52267FE27E006F3C70 /* RxAlamofire.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B47267FE27E006F3C70 /* RxAlamofire.xcframework */; };
+		4C4C7B56267FE27E006F3C70 /* RxSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B49267FE27E006F3C70 /* RxSwift.xcframework */; };
+		4C4C7B5C267FE27E006F3C70 /* RxRelay.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B4C267FE27E006F3C70 /* RxRelay.xcframework */; };
+		4C4C7B5E267FE27E006F3C70 /* Alamofire.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B4D267FE27E006F3C70 /* Alamofire.xcframework */; };
+		4C4C7B60267FE27E006F3C70 /* SwiftDate.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B4E267FE27E006F3C70 /* SwiftDate.xcframework */; };
+		4C4C7B62267FE27E006F3C70 /* RxBlocking.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B4F267FE27E006F3C70 /* RxBlocking.xcframework */; };
+		4C4C7B66267FE27F006F3C70 /* RxCocoa.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B51267FE27E006F3C70 /* RxCocoa.xcframework */; };
+		4C4C7B7F267FE319006F3C70 /* Decimal+Rounding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85A5D49422AA975000C7D254 /* Decimal+Rounding.swift */; };
+		4C4C7B83267FE32F006F3C70 /* Decimal+Values.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85A5D49B22AAB6B700C7D254 /* Decimal+Values.swift */; };
+		4C4C7B8A267FE364006F3C70 /* Alamofire.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B4D267FE27E006F3C70 /* Alamofire.xcframework */; };
+		4C4C7B8C267FE364006F3C70 /* RxAlamofire.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B47267FE27E006F3C70 /* RxAlamofire.xcframework */; };
+		4C4C7B8E267FE365006F3C70 /* RxBlocking.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B4F267FE27E006F3C70 /* RxBlocking.xcframework */; };
+		4C4C7B90267FE365006F3C70 /* RxCocoa.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B51267FE27E006F3C70 /* RxCocoa.xcframework */; };
+		4C4C7B92267FE365006F3C70 /* RxRelay.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B4C267FE27E006F3C70 /* RxRelay.xcframework */; };
+		4C4C7B94267FE365006F3C70 /* RxSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B49267FE27E006F3C70 /* RxSwift.xcframework */; };
+		4C4C7B96267FE365006F3C70 /* RxTest.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B50267FE27E006F3C70 /* RxTest.xcframework */; };
+		4C4C7B98267FE365006F3C70 /* SnapKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B4B267FE27E006F3C70 /* SnapKit.xcframework */; };
+		4C4C7B9A267FE365006F3C70 /* SwiftDate.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B4E267FE27E006F3C70 /* SwiftDate.xcframework */; };
+		4C4C7BA7267FE3F6006F3C70 /* Decimal+Rounding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85A5D49422AA975000C7D254 /* Decimal+Rounding.swift */; };
+		4C4C7BA8267FE3F6006F3C70 /* Decimal+Values.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85A5D49B22AAB6B700C7D254 /* Decimal+Values.swift */; };
+		4C4C7BB7267FE4C9006F3C70 /* ButtonHolderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF65D1724DD6C080006B001 /* ButtonHolderView.swift */; };
+		4C4C7BBA267FE4DD006F3C70 /* ButtonHolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF65D1324DD684A0006B001 /* ButtonHolder.swift */; };
+		4C4C7BBF267FE508006F3C70 /* Alamofire.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B4D267FE27E006F3C70 /* Alamofire.xcframework */; };
+		4C4C7BC1267FE508006F3C70 /* RxAlamofire.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B47267FE27E006F3C70 /* RxAlamofire.xcframework */; };
+		4C4C7BC3267FE508006F3C70 /* RxBlocking.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B4F267FE27E006F3C70 /* RxBlocking.xcframework */; };
+		4C4C7BC5267FE508006F3C70 /* RxCocoa.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B51267FE27E006F3C70 /* RxCocoa.xcframework */; };
+		4C4C7BC7267FE509006F3C70 /* RxRelay.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B4C267FE27E006F3C70 /* RxRelay.xcframework */; };
+		4C4C7BC9267FE509006F3C70 /* RxSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B49267FE27E006F3C70 /* RxSwift.xcframework */; };
+		4C4C7BCB267FE509006F3C70 /* RxTest.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B50267FE27E006F3C70 /* RxTest.xcframework */; };
+		4C4C7BCD267FE509006F3C70 /* SnapKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B4B267FE27E006F3C70 /* SnapKit.xcframework */; };
+		4C4C7BCF267FE509006F3C70 /* SwiftDate.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B4E267FE27E006F3C70 /* SwiftDate.xcframework */; };
+		4C4C7BD1267FE509006F3C70 /* TableKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B48267FE27E006F3C70 /* TableKit.xcframework */; };
+		4C4C7BD3267FE509006F3C70 /* UIScrollView_InfiniteScroll.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4C7B4A267FE27E006F3C70 /* UIScrollView_InfiniteScroll.xcframework */; };
 		4CF65D1424DD684A0006B001 /* ButtonHolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF65D1324DD684A0006B001 /* ButtonHolder.swift */; };
 		4CF65D1624DD69250006B001 /* UIButton+ButtonHolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF65D1524DD69250006B001 /* UIButton+ButtonHolder.swift */; };
 		4CF65D1824DD6C080006B001 /* ButtonHolderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CF65D1724DD6C080006B001 /* ButtonHolderView.swift */; };
@@ -273,9 +306,7 @@
 		6741CEC220E2430A00FEC4D9 /* UITableView+TableViewHolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6741CEC120E2430900FEC4D9 /* UITableView+TableViewHolder.swift */; };
 		6741CEC420E2430A00FEC4D9 /* UITableView+TableViewHolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6741CEC120E2430900FEC4D9 /* UITableView+TableViewHolder.swift */; };
 		6741CECE20E243F800FEC4D9 /* BaseCustomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6741CECC20E243F800FEC4D9 /* BaseCustomViewController.swift */; };
-		6741CED020E243F800FEC4D9 /* BaseCustomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6741CECC20E243F800FEC4D9 /* BaseCustomViewController.swift */; };
 		6741CED120E243F800FEC4D9 /* BaseConfigurableController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6741CECD20E243F800FEC4D9 /* BaseConfigurableController.swift */; };
-		6741CED320E243F800FEC4D9 /* BaseConfigurableController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6741CECD20E243F800FEC4D9 /* BaseConfigurableController.swift */; };
 		674303CF214FB8F700EF4160 /* GeneralDataLoadingHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 674303CE214FB8F700EF4160 /* GeneralDataLoadingHandler.swift */; };
 		674303D1214FB8F700EF4160 /* GeneralDataLoadingHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 674303CE214FB8F700EF4160 /* GeneralDataLoadingHandler.swift */; };
 		674303D2214FB8F700EF4160 /* GeneralDataLoadingHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 674303CE214FB8F700EF4160 /* GeneralDataLoadingHandler.swift */; };
@@ -287,7 +318,6 @@
 		675C1FB41F97CA32007D5249 /* AppearanceConfigurable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40F118461F8FEF97004AADAF /* AppearanceConfigurable.swift */; };
 		675C1FB51F97CA33007D5249 /* AppearanceConfigurable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40F118461F8FEF97004AADAF /* AppearanceConfigurable.swift */; };
 		675E0AA921072FF400CDC143 /* BaseScrollContentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 675E0AA821072FF400CDC143 /* BaseScrollContentController.swift */; };
-		675E0AAB21072FF400CDC143 /* BaseScrollContentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 675E0AA821072FF400CDC143 /* BaseScrollContentController.swift */; };
 		6760DC4D212F351700020BAE /* UIView+AddSubviews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6760DC4C212F351700020BAE /* UIView+AddSubviews.swift */; };
 		6760DC4F212F351700020BAE /* UIView+AddSubviews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6760DC4C212F351700020BAE /* UIView+AddSubviews.swift */; };
 		6762131820A0BBA30034EEF1 /* TableSection+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6762131720A0BBA30034EEF1 /* TableSection+Extensions.swift */; };
@@ -392,12 +422,9 @@
 		67CAF8C920652E2A00527085 /* TextFieldViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67CAF8C520652E2A00527085 /* TextFieldViewModel.swift */; };
 		67CDEE401EB369BF00895905 /* ConfigurableController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 671462241EB3396E00EAB194 /* ConfigurableController.swift */; };
 		67DB7760210869D1001CB56B /* TableViewWrapperView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67DB775F210869D1001CB56B /* TableViewWrapperView.swift */; };
-		67DB7762210869D1001CB56B /* TableViewWrapperView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67DB775F210869D1001CB56B /* TableViewWrapperView.swift */; };
 		67DB776421086A12001CB56B /* BaseTableContentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67DB776321086A12001CB56B /* BaseTableContentController.swift */; };
 		67DB776921087154001CB56B /* CollectionViewWrapperView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67DB776821087154001CB56B /* CollectionViewWrapperView.swift */; };
-		67DB776B21087154001CB56B /* CollectionViewWrapperView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67DB776821087154001CB56B /* CollectionViewWrapperView.swift */; };
 		67DB776D210871E8001CB56B /* BaseCollectionContentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67DB776C210871E8001CB56B /* BaseCollectionContentController.swift */; };
-		67DB776F210871E8001CB56B /* BaseCollectionContentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67DB776C210871E8001CB56B /* BaseCollectionContentController.swift */; };
 		67E3524E2119ABE40035BDDB /* UITextField+ViewTextConfigurable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67E3524D2119ABE40035BDDB /* UITextField+ViewTextConfigurable.swift */; };
 		67E352502119ABE40035BDDB /* UITextField+ViewTextConfigurable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67E3524D2119ABE40035BDDB /* UITextField+ViewTextConfigurable.swift */; };
 		67E352522119AC060035BDDB /* UIButton+ViewTextConfigurable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67E352512119AC060035BDDB /* UIButton+ViewTextConfigurable.swift */; };
@@ -473,25 +500,6 @@
 		72AECC6C224A979D00D12E7C /* BaseSearchViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72AECC6A224A979D00D12E7C /* BaseSearchViewModel.swift */; };
 		72AECC6F224A97B100D12E7C /* SearchResultsViewControllerState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72AECC6E224A97B100D12E7C /* SearchResultsViewControllerState.swift */; };
 		72AECC71224A97F100D12E7C /* SearchResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72AECC70224A97F000D12E7C /* SearchResultsViewController.swift */; };
-		785EDF7C220072B500985ED4 /* SwiftDate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDF76220072B400985ED4 /* SwiftDate.framework */; };
-		785EDF7D220072B500985ED4 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDF77220072B400985ED4 /* RxCocoa.framework */; };
-		785EDF7E220072B500985ED4 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDF78220072B500985ED4 /* Alamofire.framework */; };
-		785EDF7F220072B500985ED4 /* RxAtomic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDF79220072B500985ED4 /* RxAtomic.framework */; };
-		785EDF80220072B500985ED4 /* RxAlamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDF7A220072B500985ED4 /* RxAlamofire.framework */; };
-		785EDF81220072B500985ED4 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDF7B220072B500985ED4 /* RxSwift.framework */; };
-		785EDF8322007DF900985ED4 /* TableKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDF8222007DF900985ED4 /* TableKit.framework */; };
-		785EDF8522007E5200985ED4 /* UIScrollView_InfiniteScroll.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDF8422007E5200985ED4 /* UIScrollView_InfiniteScroll.framework */; };
-		785EDFA1220081F200985ED4 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDF9C220081F100985ED4 /* RxCocoa.framework */; };
-		785EDFA2220081F200985ED4 /* SwiftDate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDF9D220081F100985ED4 /* SwiftDate.framework */; };
-		785EDFA3220081F200985ED4 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDF9E220081F100985ED4 /* RxSwift.framework */; };
-		785EDFA4220081F200985ED4 /* RxAtomic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDF9F220081F100985ED4 /* RxAtomic.framework */; };
-		785EDFA5220081F200985ED4 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDFA0220081F100985ED4 /* Alamofire.framework */; };
-		785EDFB22200833100985ED4 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDFA8220082E600985ED4 /* Alamofire.framework */; };
-		785EDFB32200833100985ED4 /* RxAlamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDFA9220082E600985ED4 /* RxAlamofire.framework */; };
-		785EDFB42200833100985ED4 /* RxAtomic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDFAB220082E600985ED4 /* RxAtomic.framework */; };
-		785EDFB52200833100985ED4 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDFA7220082E500985ED4 /* RxCocoa.framework */; };
-		785EDFB62200833100985ED4 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDFA6220082E500985ED4 /* RxSwift.framework */; };
-		785EDFB72200833100985ED4 /* SwiftDate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 785EDFAA220082E600985ED4 /* SwiftDate.framework */; };
 		78EC7B1322019F5A0007DCFD /* String+TelpromptURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78EC7B1222019F5A0007DCFD /* String+TelpromptURL.swift */; };
 		78EC7B1422019F5A0007DCFD /* String+TelpromptURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78EC7B1222019F5A0007DCFD /* String+TelpromptURL.swift */; };
 		78EC7B1522019F5A0007DCFD /* String+TelpromptURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78EC7B1222019F5A0007DCFD /* String+TelpromptURL.swift */; };
@@ -502,7 +510,6 @@
 		82B4F8DD223903B800F6708C /* Block.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82B4F8DA223903B800F6708C /* Block.swift */; };
 		82D2966D2264B1790067735C /* LabelTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82D2966A2264B1790067735C /* LabelTableViewCell.swift */; };
 		82D2966F2264B1790067735C /* LabelCellViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82D2966C2264B1790067735C /* LabelCellViewModel.swift */; };
-		82D296712264B4C10067735C /* SnapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82D296702264B4C10067735C /* SnapKit.framework */; };
 		82F8BB181F5DDED100C1061B /* Single+DeferredJust.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82F8BB171F5DDED100C1061B /* Single+DeferredJust.swift */; };
 		8546C2E3224E86280059C255 /* ApiUploadRequestParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8546C2E2224E86280059C255 /* ApiUploadRequestParameters.swift */; };
 		8546C2E4224E86280059C255 /* ApiUploadRequestParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8546C2E2224E86280059C255 /* ApiUploadRequestParameters.swift */; };
@@ -558,6 +565,18 @@
 		40F118461F8FEF97004AADAF /* AppearanceConfigurable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppearanceConfigurable.swift; sourceTree = "<group>"; };
 		40F118481F8FF223004AADAF /* TableRow+AppearanceExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TableRow+AppearanceExtension.swift"; sourceTree = "<group>"; };
 		411073AE23466B41002DD9B9 /* UIViewController+PresentFullScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+PresentFullScreen.swift"; sourceTree = "<group>"; };
+		4C4C7B46267FE275006F3C70 /* Build */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Build; path = Carthage/Build; sourceTree = "<group>"; };
+		4C4C7B47267FE27E006F3C70 /* RxAlamofire.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxAlamofire.xcframework; path = Carthage/Build/RxAlamofire.xcframework; sourceTree = "<group>"; };
+		4C4C7B48267FE27E006F3C70 /* TableKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = TableKit.xcframework; path = Carthage/Build/TableKit.xcframework; sourceTree = "<group>"; };
+		4C4C7B49267FE27E006F3C70 /* RxSwift.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxSwift.xcframework; path = Carthage/Build/RxSwift.xcframework; sourceTree = "<group>"; };
+		4C4C7B4A267FE27E006F3C70 /* UIScrollView_InfiniteScroll.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = UIScrollView_InfiniteScroll.xcframework; path = Carthage/Build/UIScrollView_InfiniteScroll.xcframework; sourceTree = "<group>"; };
+		4C4C7B4B267FE27E006F3C70 /* SnapKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = SnapKit.xcframework; path = Carthage/Build/SnapKit.xcframework; sourceTree = "<group>"; };
+		4C4C7B4C267FE27E006F3C70 /* RxRelay.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxRelay.xcframework; path = Carthage/Build/RxRelay.xcframework; sourceTree = "<group>"; };
+		4C4C7B4D267FE27E006F3C70 /* Alamofire.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Alamofire.xcframework; path = Carthage/Build/Alamofire.xcframework; sourceTree = "<group>"; };
+		4C4C7B4E267FE27E006F3C70 /* SwiftDate.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = SwiftDate.xcframework; path = Carthage/Build/SwiftDate.xcframework; sourceTree = "<group>"; };
+		4C4C7B4F267FE27E006F3C70 /* RxBlocking.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxBlocking.xcframework; path = Carthage/Build/RxBlocking.xcframework; sourceTree = "<group>"; };
+		4C4C7B50267FE27E006F3C70 /* RxTest.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxTest.xcframework; path = Carthage/Build/RxTest.xcframework; sourceTree = "<group>"; };
+		4C4C7B51267FE27E006F3C70 /* RxCocoa.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxCocoa.xcframework; path = Carthage/Build/RxCocoa.xcframework; sourceTree = "<group>"; };
 		4CF65D1324DD684A0006B001 /* ButtonHolder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonHolder.swift; sourceTree = "<group>"; };
 		4CF65D1524DD69250006B001 /* UIButton+ButtonHolder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+ButtonHolder.swift"; sourceTree = "<group>"; };
 		4CF65D1724DD6C080006B001 /* ButtonHolderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonHolderView.swift; sourceTree = "<group>"; };
@@ -827,15 +846,17 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				785EDF7E220072B500985ED4 /* Alamofire.framework in Frameworks */,
-				785EDF81220072B500985ED4 /* RxSwift.framework in Frameworks */,
-				785EDF7F220072B500985ED4 /* RxAtomic.framework in Frameworks */,
-				785EDF7D220072B500985ED4 /* RxCocoa.framework in Frameworks */,
-				785EDF80220072B500985ED4 /* RxAlamofire.framework in Frameworks */,
-				82D296712264B4C10067735C /* SnapKit.framework in Frameworks */,
-				785EDF7C220072B500985ED4 /* SwiftDate.framework in Frameworks */,
-				785EDF8322007DF900985ED4 /* TableKit.framework in Frameworks */,
-				785EDF8522007E5200985ED4 /* UIScrollView_InfiniteScroll.framework in Frameworks */,
+				4C4C7BCB267FE509006F3C70 /* RxTest.xcframework in Frameworks */,
+				4C4C7BC1267FE508006F3C70 /* RxAlamofire.xcframework in Frameworks */,
+				4C4C7BC5267FE508006F3C70 /* RxCocoa.xcframework in Frameworks */,
+				4C4C7BCF267FE509006F3C70 /* SwiftDate.xcframework in Frameworks */,
+				4C4C7BC3267FE508006F3C70 /* RxBlocking.xcframework in Frameworks */,
+				4C4C7BCD267FE509006F3C70 /* SnapKit.xcframework in Frameworks */,
+				4C4C7BC9267FE509006F3C70 /* RxSwift.xcframework in Frameworks */,
+				4C4C7BD1267FE509006F3C70 /* TableKit.xcframework in Frameworks */,
+				4C4C7BD3267FE509006F3C70 /* UIScrollView_InfiniteScroll.xcframework in Frameworks */,
+				4C4C7BC7267FE509006F3C70 /* RxRelay.xcframework in Frameworks */,
+				4C4C7BBF267FE508006F3C70 /* Alamofire.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -843,11 +864,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				785EDFA5220081F200985ED4 /* Alamofire.framework in Frameworks */,
-				785EDFA4220081F200985ED4 /* RxAtomic.framework in Frameworks */,
-				785EDFA1220081F200985ED4 /* RxCocoa.framework in Frameworks */,
-				785EDFA2220081F200985ED4 /* SwiftDate.framework in Frameworks */,
-				785EDFA3220081F200985ED4 /* RxSwift.framework in Frameworks */,
+				4C4C7B56267FE27E006F3C70 /* RxSwift.xcframework in Frameworks */,
+				4C4C7B62267FE27E006F3C70 /* RxBlocking.xcframework in Frameworks */,
+				4C4C7B52267FE27E006F3C70 /* RxAlamofire.xcframework in Frameworks */,
+				4C4C7B66267FE27F006F3C70 /* RxCocoa.xcframework in Frameworks */,
+				4C4C7B5C267FE27E006F3C70 /* RxRelay.xcframework in Frameworks */,
+				4C4C7B5E267FE27E006F3C70 /* Alamofire.xcframework in Frameworks */,
+				4C4C7B60267FE27E006F3C70 /* SwiftDate.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -855,12 +878,15 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				785EDFB22200833100985ED4 /* Alamofire.framework in Frameworks */,
-				785EDFB42200833100985ED4 /* RxAtomic.framework in Frameworks */,
-				785EDFB62200833100985ED4 /* RxSwift.framework in Frameworks */,
-				785EDFB52200833100985ED4 /* RxCocoa.framework in Frameworks */,
-				785EDFB32200833100985ED4 /* RxAlamofire.framework in Frameworks */,
-				785EDFB72200833100985ED4 /* SwiftDate.framework in Frameworks */,
+				4C4C7B96267FE365006F3C70 /* RxTest.xcframework in Frameworks */,
+				4C4C7B8C267FE364006F3C70 /* RxAlamofire.xcframework in Frameworks */,
+				4C4C7B90267FE365006F3C70 /* RxCocoa.xcframework in Frameworks */,
+				4C4C7B9A267FE365006F3C70 /* SwiftDate.xcframework in Frameworks */,
+				4C4C7B8E267FE365006F3C70 /* RxBlocking.xcframework in Frameworks */,
+				4C4C7B98267FE365006F3C70 /* SnapKit.xcframework in Frameworks */,
+				4C4C7B94267FE365006F3C70 /* RxSwift.xcframework in Frameworks */,
+				4C4C7B92267FE365006F3C70 /* RxRelay.xcframework in Frameworks */,
+				4C4C7B8A267FE364006F3C70 /* Alamofire.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2037,6 +2063,18 @@
 		785EDF75220072B400985ED4 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				4C4C7B4D267FE27E006F3C70 /* Alamofire.xcframework */,
+				4C4C7B47267FE27E006F3C70 /* RxAlamofire.xcframework */,
+				4C4C7B4F267FE27E006F3C70 /* RxBlocking.xcframework */,
+				4C4C7B51267FE27E006F3C70 /* RxCocoa.xcframework */,
+				4C4C7B4C267FE27E006F3C70 /* RxRelay.xcframework */,
+				4C4C7B49267FE27E006F3C70 /* RxSwift.xcframework */,
+				4C4C7B50267FE27E006F3C70 /* RxTest.xcframework */,
+				4C4C7B4B267FE27E006F3C70 /* SnapKit.xcframework */,
+				4C4C7B4E267FE27E006F3C70 /* SwiftDate.xcframework */,
+				4C4C7B48267FE27E006F3C70 /* TableKit.xcframework */,
+				4C4C7B4A267FE27E006F3C70 /* UIScrollView_InfiniteScroll.xcframework */,
+				4C4C7B46267FE275006F3C70 /* Build */,
 				82D296702264B4C10067735C /* SnapKit.framework */,
 				785EDFA0220081F100985ED4 /* Alamofire.framework */,
 				785EDF9F220081F100985ED4 /* RxAtomic.framework */,
@@ -2302,7 +2340,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1230;
 				ORGANIZATIONNAME = "Touch Instinct";
 				TargetAttributes = {
 					67186B271EB248F100CFAFFB = {
@@ -2326,7 +2364,7 @@
 				};
 			};
 			buildConfigurationList = 78CFEE241C5C456B00F50370 /* Build configuration list for PBXProject "LeadKit" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 12.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -2691,6 +2729,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4C4C7B83267FE32F006F3C70 /* Decimal+Values.swift in Sources */,
+				4C4C7B7F267FE319006F3C70 /* Decimal+Rounding.swift in Sources */,
 				67EB7FE620615DE000BDD9FB /* DataSource.swift in Sources */,
 				6714634A1EB3396E00EAB194 /* ResettableType.swift in Sources */,
 				6713C23E20AF0D5900875921 /* NetworkOperationModel.swift in Sources */,
@@ -2817,6 +2857,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4C4C7BBA267FE4DD006F3C70 /* ButtonHolder.swift in Sources */,
+				4C4C7BB7267FE4C9006F3C70 /* ButtonHolderView.swift in Sources */,
+				4C4C7BA7267FE3F6006F3C70 /* Decimal+Rounding.swift in Sources */,
+				4C4C7BA8267FE3F6006F3C70 /* Decimal+Values.swift in Sources */,
 				6714634B1EB3396E00EAB194 /* ResettableType.swift in Sources */,
 				82B4F8DD223903B800F6708C /* Block.swift in Sources */,
 				671462E71EB3396E00EAB194 /* UIColor+Hex.swift in Sources */,
@@ -2858,7 +2902,6 @@
 				671463A51EB33FF600EAB194 /* Animatable.swift in Sources */,
 				67CAF8C920652E2A00527085 /* TextFieldViewModel.swift in Sources */,
 				67E352592119ACF30035BDDB /* ViewTextConfigurable+Extensions.swift in Sources */,
-				675E0AAB21072FF400CDC143 /* BaseScrollContentController.swift in Sources */,
 				6714629B1EB3396E00EAB194 /* CGSize+Resize.swift in Sources */,
 				677B06C221187559006C947D /* ViewTextConfigurable.swift in Sources */,
 				671463331EB3396E00EAB194 /* CursorType.swift in Sources */,
@@ -2881,7 +2924,6 @@
 				6714632B1EB3396E00EAB194 /* BaseViewModel.swift in Sources */,
 				673564F42068C2AD00F0CBED /* NumberFormattingService+DefaultImplementation.swift in Sources */,
 				677452A220625EEE0024EEEF /* PaginationDataLoadingModel.swift in Sources */,
-				67DB776F210871E8001CB56B /* BaseCollectionContentController.swift in Sources */,
 				673CF4362063E29B00C329F6 /* TextWithButtonPlaceholder.swift in Sources */,
 				A6F32C0C1F6EBE5C00AC08EE /* String+LocalizedComponent.swift in Sources */,
 				6741CEB620E242C100FEC4D9 /* CollectionViewHolder+ScrollViewHolder.swift in Sources */,
@@ -2898,7 +2940,6 @@
 				67745289206259CF0024EEEF /* Rx+RxDataSourceProtocol.swift in Sources */,
 				67386A8F206CF3F6004EDA6C /* DateFormattingService+DefaultImplementation.swift in Sources */,
 				671463071EB3396E00EAB194 /* UIView+LoadingIndicator.swift in Sources */,
-				67DB7762210869D1001CB56B /* TableViewWrapperView.swift in Sources */,
 				6774526E206249E30024EEEF /* UICollectionView+BackgroundViewHolder.swift in Sources */,
 				671463A91EB340C000EAB194 /* UIViewController+ConfigurableController.swift in Sources */,
 				673564F92068C68D00F0CBED /* NumberFormat.swift in Sources */,
@@ -2921,14 +2962,12 @@
 				67EB7FD720615D1700BDD9FB /* ResettableCursorType.swift in Sources */,
 				671463371EB3396E00EAB194 /* DrawingOperation.swift in Sources */,
 				67153E3D207DFADA0049D8C0 /* RotateDrawingOperation.swift in Sources */,
-				6741CED320E243F800FEC4D9 /* BaseConfigurableController.swift in Sources */,
 				67274782206CD3BD00725163 /* ViewText+Extensions.swift in Sources */,
 				673CF42E2063DE5900C329F6 /* TextPlaceholderView.swift in Sources */,
 				6741CEB120E242A500FEC4D9 /* TableViewHolder+ScrollViewHolder.swift in Sources */,
 				6741CEA320E2416C00FEC4D9 /* ScrollViewHolder.swift in Sources */,
 				B84CB06B20B702260090DB91 /* Encodable+Extensions.swift in Sources */,
 				671462731EB3396E00EAB194 /* CursorError.swift in Sources */,
-				6741CED020E243F800FEC4D9 /* BaseCustomViewController.swift in Sources */,
 				6732F242214C09F900B446F2 /* UserDefaults+Codable.swift in Sources */,
 				677B06B521186C14006C947D /* Completable+DeferredJust.swift in Sources */,
 				6727478D206CD83600725163 /* DateFormat.swift in Sources */,
@@ -2964,7 +3003,6 @@
 				6714637B1EB3396E00EAB194 /* CALayerDrawingOperation.swift in Sources */,
 				67E902592125B66E008EDF45 /* UIImageView+ExpandCollapseDisclosure.swift in Sources */,
 				6741CEA720E2418200FEC4D9 /* TableViewHolder.swift in Sources */,
-				67DB776B21087154001CB56B /* CollectionViewWrapperView.swift in Sources */,
 				6774529520625D170024EEEF /* GeneralDataLoadingModel.swift in Sources */,
 				6713C23A20AF0C4D00875921 /* NetworkOperationState.swift in Sources */,
 				6774529D20625E5B0024EEEF /* PaginationDataLoadingState.swift in Sources */,
@@ -3019,8 +3057,12 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Sources/Info-iOS.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200 -Xfrontend -debug-time-function-bodies";
 				PRODUCT_BUNDLE_IDENTIFIER = "ru.touchin.LeadKit-iOS";
 				PRODUCT_NAME = LeadKit;
@@ -3049,8 +3091,12 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Sources/Info-iOS.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200 -Xfrontend -debug-time-function-bodies";
 				PRODUCT_BUNDLE_IDENTIFIER = "ru.touchin.LeadKit-iOS";
 				PRODUCT_NAME = LeadKit;
@@ -3078,7 +3124,11 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Sources/Info-watchOS.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200 -Xfrontend -debug-time-function-bodies";
 				PRODUCT_BUNDLE_IDENTIFIER = "ru.touchin.LeadKit-watchOS";
 				PRODUCT_NAME = LeadKit;
@@ -3110,7 +3160,11 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Sources/Info-watchOS.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200 -Xfrontend -debug-time-function-bodies";
 				PRODUCT_BUNDLE_IDENTIFIER = "ru.touchin.LeadKit-watchOS";
 				PRODUCT_NAME = LeadKit;
@@ -3140,7 +3194,11 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Sources/Info-tvOS.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200 -Xfrontend -debug-time-function-bodies";
 				PRODUCT_BUNDLE_IDENTIFIER = "ru.touchin.LeadKit-tvOS";
 				PRODUCT_NAME = LeadKit;
@@ -3149,7 +3207,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 9.0;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = Debug;
 		};
@@ -3171,7 +3229,11 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Sources/Info-tvOS.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200 -Xfrontend -debug-time-function-bodies";
 				PRODUCT_BUNDLE_IDENTIFIER = "ru.touchin.LeadKit-tvOS";
 				PRODUCT_NAME = LeadKit;
@@ -3179,7 +3241,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 9.0;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = Release;
 		};
@@ -3206,6 +3268,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -3231,7 +3294,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -3265,6 +3328,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -3284,10 +3348,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";

LeadKit.xcodeproj/xcshareddata/xcschemes/LeadKit iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1230"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "67186B271EB248F100CFAFFB"
+            BuildableName = "LeadKit.framework"
+            BlueprintName = "LeadKit iOS"
+            ReferencedContainer = "container:LeadKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "67186B271EB248F100CFAFFB"
-            BuildableName = "LeadKit.framework"
-            BlueprintName = "LeadKit iOS"
-            ReferencedContainer = "container:LeadKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:LeadKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

LeadKit.xcodeproj/xcshareddata/xcschemes/LeadKit tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1230"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6782BB9F1EB31D590086E0B8"
+            BuildableName = "LeadKit.framework"
+            BlueprintName = "LeadKit tvOS"
+            ReferencedContainer = "container:LeadKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6782BB9F1EB31D590086E0B8"
-            BuildableName = "LeadKit.framework"
-            BlueprintName = "LeadKit tvOS"
-            ReferencedContainer = "container:LeadKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:LeadKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

LeadKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

Makefile

@@ -0,0 +1,107 @@
+export SRCROOT := $(shell pwd)
+
+push_to_podspecs: TISwiftUtils.target TIFoundationUtils.target TICoreGraphicsUtils.target TIKeychainUtils.target TIUIKitCore.target TIUIElements.target TIWebView.target TIBottomSheet.target TISwiftUICore.target TITableKitUtils.target TIDeeplink.target TIDeveloperUtils.target TILogging.target TINetworking.target TIMoyaNetworking.target TINetworkingCache.target TIMapUtils.target TIAppleMapUtils.target TIGoogleMapUtils.target TIPagination.target TIAuth.target TIEcommerce.target TITextProcessing.target TIApplication.target
+	$(call clean)
+
+TISwiftUtils.target:
+	MODULE_NAME="TISwiftUtils" ./project-scripts/push_to_podspecs.sh
+	touch TISwiftUtils.target
+
+TIFoundationUtils.target: TISwiftUtils.target TILogging.target
+	MODULE_NAME="TIFoundationUtils" ./project-scripts/push_to_podspecs.sh
+	touch TIFoundationUtils.target
+
+TICoreGraphicsUtils.target:
+	MODULE_NAME="TICoreGraphicsUtils" ./project-scripts/push_to_podspecs.sh
+	touch TICoreGraphicsUtils.target
+
+TIKeychainUtils.target: TIFoundationUtils.target
+	MODULE_NAME="TIKeychainUtils" ./project-scripts/push_to_podspecs.sh
+	touch TIKeychainUtils.target
+
+TIUIKitCore.target: TISwiftUtils.target
+	MODULE_NAME="TIUIKitCore" ./project-scripts/push_to_podspecs.sh
+	touch TIUIKitCore.target
+
+TIUIElements.target: TIUIKitCore.target TILogging.target
+	MODULE_NAME="TIUIElements" ./project-scripts/push_to_podspecs.sh
+	touch TIUIElements.target
+
+TIWebView.target: TIUIKitCore.target
+	MODULE_NAME="TIWebView" ./project-scripts/push_to_podspecs.sh
+	touch TIWebView.target
+
+TIBottomSheet.target: TIUIElements.target
+	MODULE_NAME="TIBottomSheet" ./project-scripts/push_to_podspecs.sh
+	touch TIBottomSheet.target
+
+TISwiftUICore.target: TIUIKitCore.target
+	MODULE_NAME="TISwiftUICore" ./project-scripts/push_to_podspecs.sh
+	touch TISwiftUICore.target
+
+TITableKitUtils.target: TIUIElements.target
+	MODULE_NAME="TITableKitUtils" ./project-scripts/push_to_podspecs.sh
+	touch TITableKitUtils.target
+
+TIDeeplink.target: TIFoundationUtils.target
+	MODULE_NAME="TIDeeplink" ./project-scripts/push_to_podspecs.sh
+	touch TIDeeplink.target
+
+TIDeveloperUtils.target: TIUIElements.target
+	MODULE_NAME="TIDeveloperUtils" ./project-scripts/push_to_podspecs.sh
+	touch TIDeveloperUtils.target
+
+TINetworking.target: TIFoundationUtils.target
+	MODULE_NAME="TINetworking" ./project-scripts/push_to_podspecs.sh
+	touch TINetworking.target
+
+TILogging.target:
+	MODULE_NAME="TILogging" ./project-scripts/push_to_podspecs.sh
+	touch TILogging.target
+
+TIMoyaNetworking.target: TINetworking.target
+	MODULE_NAME="TIMoyaNetworking" ./project-scripts/push_to_podspecs.sh
+	touch TIMoyaNetworking.target
+
+TINetworkingCache.target: TINetworking.target
+	MODULE_NAME="TINetworkingCache" ./project-scripts/push_to_podspecs.sh
+	touch TINetworkingCache.target
+
+TIMapUtils.target: TILogging TICoreGraphicsUtils.target
+	MODULE_NAME="TIMapUtils" ./project-scripts/push_to_podspecs.sh
+	touch TIMapUtils.target
+
+TIAppleMapUtils.target: TIMapUtils.target
+	MODULE_NAME="TIAppleMapUtils" ./project-scripts/push_to_podspecs.sh
+	touch TIAppleMapUtils.target
+
+TIGoogleMapUtils.target: TIMapUtils.target
+	MODULE_NAME="TIGoogleMapUtils" ./project-scripts/push_to_podspecs.sh
+	touch TIGoogleMapUtils.target
+
+TIYandexMapUtils.target: TIMapUtils.target
+	MODULE_NAME="TIYandexMapUtils" ./project-scripts/push_to_podspecs.sh
+	touch TIYandexMapUtils.target
+
+TIPagination.target: TISwiftUtils.target
+	MODULE_NAME="TIPagination" ./project-scripts/push_to_podspecs.sh
+	touch TIPagination.target
+
+TIAuth.target: TIUIKitCore.target TIKeychainUtils.target
+	MODULE_NAME="TIAuth" ./project-scripts/push_to_podspecs.sh
+	touch TIAuth.target
+
+TIEcommerce.target: TINetworking.target TIUIElements.target
+	MODULE_NAME="TIEcommerce" ./project-scripts/push_to_podspecs.sh
+	touch TIEcommerce.target
+
+TITextProcessing.target:
+	MODULE_NAME="TITextProcessing" ./project-scripts/push_to_podspecs.sh
+	touch TITextProcessing.target
+
+TIApplication.target: TIFoundationUtils.target TILogging.target
+	MODULE_NAME="TIApplication" ./project-scripts/push_to_podspecs.sh
+	touch TIApplication.target
+
+clean:
+	rm *.target

OTPSwiftView/Sources/Views/OTPSwiftView/OTPSwiftView.swift

@@ -21,7 +21,7 @@
 //
 
 import UIKit
-import TIUIKitCore
+import TIUIElements
 import TISwiftUtils
 
 /// Base full OTP View for entering the verification code

OTPSwiftView/Sources/Views/OTPView/OTPView.swift

@@ -20,7 +20,7 @@
 //  THE SOFTWARE.
 //
 
-import TIUIKitCore
+import TIUIElements
 import TISwiftUtils
 
 /// Base OTP view with textfield for entering a one symbol

Package.resolved

@@ -0,0 +1,95 @@
+{
+  "pins" : [
+    {
+      "identity" : "alamofire",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Alamofire/Alamofire.git",
+      "state" : {
+        "revision" : "bc268c28fb170f494de9e9927c371b8342979ece",
+        "version" : "5.7.1"
+      }
+    },
+    {
+      "identity" : "antlr4",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/antlr/antlr4",
+      "state" : {
+        "revision" : "44d87bc1d130c88aa452894aa5f7e2f710f68253",
+        "version" : "4.10.1"
+      }
+    },
+    {
+      "identity" : "cache",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/hyperoslo/Cache.git",
+      "state" : {
+        "revision" : "c7f4d633049c3bd649a353bad36f6c17e9df085f",
+        "version" : "6.0.0"
+      }
+    },
+    {
+      "identity" : "cursors",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/petropavel13/Cursors",
+      "state" : {
+        "revision" : "52f27b82cb1cbbc2b5fd09514c48b9c75e3b0300",
+        "version" : "0.6.0"
+      }
+    },
+    {
+      "identity" : "keychainaccess",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kishikawakatsumi/KeychainAccess.git",
+      "state" : {
+        "revision" : "84e546727d66f1adc5439debad16270d0fdd04e7",
+        "version" : "4.2.2"
+      }
+    },
+    {
+      "identity" : "moya",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Moya/Moya.git",
+      "state" : {
+        "revision" : "c263811c1f3dbf002be9bd83107f7cdc38992b26",
+        "version" : "15.0.3"
+      }
+    },
+    {
+      "identity" : "panmodal",
+      "kind" : "remoteSourceControl",
+      "location" : "https://git.svc.touchin.ru/TouchInstinct/PanModal",
+      "state" : {
+        "revision" : "ced7c1703f90746df0224b6e0d33c146d9ae4284",
+        "version" : "1.3.1"
+      }
+    },
+    {
+      "identity" : "reactiveswift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ReactiveCocoa/ReactiveSwift.git",
+      "state" : {
+        "revision" : "c43bae3dac73fdd3cb906bd5a1914686ca71ed3c",
+        "version" : "6.7.0"
+      }
+    },
+    {
+      "identity" : "rxswift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ReactiveX/RxSwift.git",
+      "state" : {
+        "revision" : "9dcaa4b333db437b0fbfaf453fad29069044a8b4",
+        "version" : "6.6.0"
+      }
+    },
+    {
+      "identity" : "tablekit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://git.svc.touchin.ru/TouchInstinct/TableKit.git",
+      "state" : {
+        "revision" : "fec9537745799fab55df7477cb3ec2b4ea5c254d",
+        "version" : "2.12.0"
+      }
+    }
+  ],
+  "version" : 2
+}

Package.swift

@@ -1,25 +1,198 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.7
+
+#if canImport(PackageDescription)
+
 import PackageDescription
 
 let package = Package(
   name: "LeadKit",
   platforms: [
-      .iOS(.v11)
+      .iOS(.v12)
   ],
   products: [
-    .library(name: "TITransitions", targets: ["TITransitions"]),
+
+    // MARK: - Application
+
+    .library(name: "TIApplication", targets: ["TIApplication"]),
+
+    // MARK: - UIKit
+
     .library(name: "TIUIKitCore", targets: ["TIUIKitCore"]),
+    .library(name: "TIUIElements", targets: ["TIUIElements"]),
+    .library(name: "TIWebView", targets: ["TIWebView"]),
+    .library(name: "TIBottomSheet", targets: ["TIBottomSheet"]),
+
+    // MARK: - SwiftUI
+
+    .library(name: "TISwiftUICore", targets: ["TISwiftUICore"]),
+
+    // MARK: - Utils
     .library(name: "TISwiftUtils", targets: ["TISwiftUtils"]),
     .library(name: "TIFoundationUtils", targets: ["TIFoundationUtils"]),
-    .library(name: "TIUIElements", targets: ["TIUIElements"]),
-    .library(name: "OTPSwiftView", targets: ["OTPSwiftView"])
+    .library(name: "TICoreGraphicsUtils", targets: ["TICoreGraphicsUtils"]),
+    .library(name: "TIKeychainUtils", targets: ["TIKeychainUtils"]),
+    .library(name: "TITableKitUtils", targets: ["TITableKitUtils"]),
+    .library(name: "TIDeeplink", targets: ["TIDeeplink"]),
+    .library(name: "TIDeveloperUtils", targets: ["TIDeveloperUtils"]),
+
+    // MARK: - Networking
+
+    .library(name: "TINetworking", targets: ["TINetworking"]),
+    .library(name: "TIMoyaNetworking", targets: ["TIMoyaNetworking"]),
+    .library(name: "TINetworkingCache", targets: ["TINetworkingCache"]),
+
+    // MARK: - Maps
+
+    .library(name: "TIMapUtils", targets: ["TIMapUtils"]),
+    .library(name: "TIAppleMapUtils", targets: ["TIAppleMapUtils"]),
+
+    // MARK: - Elements
+
+    .library(name: "OTPSwiftView", targets: ["OTPSwiftView"]),
+    .library(name: "TITransitions", targets: ["TITransitions"]),
+    .library(name: "TIPagination", targets: ["TIPagination"]),
+    .library(name: "TIAuth", targets: ["TIAuth"]),
+    .library(name: "TIEcommerce", targets: ["TIEcommerce"]),
+    .library(name: "TITextProcessing", targets: ["TITextProcessing"])
+  ],
+  dependencies: [
+    .package(url: "https://git.svc.touchin.ru/TouchInstinct/TableKit.git", .upToNextMinor(from: "2.12.0")),
+    .package(url: "https://github.com/kishikawakatsumi/KeychainAccess.git", .upToNextMajor(from: "4.2.2")),
+    .package(url: "https://github.com/petropavel13/Cursors", .upToNextMajor(from: "0.5.1")),
+    .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "5.4.0")),
+    .package(url: "https://github.com/Moya/Moya.git", .upToNextMajor(from: "15.0.0")),
+    .package(url: "https://github.com/hyperoslo/Cache.git", .upToNextMajor(from: "6.0.0")),
+    .package(url: "https://github.com/antlr/antlr4", .upToNextMinor(from: "4.10.1")),
+    .package(url: "https://git.svc.touchin.ru/TouchInstinct/PanModal", .upToNextMinor(from: "1.3.0"))
   ],
   targets: [
+
+    // MARK: - Application architecture
+
+    .target(name: "TIApplication",
+            dependencies: ["TILogging", "TIFoundationUtils", "KeychainAccess"],
+            path: "TIApplication/Sources",
+            plugins: [.plugin(name: "TISwiftLintPlugin")]),
+
+    // MARK: - UIKit
+
+    .target(name: "TIUIKitCore", dependencies: ["TISwiftUtils"], path: "TIUIKitCore/Sources"),
+
+    .target(name: "TIUIElements",
+            dependencies: ["TIUIKitCore", "TILogging"],
+            path: "TIUIElements/Sources",
+            exclude: ["../TIUIElements.app"],
+            plugins: [.plugin(name: "TISwiftLintPlugin")]),
+
+    .target(name: "TIWebView", dependencies: ["TIUIKitCore", "TISwiftUtils"], path: "TIWebView/Sources"),
+    .target(name: "TIBottomSheet",
+            dependencies: ["PanModal", "TIUIElements", "TIUIKitCore", "TISwiftUtils"],
+            path: "TIBottomSheet/Sources",
+            exclude: ["../TIBottomSheet.app"],
+            plugins: [.plugin(name: "TISwiftLintPlugin")]),
+
+    // MARK: - SwiftUI
+
+    .target(name: "TISwiftUICore",
+            dependencies: ["TIUIKitCore", "TISwiftUtils"],
+            path: "TISwiftUICore/Sources"),
+
+    // MARK: - Utils
+
+    .target(name: "TISwiftUtils",
+            path: "TISwiftUtils/Sources",
+            plugins: [.plugin(name: "TISwiftLintPlugin")]),
+
+    .target(name: "TIFoundationUtils",
+            dependencies: ["TISwiftUtils", "TILogging"],
+            path: "TIFoundationUtils",
+            exclude: ["TIFoundationUtils.app"],
+            resources: [
+                .copy("PrivacyInfo.xcprivacy"),
+            ],
+            plugins: [.plugin(name: "TISwiftLintPlugin")]),
+
+    .target(name: "TICoreGraphicsUtils",
+            dependencies: [],
+            path: "TICoreGraphicsUtils/Sources",
+            exclude: ["../TICoreGraphicsUtils.app"],
+            plugins: [.plugin(name: "TISwiftLintPlugin")]),
+
+    .target(name: "TIKeychainUtils",
+            dependencies: ["TIFoundationUtils", "KeychainAccess"],
+            path: "TIKeychainUtils/Sources",
+            exclude: ["../TIKeychainUtils.app"],
+            plugins: [.plugin(name: "TISwiftLintPlugin")]),
+
+    .target(name: "TITableKitUtils", dependencies: ["TIUIElements", "TableKit"], path: "TITableKitUtils/Sources"),
+    .target(name: "TIDeeplink", dependencies: ["TIFoundationUtils"], path: "TIDeeplink", exclude: ["TIDeeplink.app"]),
+    .target(name: "TIDeveloperUtils", dependencies: ["TISwiftUtils", "TIUIKitCore", "TIUIElements"], path: "TIDeveloperUtils/Sources"),
+    .target(name: "TILogging", path: "TILogging/Sources", plugins: ["TISwiftLintPlugin"]),
+
+    // MARK: - Networking
+
+    .target(name: "TINetworking",
+            dependencies: ["TIFoundationUtils", "Alamofire", "TILogging"],
+            path: "TINetworking/Sources",
+            plugins: [.plugin(name: "TISwiftLintPlugin")]),
+
+    .target(name: "TIMoyaNetworking",
+            dependencies: ["TINetworking", "Moya"],
+            path: "TIMoyaNetworking/Sources",
+            plugins: [.plugin(name: "TISwiftLintPlugin")]),
+
+    .target(name: "TINetworkingCache",
+            dependencies: ["TINetworking", "Cache"],
+            path: "TINetworkingCache/Sources",
+            plugins: [.plugin(name: "TISwiftLintPlugin")]),
+
+    // MARK: - Maps
+
+    .target(name: "TIMapUtils",
+            dependencies: ["TILogging", "TICoreGraphicsUtils"],
+            path: "TIMapUtils/Sources",
+            plugins: [.plugin(name: "TISwiftLintPlugin")]),
+
+    .target(name: "TIAppleMapUtils",
+            dependencies: ["TIMapUtils"],
+            path: "TIAppleMapUtils/Sources",
+            plugins: [.plugin(name: "TISwiftLintPlugin")]),
+
+    // MARK: - Elements
+
+    .target(name: "OTPSwiftView", dependencies: ["TIUIElements"], path: "OTPSwiftView/Sources"),
     .target(name: "TITransitions", path: "TITransitions/Sources"),
-    .target(name: "TIUIKitCore", path: "TIUIKitCore/Sources"),
-    .target(name: "TISwiftUtils", path: "TISwiftUtils/Sources"),
-    .target(name: "TIFoundationUtils", dependencies: ["TISwiftUtils"], path: "TIFoundationUtils/Sources"),
-    .target(name: "TIUIElements", dependencies: ["TIUIKitCore"], path: "TIUIElements/Sources"),
-    .target(name: "OTPSwiftView", dependencies: ["TIUIKitCore", "TISwiftUtils"], path: "OTPSwiftView/Sources")
+    .target(name: "TIPagination", dependencies: ["Cursors", "TISwiftUtils"], path: "TIPagination/Sources"),
+    .target(name: "TIAuth", dependencies: ["TIUIKitCore", "TIKeychainUtils"], path: "TIAuth/Sources"),
+    .target(name: "TIEcommerce", dependencies: ["TIFoundationUtils", "TISwiftUtils", "TINetworking", "TIUIKitCore", "TIUIElements"], path: "TIEcommerce/Sources"),
+    .target(name: "TITextProcessing",
+            dependencies: [.product(name: "Antlr4", package: "antlr4")],
+            path: "TITextProcessing/Sources",
+            exclude: ["../TITextProcessing.app"]),
+
+    .binaryTarget(name: "SwiftLintBinary",
+                  url: "https://github.com/realm/SwiftLint/releases/download/0.52.2/SwiftLintBinary-macos.artifactbundle.zip",
+                  checksum: "89651e1c87fb62faf076ef785a5b1af7f43570b2b74c6773526e0d5114e0578e"),
+
+    .plugin(name: "TISwiftLintPlugin",
+            capability: .buildTool(),
+            dependencies: ["SwiftLintBinary"]),
+
+    // MARK: - Tests
+
+    .testTarget(
+        name: "TITimerTests",
+        dependencies: ["TIFoundationUtils"],
+        path: "Tests/TITimerTests"),
+    .testTarget(
+        name: "TITextProcessingTests",
+        dependencies: ["TITextProcessing"],
+        path: "Tests/TITextProcessingTests"),
+    .testTarget(
+        name: "TIFoundationUtilsTests",
+        dependencies: ["TIFoundationUtils", "TISwiftUtils", "TILogging"],
+        path: "Tests/TIFoundationUtilsTests")
   ]
 )
+
+#endif

Plugins/TISwiftLintPlugin/plugin.swift

@@ -0,0 +1,57 @@
+//
+//  Copyright (c) 2023 Touch Instinct
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the Software), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+//
+
+import PackagePlugin
+import Foundation
+
+@main
+struct SwiftLintPlugin: BuildToolPlugin {
+    func createBuildCommands(context: PluginContext, target: Target) async throws -> [Command] {
+        let swiftlintScriptPath = context.package.directory.appending(["build-scripts", "xcode", "build_phases", "swiftlint.sh"])
+
+        let swiftlintExecutablePath = try context.tool(named: "swiftlint").path
+
+        let srcRoot = context.package.directory.string
+        let targetDir = target.directory.string
+
+        let relativeTargetDir = targetDir.replacingOccurrences(of: srcRoot, with: "")
+        let clearRelativeTargetDir = relativeTargetDir[relativeTargetDir.index(after: relativeTargetDir.startIndex)...] // trim leading /
+
+        return [
+            .prebuildCommand(displayName: "SwiftLint linting \(target.name)...",
+                             executable: swiftlintScriptPath,
+                             arguments: [
+                                swiftlintExecutablePath,
+                                context.package.directory.appending(subpath: "swiftlint_base.yml")
+                             ],
+                             environment: [
+                                "SCRIPT_DIR": swiftlintScriptPath.removingLastComponent().string,
+                                "SRCROOT": srcRoot,
+                                "SCRIPT_INPUT_FILE_COUNT": "1",
+                                "SCRIPT_INPUT_FILE_0": clearRelativeTargetDir,
+//                                "FORCE_LINT": "1", // Lint all files in target (not only modified)
+//                                "AUTOCORRECT": "1"
+                             ],
+                             outputFilesDirectory: context.package.directory)
+        ]
+    }
+}

README.md

@@ -1,11 +1,139 @@
 # LeadKit
-LeadKit is the iOS framework with a bunch of tools for rapid app development.  
 
-## Additional
-This repository contains the following additional frameworks:
+LeadKit is the iOS framework with a bunch of tools for rapid app development.
+
+This repository contains the following frameworks:
+
+- [TISwiftUtils](TISwiftUtils) - a bunch of useful helpers for Swift development.
+- [TIFoundationUtils](TIFoundationUtils) - set of helpers for Foundation framework classes.
 - [TIUIKitCore](TIUIKitCore) - core ui elements and protocols from LeadKit.
-- [TITransitions](TITransitions) - set of custom transitions to present controller.
+- [TISwiftUICore](TISwiftUICore) Core UI elements: protocols, views and helpers.
 - [TIUIElements](TIUIElements) - bunch of of useful protocols and views.
 - [OTPSwiftView](OTPSwiftView) - a fully customizable OTP view.
-- [TISwiftUtils](TISwiftUtils) - a bunch of useful helpers for development.
+- [TITableKitUtils](TITableKitUtils) - set of helpers for TableKit classes.
+- [TIKeychainUtils](TIKeychainUtils) - set of helpers for Keychain classes.
+- [TIPagination](TIPagination) - realisation of paginating items from a data source.
+- [TINetworking](TINetworking) - Swagger-frendly networking layer helpers.
+- [TIMoyaNetworking](TIMoyaNetworking) - Moya + Swagger network service.
+- [TIAppleMapUtils](TIAppleMapUtils) - set of helpers for map objects clustering and interacting using Apple MapKit.
+- [TIGoogleMapUtils](TIGoogleMapUtils) - set of helpers for map objects clustering and interacting using Google Maps SDK.
+- [TIYandexMapUtils](TIYandexMapUtils) - set of helpers for map objects clustering and interacting using Yandex Maps SDK.
+- [TIAuth](TIAuth) - login, registration, confirmation and other related actions
 
+## Playgrounds
+
+### Create new Playground
+
+```sh
+$ cd TIModuleName
+
+$ touch PlaygroundPodfile
+
+$ echo "ENV[\"DEVELOPMENT_INSTALL\"] = \"true\"
+
+target 'TIModuleName' do
+  platform :ios, IOS_VERSION_NUMBER
+  use_frameworks!
+
+  pod 'TIDependencyModuleName', :path => '../../../../TIDependencyModuleName/TIDependencyModuleName.podspec'
+  pod 'TIModuleName', :path => '../../../../TIModuleName/TIModuleName.podspec'
+end" > PlaygroundPodfile
+
+$ nef playground --name TIModuleName --cocoapods --custom-podfile PlaygroundPodfile
+```
+See example of `PlaygroundPodfile` in `TIFoundationUtils`
+
+
+### Rename/add pages to Playground
+
+For every new feature in module create new Playground page with documentation in comments. See [nef markdown documentation](https://github.com/bow-swift/nef#-generating-a-markdown-project).
+
+### Create symlink to nef playground
+
+```sh
+$ cd TIModuleName
+$ ln -s TIModuleName.app/Contents/MacOS/TIModuleName.playground TIModuleName.playground
+```
+
+### Add nef files to TIModuleName.app/.gitignore
+
+```
+# gitignore nef files
+**/build/
+**/nef/
+LICENSE
+```
+
+### Exclude .app bundles from package sources
+
+#### SPM
+
+```swift
+.target(name: "TIModuleName", dependencies: ..., path: ..., exclude: ["TIModuleName.app"]),
+```
+
+#### Podspec
+
+```ruby
+  sources = 'your_sources_expression'
+  if ENV["DEVELOPMENT_INSTALL"] # installing using :path =>
+    s.source_files = sources
+    s.exclude_files = s.name + '.app'
+  else
+    s.source_files = s.name + '/' + sources
+    s.exclude_files = s.name + '/*.app'
+  end
+```
+
+## Docs:
+
+- [TIFoundationUtils](docs/tifoundationutils)
+  * [AsyncOperation](docs/tifoundationutils/asyncoperation.md)
+- [TICoreGraphicsUtils](docs/ticoregraphicsutils)
+  * [DrawingOperations](docs/ticoregraphicsutils/drawingoperations.md)
+- [TIKeychainUtils](docs/tikeychainutils)
+  * [SingleValueStorage](docs/tikeychainutils/singlevaluestorage.md)
+- [TIUIElements](docs/tiuielements)
+  * [Skeletons](docs/tiuielements/skeletons.md)
+  * [Placeholders](docs/tiuielements/placeholder.md)
+- [TITextProcessing](docs/titextprocessing)
+  * [TITextProcessing](docs/titextprocessing/titextprocessing.md)
+- [TIDeeplink](docs/tideeplink/deeplinks.md)
+- [TIBottomSheet](docs/tibottomsheet/tibottomsheet.md)
+- [Semantic Commit Messages](docs/semantic-commit-messages.md) - commit message codestyle.
+- [Snippets](docs/snippets.md) - useful commands and scripts for development.
+
+## Contributing
+
+- Run following script in framework's folder:
+```
+./setup
+```
+
+- If legacy [Source](https://git.svc.touchin.ru/TouchInstinct/LeadKit/tree/master/Sources) folder needed, [build dependencies for LeadKit.xcodeproj](https://git.svc.touchin.ru/TouchInstinct/LeadKit/blob/master/docs/snippets.md#build-dependencies-for-LeadKit.xcodeproj).
+
+- Make sure the commit message codestyle is followed. More about [Semantic Commit Messages](docs/semantic-commit-messages.md).
+
+## Installation
+
+### SPM
+
+```swift
+dependencies: [
+    .package(url: "https://git.svc.touchin.ru/TouchInstinct/LeadKit.git", from: "x.y.z"),
+],
+```
+
+### Cocoapods
+
+```ruby
+source 'https://git.svc.touchin.ru/TouchInstinct/Podspecs.git'
+
+pod 'TISwiftUtils', 'x.y.z'
+pod 'TIFoundationUtils', 'x.y.z'
+# ...
+```
+
+## Legacy
+
+Code located in root `Sources` folder and  `LeadKit.podspec` should be treated as legacy and shouldn't be used in newly created projects. Please use TI* modules via SPM or CocoaPods.

Sources/Classes/Controllers/BaseCollectionContentController.swift

@@ -26,11 +26,11 @@ import UIKit
 open class BaseCollectionContentController<ViewModel>: BaseScrollContentController<ViewModel, CollectionViewWrapperView> {
 
     override open func createView() -> CollectionViewWrapperView {
-        return CollectionViewWrapperView(layout: UICollectionViewFlowLayout())
+        CollectionViewWrapperView(layout: UICollectionViewFlowLayout())
     }
 
     /// Contained UICollectionView instance.
     public var collectionView: UICollectionView {
-        return customView.collectionView
+        customView.collectionView
     }
 }

Sources/Classes/Controllers/BaseCustomViewController.swift

@@ -49,6 +49,6 @@ open class BaseCustomViewController<ViewModel, View: UIView>: BaseConfigurableCo
     ///
     /// - Returns: Initialized custom view.
     open func createView() -> View {
-        return View()
+        View()
     }
 }

Sources/Classes/Controllers/BaseOrientationController.swift

@@ -23,8 +23,8 @@ open class BaseOrientationController: UIViewController {
                 return super.supportedInterfaceOrientations
             }
         }
-    
+
     open override var preferredInterfaceOrientationForPresentation: UIInterfaceOrientation {
-        return forcedInterfaceOrientation ?? super.preferredInterfaceOrientationForPresentation
+        forcedInterfaceOrientation ?? super.preferredInterfaceOrientationForPresentation
     }
 }

Sources/Classes/Controllers/BaseScrollContentController.swift

@@ -49,13 +49,13 @@ open class BaseScrollContentController<ViewModel, View: ScrollViewHolderView>: B
 
     /// Contained UIScrollView instance.
     public var scrollView: UIScrollView {
-        return customView.scrollView
+        customView.scrollView
     }
 
     /// Default insets used for contained scroll view.
     public var defaultInsets: UIEdgeInsets {
         get {
-            return defaultInsetsRelay.value
+            defaultInsetsRelay.value
         }
         set {
             defaultInsetsRelay.accept(newValue)

Sources/Classes/Controllers/BaseTableContentController.swift

@@ -32,11 +32,11 @@ open class BaseTableContentController<ViewModel>: BaseScrollContentController<Vi
     ///
     /// - Returns: Initialized TableDirector.
     open func createTableDirector() -> TableDirector {
-        return TableDirector(tableView: tableView)
+        TableDirector(tableView: tableView)
     }
 
     override open func createView() -> TableViewWrapperView {
-        return TableViewWrapperView(tableViewStyle: .plain)
+        TableViewWrapperView(tableViewStyle: .plain)
     }
 
     override open func configureAppearance() {
@@ -47,6 +47,6 @@ open class BaseTableContentController<ViewModel>: BaseScrollContentController<Vi
 
     /// Contained UITableView instance.
     public var tableView: UITableView {
-        return customView.tableView
+        customView.tableView
     }
 }

Sources/Classes/DataLoading/Cursors/FixedPageCursor.swift

@@ -42,17 +42,17 @@ public class FixedPageCursor<Cursor: CursorType>: CursorType, RxDataSource {
     }
 
     public var exhausted: Bool {
-        return cursor.exhausted && cursor.count == count
+        cursor.exhausted && cursor.count == count
     }
 
     public private(set) var count: Int = 0
 
     public subscript(index: Int) -> Cursor.Element {
-        return cursor[index]
+        cursor[index]
     }
 
     public func loadNextBatch() -> Single<[Cursor.Element]> {
-        return Single.deferred {
+        Single.deferred {
             if self.exhausted {
                 return .error(CursorError.exhausted)
             }

Sources/Classes/DataLoading/Cursors/MapCursor.swift

@@ -29,7 +29,7 @@ public extension CursorType {
     /// - Parameter transform: closure to transform elements
     /// - Returns: new MapCursor instance
     func flatMap<T>(transform: @escaping MapCursor<Self, T>.Transform) -> MapCursor<Self, T> {
-        return MapCursor(cursor: self, transform: transform)
+        MapCursor(cursor: self, transform: transform)
     }
 
     /// Creates ResettableMapCursor with current cursor
@@ -39,7 +39,7 @@ public extension CursorType {
     func flatMap<T>(transform: @escaping ResettableMapCursor<Self, T>.Transform)
         -> ResettableMapCursor<Self, T> where Self: ResettableCursorType {
 
-        return ResettableMapCursor(cursor: self, transform: transform)
+        ResettableMapCursor(cursor: self, transform: transform)
     }
 }
 
@@ -67,19 +67,19 @@ public class MapCursor<Cursor: CursorType, T>: CursorType, RxDataSource {
     }
 
     public var exhausted: Bool {
-        return cursor.exhausted
+        cursor.exhausted
     }
 
     public var count: Int {
-        return elements.count
+        elements.count
     }
 
     public subscript(index: Int) -> T {
-        return elements[index]
+        elements[index]
     }
 
     public func loadNextBatch() -> Single<[T]> {
-        return cursor.loadNextBatch().map { newItems in
+        cursor.loadNextBatch().map { newItems in
             let transformedNewItems = newItems.compactMap(self.transform)
             self.elements += transformedNewItems
 

Sources/Classes/DataLoading/Cursors/SingleLoadCursor.swift

@@ -37,7 +37,7 @@ public final class SingleLoadCursorConfiguration<Element>: TotalCountCursorConfi
     }
 
     public func resultSingle() -> Single<ResultType> {
-        return loadingSingle
+        loadingSingle
     }
 
     public init(resetFrom other: SingleLoadCursorConfiguration) {
@@ -67,15 +67,15 @@ public class SingleLoadCursor<Element>: ResettableCursorType {
     public private(set) var exhausted = false
 
     public var count: Int {
-        return content.count
+        content.count
     }
 
     public subscript(index: Int) -> Element {
-        return content[index]
+        content[index]
     }
 
     public func loadNextBatch() -> Single<[Element]> {
-        return Single.deferred {
+        Single.deferred {
             if self.exhausted {
                 return .error(CursorError.exhausted)
             }

Sources/Classes/DataLoading/Cursors/StaticCursor.swift

@@ -45,11 +45,11 @@ public class StaticCursor<Element>: ResettableRxDataSourceCursor {
     public private(set) var count = 0
 
     public subscript(index: Int) -> Element {
-        return content[index]
+        content[index]
     }
 
     public func loadNextBatch() -> Single<[Element]> {
-        return Single.deferred {
+        Single.deferred {
             if self.exhausted {
                 return .error(CursorError.exhausted)
             }

Sources/Classes/DataLoading/Cursors/TotalCountCursor.swift

@@ -35,15 +35,15 @@ open class TotalCountCursor<CursorConfiguration: TotalCountCursorConfiguration>:
     public private(set) var totalCount: Int = .max
 
     public var exhausted: Bool {
-        return count >= totalCount
+        count >= totalCount
     }
 
     public var count: Int {
-        return elements.count
+        elements.count
     }
 
     public subscript(index: Int) -> Element {
-        return elements[index]
+        elements[index]
     }
 
     public init(configuration: CursorConfiguration) {
@@ -55,11 +55,11 @@ open class TotalCountCursor<CursorConfiguration: TotalCountCursorConfiguration>:
     }
 
     open func processResultFromConfigurationSingle() -> Single<CursorConfiguration.ResultType> {
-        return configuration.resultSingle()
+        configuration.resultSingle()
     }
 
     public func loadNextBatch() -> Single<[Element]> {
-        return processResultFromConfigurationSingle()
+        processResultFromConfigurationSingle()
             .do(onSuccess: { [weak self] listingResult in
                 self?.totalCount = listingResult.totalCount
                 self?.elements = (self?.elements ?? []) + listingResult.results

Sources/Classes/DataLoading/GeneralDataLoading/GeneralDataLoadingViewModel.swift

@@ -63,28 +63,28 @@ open class GeneralDataLoadingViewModel<ResultType>: BaseViewModel, GeneralDataLo
 
     /// Returns observable that emits current loading state.
     open var loadingStateObservable: Observable<LoadingState> {
-        return loadingStateRelay.asObservable()
+        loadingStateRelay.asObservable()
     }
 
     /// Returns driver that emits current loading state.
     open var loadingStateDriver: Driver<LoadingState> {
-        return loadingStateRelay.asDriver()
+        loadingStateRelay.asDriver()
     }
 
     /// By default returns true if loading state == .result.
     open var hasContent: Bool {
-        return currentLoadingState.hasResult
+        currentLoadingState.hasResult
     }
 
     /// Returns current result if it exists.
     public var currentResult: ResultType? {
-        return currentLoadingState.result
+        currentLoadingState.result
     }
 
     /// Current state of loading process.
     private(set) public var currentLoadingState: LoadingState {
         get {
-            return loadingStateRelay.value
+            loadingStateRelay.value
         }
         set {
             loadingStateRelay.accept(newValue)

Sources/Classes/DataLoading/PaginationDataLoading/PaginationDataLoadingModel.swift

@@ -22,9 +22,11 @@
 
 import RxSwift
 
+public typealias RxPaginationDataLoadingModel<Cursor: ResettableRxDataSourceCursor> =
+    RxDataLoadingModel<PaginationDataLoadingState<Cursor>>
+
 /// Data loading model for PaginationDataLoadingState with ResettableRxDataSourceCursor as data source.
-public final class PaginationDataLoadingModel<Cursor: ResettableRxDataSourceCursor>:
-    RxDataLoadingModel<PaginationDataLoadingState<Cursor>> {
+public final class PaginationDataLoadingModel<Cursor: ResettableRxDataSourceCursor>: RxPaginationDataLoadingModel<Cursor> {
 
     private enum LoadType {
 

Sources/Classes/DataLoading/PaginationDataLoading/PaginationWrapper.swift

@@ -43,7 +43,7 @@ final public class PaginationWrapper<Cursor: ResettableRxDataSourceCursor, Deleg
     /// so the handler can be triggered before reaching end. Defaults to 0.0;
     public var infiniteScrollTriggerOffset: CGFloat {
         get {
-            return wrappedView.scrollView.infiniteScrollTriggerOffset
+            wrappedView.scrollView.infiniteScrollTriggerOffset
         }
         set {
             wrappedView.scrollView.infiniteScrollTriggerOffset = newValue
@@ -327,7 +327,7 @@ final public class PaginationWrapper<Cursor: ResettableRxDataSourceCursor, Deleg
 private extension PaginationWrapper {
 
     private var stateChanged: Binder<LoadingState> {
-        return Binder(self) { base, value in
+        Binder(self) { base, value in
             switch value {
             case .initial:
                 base.onInitialState()
@@ -354,7 +354,7 @@ private extension PaginationWrapper {
     }
 
     var scrollOffsetChanged: Binder<CGPoint> {
-        return Binder(self) { base, value in
+        Binder(self) { base, value in
             base.currentPlaceholderViewTopConstraint?.constant = -value.y
         }
     }

Sources/Classes/DataLoading/RxNetworkOperationModel.swift

@@ -39,7 +39,7 @@ open class RxNetworkOperationModel<LoadingStateType: NetworkOperationState>: Net
     private let errorHandler: ErrorHandler
 
     open var stateDriver: Driver<LoadingStateType> {
-        return stateRelay.asDriver()
+        stateRelay.asDriver()
     }
 
     /// Model initializer with data source and custom error handler.
@@ -81,17 +81,17 @@ open class RxNetworkOperationModel<LoadingStateType: NetworkOperationState>: Net
     func requestResult(from dataSource: DataSourceType) {
         currentRequestDisposable = dataSource
             .resultSingle()
-            .observeOn(MainScheduler.instance)
+            .observe(on: MainScheduler.instance)
             .subscribe(onSuccess: { [weak self] result in
                 self?.onGot(result: result, from: dataSource)
-            }, onError: { [weak self] error in
+            }, onFailure: { [weak self] error in
                 self?.onGot(error: error)
             })
     }
 
     var state: LoadingStateType {
         get {
-            return stateRelay.value
+            stateRelay.value
         }
         set {
             stateRelay.accept(newValue)

Sources/Classes/Search/BaseSearchViewController.swift

@@ -58,15 +58,15 @@ where ViewModel: BaseSearchViewModel<Item, ItemViewModel> {
     open override func bindViews() {
         super.bindViews()
         viewModel.itemsViewModelsDriver
-            .drive(onNext: { [weak self] viewModels in
-                self?.handle(itemViewModels: viewModels)
-            })
+            .drive(with: self) { owner, viewModels in
+                owner.handle(itemViewModels: viewModels)
+            }
             .disposed(by: disposeBag)
 
         Observable.merge(searchResults, resetResults)
-            .subscribe(onNext: { [weak self] state in
-                self?.handle(searchResultsState: state)
-            })
+            .subscribe(with: self) { owner, state in
+                owner.handle(searchResultsState: state)
+            }
             .disposed(by: disposeBag)
 
         let searchText = searchController.searchBar.rx.text
@@ -112,11 +112,11 @@ where ViewModel: BaseSearchViewModel<Item, ItemViewModel> {
     }
 
     open var searchBarPlaceholder: String {
-        return ""
+        ""
     }
 
     open var searchBarColor: UIColor {
-        return .gray
+        .gray
     }
 
     open var statusBarView: UIView {
@@ -131,7 +131,7 @@ where ViewModel: BaseSearchViewModel<Item, ItemViewModel> {
     }
 
     open var statusBarColor: UIColor {
-        return .black
+        .black
     }
 
     open func updateContent(with viewModels: [ItemViewModel]) {
@@ -144,15 +144,15 @@ where ViewModel: BaseSearchViewModel<Item, ItemViewModel> {
     }
 
     open var resetResults: Observable<SearchResultsViewControllerState> {
-        return searchController.rx.willPresent
+        searchController.rx.willPresent
             .map { SearchResultsViewControllerState.initial }
     }
 
     open var searchResults: Observable<SearchResultsViewControllerState> {
-        return viewModel.searchResultsDriver
+        viewModel.searchResultsDriver
             .asObservable()
-            .map { [weak self] viewModels -> SearchResultsViewControllerState in
-                self?.stateForUpdate(with: viewModels) ?? .rowsContent(rows: [])
+            .compactMap { [weak self] viewModels -> SearchResultsViewControllerState? in
+                self?.stateForUpdate(with: viewModels)
             }
     }
 

Sources/Classes/Search/BaseSearchViewModel.swift

@@ -35,8 +35,8 @@ open class BaseSearchViewModel<Item, ItemViewModel>: GeneralDataLoadingViewModel
     }
 
     open var itemsViewModelsDriver: Driver<[ItemViewModel]> {
-        return loadingResultObservable
-            .map { [weak self] items in
+        loadingResultObservable
+            .compactMap { [weak self] items in
                 self?.viewModels(from: items)
             }
             .flatMap { Observable.from(optional: $0) }
@@ -45,16 +45,16 @@ open class BaseSearchViewModel<Item, ItemViewModel>: GeneralDataLoadingViewModel
     }
 
     open var searchDebounceInterval: RxTimeInterval {
-        return .seconds(1)
+        .seconds(1)
     }
 
     open var searchResultsDriver: Driver<[ItemViewModel]> {
-        return searchTextRelay.debounce(searchDebounceInterval, scheduler: MainScheduler.instance)
+        searchTextRelay.debounce(searchDebounceInterval, scheduler: MainScheduler.instance)
             .withLatestFrom(loadingResultObservable) { ($0, $1) }
             .flatMapLatest { [weak self] searchText, items -> Observable<ItemsList> in
                 self?.search(by: searchText, from: items).asObservable() ?? .empty()
             }
-            .map { [weak self] items in
+            .compactMap { [weak self] items in
                 self?.viewModels(from: items)
             }
             .flatMap { Observable.from(optional: $0) }
@@ -71,29 +71,29 @@ open class BaseSearchViewModel<Item, ItemViewModel>: GeneralDataLoadingViewModel
     }
 
     open func bind(searchText: Observable<String>) -> Disposable {
-        return searchText.bind(to: searchTextRelay)
+        searchText.bind(to: searchTextRelay)
     }
 
     private func viewModels(from items: ItemsList) -> [ItemViewModel] {
-        return items.map { self.viewModel(from: $0) }
+        items.map { self.viewModel(from: $0) }
     }
 
     open var loadingResultObservable: Observable<ResultType> {
-        return loadingStateDriver
+        loadingStateDriver
             .asObservable()
             .map { $0.result }
             .flatMap { Observable.from(optional: $0) }
     }
 
     open var loadingErrorObservable: Observable<Error> {
-        return loadingStateDriver
+        loadingStateDriver
             .asObservable()
             .map { $0.error }
             .flatMap { Observable.from(optional: $0) }
     }
 
     open var firstLoadingResultObservable: Single<ResultType> {
-        return loadingResultObservable
+        loadingResultObservable
             .take(1)
             .asSingle()
     }

Sources/Classes/Services/NetworkService.swift

@@ -39,7 +39,7 @@ open class NetworkService {
 
     /// Driver that emits true when active requests count != 0 and false otherwise.
     public var isActivityIndicatorVisibleDriver: Driver<Bool> {
-        return requestCountRelay.asDriver().map { $0 != 0 }.distinctUntilChanged()
+        requestCountRelay.asDriver().map { $0 != 0 }.distinctUntilChanged()
     }
 
     /// - Parameter sessionManager: Alamofire.SessionManager to use for requests
@@ -63,12 +63,12 @@ open class NetworkService {
     public func rxObservableRequest<T: ObservableMappable>(with parameters: ApiRequestParameters,
                                                            additionalValidStatusCodes: Set<Int> = [],
                                                            decoder: JSONDecoder = JSONDecoder())
-        -> Observable<SessionManager.ModelResponse<T>> {
+    -> Observable<SessionManager.ModelResponse<T>> {
 
-            return sessionManager.rx.responseObservableModel(requestParameters: parameters,
-                                                             additionalValidStatusCodes: additionalValidStatusCodes,
-                                                             decoder: decoder)
-                .counterTracking(for: self)
+        sessionManager.rx.responseObservableModel(requestParameters: parameters,
+                                                  additionalValidStatusCodes: additionalValidStatusCodes,
+                                                  decoder: decoder)
+            .counterTracking(for: self)
     }
 
     /// Perform reactive request to get mapped ImmutableMappable model and http response
@@ -81,12 +81,12 @@ open class NetworkService {
     public func rxRequest<T: Decodable>(with parameters: ApiRequestParameters,
                                         additionalValidStatusCodes: Set<Int> = [],
                                         decoder: JSONDecoder = JSONDecoder())
-        -> Observable<SessionManager.ModelResponse<T>> {
+    -> Observable<SessionManager.ModelResponse<T>> {
 
-            return sessionManager.rx.responseModel(requestParameters: parameters,
-                                                   additionalValidStatusCodes: additionalValidStatusCodes,
-                                                   decoder: decoder)
-                .counterTracking(for: self)
+        sessionManager.rx.responseModel(requestParameters: parameters,
+                                        additionalValidStatusCodes: additionalValidStatusCodes,
+                                        decoder: decoder)
+            .counterTracking(for: self)
     }
 
     /// Perform reactive request to get data and http response
@@ -96,11 +96,11 @@ open class NetworkService {
     ///   - additionalValidStatusCodes: set of additional valid status codes
     /// - Returns: Observable of tuple containing (HTTPURLResponse, Data)
     public func rxDataRequest(with parameters: ApiRequestParameters, additionalValidStatusCodes: Set<Int> = [])
-        -> Observable<SessionManager.DataResponse> {
+    -> Observable<SessionManager.DataResponse> {
 
-            return sessionManager.rx.responseData(requestParameters: parameters,
-                                                  additionalValidStatusCodes: additionalValidStatusCodes)
-                .counterTracking(for: self)
+        sessionManager.rx.responseData(requestParameters: parameters,
+                                       additionalValidStatusCodes: additionalValidStatusCodes)
+            .counterTracking(for: self)
     }
 
     /// Perform reactive request to upload data and get Observable model and http response
@@ -113,12 +113,12 @@ open class NetworkService {
     public func rxUploadRequest<T: Decodable>(with parameters: ApiUploadRequestParameters,
                                               additionalValidStatusCodes: Set<Int> = [],
                                               decoder: JSONDecoder = JSONDecoder())
-        -> Observable<SessionManager.ModelResponse<T>> {
+    -> Observable<SessionManager.ModelResponse<T>> {
 
-            return sessionManager.rx.uploadResponseModel(requestParameters: parameters,
-                                                         additionalValidStatusCodes: additionalValidStatusCodes,
-                                                         decoder: decoder)
-                .counterTracking(for: self)
+        sessionManager.rx.uploadResponseModel(requestParameters: parameters,
+                                              additionalValidStatusCodes: additionalValidStatusCodes,
+                                              decoder: decoder)
+            .counterTracking(for: self)
     }
 }
 
@@ -145,7 +145,7 @@ public extension Observable {
     /// - Parameter networkService: NetworkService to operate on it
     /// - Returns: The source sequence with the side-effecting behavior applied.
     func counterTracking(for networkService: NetworkService) -> Observable<Observable.Element> {
-        return `do`(onSubscribe: {
+        `do`(onSubscribe: {
             networkService.increaseRequestCounter()
         }, onDispose: {
             networkService.decreaseRequestCounter()

Sources/Classes/Views/BasePlaceholderView/BasePlaceholderViewModel.swift

@@ -62,16 +62,16 @@ public extension BasePlaceholderViewModel {
 
     /// Returns true if description is not nil.
     var hasDescription: Bool {
-        return description != nil
+        description != nil
     }
 
     /// Returns true buttonTitle is not nil.
     var hasButton: Bool {
-        return buttonTitle != nil
+        buttonTitle != nil
     }
 
     /// Returns true if centerImage is not nil.
     var hasCenterImage: Bool {
-        return centerImage != nil
+        centerImage != nil
     }
 }

Sources/Classes/Views/BasePlaceholderView/BasePlaceholerView.swift

@@ -55,7 +55,7 @@ open class BasePlaceholderView: ButtonHolderView, InitializableView {
     ///
     /// - Returns: UIButton (sub)class.
     open func createButton() -> UIButton {
-        return UIButton()
+        UIButton()
     }
 
     // MARK: - InitializableView

Sources/Classes/Views/CustomizableButton/CustomizableButton.swift

@@ -48,7 +48,7 @@ open class CustomizableButton: UIButton {
     }
 
     func backgroundColor(for state: UIControl.State) -> UIColor? {
-        return backgroundColors[state]
+        backgroundColors[state]
     }
 
     private func updateBackgroundColor() {

Sources/Classes/Views/CustomizableButton/CustomizableButtonView.swift

@@ -21,7 +21,6 @@
 //
 
 import RxSwift
-import RxCocoa
 
 public typealias Spinner = UIView & Animatable
 
@@ -46,7 +45,7 @@ public struct CustomizableButtonState: OptionSet {
     // MARK: - Properties
 
     public var isLoading: Bool {
-        return contains(.loading)
+        contains(.loading)
     }
 }
 
@@ -100,15 +99,15 @@ open class CustomizableButtonView: UIView, InitializableView, ConfigurableView {
     // MARK: - Computed Properties
 
     public var tapObservable: Observable<Void> {
-        return button.rx.tap.asObservable()
+        button.rx.tap.asObservable()
     }
 
     override open var forFirstBaselineLayout: UIView {
-        return button.forFirstBaselineLayout
+        button.forFirstBaselineLayout
     }
 
     override open var forLastBaselineLayout: UIView {
-        return button.forLastBaselineLayout
+        button.forLastBaselineLayout
     }
 
     override open func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
@@ -256,7 +255,7 @@ open class CustomizableButtonView: UIView, InitializableView, ConfigurableView {
     }
 
     private var stateBinder: Binder<CustomizableButtonState> {
-        return Binder(self) { base, value in
+        Binder(self) { base, value in
             base.configureButton(withState: value)
             base.onStateChange(value)
         }

Sources/Classes/Views/CustomizableButton/CustomizableButtonViewModel.swift

@@ -39,15 +39,15 @@ open class CustomizableButtonViewModel {
     }
 
     open var stateDriver: Driver<CustomizableButtonState> {
-        return stateRelay.asDriver()
+        stateRelay.asDriver()
     }
 
     func bind(tapObservable: Observable<Void>) -> Disposable {
-        return tapObservable.bind(to: tapRelay)
+        tapObservable.bind(to: tapRelay)
     }
 
     public var tapDriver: Driver<Void> {
-        return tapRelay.asDriver()
+        tapRelay.asDriver()
     }
 
     public func updateState(with newState: CustomizableButtonState) {

Sources/Classes/Views/EmptyCell/EmptyCellRow.swift

@@ -48,6 +48,6 @@ public final class EmptyCellRow: TableRow<EmptyCell> {
 
     /// Used for set custom height to each cell, not for each cell type
     override public var defaultHeight: CGFloat? {
-        return rowHeight
+        rowHeight
     }
 }

Sources/Classes/Views/LabelTableViewCell/LabelTableViewCell.swift

@@ -93,11 +93,11 @@ open class LabelTableViewCell: SeparatorCell, InitializableView, ConfigurableCel
     // MARK: - Private
 
     private var labelInsets: UIEdgeInsets {
-        return viewModel?.labelInsets ?? .zero
+        viewModel?.labelInsets ?? .zero
     }
 
     private var contentInsets: UIEdgeInsets {
-        return viewModel?.contentInsets ?? .zero
+        viewModel?.contentInsets ?? .zero
     }
 
     // MARK: - Subclass methods to override

Sources/Classes/Views/SpinnerView/SpinnerView.swift

@@ -25,7 +25,7 @@ import UIKit
 public final class SpinnerView: UIView, Animatable, LoadingIndicator {
 
     private var animating: Bool {
-        return imageView?.layer.animation(forKey: CABasicAnimation.rotationKeyPath) != nil
+        imageView?.layer.animation(forKey: CABasicAnimation.rotationKeyPath) != nil
     }
 
     private var startTime = CFTimeInterval(0)

Sources/Classes/Views/TextField/DataModelFieldBinding.swift

@@ -57,7 +57,7 @@ public final class DataModelFieldBinding<T> {
     /// - Parameter textDriver: Driver that emits new text values.
     /// - Returns: Disposable object that can be used to unsubscribe the observer from the behaviour relay.
     public func mergeStringToModel(from textDriver: Driver<String?>) -> Disposable {
-        return textDriver.map { [modelRelay, mergeFieldClosure] in
+        textDriver.map { [modelRelay, mergeFieldClosure] in
             mergeFieldClosure(modelRelay.value, $0)
         }
         .drive(modelRelay)
@@ -65,7 +65,7 @@ public final class DataModelFieldBinding<T> {
 
     /// A Driver that will emit current field value.
     public var fieldDriver: Driver<String?> {
-        return modelDriver.map(getFieldClosure)
+        modelDriver.map(getFieldClosure)
     }
 }
 
@@ -111,11 +111,11 @@ public extension BehaviorRelay {
     /// - Returns: DataModelFieldBinding instance.
     func fieldBinding(getFieldClosure: @escaping DataModelFieldBinding<Element>.GetFieldClosure,
                       mergeFieldClosure: @escaping DataModelFieldBinding<Element>.MergeFieldClosure)
-        -> DataModelFieldBinding<Element> {
+    -> DataModelFieldBinding<Element> {
 
-        return DataModelFieldBinding(modelRelay: self,
-                                     getFieldClosure: getFieldClosure,
-                                     mergeFieldClosure: mergeFieldClosure)
+        DataModelFieldBinding(modelRelay: self,
+                              getFieldClosure: getFieldClosure,
+                              mergeFieldClosure: mergeFieldClosure)
     }
 }
 
@@ -125,6 +125,6 @@ public extension BehaviorRelay where Element == String? {
     ///
     /// - Returns: DataModelFieldBinding instance.
     func fieldBinding() -> DataModelFieldBinding<Element> {
-        return DataModelFieldBinding(modelRelay: self)
+        DataModelFieldBinding(modelRelay: self)
     }
 }

Sources/Classes/Views/TextField/TextFieldViewModel.swift

@@ -44,7 +44,7 @@ open class TextFieldViewModel < ViewEvents: TextFieldViewEvents,
     /// View events driver that will emit view events structure
     /// when view will bind itself to the view model.
     public var viewEventsDriver: Driver<ViewEvents> {
-        return viewEventsRelay
+        viewEventsRelay
             .asDriver()
             .flatMap { viewEvents -> Driver<ViewEvents> in
                 guard let viewEvents = viewEvents else {
@@ -77,7 +77,7 @@ public extension TextFieldViewModel {
     /// - Parameter closure: Closure that takes a view events parameter and returns Disposable.
     /// - Returns: Disposable object that can be used to unsubscribe the observer from the binding.
     func mapViewEvents(_ closure: @escaping MapViewEventClosure) -> Disposable {
-        return mapViewEvents { [closure($0)] }
+        mapViewEvents { [closure($0)] }
     }
 
     typealias MapViewEventsClosure = (ViewEvents) -> [Disposable]
@@ -87,7 +87,7 @@ public extension TextFieldViewModel {
     /// - Parameter closure: Closure that takes a view events parameter and returns [Disposable].
     /// - Returns: Disposable object that can be used to unsubscribe the observer from the binding.
     func mapViewEvents(_ closure: @escaping MapViewEventsClosure) -> Disposable {
-        return viewEventsDriver
+        viewEventsDriver
             .map { [weak self] in
                 guard let strongSelf = self else {
                     return

Sources/Classes/Views/XibView/XibView.swift

@@ -28,7 +28,7 @@ open class XibView: UIView {
     /// Nib name used to instantiate inner view
     /// - NOTE: Be very carefully when you're intending to change this line
     open var innerViewNibName: String {
-        return typeName(of: type(of: self))
+        typeName(of: type(of: self))
     }
 
     public convenience init() {

Sources/Enums/DataLoading/GeneralDataLoading/GeneralDataLoadingState.swift

@@ -41,28 +41,28 @@ extension GeneralDataLoadingState: DataLoadingState {
     public typealias DataSourceType = DS
 
     public static var initialState: GeneralDataLoadingState<DS> {
-        return .initial
+        .initial
     }
 
     public static var emptyState: GeneralDataLoadingState<DS> {
-        return .empty
+        .empty
     }
 
     public static func initialLoadingState(after: GeneralDataLoadingState<DS>) -> GeneralDataLoadingState<DS> {
-        return .loading
+        .loading
     }
 
     public static func resultState(result: DS.ResultType,
                                    from: DS,
                                    after: GeneralDataLoadingState<DS>) -> GeneralDataLoadingState<DS> {
 
-        return .result(newResult: result, from: from)
+        .result(newResult: result, from: from)
     }
 
     public static func errorState(error: Error,
                                   after: GeneralDataLoadingState<DS>) -> GeneralDataLoadingState<DS> {
 
-        return .error(error: error)
+        .error(error: error)
     }
 
     public var isInitialState: Bool {

Sources/Enums/DataLoading/PaginationDataLoading/PaginationDataLoadingState.swift

@@ -45,28 +45,28 @@ extension PaginationDataLoadingState: DataLoadingState {
     public typealias DataSourceType = DS
 
     public static var initialState: PaginationDataLoadingState<DS> {
-        return .initial
+        .initial
     }
 
     public static var emptyState: PaginationDataLoadingState<DS> {
-        return .empty
+        .empty
     }
 
     public static func initialLoadingState(after: PaginationDataLoadingState<DS>) -> PaginationDataLoadingState<DS> {
-        return .initialLoading(after: after)
+        .initialLoading(after: after)
     }
 
     public static func resultState(result: DS.ResultType,
                                    from: DataSourceType,
                                    after: PaginationDataLoadingState<DS>) -> PaginationDataLoadingState<DS> {
 
-        return .results(newItems: result, from: from, after: after)
+        .results(newItems: result, from: from, after: after)
     }
 
     public static func errorState(error: Error,
                                   after: PaginationDataLoadingState<DS>) -> PaginationDataLoadingState<DS> {
 
-        return .error(error: error, after: after)
+        .error(error: error, after: after)
     }
 
     public var isInitialState: Bool {

Sources/Enums/RequestError.swift

@@ -31,8 +31,8 @@ import Alamofire
 /// - mapping: Errors that occurs during mapping json into model.
 public enum RequestError: Error {
 
-    case noConnection
-    case network(error: Error, response: Data?)
-    case invalidResponse(error: AFError, response: Data?)
-    case mapping(error: Error, response: Data)
+    case noConnection(url: String?)
+    case network(error: Error, response: Data?, url: String?)
+    case invalidResponse(error: AFError, response: Data?, url: String?)
+    case mapping(error: Error, response: Data, url: String?)
 }

Sources/Extensions/Alamofire/DataRequest+Extensions.swift

@@ -36,7 +36,7 @@ public extension Reactive where Base: DataRequest {
     func apiResponse<T: Decodable>(mappingQueue: DispatchQueue = .global(), decoder: JSONDecoder)
         -> Observable<SessionManager.ModelResponse<T>> {
 
-            return response(onQueue: mappingQueue)
+            response(onQueue: mappingQueue)
                 .tryMapResult { response, data in
                     (response, try decoder.decode(T.self, from: data))
                 }
@@ -50,7 +50,7 @@ public extension Reactive where Base: DataRequest {
     func observableApiResponse<T: ObservableMappable>(mappingQueue: DispatchQueue = .global(), decoder: JSONDecoder)
         -> Observable<SessionManager.ModelResponse<T>> {
 
-            return response(onQueue: mappingQueue)
+            response(onQueue: mappingQueue)
                 .tryMapObservableResult { response, value in
                     let json = try JSONSerialization.jsonObject(with: value, options: [])
                     return T.create(from: json, with: decoder)
@@ -64,13 +64,13 @@ public extension Reactive where Base: DataRequest {
     /// - Parameter mappingQueue: The dispatch queue to use for mapping
     /// - Returns: Observable with HTTP URL Response and data
     func dataApiResponse(mappingQueue: DispatchQueue) -> Observable<SessionManager.DataResponse> {
-        return response(onQueue: mappingQueue)
+        response(onQueue: mappingQueue)
             .map { $0 as SessionManager.DataResponse }
             .catchAsRequestError(with: self.base)
     }
 
     private func response(onQueue queue: DispatchQueue) -> Observable<(HTTPURLResponse, Data)> {
-        return responseResult(queue: queue, responseSerializer: DataResponseSerializer())
+        responseResult(queue: queue, responseSerializer: DataResponseSerializer())
     }
 }
 
@@ -80,33 +80,39 @@ public extension ObservableType where Element == DataRequest {
     ///
     /// - Parameter statusCodes: set of status codes to validate
     /// - Returns: Observable on self
-    func validate(statusCodes: Set<Int>) -> Observable<Element> {
-        return map { $0.validate(statusCode: statusCodes) }
-            .catchAsRequestError()
+    func validate(statusCodes: Set<Int>, url: String? = nil) -> Observable<Element> {
+        map { $0.validate(statusCode: statusCodes) }
+            .catchAsRequestError(url: url)
     }
 }
 
 private extension ObservableType where Element == ServerResponse {
 
     func tryMapResult<R>(_ transform: @escaping (Element) throws -> R) -> Observable<R> {
-        return map {
+        map {
             do {
                 return try transform($0)
             } catch {
-                throw RequestError.mapping(error: error, response: $0.1)
+                throw RequestError.mapping(error: error,
+                                           response: $0.1,
+                                           url: $0.0.url?.absoluteString)
             }
         }
     }
 
     func tryMapObservableResult<R>(_ transform: @escaping (Element) throws -> Observable<R>) -> Observable<R> {
-        return flatMap { response, result -> Observable<R> in
+        flatMap { response, result -> Observable<R> in
             do {
                 return try transform((response, result))
-                    .catchError {
-                        throw RequestError.mapping(error: $0, response: result)
+                    .catch {
+                        throw RequestError.mapping(error: $0,
+                                                   response: result,
+                                                   url: response.url?.absoluteString)
                     }
             } catch {
-                throw RequestError.mapping(error: error, response: result)
+                throw RequestError.mapping(error: error,
+                                           response: result,
+                                           url: response.url?.absoluteString)
             }
         }
     }
@@ -114,8 +120,9 @@ private extension ObservableType where Element == ServerResponse {
 
 private extension ObservableType {
 
-    func catchAsRequestError(with request: DataRequest? = nil) -> Observable<Element> {
-        return catchError { error in
+    func catchAsRequestError(with request: DataRequest? = nil,
+                             url: String? = nil) -> Observable<Element> {
+        self.catch { error in
             let resultError: RequestError
             let response = request?.data
 
@@ -126,10 +133,10 @@ private extension ObservableType {
             case let urlError as URLError:
                 switch urlError.code {
                 case .notConnectedToInternet:
-                    resultError = .noConnection
+                    resultError = .noConnection(url: url)
 
                 default:
-                    resultError = .network(error: urlError, response: response)
+                    resultError = .network(error: urlError, response: response, url: url)
                 }
 
             case let afError as AFError:
@@ -137,21 +144,21 @@ private extension ObservableType {
                 case let .sessionTaskFailed(error):
                     switch error {
                     case let urlError as URLError where urlError.code == .notConnectedToInternet:
-                        resultError = .noConnection
+                        resultError = .noConnection(url: url)
 
                     default:
-                        resultError = .network(error: error, response: response)
+                        resultError = .network(error: error, response: response, url: url)
                     }
 
                 case .responseSerializationFailed, .responseValidationFailed:
-                    resultError = .invalidResponse(error: afError, response: response)
+                    resultError = .invalidResponse(error: afError, response: response, url: url)
 
                 default:
-                    resultError = .network(error: afError, response: response)
+                    resultError = .network(error: afError, response: response, url: url)
                 }
 
             default:
-                resultError = .network(error: error, response: response)
+                resultError = .network(error: error, response: response, url: url)
             }
 
             throw resultError

Sources/Extensions/Alamofire/SessionManager+Extensions.swift

@@ -53,7 +53,7 @@ public extension Reactive where Base: SessionManager {
                  headers: HTTPHeaders? = nil)
         -> Observable<DataRequest> {
 
-        return Observable.deferred {
+        Observable.deferred {
 
             guard method != .get else {
                 assertionFailure("Unable to pass array in get request")
@@ -74,7 +74,7 @@ public extension Reactive where Base: SessionManager {
     ///   - additionalValidStatusCodes: set of additional valid status codes
     /// - Returns: Observable with request
     func apiRequest(requestParameters: ApiRequestParameters, additionalValidStatusCodes: Set<Int>) -> Observable<DataRequest> {
-        return .deferred {
+        .deferred {
             var url = try requestParameters.url.asURL()
 
             if let queryItems = requestParameters.queryItems {
@@ -117,7 +117,8 @@ public extension Reactive where Base: SessionManager {
             }
 
             return requestObservable
-                .validate(statusCodes: self.base.acceptableStatusCodes.union(additionalValidStatusCodes))
+                .validate(statusCodes: self.base.acceptableStatusCodes.union(additionalValidStatusCodes),
+                          url: url.absoluteString)
         }
     }
 
@@ -133,7 +134,7 @@ public extension Reactive where Base: SessionManager {
                                      decoder: JSONDecoder)
         -> Observable<SessionManager.ModelResponse<T>> {
 
-        return apiRequest(requestParameters: requestParameters, additionalValidStatusCodes: additionalValidStatusCodes)
+        apiRequest(requestParameters: requestParameters, additionalValidStatusCodes: additionalValidStatusCodes)
             .flatMap {
                 $0.rx.apiResponse(mappingQueue: self.base.mappingQueue, decoder: decoder)
             }
@@ -151,7 +152,7 @@ public extension Reactive where Base: SessionManager {
                                                         decoder: JSONDecoder)
         -> Observable<SessionManager.ModelResponse<T>> {
 
-        return apiRequest(requestParameters: requestParameters, additionalValidStatusCodes: additionalValidStatusCodes)
+        apiRequest(requestParameters: requestParameters, additionalValidStatusCodes: additionalValidStatusCodes)
             .flatMap {
                 $0.rx.observableApiResponse(mappingQueue: self.base.mappingQueue, decoder: decoder)
             }
@@ -166,7 +167,7 @@ public extension Reactive where Base: SessionManager {
     func responseData(requestParameters: ApiRequestParameters, additionalValidStatusCodes: Set<Int>)
         -> Observable<SessionManager.DataResponse> {
 
-            return apiRequest(requestParameters: requestParameters, additionalValidStatusCodes: additionalValidStatusCodes)
+            apiRequest(requestParameters: requestParameters, additionalValidStatusCodes: additionalValidStatusCodes)
                 .flatMap {
                     $0.rx.dataApiResponse(mappingQueue: self.base.mappingQueue)
                 }
@@ -184,14 +185,15 @@ public extension Reactive where Base: SessionManager {
                                            decoder: JSONDecoder)
         -> Observable<SessionManager.ModelResponse<T>> {
 
-            return Observable.deferred {
+            Observable.deferred {
 
                 let urlRequest = try URLRequest(url: requestParameters.url, method: .post, headers: requestParameters.headers)
                 let data = try requestParameters.formData.encode()
 
                 return self.upload(data, urlRequest: urlRequest)
                     .map { $0 as DataRequest }
-                    .validate(statusCodes: self.base.acceptableStatusCodes.union(additionalValidStatusCodes))
+                    .validate(statusCodes: self.base.acceptableStatusCodes.union(additionalValidStatusCodes),
+                              url: try? requestParameters.url.asURL().absoluteString)
                     .flatMap {
                         $0.rx.apiResponse(mappingQueue: self.base.mappingQueue, decoder: decoder)
                     }

Sources/Extensions/Array/Array+Extensions.swift

@@ -69,6 +69,6 @@ public extension Array {
 
     // Subscript for safe access to element by index
     subscript(safe index: Index) -> Element? {
-        return (index < count && index >= 0) ? self[index] : nil
+        (index < count && index >= 0) ? self[index] : nil
     }
 }

Sources/Extensions/Array/Array+RowExtensions.swift

@@ -26,11 +26,11 @@ public extension Array where Element: TableKitViewModel {
 
     /// Creates [Row] array from TableKitViewModels.
     var tableRows: [Row] {
-        return map { $0.tableRow }
+        map { $0.tableRow }
     }
 
     /// Creates TableSection with empty, zero height header and footer.
     var onlyRowsSection: TableSection {
-        return TableSection(onlyRows: tableRows)
+        TableSection(onlyRows: tableRows)
     }
 }

Sources/Extensions/Array/Array+SeparatorRowBoxExtensions.swift

@@ -26,7 +26,7 @@ public extension Array where Element == SeparatorRowBox {
 
     /// Create rows from SeparatorRowBox array
     var rows: [Row] {
-        return map { $0.row }
+        map { $0.row }
     }
 
     /// Configure separators from SeparatorRowBox array

Sources/Extensions/Array/Array+TotalCountCursorListingResult.swift

@@ -25,10 +25,10 @@ extension Array: TotalCountCursorListingResult {
     public typealias ElementType = Element
 
     public var results: [Element] {
-        return self
+        self
     }
 
     public var totalCount: Int {
-        return count
+        count
     }
 }

Sources/Extensions/Codable/Encodable+Extensions.swift

@@ -39,7 +39,7 @@ public extension Encodable {
     /// Method that converts encodable model to URLQueryItems array
     /// - Returns: URLQueryItems array
     func asUrlQueryItems() throws -> [URLQueryItem] {
-        return try toJSON().map {
+        try toJSON().map {
             if ($1 is [String: Any] || $1 is [Any]),
                 let jsonData = try? JSONSerialization.data(withJSONObject: $1, options: []),
                 let jsonString = String(data: jsonData, encoding: .utf8) {

Sources/Extensions/Comparable/Comparable+Extensions.swift

@@ -28,13 +28,13 @@ public extension Comparable {
     /// - parameter bounds: Lower and uppper bounds tuple
     /// - returns: Current value if it fits range, otherwise lower if value is too small or upper if value is too big
     func `in`(bounds: (lower: Self, upper: Self)) -> Self {
-        return min(max(bounds.lower, self), bounds.upper)
+        min(max(bounds.lower, self), bounds.upper)
     }
 
     /// Use this function to restrict comparable with lower and upper values
     /// - parameter range: ClosedRange representing bounds
     /// - returns: Current value if it fits range, otherwise lower if value is too small or upper if value is too big
     func `in`(range: ClosedRange<Self>) -> Self {
-        return `in`(bounds: (lower: range.lowerBound, upper: range.upperBound))
+        `in`(bounds: (lower: range.lowerBound, upper: range.upperBound))
     }
 }

Sources/Extensions/DataLoading/CursorType/CursorType+RxDataSourceDefaultImplementation.swift

@@ -25,6 +25,6 @@ import RxSwift
 public extension RxDataSource where Self: CursorType {
 
     func resultSingle() -> Single<[Element]> {
-        return loadNextBatch()
+        loadNextBatch()
     }
 }

Sources/Extensions/DataLoading/CursorType/CursorType+Slice.swift

@@ -25,14 +25,14 @@ import Foundation
 public extension CursorType {
 
     subscript(range: CountableRange<Int>) -> [Self.Element] {
-        return range.map { self[$0] }
+        range.map { self[$0] }
     }
 
     subscript(range: CountableClosedRange<Int>) -> [Self.Element] {
-        return range.map { self[$0] }
+        range.map { self[$0] }
     }
 
     var loadedElements: [Self.Element] {
-        return self[0..<count]
+        self[0..<count]
     }
 }

Sources/Extensions/DataLoading/Cursors/TotalCountCursorListingResult+DefaultTotalCountCursorListingResult.swift

@@ -28,8 +28,8 @@ public extension TotalCountCursorListingResult {
     /// - Parameter transform: closure to transform results
     /// - Returns: new DefaultTotalCountCursorListingResult instance
     func asDefaultListingResult<E>(transform: ((ElementType) -> E)) -> DefaultTotalCountCursorListingResult<E> {
-        return DefaultTotalCountCursorListingResult(results: results.map(transform),
-                                                    totalCount: totalCount)
+        DefaultTotalCountCursorListingResult(results: results.map(transform),
+                                             totalCount: totalCount)
     }
 
     /// Method that creates DefaultTotalCountCursorListingResult
@@ -37,7 +37,7 @@ public extension TotalCountCursorListingResult {
     ///
     /// - Returns: new DefaultTotalCountCursorListingResult instance
     func asDefaultListingResult() -> DefaultTotalCountCursorListingResult<ElementType> {
-        return DefaultTotalCountCursorListingResult(results: results,
-                                                    totalCount: totalCount)
+        DefaultTotalCountCursorListingResult(results: results,
+                                             totalCount: totalCount)
     }
 }

Sources/Extensions/DataLoading/GeneralDataLoading/GeneralDataLoadingController+DefaultImplementation.swift

@@ -28,13 +28,13 @@ public extension GeneralDataLoadingController {
     // MARK: - DisposeBagHolder default implementation
 
     var disposeBag: DisposeBag {
-        return viewModel.disposeBag
+        viewModel.disposeBag
     }
 
     // MARK: - StatefulViewController default implementation
 
     func hasContent() -> Bool {
-        return viewModel.hasContent
+        viewModel.hasContent
     }
 
     // MARK: - GeneralDataLoadingController default implementation

Sources/Extensions/DataLoading/GeneralDataLoading/GeneralDataLoadingHandler+Extensions.swift

@@ -27,7 +27,7 @@ import RxCocoa
 internal extension GeneralDataLoadingHandler where Self: AnyObject {
 
     var stateChangeBinder: Binder<GeneralDataLoadingState<Single<ResultType>>> {
-        return Binder(self) { base, value in
+        Binder(self) { base, value in
             switch value {
             case .loading:
                 base.onLoadingState()

Sources/Extensions/DataLoading/GeneralDataLoading/GeneralDataLoadingViewModel+Extensions.swift

@@ -34,7 +34,7 @@ public extension GeneralDataLoadingViewModel {
 
     /// Emit elements of ResultType from state observable.
     var resultObservable: Observable<ResultType> {
-        return loadingStateObservable.flatMap { state -> Observable<ResultType> in
+        loadingStateObservable.flatMap { state -> Observable<ResultType> in
             switch state {
             case .result(let newResult, _):
                 return .just(newResult)
@@ -47,7 +47,7 @@ public extension GeneralDataLoadingViewModel {
 
     /// Emit elements of ResultType from state driver.
     var resultDriver: Driver<ResultType> {
-        return loadingStateDriver.flatMap { state -> Driver<ResultType> in
+        loadingStateDriver.flatMap { state -> Driver<ResultType> in
             switch state {
             case .result(let newResult, _):
                 return .just(newResult)

Sources/Extensions/DataLoading/PaginationDataLoading/PaginationWrapperUIDelegate+DefaultImplementation.swift

@@ -25,15 +25,15 @@ import UIKit
 public extension PaginationWrapperUIDelegate {
 
     func emptyPlaceholder() -> UIView? {
-        return TextPlaceholderView(title: .empty)
+        TextPlaceholderView(title: .empty)
     }
 
     func customInitialLoadingErrorHandling(for error: Error) -> Bool {
-        return false
+        false
     }
 
     func errorPlaceholder(for error: Error) -> UIView? {
-        return TextPlaceholderView(title: .error)
+        TextPlaceholderView(title: .error)
     }
 
     func initialLoadingIndicator() -> AnyLoadingIndicator? {
@@ -58,7 +58,7 @@ public extension PaginationWrapperUIDelegate {
     }
 
     func footerRetryViewHeight() -> CGFloat {
-        return 44
+        44
     }
 
     func footerRetryViewWillAppear() {

Sources/Extensions/DataLoading/PaginationDataLoading/UITableView+PaginationWrappable.swift

@@ -26,7 +26,7 @@ extension UITableView: PaginationWrappable {
 
     public var footerView: UIView? {
         get {
-            return tableFooterView
+            tableFooterView
         }
         set {
             tableFooterView = newValue

Sources/Extensions/DataLoading/Rx+RxDataSourceProtocol.swift

@@ -28,7 +28,7 @@ extension Observable: RxDataSource {
     public typealias ResultType = Element
 
     public func resultSingle() -> Single<ResultType> {
-        return asSingle()
+        asSingle()
     }
 }
 
@@ -41,6 +41,6 @@ extension Single: RxDataSource {
     public typealias ResultType = Element
 
     public func resultSingle() -> Single<ResultType> {
-        return asObservable().asSingle()
+        asObservable().asSingle()
     }
 }

Sources/Extensions/DateFormattingService/DateFormattingService+DefaultImplementation.swift

@@ -28,7 +28,7 @@ public extension DateFormattingService {
               format: DateFormatType,
               defaultDate: DateInRegion = Date().inDefaultRegion()) -> DateInRegion {
 
-        return date(from: string, format: format, parsedIn: nil) ?? defaultDate
+        date(from: string, format: format, parsedIn: nil) ?? defaultDate
     }
 
     func date(from string: String,
@@ -53,7 +53,7 @@ public extension DateFormattingService {
     }
 
     func string(from date: DateRepresentable, format: DateFormatType) -> String {
-        return format.dateToStringFormat.toString(date)
+        format.dateToStringFormat.toString(date)
     }
 
     func string(from date: DateRepresentable, format: DateFormatType, formattedIn: Region?) -> String {
@@ -79,7 +79,7 @@ public extension DateFormattingService where Self: Singleton {
                      format: DateFormatType,
                      defaultDate: DateInRegion = Date().inDefaultRegion()) -> DateInRegion {
 
-        return shared.date(from: string, format: format, defaultDate: defaultDate)
+        shared.date(from: string, format: format, defaultDate: defaultDate)
     }
 
     /// Method parses date from string in given format with current region.
@@ -90,7 +90,7 @@ public extension DateFormattingService where Self: Singleton {
     ///   - parsedIn: A region that should be used for date parsing. In case of nil defaultRegion will be used.
     /// - Returns: Date parsed from given string or default date if parsing did fail.
     static func date(from string: String, format: DateFormatType, parsedIn: Region?) -> DateInRegion? {
-        return shared.date(from: string, format: format, parsedIn: parsedIn)
+        shared.date(from: string, format: format, parsedIn: parsedIn)
     }
 
     /// Method parses date from string in one of the given formats with current region.
@@ -101,7 +101,7 @@ public extension DateFormattingService where Self: Singleton {
     ///   - parsedIn: A region that should be used for date parsing. In case of nil defaultRegion will be used.
     /// - Returns: Date parsed from given string or default date if parsing did fail.
     static func date(from string: String, formats: [DateFormatType], parsedIn: Region?) -> DateInRegion? {
-        return shared.date(from: string, formats: formats, parsedIn: parsedIn)
+        shared.date(from: string, formats: formats, parsedIn: parsedIn)
     }
 
     /// Method format date in given format.
@@ -111,7 +111,7 @@ public extension DateFormattingService where Self: Singleton {
     ///   - format: Format that should be used for date formatting.
     /// - Returns: String that contains formatted date or nil if formatting did fail.
     static func string(from date: DateRepresentable, format: DateFormatType) -> String {
-        return shared.string(from: date, format: format)
+        shared.string(from: date, format: format)
     }
 
     /// Method format date in given format for specific region.
@@ -122,6 +122,6 @@ public extension DateFormattingService where Self: Singleton {
     ///   - formattedIn: A region that should be used for date formatting. In case of nil defaultRegion will be used.
     /// - Returns: String that contains formatted date or nil if formatting did fail.
     static func string(from date: DateRepresentable, format: DateFormatType, formattedIn: Region?) -> String {
-        return shared.string(from: date, format: format, formattedIn: formattedIn)
+        shared.string(from: date, format: format, formattedIn: formattedIn)
     }
 }

Sources/Extensions/Decimal/Decimal+Values.swift

@@ -26,11 +26,11 @@ public extension Decimal {
 
     /// Conver Decimal to Double value
     var doubleValue: Double {
-        return NSDecimalNumber(decimal: self).doubleValue
+        NSDecimalNumber(decimal: self).doubleValue
     }
 
     /// Conver Decimal to Int value
     var intValue: Int {
-        return NSDecimalNumber(decimal: self).intValue
+        NSDecimalNumber(decimal: self).intValue
     }
 }

Sources/Extensions/Drawing/CGContext/CGContext+Initializers.swift

@@ -41,11 +41,11 @@ public extension CGContext {
     static func create(forCGImage cgImage: CGImage,
                        fallbackColorSpace: CGColorSpace = CGColorSpaceCreateDeviceRGB()) -> CGContext? {
 
-        return create(width: cgImage.width,
-                      height: cgImage.height,
-                      bitmapInfo: cgImage.bitmapInfo,
-                      colorSpace: cgImage.colorSpace ?? fallbackColorSpace,
-                      bitsPerComponent: cgImage.bitsPerComponent)
+        create(width: cgImage.width,
+               height: cgImage.height,
+               bitmapInfo: cgImage.bitmapInfo,
+               colorSpace: cgImage.colorSpace ?? fallbackColorSpace,
+               bitsPerComponent: cgImage.bitsPerComponent)
     }
 
     /// Creates a bitmap graphics context.
@@ -65,12 +65,12 @@ public extension CGContext {
                        colorSpace: CGColorSpace = CGColorSpaceCreateDeviceRGB(),
                        bitsPerComponent: Int = 8) -> CGContext? {
 
-        return CGContext(data: nil,
-                         width: width,
-                         height: height,
-                         bitsPerComponent: bitsPerComponent,
-                         bytesPerRow: 0,
-                         space: colorSpace,
-                         bitmapInfo: bitmapInfo.rawValue)
+        CGContext(data: nil,
+                  width: width,
+                  height: height,
+                  bitsPerComponent: bitsPerComponent,
+                  bytesPerRow: 0,
+                  space: colorSpace,
+                  bitmapInfo: bitmapInfo.rawValue)
     }
 }

Sources/Extensions/Drawing/CGSize/CGSize+CGContextSize.swift

@@ -25,6 +25,6 @@ import CoreGraphics.CGGeometry
 public extension CGSize {
 
     var ceiledContextSize: CGContextSize {
-        return (width: Int(ceil(width)), height: Int(ceil(height)))
+        (width: Int(ceil(width)), height: Int(ceil(height)))
     }
 }

Sources/Extensions/Drawing/UIImage/UIImage+Extensions.swift

@@ -55,7 +55,7 @@ public extension UIImage {
     /// - Parameter color: Color to fill template image.
     /// - Returns: A new UIImage rendered with given color or original image if something goes wrong.
     func renderTemplate(withColor color: UIColor) -> UIImage {
-        return withCGImage { image in
+        withCGImage { image in
             let operation = TemplateDrawingOperation(image: image,
                                                      imageSize: size,
                                                      color: color.cgColor)
@@ -77,7 +77,7 @@ public extension UIImage {
                       color: UIColor,
                       extendSize: Bool = false) -> UIImage {
 
-        return withCGImage { image in
+        withCGImage { image in
             let roundOperation = RoundDrawingOperation(image: image,
                                                        imageSize: size,
                                                        radius: cornerRadius)
@@ -101,7 +101,7 @@ public extension UIImage {
     ///
     /// - Returns: A new circled image or original image if something goes wrong.
     func roundCornersToCircle() -> UIImage {
-        return withCGImage { image in
+        withCGImage { image in
             let radius = CGFloat(min(size.width, size.height) / 2)
 
             let operation = RoundDrawingOperation(image: image,
@@ -123,7 +123,7 @@ public extension UIImage {
                               borderColor: UIColor,
                               extendSize: Bool = false) -> UIImage {
 
-        return withCGImage { image in
+        withCGImage { image in
             let radius = CGFloat(min(size.width, size.height) / 2)
 
             let roundOperation = RoundDrawingOperation(image: image,
@@ -157,7 +157,7 @@ public extension UIImage {
                 contentMode: ResizeMode = .scaleToFill,
                 cropToImageBounds: Bool = false) -> UIImage {
 
-        return withCGImage { image in
+        withCGImage { image in
             let operation = ResizeDrawingOperation(image: image,
                                                    imageSize: size,
                                                    preferredNewSize: newSize,
@@ -172,7 +172,7 @@ public extension UIImage {
     ///
     /// - Returns: A copy of the given image, adding an alpha channel if it doesn't already have one.
     func applyAlpha() -> UIImage {
-        return withCGImage { image in
+        withCGImage { image in
             guard !image.hasAlpha else {
                 return self
             }
@@ -190,7 +190,7 @@ public extension UIImage {
     /// - Parameter padding: The padding amount.
     /// - Returns: A new padded image or original image if something goes wrong.
     func applyPadding(_ padding: CGFloat) -> UIImage {
-        return withCGImage { image in
+        withCGImage { image in
             let operation = PaddingDrawingOperation(image: image, imageSize: size, padding: padding)
 
             return operation.imageFromNewRenderer(scale: scale).redraw()
@@ -204,7 +204,7 @@ public extension UIImage {
     ///   - clockwise: Should rotate image clockwise.
     /// - Returns: A new rotated image or original image if something goes wrong.
     func rotate(degrees: CGFloat, clockwise: Bool = true) -> UIImage {
-        return withCGImage { image in
+        withCGImage { image in
             let radians = degrees.degreesToRadians()
 
             let operation = RotateDrawingOperation(image: image,
@@ -218,7 +218,7 @@ public extension UIImage {
 
     /// Workaround to fix flipped image rendering (by Y)
     private func redraw() -> UIImage {
-        return withCGImage { image in
+        withCGImage { image in
             let operation = ImageDrawingOperation(image: image, newSize: size)
 
             return operation.imageFromNewRenderer(scale: scale)

Sources/Extensions/Error/Error+NetworkExtensions.swift

@@ -25,7 +25,7 @@ import RxSwift
 public extension Error {
 
     var requestError: RequestError? {
-        return self as? RequestError
+        self as? RequestError
     }
 
     /// Method that tries to serialize response from a mapping request error to a model
@@ -34,7 +34,7 @@ public extension Error {
     /// - Returns: optional target object
     /// - Throws: an error during decoding
     func handleMappingError<T: Decodable>(with decoder: JSONDecoder = JSONDecoder()) throws -> T? {
-        guard let self = requestError, case .mapping(_, let response) = self else {
+        guard let self = requestError, case .mapping(_, let response, _) = self else {
             return nil
         }
 
@@ -52,7 +52,7 @@ public extension ObservableType {
     /// - Returns: Observable on caller
     func handleMappingError<T: Decodable>(with decoder: JSONDecoder = JSONDecoder(),
                                           handler: @escaping ParameterClosure<T>) -> Observable<Element> {
-            return self.do(onError: { error in
+            self.do(onError: { error in
                 guard let errorModel = try error.handleMappingError(with: decoder) as T? else {
                     return
                 }
@@ -72,7 +72,7 @@ public extension PrimitiveSequence where Trait == SingleTrait {
     /// - Returns: Single on caller
     func handleMappingError<T: Decodable>(with decoder: JSONDecoder = JSONDecoder(),
                                           handler: @escaping ParameterClosure<T>) -> PrimitiveSequence<Trait, Element> {
-            return self.do(onError: { error in
+            self.do(onError: { error in
                 guard let errorModel = try error.handleMappingError(with: decoder) as T? else {
                     return
                 }
@@ -92,7 +92,7 @@ public extension PrimitiveSequence where Trait == CompletableTrait, Element == N
     /// - Returns: Completable
     func handleMappingError<T: Decodable>(with decoder: JSONDecoder = JSONDecoder(),
                                           handler: @escaping ParameterClosure<T>) -> Completable {
-            return self.do(onError: { error in
+            self.do(onError: { error in
                 guard let errorModel = try error.handleMappingError(with: decoder) as T? else {
                     return
                 }

Sources/Extensions/FloatingPoint/FloatingPoint+DegreesRadiansConvertion.swift

@@ -26,13 +26,13 @@ public extension FloatingPoint {
     ///
     /// - Returns: radians
     func degreesToRadians() -> Self {
-        return self * .pi / 180
+        self * .pi / 180
     }
 
     /// Converts radians to degrees
     ///
     /// - Returns: degrees
     func radiansToDegrees() -> Self {
-        return self * 180 / .pi
+        self * 180 / .pi
     }
 }

Sources/Extensions/Foundation/UserDefaults/UserDefaults+Codable.swift

@@ -38,7 +38,7 @@ public extension UserDefaults {
     /// - Returns: The object with specified type associated with the specified key, or passed default value
     /// if there is no such value for specified key or if error occurred during mapping.
     func object<T: Decodable>(forKey key: String, defaultValue: T, decoder: JSONDecoder = JSONDecoder()) -> T {
-        return (try? object(forKey: key, decoder: decoder)) ?? defaultValue
+        (try? object(forKey: key, decoder: decoder)) ?? defaultValue
     }
 
     /// Set or remove the value of the specified default key in the standard application domain.
@@ -58,7 +58,7 @@ public extension UserDefaults {
 
     subscript<T: Codable>(key: String) -> T? {
         get {
-            return try? object(forKey: key)
+            try? object(forKey: key)
         }
         set {
             try? set(object: newValue, forKey: key)
@@ -75,7 +75,7 @@ public extension Reactive where Base: UserDefaults {
     ///   - decoder: JSON decoder to decode stored data.
     /// - Returns: Single of specified model type.
     func object<T: Decodable>(forKey key: String, decoder: JSONDecoder = JSONDecoder()) -> Single<T> {
-        return .deferredJust { try self.base.object(forKey: key, decoder: decoder) }
+        .deferredJust { try self.base.object(forKey: key, decoder: decoder) }
     }
 
     /// Reactive version of object<T>(forKey:defaultValue:decoder:) -> T.
@@ -87,7 +87,7 @@ public extension Reactive where Base: UserDefaults {
     ///   - decoder: JSON decoder to decode stored data.
     /// - Returns: Single of specified model type.
     func object<T: Decodable>(forKey key: String, defaultValue: T, decoder: JSONDecoder = JSONDecoder()) -> Single<T> {
-        return .deferredJust { self.base.object(forKey: key, defaultValue: defaultValue, decoder: decoder) }
+        .deferredJust { self.base.object(forKey: key, defaultValue: defaultValue, decoder: decoder) }
     }
 
     /// Reactive version of set<T>(object:forKey:encoder:).
@@ -98,7 +98,7 @@ public extension Reactive where Base: UserDefaults {
     ///   - encoder: JSON encoder to encode to encode passed object.
     /// - Returns: Completable.
     func set<T: Encodable>(object: T?, forKey key: String, encoder: JSONEncoder = JSONEncoder()) -> Completable {
-        return .deferredJust {
+        .deferredJust {
             try self.base.set(object: object, forKey: key, encoder: encoder)
         }
     }

Sources/Extensions/NSAttributedString/NSAttributedString+Extensions.swift

@@ -33,7 +33,7 @@ public extension NSAttributedString {
 
     /// Mutable copy of attributed string.
     var mutable: NSMutableAttributedString {
-        return NSMutableAttributedString(attributedString: self)
+        NSMutableAttributedString(attributedString: self)
     }
 }
 
@@ -51,6 +51,6 @@ public extension NSMutableAttributedString {
 
     /// Immutable copy of attributed string.
     var immutable: NSAttributedString {
-        return NSAttributedString(attributedString: self)
+        NSAttributedString(attributedString: self)
     }
 }

Sources/Extensions/NumberFormattingService/BuildInNumberTypes+NSNumberConvertible.swift

@@ -25,41 +25,41 @@ import Foundation
 extension NSNumber: NSNumberConvertible {
 
     public func asNSNumber() -> NSNumber {
-        return self
+        self
     }
 }
 
 extension Decimal: NSNumberConvertible {
 
     public func asNSNumber() -> NSNumber {
-        return NSDecimalNumber(decimal: self)
+        NSDecimalNumber(decimal: self)
     }
 }
 
 extension Int: NSNumberConvertible {
 
     public func asNSNumber() -> NSNumber {
-        return NSNumber(value: self)
+        NSNumber(value: self)
     }
 }
 
 extension Int64: NSNumberConvertible {
 
     public func asNSNumber() -> NSNumber {
-        return NSNumber(value: self)
+        NSNumber(value: self)
     }
 }
 
 extension Double: NSNumberConvertible {
 
     public func asNSNumber() -> NSNumber {
-        return NSNumber(value: self)
+        NSNumber(value: self)
     }
 }
 
 extension Float: NSNumberConvertible {
 
     public func asNSNumber() -> NSNumber {
-        return NSNumber(value: self)
+        NSNumber(value: self)
     }
 }

Sources/Extensions/NumberFormattingService/NumberFormattingService+DefaultImplementation.swift

@@ -26,7 +26,7 @@ public extension NumberFormattingService {
 
     /// Computed static property. Use only once for `formatters` field implementation!
     static var computedFormatters: [NumberFormatType: NumberFormatter] {
-        return Dictionary(uniqueKeysWithValues: NumberFormatType.allCases.map { ($0, $0.numberFormatter) })
+        Dictionary(uniqueKeysWithValues: NumberFormatType.allCases.map { ($0, $0.numberFormatter) })
     }
 
     func numberFormatter(for format: NumberFormatType) -> NumberFormatter {
@@ -38,21 +38,21 @@ public extension NumberFormattingService {
     }
 
     func string(from number: NSNumberConvertible, format: NumberFormatType, defaultString: String = "") -> String {
-        return numberFormatter(for: format).string(from: number.asNSNumber()) ?? defaultString
+        numberFormatter(for: format).string(from: number.asNSNumber()) ?? defaultString
     }
 
     func number(from string: String, format: NumberFormatType) -> NSNumber? {
-        return numberFormatter(for: format).number(from: string)
+        numberFormatter(for: format).number(from: string)
     }
 }
 
 public extension NumberFormattingService where Self: Singleton {
 
     static func string(from number: NSNumberConvertible, format: NumberFormatType, defaultString: String = "") -> String {
-        return shared.string(from: number, format: format, defaultString: defaultString)
+        shared.string(from: number, format: format, defaultString: defaultString)
     }
 
     static func number(from string: String, format: NumberFormatType) -> NSNumber? {
-        return shared.number(from: string, format: format)
+        shared.number(from: string, format: format)
     }
 }

Sources/Extensions/Rx/ObservableType/Observable+DeferredJust.swift

@@ -30,7 +30,7 @@ public extension ObservableType {
     /// that subscribes to the resulting sequence.
     /// - Returns: An observable sequence whose observers trigger an invocation of the given element factory function.
     static func deferredJust(_ elementFactory: @escaping () throws -> Element) -> Observable<Element> {
-        return .create { observer in
+        .create { observer in
             do {
                 observer.onNext(try elementFactory())
                 observer.onCompleted()

Sources/Extensions/Rx/ObservableType/ObservableType+Extensions.swift

@@ -29,20 +29,20 @@ public extension ObservableType {
     /// - Parameter value: A new element.
     /// - Returns: An observable sequence whose elements are equals to passed value.
     func replace<T>(with value: T) -> Observable<T> {
-        return map { _ in value } // swiftlint:disable:this unused_map_parameter
+        map { _ in value } // swiftlint:disable:this unused_map_parameter
     }
 
     /// Replaces all emitted elements with Void.
     ///
     /// - Returns: An observable sequence whose elements are equals to Void.
     func asVoid() -> Observable<Void> {
-        return replace(with: Void())
+        replace(with: Void())
     }
 
     /// Cast all emitted elements to optional type.
     ///
     /// - Returns: An observable sequence whose elements are equals to optional type of element.
     func asOptional() -> Observable<Element?> {
-        return map { $0 }
+        map { $0 }
     }
 }

Sources/Extensions/Rx/PrimitiveSequence/Completable/Completable+DeferredJust.swift

@@ -30,7 +30,7 @@ public extension PrimitiveSequence where Trait == CompletableTrait {
     /// that subscribes to the resulting sequence.
     /// - Returns: A single whose observers trigger an invocation of the given element factory function.
     static func deferredJust(_ workUnit: @escaping ThrowableVoidBlock) -> Completable {
-        return .create { observer in
+        .create { observer in
             do {
                 try workUnit()
                 observer(.completed)

Sources/Extensions/Rx/PrimitiveSequence/Single/Single+DeferredJust.swift

@@ -30,11 +30,11 @@ public extension Single {
     /// that subscribes to the resulting sequence.
     /// - Returns: A single whose observers trigger an invocation of the given element factory function.
     static func deferredJust(_ elementFactory: @escaping () throws -> Element) -> Single<Element> {
-        return .create { observer in
+        .create { observer in
             do {
                 observer(.success(try elementFactory()))
             } catch {
-                observer(.error(error))
+                observer(.failure(error))
             }
 
             return Disposables.create()

Sources/Extensions/Rx/PrimitiveSequence/Single/Single+Extensions.swift

@@ -29,20 +29,20 @@ public extension PrimitiveSequence where Trait == SingleTrait {
     /// - Parameter value: A new element.
     /// - Returns: An primitive sequence whose element is equal to passed value.
     func replace<T>(with value: T) -> PrimitiveSequence<Trait, T> {
-        return map { _ in value } // swiftlint:disable:this unused_map_parameter
+        map { _ in value } // swiftlint:disable:this unused_map_parameter
     }
 
     /// Replaces emitted element with Void.
     ///
     /// - Returns: An primitive sequence whose element is equal to Void.
     func asVoid() -> PrimitiveSequence<Trait, Void> {
-        return replace(with: Void())
+        replace(with: Void())
     }
 
     /// Cast emitted element to optional type.
     ///
     /// - Returns: An primitive sequence whose element is equals to optional type of element.
     func asOptional() -> PrimitiveSequence<Trait, Element?> {
-        return map { $0 }
+        map { $0 }
     }
 }

Sources/Extensions/Rx/SharedSequence/SharedSequence+Extensions.swift

@@ -29,20 +29,20 @@ public extension SharedSequence {
     /// - Parameter value: A new element.
     /// - Returns: An observable sequence whose elements are equals to passed value.
     func replace<T>(with value: T) -> SharedSequence<SharingStrategy, T> {
-        return map { _ in value } // swiftlint:disable:this unused_map_parameter
+        map { _ in value } // swiftlint:disable:this unused_map_parameter
     }
 
     /// Replaces all emitted elements with Void.
     ///
     /// - Returns: An observable sequence whose elements are equals to Void.
     func asVoid() -> SharedSequence<SharingStrategy, Void> {
-        return replace(with: Void())
+        replace(with: Void())
     }
 
     /// Cast all emitted elements to optional type.
     ///
     /// - Returns: An observable sequence whose elements are equals to optional type of element.
     func asOptional() -> SharedSequence<SharingStrategy, Element?> {
-        return map { $0 }
+        map { $0 }
     }
 }

Sources/Extensions/Sequence/Sequence+ConcurrentMap.swift

@@ -55,7 +55,7 @@ public extension Sequence {
         return Observable.from(indexedRanges)
             .flatMap { indexedRange -> Observable<(idx: Int, results: [R])> in
                 Observable.just(indexedRange)
-                    .observeOn(scheduler)
+                    .observe(on: scheduler)
                     .map { (idx: $0.idx, results: try array[$0.range].map(transform)) }
             }
             .toArray()

Sources/Extensions/String/String+Extensions.swift

@@ -30,6 +30,6 @@ public extension String {
      - returns: nil if string empty, self otherwise
      */
     var nilIfEmpty: String? {
-        return isEmpty ? nil : self
+        isEmpty ? nil : self
     }
 }

Sources/Extensions/String/String+Localization.swift

@@ -30,6 +30,6 @@ public extension String {
      - returns: localized string
      */
     func localized() -> String {
-        return NSLocalizedString(self, comment: "")
+        NSLocalizedString(self, comment: "")
     }
 }

Sources/Extensions/TableKit/TableDirector/TableDirector+Extensions.swift

@@ -96,7 +96,7 @@ public extension TableDirector {
      */
     @discardableResult
     func replace(withSection section: TableSection) -> Self {
-        return replace(withSections: [section])
+        replace(withSections: [section])
     }
 
     /**
@@ -108,7 +108,7 @@ public extension TableDirector {
      */
     @discardableResult
     func replace(withRows rows: [Row]) -> Self {
-        return replace(withSection: TableSection(rows: rows))
+        replace(withSection: TableSection(rows: rows))
     }
 
     /// Clear table view and reload it within empty section

Sources/Extensions/TableKit/TableDirector/TableRow+SeparatorsExtensions.swift

@@ -47,6 +47,6 @@ public extension TableRow where CellType: SeparatorCell {
 
     /// TableRow typed as SeparatorRowBox
     var separatorRowBox: SeparatorRowBox {
-        return SeparatorRowBox(row: self)
+        SeparatorRowBox(row: self)
     }
 }

Sources/Extensions/TableKit/TableKitViewModel/TableKitViewModel+Extenstions.swift

@@ -29,6 +29,6 @@ public extension TableKitViewModel {
 
     /// Returns TableRow initialized with current view model.
     var tableRow: RowType {
-        return RowType(item: self)
+        RowType(item: self)
     }
 }

Sources/Extensions/UIColor/UIColor+Hex.swift

@@ -138,9 +138,13 @@ public extension UIColor {
 
         getRed(&red, green: &green, blue: &blue, alpha: &alpha)
 
-        let intRepresentation = alpha == 1
-            ? Int(red * 255) << 16 | Int(green * 255) << 8 | Int(blue * 255) << 0
-            : Int(red * 255) << 24 | Int(green * 255) << 16 | Int(blue * 255) << 8 | Int(alpha * 255) << 0
+        let intRepresentation: Int
+
+        if alpha == 1 {
+            intRepresentation = Int(red * 255) << 16 | Int(green * 255) << 8 | Int(blue * 255)
+        } else {
+            intRepresentation = Int(red * 255) << 24 | Int(green * 255) << 16 | Int(blue * 255) << 8 | Int(alpha * 255)
+        }
 
         return String(intRepresentation, radix: 16)
     }

Sources/Extensions/UIInterfaceOrientation/UIInterfaceOrientation+ VideoOrientation.swift

@@ -2,7 +2,7 @@ import Foundation
 import AVFoundation
 
 public extension UIInterfaceOrientation {
-    
+
     var videoOrientation: AVCaptureVideoOrientation {
             switch self {
             case .portrait, .unknown:
@@ -16,7 +16,7 @@ public extension UIInterfaceOrientation {
 
             case .portraitUpsideDown:
                 return .portraitUpsideDown
-                
+
             @unknown default:
                 return .portrait
             }

Sources/Extensions/UIKit/CollectionViewHolder/CollectionViewHolder+ScrollViewHolder.swift

@@ -25,6 +25,6 @@ import UIKit.UIScrollView
 public extension ScrollViewHolder where Self: CollectionViewHolder {
 
     var scrollView: UIScrollView {
-        return collectionView
+        collectionView
     }
 }

Sources/Extensions/UIKit/TableViewHolder/TableViewHolder+ScrollViewHolder.swift

@@ -25,6 +25,6 @@ import UIKit.UIScrollView
 public extension ScrollViewHolder where Self: TableViewHolder {
 
     var scrollView: UIScrollView {
-        return tableView
+        tableView
     }
 }

Sources/Extensions/UIKit/UIButton/UIButton+ViewTextConfigurable.swift

@@ -26,7 +26,7 @@ extension UIButton: ViewTextConfigurable {
 
     public var textFont: UIFont? {
         get {
-            return titleLabel?.font
+            titleLabel?.font
         }
         set {
             titleLabel?.font = newValue
@@ -35,7 +35,7 @@ extension UIButton: ViewTextConfigurable {
 
     public var titleColor: UIColor? {
         get {
-            return currentTitleColor
+            currentTitleColor
         }
         set {
             setTitleColor(newValue, for: [])
@@ -44,7 +44,7 @@ extension UIButton: ViewTextConfigurable {
 
     public var textAlignment: NSTextAlignment {
         get {
-            return contentHorizontalAlignment.textAlignment
+            contentHorizontalAlignment.textAlignment
         }
         set {
             contentHorizontalAlignment = .init(textAlignment: newValue)
@@ -53,7 +53,7 @@ extension UIButton: ViewTextConfigurable {
 
     public var text: String? {
         get {
-            return currentTitle
+            currentTitle
         }
         set {
             setTitle(newValue, for: [])
@@ -62,7 +62,7 @@ extension UIButton: ViewTextConfigurable {
 
     public var attributedText: NSAttributedString? {
         get {
-            return currentAttributedTitle
+            currentAttributedTitle
         }
         set {
             setAttributedTitle(newValue, for: [])
@@ -100,6 +100,13 @@ private extension UIControl.ContentHorizontalAlignment {
             } else {
                 self = .left
             }
+
+        @unknown default:
+            if #available(iOS 11, tvOS 11, *) {
+                self = .leading
+            } else {
+                self = .left
+            }
         }
     }
 
@@ -122,6 +129,9 @@ private extension UIControl.ContentHorizontalAlignment {
 
         case .trailing:
             return .right
+
+        @unknown default:
+            return .left
         }
     }
 }

Sources/Extensions/UIKit/UIImageView/UIImageView+ExpandCollapseDisclosure.swift

@@ -20,7 +20,7 @@
 //  THE SOFTWARE.
 //
 
-import RxCocoa
+import RxSwift
 
 private extension Double {
     static let halfPeriod = 0.5
@@ -30,7 +30,7 @@ public extension UIImageView {
 
     /// Rotates image view by 180 degrees via transform property with animation.
     var expandRotationBinder: Binder<Bool> {
-        return Binder(self) { view, isExpanded in
+        Binder(self) { view, isExpanded in
 
             let angle = isExpanded ? CGFloat.pi / 2 : -CGFloat.pi / 2
 

Sources/Extensions/UIKit/UILabel/UILabel+ViewTextConfigurable.swift

@@ -26,7 +26,7 @@ extension UILabel: ViewTextConfigurable {
 
     public var textFont: UIFont? {
         get {
-            return font
+            font
         }
         set {
             font = newValue
@@ -35,7 +35,7 @@ extension UILabel: ViewTextConfigurable {
 
     public var titleColor: UIColor? {
         get {
-            return textColor
+            textColor
         }
         set {
             textColor = newValue