From 698243ee39962b1202ea281f08bf8cb1db3262d9 Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Thu, 2 Mar 2023 16:48:17 +0300 Subject: [PATCH 01/15] fix: updated url to ti repositories --- .gitmodules | 2 +- LeadKit.podspec | 4 ++-- README.md | 6 +++--- TIAppleMapUtils/TIAppleMapUtils.podspec | 4 ++-- TIAuth/TIAuth.podspec | 4 ++-- TIDeveloperUtils/TIDeveloperUtils.podspec | 4 ++-- TIEcommerce/TIEcommerce.podspec | 4 ++-- TIFoundationUtils/TIFoundationUtils.podspec | 4 ++-- TIGoogleMapUtils/TIGoogleMapUtils.podspec | 4 ++-- TIKeychainUtils/TIKeychainUtils.podspec | 4 ++-- TILogging/TILogging.podspec | 4 ++-- TIMapUtils/TIMapUtils.podspec | 4 ++-- TIMoyaNetworking/TIMoyaNetworking.podspec | 4 ++-- TINetworking/TINetworking.podspec | 4 ++-- TINetworkingCache/TINetworkingCache.podspec | 4 ++-- TIPagination/TIPagination.podspec | 4 ++-- TISwiftUICore/TISwiftUICore.podspec | 4 ++-- TISwiftUtils/TISwiftUtils.podspec | 4 ++-- TITableKitUtils/TITableKitUtils.podspec | 4 ++-- TITransitions/TITransitions.podspec | 4 ++-- TIUIElements/TIUIElements.podspec | 4 ++-- TIUIKitCore/TIUIKitCore.podspec | 4 ++-- TIWebView/TIWebView.podspec | 4 ++-- TIYandexMapUtils/TIYandexMapUtils.podspec | 4 ++-- 24 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.gitmodules b/.gitmodules index af2dbee6..3e7fa1a8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "build-scripts"] path = build-scripts - url = https://github.com/TouchInstinct/BuildScripts.git + url = https://gitlab.ti/touchinstinct/BuildScripts.git diff --git a/LeadKit.podspec b/LeadKit.podspec index 74bc50d0..fa413634 100644 --- a/LeadKit.podspec +++ b/LeadKit.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = "LeadKit" 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://gitlab.ti/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://gitlab.ti/touchinstinct/LeadKit.git", :tag => s.version } s.platform = :ios, '10.0' s.swift_versions = ['5.1'] diff --git a/README.md b/README.md index e78ba9ca..9e1cb04c 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ ${SRCROOT}/TIModuleName/TIModuleName.app" ./setup ``` -- If legacy [Source](https://github.com/TouchInstinct/LeadKit/tree/master/Sources) folder needed, [build dependencies for LeadKit.xcodeproj](https://github.com/TouchInstinct/LeadKit/blob/master/docs/snippets.md#build-dependencies-for-LeadKit.xcodeproj). +- If legacy [Source](https://gitlab.ti/touchinstinct/LeadKit/tree/master/Sources) folder needed, [build dependencies for LeadKit.xcodeproj](https://gitlab.ti/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). @@ -105,14 +105,14 @@ ${SRCROOT}/TIModuleName/TIModuleName.app" ```swift dependencies: [ - .package(url: "https://github.com/TouchInstinct/LeadKit.git", from: "x.y.z"), + .package(url: "https://gitlab.ti/touchinstinct/LeadKit.git", from: "x.y.z"), ], ``` ### Cocoapods ```ruby -source 'https://github.com/TouchInstinct/Podspecs.git' +source 'https://gitlab.ti/touchinstinct/Podspecs.git' pod 'TISwiftUtils', 'x.y.z' pod 'TIFoundationUtils', 'x.y.z' diff --git a/TIAppleMapUtils/TIAppleMapUtils.podspec b/TIAppleMapUtils/TIAppleMapUtils.podspec index 339d3b27..d0d5e984 100644 --- a/TIAppleMapUtils/TIAppleMapUtils.podspec +++ b/TIAppleMapUtils/TIAppleMapUtils.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = 'TIAppleMapUtils' s.version = '1.35.1' s.summary = 'Set of helpers for map objects clustering and interacting using Apple MapKit.' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_versions = ['5.3'] diff --git a/TIAuth/TIAuth.podspec b/TIAuth/TIAuth.podspec index ae8f0d87..9a69cbc3 100644 --- a/TIAuth/TIAuth.podspec +++ b/TIAuth/TIAuth.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = 'TIAuth' s.version = '1.35.1' s.summary = 'Login, registration, confirmation and other related actions' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '13.0' s.swift_versions = ['5.3'] diff --git a/TIDeveloperUtils/TIDeveloperUtils.podspec b/TIDeveloperUtils/TIDeveloperUtils.podspec index 11469088..27cc7c15 100644 --- a/TIDeveloperUtils/TIDeveloperUtils.podspec +++ b/TIDeveloperUtils/TIDeveloperUtils.podspec @@ -2,11 +2,11 @@ Pod::Spec.new do |s| s.name = 'TIDeveloperUtils' s.version = '1.35.1' s.summary = 'Universal web view API' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru', 'castlele' => 'nikita.semenov@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_versions = ['5.3'] diff --git a/TIEcommerce/TIEcommerce.podspec b/TIEcommerce/TIEcommerce.podspec index 7e1ccab1..834b3236 100644 --- a/TIEcommerce/TIEcommerce.podspec +++ b/TIEcommerce/TIEcommerce.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = 'TIEcommerce' s.version = '1.35.1' s.summary = 'Cart, products, promocodes, bonuses and other related actions' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_versions = ['5.3'] diff --git a/TIFoundationUtils/TIFoundationUtils.podspec b/TIFoundationUtils/TIFoundationUtils.podspec index f31f6a4a..87ddb6e6 100644 --- a/TIFoundationUtils/TIFoundationUtils.podspec +++ b/TIFoundationUtils/TIFoundationUtils.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = 'TIFoundationUtils' s.version = '1.35.1' s.summary = 'Set of helpers for Foundation framework classes.' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '10.0' s.swift_versions = ['5.3'] diff --git a/TIGoogleMapUtils/TIGoogleMapUtils.podspec b/TIGoogleMapUtils/TIGoogleMapUtils.podspec index f19719fc..449f1470 100644 --- a/TIGoogleMapUtils/TIGoogleMapUtils.podspec +++ b/TIGoogleMapUtils/TIGoogleMapUtils.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = 'TIGoogleMapUtils' s.version = '1.35.1' s.summary = 'Set of helpers for map objects clustering and interacting using Google Maps SDK.' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '12.0' s.swift_versions = ['5.3'] diff --git a/TIKeychainUtils/TIKeychainUtils.podspec b/TIKeychainUtils/TIKeychainUtils.podspec index fc391f7e..584a620b 100644 --- a/TIKeychainUtils/TIKeychainUtils.podspec +++ b/TIKeychainUtils/TIKeychainUtils.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = 'TIKeychainUtils' s.version = '1.35.1' s.summary = 'Set of helpers for Keychain classes.' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_versions = ['5.3'] diff --git a/TILogging/TILogging.podspec b/TILogging/TILogging.podspec index 2d6ade90..95368dfe 100644 --- a/TILogging/TILogging.podspec +++ b/TILogging/TILogging.podspec @@ -2,11 +2,11 @@ Pod::Spec.new do |s| s.name = 'TILogging' s.version = '1.35.1' s.summary = 'Logging API' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru', 'castlele' => 'nikita.semenov@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_versions = ['5.3'] diff --git a/TIMapUtils/TIMapUtils.podspec b/TIMapUtils/TIMapUtils.podspec index cc1a494e..ac90666a 100644 --- a/TIMapUtils/TIMapUtils.podspec +++ b/TIMapUtils/TIMapUtils.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = 'TIMapUtils' s.version = '1.35.1' s.summary = 'Set of helpers for map objects clustering and interacting.' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '10.0' s.swift_versions = ['5.3'] diff --git a/TIMoyaNetworking/TIMoyaNetworking.podspec b/TIMoyaNetworking/TIMoyaNetworking.podspec index 52903c66..8e9fea8c 100644 --- a/TIMoyaNetworking/TIMoyaNetworking.podspec +++ b/TIMoyaNetworking/TIMoyaNetworking.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = 'TIMoyaNetworking' s.version = '1.35.1' s.summary = 'Moya + Swagger network service.' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_versions = ['5.3'] diff --git a/TINetworking/TINetworking.podspec b/TINetworking/TINetworking.podspec index 19417603..d54ef10f 100644 --- a/TINetworking/TINetworking.podspec +++ b/TINetworking/TINetworking.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = 'TINetworking' s.version = '1.35.1' s.summary = 'Swagger-frendly networking layer helpers.' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '10.0' s.swift_versions = ['5.3'] diff --git a/TINetworkingCache/TINetworkingCache.podspec b/TINetworkingCache/TINetworkingCache.podspec index 3073835f..5d53d102 100644 --- a/TINetworkingCache/TINetworkingCache.podspec +++ b/TINetworkingCache/TINetworkingCache.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = 'TINetworkingCache' s.version = '1.35.1' s.summary = 'Caching results of EndpointRequests.' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_versions = ['5.3'] diff --git a/TIPagination/TIPagination.podspec b/TIPagination/TIPagination.podspec index 7dcbb29e..15c14ae4 100644 --- a/TIPagination/TIPagination.podspec +++ b/TIPagination/TIPagination.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = 'TIPagination' s.version = '1.35.1' s.summary = 'Generic pagination component.' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '10.0' s.swift_versions = ['5.3'] diff --git a/TISwiftUICore/TISwiftUICore.podspec b/TISwiftUICore/TISwiftUICore.podspec index 267918bc..c2bc98c0 100644 --- a/TISwiftUICore/TISwiftUICore.podspec +++ b/TISwiftUICore/TISwiftUICore.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = 'TISwiftUICore' s.version = '1.35.1' s.summary = 'Core UI elements: protocols, views and helpers.' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '13.0' s.swift_versions = ['5.3'] diff --git a/TISwiftUtils/TISwiftUtils.podspec b/TISwiftUtils/TISwiftUtils.podspec index 8774d395..8c1de45d 100644 --- a/TISwiftUtils/TISwiftUtils.podspec +++ b/TISwiftUtils/TISwiftUtils.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = 'TISwiftUtils' s.version = '1.35.1' s.summary = 'Bunch of useful helpers for Swift development.' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '9.0' s.swift_versions = ['5.3'] diff --git a/TITableKitUtils/TITableKitUtils.podspec b/TITableKitUtils/TITableKitUtils.podspec index 60df6488..bdae8fba 100644 --- a/TITableKitUtils/TITableKitUtils.podspec +++ b/TITableKitUtils/TITableKitUtils.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = 'TITableKitUtils' s.version = '1.35.1' s.summary = 'Set of helpers for TableKit classes.' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_versions = ['5.3'] diff --git a/TITransitions/TITransitions.podspec b/TITransitions/TITransitions.podspec index 9923841f..39a30619 100644 --- a/TITransitions/TITransitions.podspec +++ b/TITransitions/TITransitions.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = 'TITransitions' s.version = '1.34.1' s.summary = 'Set of custom transitions to present controller. ' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'Loupehope' => 'vladislav.suhomlinov@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_versions = ['5.0'] diff --git a/TIUIElements/TIUIElements.podspec b/TIUIElements/TIUIElements.podspec index 336d94b3..37a6e323 100644 --- a/TIUIElements/TIUIElements.podspec +++ b/TIUIElements/TIUIElements.podspec @@ -2,11 +2,11 @@ Pod::Spec.new do |s| s.name = 'TIUIElements' s.version = '1.35.1' s.summary = 'Bunch of useful protocols and views.' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru', 'castlele' => 'nikita.semenov@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_versions = ['5.3'] diff --git a/TIUIKitCore/TIUIKitCore.podspec b/TIUIKitCore/TIUIKitCore.podspec index 4e3768de..e268fc5b 100644 --- a/TIUIKitCore/TIUIKitCore.podspec +++ b/TIUIKitCore/TIUIKitCore.podspec @@ -2,11 +2,11 @@ Pod::Spec.new do |s| s.name = 'TIUIKitCore' s.version = '1.35.1' s.summary = 'Core UI elements: protocols, views and helpers.' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru', 'castlele' => 'nikita.semenov@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_versions = ['5.3'] diff --git a/TIWebView/TIWebView.podspec b/TIWebView/TIWebView.podspec index a63876cc..528a2e94 100644 --- a/TIWebView/TIWebView.podspec +++ b/TIWebView/TIWebView.podspec @@ -2,11 +2,11 @@ Pod::Spec.new do |s| s.name = 'TIWebView' s.version = '1.35.1' s.summary = 'Universal web view API' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru', 'castlele' => 'nikita.semenov@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_versions = ['5.3'] diff --git a/TIYandexMapUtils/TIYandexMapUtils.podspec b/TIYandexMapUtils/TIYandexMapUtils.podspec index ec22d532..3160811e 100644 --- a/TIYandexMapUtils/TIYandexMapUtils.podspec +++ b/TIYandexMapUtils/TIYandexMapUtils.podspec @@ -2,10 +2,10 @@ Pod::Spec.new do |s| s.name = 'TIYandexMapUtils' s.version = '1.35.1' s.summary = 'Set of helpers for map objects clustering and interacting using Yandex Maps SDK.' - s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name + s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru' } - s.source = { :git => 'https://github.com/TouchInstinct/LeadKit.git', :tag => s.version.to_s } + s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } s.ios.deployment_target = '10.0' s.swift_versions = ['5.3'] From e471bae4690c8219368871389b899d04781a964b Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Thu, 2 Mar 2023 16:54:47 +0300 Subject: [PATCH 02/15] docs: bumps podspec version of pods --- TIAppleMapUtils/TIAppleMapUtils.podspec | 2 +- TIAuth/TIAuth.podspec | 2 +- TIDeveloperUtils/TIDeveloperUtils.podspec | 2 +- TIEcommerce/TIEcommerce.podspec | 2 +- TIFoundationUtils/TIFoundationUtils.podspec | 2 +- TIGoogleMapUtils/TIGoogleMapUtils.podspec | 2 +- TIKeychainUtils/TIKeychainUtils.podspec | 2 +- TILogging/TILogging.podspec | 2 +- TIMapUtils/TIMapUtils.podspec | 2 +- TIMoyaNetworking/TIMoyaNetworking.podspec | 2 +- TINetworking/TINetworking.podspec | 2 +- TINetworkingCache/TINetworkingCache.podspec | 2 +- TIPagination/TIPagination.podspec | 2 +- TISwiftUICore/TISwiftUICore.podspec | 2 +- TISwiftUtils/TISwiftUtils.podspec | 2 +- TITableKitUtils/TITableKitUtils.podspec | 2 +- TIUIElements/TIUIElements.podspec | 2 +- TIUIKitCore/TIUIKitCore.podspec | 2 +- TIWebView/TIWebView.podspec | 2 +- TIYandexMapUtils/TIYandexMapUtils.podspec | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/TIAppleMapUtils/TIAppleMapUtils.podspec b/TIAppleMapUtils/TIAppleMapUtils.podspec index d0d5e984..54bc0f9b 100644 --- a/TIAppleMapUtils/TIAppleMapUtils.podspec +++ b/TIAppleMapUtils/TIAppleMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIAppleMapUtils' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Set of helpers for map objects clustering and interacting using Apple MapKit.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIAuth/TIAuth.podspec b/TIAuth/TIAuth.podspec index 9a69cbc3..f601f3f7 100644 --- a/TIAuth/TIAuth.podspec +++ b/TIAuth/TIAuth.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIAuth' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Login, registration, confirmation and other related actions' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIDeveloperUtils/TIDeveloperUtils.podspec b/TIDeveloperUtils/TIDeveloperUtils.podspec index 27cc7c15..e95ac021 100644 --- a/TIDeveloperUtils/TIDeveloperUtils.podspec +++ b/TIDeveloperUtils/TIDeveloperUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIDeveloperUtils' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Universal web view API' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIEcommerce/TIEcommerce.podspec b/TIEcommerce/TIEcommerce.podspec index 834b3236..a80fa2e2 100644 --- a/TIEcommerce/TIEcommerce.podspec +++ b/TIEcommerce/TIEcommerce.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIEcommerce' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Cart, products, promocodes, bonuses and other related actions' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIFoundationUtils/TIFoundationUtils.podspec b/TIFoundationUtils/TIFoundationUtils.podspec index 87ddb6e6..bfdc8641 100644 --- a/TIFoundationUtils/TIFoundationUtils.podspec +++ b/TIFoundationUtils/TIFoundationUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIFoundationUtils' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Set of helpers for Foundation framework classes.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIGoogleMapUtils/TIGoogleMapUtils.podspec b/TIGoogleMapUtils/TIGoogleMapUtils.podspec index 449f1470..57f0ee8e 100644 --- a/TIGoogleMapUtils/TIGoogleMapUtils.podspec +++ b/TIGoogleMapUtils/TIGoogleMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIGoogleMapUtils' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Set of helpers for map objects clustering and interacting using Google Maps SDK.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIKeychainUtils/TIKeychainUtils.podspec b/TIKeychainUtils/TIKeychainUtils.podspec index 584a620b..dd1787f3 100644 --- a/TIKeychainUtils/TIKeychainUtils.podspec +++ b/TIKeychainUtils/TIKeychainUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIKeychainUtils' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Set of helpers for Keychain classes.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TILogging/TILogging.podspec b/TILogging/TILogging.podspec index 95368dfe..3327bbe3 100644 --- a/TILogging/TILogging.podspec +++ b/TILogging/TILogging.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TILogging' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Logging API' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIMapUtils/TIMapUtils.podspec b/TIMapUtils/TIMapUtils.podspec index ac90666a..730596ff 100644 --- a/TIMapUtils/TIMapUtils.podspec +++ b/TIMapUtils/TIMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIMapUtils' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Set of helpers for map objects clustering and interacting.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIMoyaNetworking/TIMoyaNetworking.podspec b/TIMoyaNetworking/TIMoyaNetworking.podspec index 8e9fea8c..b5ea8303 100644 --- a/TIMoyaNetworking/TIMoyaNetworking.podspec +++ b/TIMoyaNetworking/TIMoyaNetworking.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIMoyaNetworking' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Moya + Swagger network service.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TINetworking/TINetworking.podspec b/TINetworking/TINetworking.podspec index d54ef10f..b0547b59 100644 --- a/TINetworking/TINetworking.podspec +++ b/TINetworking/TINetworking.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TINetworking' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Swagger-frendly networking layer helpers.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TINetworkingCache/TINetworkingCache.podspec b/TINetworkingCache/TINetworkingCache.podspec index 5d53d102..2263e554 100644 --- a/TINetworkingCache/TINetworkingCache.podspec +++ b/TINetworkingCache/TINetworkingCache.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TINetworkingCache' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Caching results of EndpointRequests.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIPagination/TIPagination.podspec b/TIPagination/TIPagination.podspec index 15c14ae4..96b6d1fd 100644 --- a/TIPagination/TIPagination.podspec +++ b/TIPagination/TIPagination.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIPagination' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Generic pagination component.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TISwiftUICore/TISwiftUICore.podspec b/TISwiftUICore/TISwiftUICore.podspec index c2bc98c0..507330f9 100644 --- a/TISwiftUICore/TISwiftUICore.podspec +++ b/TISwiftUICore/TISwiftUICore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TISwiftUICore' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Core UI elements: protocols, views and helpers.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TISwiftUtils/TISwiftUtils.podspec b/TISwiftUtils/TISwiftUtils.podspec index 8c1de45d..2f400f0c 100644 --- a/TISwiftUtils/TISwiftUtils.podspec +++ b/TISwiftUtils/TISwiftUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TISwiftUtils' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Bunch of useful helpers for Swift development.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TITableKitUtils/TITableKitUtils.podspec b/TITableKitUtils/TITableKitUtils.podspec index bdae8fba..4cb80b5d 100644 --- a/TITableKitUtils/TITableKitUtils.podspec +++ b/TITableKitUtils/TITableKitUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TITableKitUtils' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Set of helpers for TableKit classes.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIUIElements/TIUIElements.podspec b/TIUIElements/TIUIElements.podspec index 37a6e323..c3d59167 100644 --- a/TIUIElements/TIUIElements.podspec +++ b/TIUIElements/TIUIElements.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIUIElements' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Bunch of useful protocols and views.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIUIKitCore/TIUIKitCore.podspec b/TIUIKitCore/TIUIKitCore.podspec index e268fc5b..8f6918db 100644 --- a/TIUIKitCore/TIUIKitCore.podspec +++ b/TIUIKitCore/TIUIKitCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIUIKitCore' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Core UI elements: protocols, views and helpers.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIWebView/TIWebView.podspec b/TIWebView/TIWebView.podspec index 528a2e94..1de74347 100644 --- a/TIWebView/TIWebView.podspec +++ b/TIWebView/TIWebView.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIWebView' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Universal web view API' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIYandexMapUtils/TIYandexMapUtils.podspec b/TIYandexMapUtils/TIYandexMapUtils.podspec index 3160811e..020100d1 100644 --- a/TIYandexMapUtils/TIYandexMapUtils.podspec +++ b/TIYandexMapUtils/TIYandexMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIYandexMapUtils' - s.version = '1.35.1' + s.version = '1.35.2' s.summary = 'Set of helpers for map objects clustering and interacting using Yandex Maps SDK.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } From 1da2d4d5014add0eb13f7c7ac1412779713dcdb2 Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Fri, 3 Mar 2023 17:47:25 +0300 Subject: [PATCH 03/15] fix: bump version back + update push to podspec script --- TIAppleMapUtils/TIAppleMapUtils.podspec | 2 +- TIAuth/TIAuth.podspec | 2 +- TIDeveloperUtils/TIDeveloperUtils.podspec | 2 +- TIEcommerce/TIEcommerce.podspec | 2 +- TIFoundationUtils/TIFoundationUtils.podspec | 2 +- TIGoogleMapUtils/TIGoogleMapUtils.podspec | 2 +- TIKeychainUtils/TIKeychainUtils.podspec | 2 +- TILogging/TILogging.podspec | 2 +- TIMapUtils/TIMapUtils.podspec | 2 +- TIMoyaNetworking/TIMoyaNetworking.podspec | 2 +- TINetworking/TINetworking.podspec | 2 +- TINetworkingCache/TINetworkingCache.podspec | 2 +- TIPagination/TIPagination.podspec | 2 +- TISwiftUICore/TISwiftUICore.podspec | 2 +- TISwiftUtils/TISwiftUtils.podspec | 2 +- TITableKitUtils/TITableKitUtils.podspec | 2 +- TIUIElements/TIUIElements.podspec | 2 +- TIUIKitCore/TIUIKitCore.podspec | 2 +- TIWebView/TIWebView.podspec | 2 +- TIYandexMapUtils/TIYandexMapUtils.podspec | 2 +- project-scripts/push_to_podspecs.sh | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/TIAppleMapUtils/TIAppleMapUtils.podspec b/TIAppleMapUtils/TIAppleMapUtils.podspec index 54bc0f9b..d0d5e984 100644 --- a/TIAppleMapUtils/TIAppleMapUtils.podspec +++ b/TIAppleMapUtils/TIAppleMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIAppleMapUtils' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Set of helpers for map objects clustering and interacting using Apple MapKit.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIAuth/TIAuth.podspec b/TIAuth/TIAuth.podspec index f601f3f7..9a69cbc3 100644 --- a/TIAuth/TIAuth.podspec +++ b/TIAuth/TIAuth.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIAuth' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Login, registration, confirmation and other related actions' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIDeveloperUtils/TIDeveloperUtils.podspec b/TIDeveloperUtils/TIDeveloperUtils.podspec index e95ac021..27cc7c15 100644 --- a/TIDeveloperUtils/TIDeveloperUtils.podspec +++ b/TIDeveloperUtils/TIDeveloperUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIDeveloperUtils' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Universal web view API' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIEcommerce/TIEcommerce.podspec b/TIEcommerce/TIEcommerce.podspec index a80fa2e2..834b3236 100644 --- a/TIEcommerce/TIEcommerce.podspec +++ b/TIEcommerce/TIEcommerce.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIEcommerce' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Cart, products, promocodes, bonuses and other related actions' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIFoundationUtils/TIFoundationUtils.podspec b/TIFoundationUtils/TIFoundationUtils.podspec index bfdc8641..87ddb6e6 100644 --- a/TIFoundationUtils/TIFoundationUtils.podspec +++ b/TIFoundationUtils/TIFoundationUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIFoundationUtils' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Set of helpers for Foundation framework classes.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIGoogleMapUtils/TIGoogleMapUtils.podspec b/TIGoogleMapUtils/TIGoogleMapUtils.podspec index 57f0ee8e..449f1470 100644 --- a/TIGoogleMapUtils/TIGoogleMapUtils.podspec +++ b/TIGoogleMapUtils/TIGoogleMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIGoogleMapUtils' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Set of helpers for map objects clustering and interacting using Google Maps SDK.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIKeychainUtils/TIKeychainUtils.podspec b/TIKeychainUtils/TIKeychainUtils.podspec index dd1787f3..584a620b 100644 --- a/TIKeychainUtils/TIKeychainUtils.podspec +++ b/TIKeychainUtils/TIKeychainUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIKeychainUtils' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Set of helpers for Keychain classes.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TILogging/TILogging.podspec b/TILogging/TILogging.podspec index 3327bbe3..95368dfe 100644 --- a/TILogging/TILogging.podspec +++ b/TILogging/TILogging.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TILogging' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Logging API' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIMapUtils/TIMapUtils.podspec b/TIMapUtils/TIMapUtils.podspec index 730596ff..ac90666a 100644 --- a/TIMapUtils/TIMapUtils.podspec +++ b/TIMapUtils/TIMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIMapUtils' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Set of helpers for map objects clustering and interacting.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIMoyaNetworking/TIMoyaNetworking.podspec b/TIMoyaNetworking/TIMoyaNetworking.podspec index b5ea8303..8e9fea8c 100644 --- a/TIMoyaNetworking/TIMoyaNetworking.podspec +++ b/TIMoyaNetworking/TIMoyaNetworking.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIMoyaNetworking' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Moya + Swagger network service.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TINetworking/TINetworking.podspec b/TINetworking/TINetworking.podspec index b0547b59..d54ef10f 100644 --- a/TINetworking/TINetworking.podspec +++ b/TINetworking/TINetworking.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TINetworking' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Swagger-frendly networking layer helpers.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TINetworkingCache/TINetworkingCache.podspec b/TINetworkingCache/TINetworkingCache.podspec index 2263e554..5d53d102 100644 --- a/TINetworkingCache/TINetworkingCache.podspec +++ b/TINetworkingCache/TINetworkingCache.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TINetworkingCache' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Caching results of EndpointRequests.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIPagination/TIPagination.podspec b/TIPagination/TIPagination.podspec index 96b6d1fd..15c14ae4 100644 --- a/TIPagination/TIPagination.podspec +++ b/TIPagination/TIPagination.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIPagination' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Generic pagination component.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TISwiftUICore/TISwiftUICore.podspec b/TISwiftUICore/TISwiftUICore.podspec index 507330f9..c2bc98c0 100644 --- a/TISwiftUICore/TISwiftUICore.podspec +++ b/TISwiftUICore/TISwiftUICore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TISwiftUICore' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Core UI elements: protocols, views and helpers.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TISwiftUtils/TISwiftUtils.podspec b/TISwiftUtils/TISwiftUtils.podspec index 2f400f0c..8c1de45d 100644 --- a/TISwiftUtils/TISwiftUtils.podspec +++ b/TISwiftUtils/TISwiftUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TISwiftUtils' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Bunch of useful helpers for Swift development.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TITableKitUtils/TITableKitUtils.podspec b/TITableKitUtils/TITableKitUtils.podspec index 4cb80b5d..bdae8fba 100644 --- a/TITableKitUtils/TITableKitUtils.podspec +++ b/TITableKitUtils/TITableKitUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TITableKitUtils' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Set of helpers for TableKit classes.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIUIElements/TIUIElements.podspec b/TIUIElements/TIUIElements.podspec index c3d59167..37a6e323 100644 --- a/TIUIElements/TIUIElements.podspec +++ b/TIUIElements/TIUIElements.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIUIElements' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Bunch of useful protocols and views.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIUIKitCore/TIUIKitCore.podspec b/TIUIKitCore/TIUIKitCore.podspec index 8f6918db..e268fc5b 100644 --- a/TIUIKitCore/TIUIKitCore.podspec +++ b/TIUIKitCore/TIUIKitCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIUIKitCore' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Core UI elements: protocols, views and helpers.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIWebView/TIWebView.podspec b/TIWebView/TIWebView.podspec index 1de74347..528a2e94 100644 --- a/TIWebView/TIWebView.podspec +++ b/TIWebView/TIWebView.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIWebView' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Universal web view API' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIYandexMapUtils/TIYandexMapUtils.podspec b/TIYandexMapUtils/TIYandexMapUtils.podspec index 020100d1..3160811e 100644 --- a/TIYandexMapUtils/TIYandexMapUtils.podspec +++ b/TIYandexMapUtils/TIYandexMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIYandexMapUtils' - s.version = '1.35.2' + s.version = '1.35.1' s.summary = 'Set of helpers for map objects clustering and interacting using Yandex Maps SDK.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/project-scripts/push_to_podspecs.sh b/project-scripts/push_to_podspecs.sh index e96cdebd..b3a69986 100755 --- a/project-scripts/push_to_podspecs.sh +++ b/project-scripts/push_to_podspecs.sh @@ -14,5 +14,5 @@ # for module_name in $(cat ${SRCROOT}/project-scripts/ordered_modules_list.txt); do - bundle exec pod repo push git@github.com:TouchInstinct/Podspecs ${SRCROOT}/${module_name}/${module_name}.podspec "$@" --allow-warnings + bundle exec pod repo push git@gitlab.ti:touchinstinct/Podspecs ${SRCROOT}/${module_name}/${module_name}.podspec "$@" --allow-warnings done From 2061050c785648a4a513b5b3b2b763043066272c Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Sun, 5 Mar 2023 17:52:00 +0300 Subject: [PATCH 04/15] fix: removed custom logger wrapper --- TILogging/Sources/Logger/Logger.swift | 77 ------------------- .../Sources/Logger/LoggerRepresentable.swift | 27 ------- TILogging/TILogging.podspec | 2 +- 3 files changed, 1 insertion(+), 105 deletions(-) delete mode 100644 TILogging/Sources/Logger/Logger.swift delete mode 100644 TILogging/Sources/Logger/LoggerRepresentable.swift diff --git a/TILogging/Sources/Logger/Logger.swift b/TILogging/Sources/Logger/Logger.swift deleted file mode 100644 index 07507989..00000000 --- a/TILogging/Sources/Logger/Logger.swift +++ /dev/null @@ -1,77 +0,0 @@ -// -// Copyright (c) 2022 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 Foundation -import os - -public struct TILogger: LoggerRepresentable { - - // MARK: - Properties - - @available(iOS 12, *) - public static let defaultLogger = TILogger(subsystem: .defaultSubsystem ?? "", category: .pointsOfInterest) - - public let logInfo: OSLog - - // MARK: - Init - - public init(subsystem: String, category: String) { - self.logInfo = .init(subsystem: subsystem, category: category) - } - - @available(iOS 12, *) - public init(subsystem: String, category: OSLog.Category) { - self.logInfo = .init(subsystem: subsystem, category: category) - } - - // MARK: - LoggerRepresentable - - public func log(_ message: StaticString, log: OSLog?, type: OSLogType, _ arguments: CVarArg...) { - os_log(message, log: log ?? logInfo, type: type, arguments) - } - - // MARK: - Public methods - - public func verbose(_ message: StaticString, _ arguments: CVarArg...) { - self.log(message, log: logInfo, type: .default, arguments) - } - - public func info(_ message: StaticString, _ arguments: CVarArg...) { - self.log(message, log: logInfo, type: .info, arguments) - } - - public func debug(_ message: StaticString, _ arguments: CVarArg...) { - self.log(message, log: logInfo, type: .debug, arguments) - } - - public func error(_ message: StaticString, _ arguments: CVarArg...) { - self.log(message, log: logInfo, type: .error, arguments) - } - - public func fault(_ message: StaticString, _ arguments: CVarArg...) { - self.log(message, log: logInfo, type: .fault, arguments) - } -} - -private extension String { - static let defaultSubsystem = Bundle.main.bundleIdentifier -} diff --git a/TILogging/Sources/Logger/LoggerRepresentable.swift b/TILogging/Sources/Logger/LoggerRepresentable.swift deleted file mode 100644 index 5337fcfe..00000000 --- a/TILogging/Sources/Logger/LoggerRepresentable.swift +++ /dev/null @@ -1,27 +0,0 @@ -// -// Copyright (c) 2022 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 os - -public protocol LoggerRepresentable { - func log(_ message: StaticString, log: OSLog?, type: OSLogType, _ arguments: CVarArg...) -} diff --git a/TILogging/TILogging.podspec b/TILogging/TILogging.podspec index 95368dfe..0dd4b5e3 100644 --- a/TILogging/TILogging.podspec +++ b/TILogging/TILogging.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| 'castlele' => 'nikita.semenov@touchin.ru' } s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } - s.ios.deployment_target = '11.0' + s.ios.deployment_target = '15.0' s.swift_versions = ['5.3'] s.source_files = s.name + '/Sources/**/*' From 5ea58f3746b0671638411a8424e239e97f946ab5 Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Mon, 6 Mar 2023 10:47:09 +0300 Subject: [PATCH 05/15] feat: update TIDeveloperUtils module, removed TILogger module --- CHANGELOG.md | 5 +++++ Package.swift | 2 -- TIAppleMapUtils/TIAppleMapUtils.podspec | 2 +- TIAuth/TIAuth.podspec | 2 +- .../LoggingPresenter}/LoggingPresenter.swift | 0 .../Views/LoggerList/LogEntryCellView.swift | 0 .../LoggerList/LogEntryTableViewCell.swift | 0 .../LoggerList/LogsListViewController.swift | 0 .../LoggingTogglingViewController.swift | 0 .../LoggerWindow/LoggingTogglingWindow.swift | 0 .../Views/ViewModels/FileCreator.swift | 0 .../Helpers/DefaultLogsListManipulator.swift | 0 .../Helpers/LogsListManipulatorProtocol.swift | 0 .../Views/ViewModels/LogsListViewOutput.swift | 0 .../ViewModels/LogsStorageViewModel.swift | 0 TIDeveloperUtils/TIDeveloperUtils.podspec | 2 +- TIEcommerce/TIEcommerce.podspec | 2 +- TIFoundationUtils/TIFoundationUtils.podspec | 2 +- TIGoogleMapUtils/TIGoogleMapUtils.podspec | 2 +- TIKeychainUtils/TIKeychainUtils.podspec | 2 +- TILogging/TILogging.podspec | 20 ------------------- TIMapUtils/TIMapUtils.podspec | 2 +- TIMoyaNetworking/TIMoyaNetworking.podspec | 2 +- TINetworking/TINetworking.podspec | 2 +- TINetworkingCache/TINetworkingCache.podspec | 2 +- TIPagination/TIPagination.podspec | 2 +- TISwiftUICore/TISwiftUICore.podspec | 2 +- TISwiftUtils/TISwiftUtils.podspec | 2 +- TITableKitUtils/TITableKitUtils.podspec | 2 +- TIUIElements/TIUIElements.podspec | 2 +- TIUIKitCore/TIUIKitCore.podspec | 2 +- TIWebView/TIWebView.podspec | 2 +- TIYandexMapUtils/TIYandexMapUtils.podspec | 2 +- project-scripts/ordered_modules_list.txt | 3 +-- 34 files changed, 25 insertions(+), 43 deletions(-) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/LoggingPresenter.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/LoggerList/LogEntryCellView.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/LoggerList/LogEntryTableViewCell.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/LoggerList/LogsListViewController.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/LoggerWindow/LoggingTogglingViewController.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/LoggerWindow/LoggingTogglingWindow.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/ViewModels/FileCreator.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/ViewModels/Helpers/DefaultLogsListManipulator.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/ViewModels/Helpers/LogsListManipulatorProtocol.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/ViewModels/LogsListViewOutput.swift (100%) rename {TILogging/Sources => TIDeveloperUtils/Sources/LoggingPresenter}/Views/ViewModels/LogsStorageViewModel.swift (100%) delete mode 100644 TILogging/TILogging.podspec diff --git a/CHANGELOG.md b/CHANGELOG.md index 939213b8..615150b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +### 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 diff --git a/Package.swift b/Package.swift index 32aff137..f6a8d8f4 100644 --- a/Package.swift +++ b/Package.swift @@ -21,7 +21,6 @@ let package = Package( .library(name: "TIFoundationUtils", targets: ["TIFoundationUtils"]), .library(name: "TIKeychainUtils", targets: ["TIKeychainUtils"]), .library(name: "TITableKitUtils", targets: ["TITableKitUtils"]), - .library(name: "TILogging", targets: ["TILogging"]), .library(name: "TIDeveloperUtils", targets: ["TIDeveloperUtils"]), // MARK: - Networking @@ -67,7 +66,6 @@ let package = Package( .target(name: "TIFoundationUtils", dependencies: ["TISwiftUtils"], path: "TIFoundationUtils", exclude: ["TIFoundationUtils.app"]), .target(name: "TIKeychainUtils", dependencies: ["TIFoundationUtils", "KeychainAccess"], path: "TIKeychainUtils/Sources"), .target(name: "TITableKitUtils", dependencies: ["TIUIElements", "TableKit"], path: "TITableKitUtils/Sources"), - .target(name: "TILogging", dependencies: ["TIUIElements", "TISwiftUtils", "TIUIKitCore"], path: "TILogging/Sources"), .target(name: "TIDeveloperUtils", dependencies: [], path: "TIDeveloperUtils/Sources"), // MARK: - Networking diff --git a/TIAppleMapUtils/TIAppleMapUtils.podspec b/TIAppleMapUtils/TIAppleMapUtils.podspec index d0d5e984..c0516d66 100644 --- a/TIAppleMapUtils/TIAppleMapUtils.podspec +++ b/TIAppleMapUtils/TIAppleMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIAppleMapUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Set of helpers for map objects clustering and interacting using Apple MapKit.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIAuth/TIAuth.podspec b/TIAuth/TIAuth.podspec index 9a69cbc3..0f8cbf2d 100644 --- a/TIAuth/TIAuth.podspec +++ b/TIAuth/TIAuth.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIAuth' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Login, registration, confirmation and other related actions' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TILogging/Sources/LoggingPresenter.swift b/TIDeveloperUtils/Sources/LoggingPresenter/LoggingPresenter.swift similarity index 100% rename from TILogging/Sources/LoggingPresenter.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/LoggingPresenter.swift diff --git a/TILogging/Sources/Views/LoggerList/LogEntryCellView.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerList/LogEntryCellView.swift similarity index 100% rename from TILogging/Sources/Views/LoggerList/LogEntryCellView.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerList/LogEntryCellView.swift diff --git a/TILogging/Sources/Views/LoggerList/LogEntryTableViewCell.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerList/LogEntryTableViewCell.swift similarity index 100% rename from TILogging/Sources/Views/LoggerList/LogEntryTableViewCell.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerList/LogEntryTableViewCell.swift diff --git a/TILogging/Sources/Views/LoggerList/LogsListViewController.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerList/LogsListViewController.swift similarity index 100% rename from TILogging/Sources/Views/LoggerList/LogsListViewController.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerList/LogsListViewController.swift diff --git a/TILogging/Sources/Views/LoggerWindow/LoggingTogglingViewController.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerWindow/LoggingTogglingViewController.swift similarity index 100% rename from TILogging/Sources/Views/LoggerWindow/LoggingTogglingViewController.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerWindow/LoggingTogglingViewController.swift diff --git a/TILogging/Sources/Views/LoggerWindow/LoggingTogglingWindow.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerWindow/LoggingTogglingWindow.swift similarity index 100% rename from TILogging/Sources/Views/LoggerWindow/LoggingTogglingWindow.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/LoggerWindow/LoggingTogglingWindow.swift diff --git a/TILogging/Sources/Views/ViewModels/FileCreator.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/FileCreator.swift similarity index 100% rename from TILogging/Sources/Views/ViewModels/FileCreator.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/FileCreator.swift diff --git a/TILogging/Sources/Views/ViewModels/Helpers/DefaultLogsListManipulator.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/Helpers/DefaultLogsListManipulator.swift similarity index 100% rename from TILogging/Sources/Views/ViewModels/Helpers/DefaultLogsListManipulator.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/Helpers/DefaultLogsListManipulator.swift diff --git a/TILogging/Sources/Views/ViewModels/Helpers/LogsListManipulatorProtocol.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/Helpers/LogsListManipulatorProtocol.swift similarity index 100% rename from TILogging/Sources/Views/ViewModels/Helpers/LogsListManipulatorProtocol.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/Helpers/LogsListManipulatorProtocol.swift diff --git a/TILogging/Sources/Views/ViewModels/LogsListViewOutput.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/LogsListViewOutput.swift similarity index 100% rename from TILogging/Sources/Views/ViewModels/LogsListViewOutput.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/LogsListViewOutput.swift diff --git a/TILogging/Sources/Views/ViewModels/LogsStorageViewModel.swift b/TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/LogsStorageViewModel.swift similarity index 100% rename from TILogging/Sources/Views/ViewModels/LogsStorageViewModel.swift rename to TIDeveloperUtils/Sources/LoggingPresenter/Views/ViewModels/LogsStorageViewModel.swift diff --git a/TIDeveloperUtils/TIDeveloperUtils.podspec b/TIDeveloperUtils/TIDeveloperUtils.podspec index 27cc7c15..9eb4b19b 100644 --- a/TIDeveloperUtils/TIDeveloperUtils.podspec +++ b/TIDeveloperUtils/TIDeveloperUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIDeveloperUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Universal web view API' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIEcommerce/TIEcommerce.podspec b/TIEcommerce/TIEcommerce.podspec index 834b3236..80684688 100644 --- a/TIEcommerce/TIEcommerce.podspec +++ b/TIEcommerce/TIEcommerce.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIEcommerce' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Cart, products, promocodes, bonuses and other related actions' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIFoundationUtils/TIFoundationUtils.podspec b/TIFoundationUtils/TIFoundationUtils.podspec index 87ddb6e6..814dae4d 100644 --- a/TIFoundationUtils/TIFoundationUtils.podspec +++ b/TIFoundationUtils/TIFoundationUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIFoundationUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Set of helpers for Foundation framework classes.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIGoogleMapUtils/TIGoogleMapUtils.podspec b/TIGoogleMapUtils/TIGoogleMapUtils.podspec index 449f1470..3a31c891 100644 --- a/TIGoogleMapUtils/TIGoogleMapUtils.podspec +++ b/TIGoogleMapUtils/TIGoogleMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIGoogleMapUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Set of helpers for map objects clustering and interacting using Google Maps SDK.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIKeychainUtils/TIKeychainUtils.podspec b/TIKeychainUtils/TIKeychainUtils.podspec index 584a620b..9dcc348d 100644 --- a/TIKeychainUtils/TIKeychainUtils.podspec +++ b/TIKeychainUtils/TIKeychainUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIKeychainUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Set of helpers for Keychain classes.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TILogging/TILogging.podspec b/TILogging/TILogging.podspec deleted file mode 100644 index 0dd4b5e3..00000000 --- a/TILogging/TILogging.podspec +++ /dev/null @@ -1,20 +0,0 @@ -Pod::Spec.new do |s| - s.name = 'TILogging' - s.version = '1.35.1' - s.summary = 'Logging API' - s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name - s.license = { :type => 'MIT', :file => 'LICENSE' } - s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru', - 'castlele' => 'nikita.semenov@touchin.ru' } - s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } - - s.ios.deployment_target = '15.0' - s.swift_versions = ['5.3'] - - s.source_files = s.name + '/Sources/**/*' - - s.dependency 'TIUIKitCore', s.version.to_s - s.dependency 'TISwiftUtils', s.version.to_s - s.dependency 'TIUIElements', s.version.to_s - -end diff --git a/TIMapUtils/TIMapUtils.podspec b/TIMapUtils/TIMapUtils.podspec index ac90666a..bd226a6b 100644 --- a/TIMapUtils/TIMapUtils.podspec +++ b/TIMapUtils/TIMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIMapUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Set of helpers for map objects clustering and interacting.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIMoyaNetworking/TIMoyaNetworking.podspec b/TIMoyaNetworking/TIMoyaNetworking.podspec index 8e9fea8c..1ccd3939 100644 --- a/TIMoyaNetworking/TIMoyaNetworking.podspec +++ b/TIMoyaNetworking/TIMoyaNetworking.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIMoyaNetworking' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Moya + Swagger network service.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TINetworking/TINetworking.podspec b/TINetworking/TINetworking.podspec index d54ef10f..1b35c434 100644 --- a/TINetworking/TINetworking.podspec +++ b/TINetworking/TINetworking.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TINetworking' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Swagger-frendly networking layer helpers.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TINetworkingCache/TINetworkingCache.podspec b/TINetworkingCache/TINetworkingCache.podspec index 5d53d102..f2a1ad6c 100644 --- a/TINetworkingCache/TINetworkingCache.podspec +++ b/TINetworkingCache/TINetworkingCache.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TINetworkingCache' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Caching results of EndpointRequests.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIPagination/TIPagination.podspec b/TIPagination/TIPagination.podspec index 15c14ae4..faa154dd 100644 --- a/TIPagination/TIPagination.podspec +++ b/TIPagination/TIPagination.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIPagination' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Generic pagination component.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TISwiftUICore/TISwiftUICore.podspec b/TISwiftUICore/TISwiftUICore.podspec index c2bc98c0..dca66b9c 100644 --- a/TISwiftUICore/TISwiftUICore.podspec +++ b/TISwiftUICore/TISwiftUICore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TISwiftUICore' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Core UI elements: protocols, views and helpers.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TISwiftUtils/TISwiftUtils.podspec b/TISwiftUtils/TISwiftUtils.podspec index 8c1de45d..b171f9b3 100644 --- a/TISwiftUtils/TISwiftUtils.podspec +++ b/TISwiftUtils/TISwiftUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TISwiftUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Bunch of useful helpers for Swift development.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TITableKitUtils/TITableKitUtils.podspec b/TITableKitUtils/TITableKitUtils.podspec index bdae8fba..fdcca1e6 100644 --- a/TITableKitUtils/TITableKitUtils.podspec +++ b/TITableKitUtils/TITableKitUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TITableKitUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Set of helpers for TableKit classes.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIUIElements/TIUIElements.podspec b/TIUIElements/TIUIElements.podspec index 37a6e323..7b76d25c 100644 --- a/TIUIElements/TIUIElements.podspec +++ b/TIUIElements/TIUIElements.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIUIElements' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Bunch of useful protocols and views.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIUIKitCore/TIUIKitCore.podspec b/TIUIKitCore/TIUIKitCore.podspec index e268fc5b..f8bc46cc 100644 --- a/TIUIKitCore/TIUIKitCore.podspec +++ b/TIUIKitCore/TIUIKitCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIUIKitCore' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Core UI elements: protocols, views and helpers.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIWebView/TIWebView.podspec b/TIWebView/TIWebView.podspec index 528a2e94..4ad75015 100644 --- a/TIWebView/TIWebView.podspec +++ b/TIWebView/TIWebView.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIWebView' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Universal web view API' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIYandexMapUtils/TIYandexMapUtils.podspec b/TIYandexMapUtils/TIYandexMapUtils.podspec index 3160811e..908e1c20 100644 --- a/TIYandexMapUtils/TIYandexMapUtils.podspec +++ b/TIYandexMapUtils/TIYandexMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIYandexMapUtils' - s.version = '1.35.1' + s.version = '1.36.0' s.summary = 'Set of helpers for map objects clustering and interacting using Yandex Maps SDK.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/project-scripts/ordered_modules_list.txt b/project-scripts/ordered_modules_list.txt index 46127ea8..71f5d1ca 100644 --- a/project-scripts/ordered_modules_list.txt +++ b/project-scripts/ordered_modules_list.txt @@ -5,7 +5,6 @@ TIKeychainUtils TIUIKitCore TISwiftUICore TIUIElements -TILogging TIAuth TITableKitUtils TINetworking @@ -17,4 +16,4 @@ TIGoogleMapUtils TIYandexMapUtils TIEcommerce TIWebView -TIDeveloperUtils \ No newline at end of file +TIDeveloperUtils From dda06ece3c5895a8bbcaf56df655c2cb460ba1da Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Mon, 6 Mar 2023 10:59:55 +0300 Subject: [PATCH 06/15] fix: dependencies of TIDeveloperUtils module --- Package.swift | 2 +- TIDeveloperUtils/TIDeveloperUtils.podspec | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index f6a8d8f4..642b75ae 100644 --- a/Package.swift +++ b/Package.swift @@ -66,7 +66,7 @@ let package = Package( .target(name: "TIFoundationUtils", dependencies: ["TISwiftUtils"], path: "TIFoundationUtils", exclude: ["TIFoundationUtils.app"]), .target(name: "TIKeychainUtils", dependencies: ["TIFoundationUtils", "KeychainAccess"], path: "TIKeychainUtils/Sources"), .target(name: "TITableKitUtils", dependencies: ["TIUIElements", "TableKit"], path: "TITableKitUtils/Sources"), - .target(name: "TIDeveloperUtils", dependencies: [], path: "TIDeveloperUtils/Sources"), + .target(name: "TIDeveloperUtils", dependencies: ["TISwiftUtils", "TIUIKitCore", "TIUIElements"], path: "TIDeveloperUtils/Sources"), // MARK: - Networking .target(name: "TINetworking", dependencies: ["TIFoundationUtils", "Alamofire"], path: "TINetworking/Sources"), diff --git a/TIDeveloperUtils/TIDeveloperUtils.podspec b/TIDeveloperUtils/TIDeveloperUtils.podspec index 9eb4b19b..aa6495a1 100644 --- a/TIDeveloperUtils/TIDeveloperUtils.podspec +++ b/TIDeveloperUtils/TIDeveloperUtils.podspec @@ -13,4 +13,8 @@ Pod::Spec.new do |s| s.source_files = s.name + '/Sources/**/*' + s.dependency 'TIUIKitCore', s.version.to_s + s.dependency 'TIUIElements', s.version.to_s + s.dependency 'TISwiftUtils', s.version.to_s + end From 48f6655efced75f61c36c6e3175014c4d6640e7f Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Mon, 6 Mar 2023 14:55:36 +0300 Subject: [PATCH 07/15] fix: logic of font size determination --- .../Skeletons/Helpers/UIView+Skeletons.swift | 47 +++++++++++++++++-- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/TIUIElements/Sources/Views/Skeletons/Helpers/UIView+Skeletons.swift b/TIUIElements/Sources/Views/Skeletons/Helpers/UIView+Skeletons.swift index aae9f042..bf5c01ee 100644 --- a/TIUIElements/Sources/Views/Skeletons/Helpers/UIView+Skeletons.swift +++ b/TIUIElements/Sources/Views/Skeletons/Helpers/UIView+Skeletons.swift @@ -22,6 +22,8 @@ import UIKit +// MARK: - UIView + Skeleton helpers + extension UIView { public var skeletonableViews: [UIView] { if let skeletonableView = self as? Skeletonable { @@ -58,27 +60,62 @@ extension UIView { } } +// MARK: - UITextView + is multiline + extension UITextView { var isMultiline: Bool { - guard let text = attributedText?.string ?? text, let font = font else { + let _text: String + let _font: UIFont + + if let attributedText = attributedText, let maxFont = attributedText.getMaxFont() { + _text = attributedText.string + _font = maxFont + + } else if let text = text, let font = self.font { + _text = text + _font = font + + } else { return false } - let labelTextSize = (text as NSString).size(withAttributes: [.font: font]) + let labelTextSize = (_text as NSString).size(withAttributes: [.font: _font]) return labelTextSize.width > bounds.width } } +// MARK: - UILabel + is multiline + extension UILabel { var isMultiline: Bool { - // Unwrapping font to mute warning while casting UIFont! to Any - guard let text = attributedText?.string ?? text, let font = font else { + let _text: String + let _font: UIFont + + if let attributedText = attributedText, let maxFont = attributedText.getMaxFont() { + _text = attributedText.string + _font = maxFont + + } else if let text = text, let font = self.font { + _text = text + _font = font + + } else { return false } - let labelTextSize = (text as NSString).size(withAttributes: [.font: font]) + let labelTextSize = (_text as NSString).size(withAttributes: [.font: _font]) return labelTextSize.width > bounds.width } } + +// MARK: - NSAttributedString helper extension + +extension NSAttributedString { + func getMaxFont() -> UIFont? { + (0.. Date: Mon, 6 Mar 2023 14:57:52 +0300 Subject: [PATCH 08/15] docs: change release version --- CHANGELOG.md | 2 +- TIAppleMapUtils/TIAppleMapUtils.podspec | 2 +- TIAuth/TIAuth.podspec | 2 +- TIDeveloperUtils/TIDeveloperUtils.podspec | 2 +- TIEcommerce/TIEcommerce.podspec | 2 +- TIFoundationUtils/TIFoundationUtils.podspec | 2 +- TIGoogleMapUtils/TIGoogleMapUtils.podspec | 2 +- TIKeychainUtils/TIKeychainUtils.podspec | 2 +- TILogging/TILogging.podspec | 2 +- TIMapUtils/TIMapUtils.podspec | 2 +- TIMoyaNetworking/TIMoyaNetworking.podspec | 2 +- TINetworking/TINetworking.podspec | 2 +- TINetworkingCache/TINetworkingCache.podspec | 2 +- TIPagination/TIPagination.podspec | 2 +- TISwiftUICore/TISwiftUICore.podspec | 2 +- TISwiftUtils/TISwiftUtils.podspec | 2 +- TITableKitUtils/TITableKitUtils.podspec | 2 +- TIUIElements/TIUIElements.podspec | 2 +- TIUIKitCore/TIUIKitCore.podspec | 2 +- TIWebView/TIWebView.podspec | 2 +- TIYandexMapUtils/TIYandexMapUtils.podspec | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c3fc4d0..e792762e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -### 1.36.0 +### 1.37.0 - **Added**: API for converting view hierarchy to skeletons diff --git a/TIAppleMapUtils/TIAppleMapUtils.podspec b/TIAppleMapUtils/TIAppleMapUtils.podspec index dc80fcdc..165c1a89 100644 --- a/TIAppleMapUtils/TIAppleMapUtils.podspec +++ b/TIAppleMapUtils/TIAppleMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIAppleMapUtils' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Set of helpers for map objects clustering and interacting using Apple MapKit.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIAuth/TIAuth.podspec b/TIAuth/TIAuth.podspec index 8b7fcfec..01745b46 100644 --- a/TIAuth/TIAuth.podspec +++ b/TIAuth/TIAuth.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIAuth' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Login, registration, confirmation and other related actions' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIDeveloperUtils/TIDeveloperUtils.podspec b/TIDeveloperUtils/TIDeveloperUtils.podspec index a2580e31..0f6f94c0 100644 --- a/TIDeveloperUtils/TIDeveloperUtils.podspec +++ b/TIDeveloperUtils/TIDeveloperUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIDeveloperUtils' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Universal web view API' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIEcommerce/TIEcommerce.podspec b/TIEcommerce/TIEcommerce.podspec index a7adf60b..854e0ad7 100644 --- a/TIEcommerce/TIEcommerce.podspec +++ b/TIEcommerce/TIEcommerce.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIEcommerce' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Cart, products, promocodes, bonuses and other related actions' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIFoundationUtils/TIFoundationUtils.podspec b/TIFoundationUtils/TIFoundationUtils.podspec index 3d89b8f3..e3721de7 100644 --- a/TIFoundationUtils/TIFoundationUtils.podspec +++ b/TIFoundationUtils/TIFoundationUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIFoundationUtils' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Set of helpers for Foundation framework classes.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIGoogleMapUtils/TIGoogleMapUtils.podspec b/TIGoogleMapUtils/TIGoogleMapUtils.podspec index 31195b66..0f5c3c6d 100644 --- a/TIGoogleMapUtils/TIGoogleMapUtils.podspec +++ b/TIGoogleMapUtils/TIGoogleMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIGoogleMapUtils' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Set of helpers for map objects clustering and interacting using Google Maps SDK.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIKeychainUtils/TIKeychainUtils.podspec b/TIKeychainUtils/TIKeychainUtils.podspec index 57162d4a..97f19406 100644 --- a/TIKeychainUtils/TIKeychainUtils.podspec +++ b/TIKeychainUtils/TIKeychainUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIKeychainUtils' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Set of helpers for Keychain classes.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TILogging/TILogging.podspec b/TILogging/TILogging.podspec index d5070666..96997027 100644 --- a/TILogging/TILogging.podspec +++ b/TILogging/TILogging.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TILogging' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Logging API' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIMapUtils/TIMapUtils.podspec b/TIMapUtils/TIMapUtils.podspec index 5819982a..40ca905f 100644 --- a/TIMapUtils/TIMapUtils.podspec +++ b/TIMapUtils/TIMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIMapUtils' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Set of helpers for map objects clustering and interacting.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIMoyaNetworking/TIMoyaNetworking.podspec b/TIMoyaNetworking/TIMoyaNetworking.podspec index 46259090..239184e5 100644 --- a/TIMoyaNetworking/TIMoyaNetworking.podspec +++ b/TIMoyaNetworking/TIMoyaNetworking.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIMoyaNetworking' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Moya + Swagger network service.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TINetworking/TINetworking.podspec b/TINetworking/TINetworking.podspec index 0e403b87..d1c1ef32 100644 --- a/TINetworking/TINetworking.podspec +++ b/TINetworking/TINetworking.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TINetworking' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Swagger-frendly networking layer helpers.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TINetworkingCache/TINetworkingCache.podspec b/TINetworkingCache/TINetworkingCache.podspec index 3a151388..64831b1f 100644 --- a/TINetworkingCache/TINetworkingCache.podspec +++ b/TINetworkingCache/TINetworkingCache.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TINetworkingCache' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Caching results of EndpointRequests.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIPagination/TIPagination.podspec b/TIPagination/TIPagination.podspec index ffcc30e5..3ee3bb66 100644 --- a/TIPagination/TIPagination.podspec +++ b/TIPagination/TIPagination.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIPagination' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Generic pagination component.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TISwiftUICore/TISwiftUICore.podspec b/TISwiftUICore/TISwiftUICore.podspec index 6a2a4a42..be59b9b8 100644 --- a/TISwiftUICore/TISwiftUICore.podspec +++ b/TISwiftUICore/TISwiftUICore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TISwiftUICore' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Core UI elements: protocols, views and helpers.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TISwiftUtils/TISwiftUtils.podspec b/TISwiftUtils/TISwiftUtils.podspec index f927fd06..ab75d35d 100644 --- a/TISwiftUtils/TISwiftUtils.podspec +++ b/TISwiftUtils/TISwiftUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TISwiftUtils' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Bunch of useful helpers for Swift development.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TITableKitUtils/TITableKitUtils.podspec b/TITableKitUtils/TITableKitUtils.podspec index cf268632..d0938b2e 100644 --- a/TITableKitUtils/TITableKitUtils.podspec +++ b/TITableKitUtils/TITableKitUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TITableKitUtils' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Set of helpers for TableKit classes.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIUIElements/TIUIElements.podspec b/TIUIElements/TIUIElements.podspec index b2e04081..60c2bc98 100644 --- a/TIUIElements/TIUIElements.podspec +++ b/TIUIElements/TIUIElements.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIUIElements' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Bunch of useful protocols and views.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIUIKitCore/TIUIKitCore.podspec b/TIUIKitCore/TIUIKitCore.podspec index e8bededa..e68a1d70 100644 --- a/TIUIKitCore/TIUIKitCore.podspec +++ b/TIUIKitCore/TIUIKitCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIUIKitCore' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Core UI elements: protocols, views and helpers.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIWebView/TIWebView.podspec b/TIWebView/TIWebView.podspec index c6c2afeb..269c97dc 100644 --- a/TIWebView/TIWebView.podspec +++ b/TIWebView/TIWebView.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIWebView' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Universal web view API' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIYandexMapUtils/TIYandexMapUtils.podspec b/TIYandexMapUtils/TIYandexMapUtils.podspec index b3d899dc..001c878c 100644 --- a/TIYandexMapUtils/TIYandexMapUtils.podspec +++ b/TIYandexMapUtils/TIYandexMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIYandexMapUtils' - s.version = '1.36.0' + s.version = '1.37.0' s.summary = 'Set of helpers for map objects clustering and interacting using Yandex Maps SDK.' s.homepage = 'https://github.com/TouchInstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } From 29347d77e13e3a2a0a775ba280371172fbcf37b9 Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Mon, 6 Mar 2023 19:27:56 +0300 Subject: [PATCH 09/15] fix: code review notes --- .../Skeletons/Helpers/UIView+Skeletons.swift | 64 +++++++++---------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/TIUIElements/Sources/Views/Skeletons/Helpers/UIView+Skeletons.swift b/TIUIElements/Sources/Views/Skeletons/Helpers/UIView+Skeletons.swift index bf5c01ee..85803073 100644 --- a/TIUIElements/Sources/Views/Skeletons/Helpers/UIView+Skeletons.swift +++ b/TIUIElements/Sources/Views/Skeletons/Helpers/UIView+Skeletons.swift @@ -20,14 +20,37 @@ // THE SOFTWARE. // +import TIUIKitCore import UIKit +// MARK: - UITextView + is multiline + +extension UITextView { + var isMultiline: Bool { + isMultiline(text: text, + attributedText: attributedText, + font: font, + textAlignment: textAlignment) + } +} + +// MARK: - UILabel + is multiline + +extension UILabel { + var isMultiline: Bool { + isMultiline(text: text, + attributedText: attributedText, + font: font, + textAlignment: textAlignment) + } +} + // MARK: - UIView + Skeleton helpers extension UIView { public var skeletonableViews: [UIView] { if let skeletonableView = self as? Skeletonable { - return skeletonableView.viewsToSkeletone + return skeletonableView.viewsToSkeletone } return subviews @@ -58,12 +81,11 @@ extension UIView { return .generic(self) } } -} -// MARK: - UITextView + is multiline - -extension UITextView { - var isMultiline: Bool { + fileprivate func isMultiline(text: String?, + attributedText: NSAttributedString?, + font: UIFont?, + textAlignment: NSTextAlignment) -> Bool { let _text: String let _font: UIFont @@ -71,7 +93,7 @@ extension UITextView { _text = attributedText.string _font = maxFont - } else if let text = text, let font = self.font { + } else if let text = text, let font = font { _text = text _font = font @@ -79,32 +101,8 @@ extension UITextView { return false } - let labelTextSize = (_text as NSString).size(withAttributes: [.font: _font]) - - return labelTextSize.width > bounds.width - } -} - -// MARK: - UILabel + is multiline - -extension UILabel { - var isMultiline: Bool { - let _text: String - let _font: UIFont - - if let attributedText = attributedText, let maxFont = attributedText.getMaxFont() { - _text = attributedText.string - _font = maxFont - - } else if let text = text, let font = self.font { - _text = text - _font = font - - } else { - return false - } - - let labelTextSize = (_text as NSString).size(withAttributes: [.font: _font]) + let textAttributes = BaseTextAttributes(font: _font, color: .black, alignment: textAlignment, isMultiline: true) + let labelTextSize = textAttributes.size(of: _text, with: .zero) return labelTextSize.width > bounds.width } From 343d36cb8574d624ea339129de95def673e2e5f6 Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Tue, 7 Mar 2023 10:11:56 +0300 Subject: [PATCH 10/15] feat: removed SkeletonsPresenter and move all logic to extensions of UIView and UIViewController --- ...swift => UIView+PresentingSkeletons.swift} | 82 ++++++------------- .../Skeletons/UIView+PresetingSkeletons.swift | 8 ++ ...UIViewController+PresentingSkeletons.swift | 53 ++++++++++++ 3 files changed, 87 insertions(+), 56 deletions(-) rename TIUIElements/Sources/Views/Skeletons/{Protocols/SkeletonsPresenter.swift => UIView+PresentingSkeletons.swift} (66%) create mode 100644 TIUIElements/Sources/Views/Skeletons/UIView+PresetingSkeletons.swift create mode 100644 TIUIElements/Sources/Views/Skeletons/UIViewController+PresentingSkeletons.swift diff --git a/TIUIElements/Sources/Views/Skeletons/Protocols/SkeletonsPresenter.swift b/TIUIElements/Sources/Views/Skeletons/UIView+PresentingSkeletons.swift similarity index 66% rename from TIUIElements/Sources/Views/Skeletons/Protocols/SkeletonsPresenter.swift rename to TIUIElements/Sources/Views/Skeletons/UIView+PresentingSkeletons.swift index f47b0d7c..e044e72b 100644 --- a/TIUIElements/Sources/Views/Skeletons/Protocols/SkeletonsPresenter.swift +++ b/TIUIElements/Sources/Views/Skeletons/UIView+PresentingSkeletons.swift @@ -22,38 +22,38 @@ import UIKit -public protocol SkeletonsPresenter { - var baseView: UIView? { get } - var skeletonsConfiguration: SkeletonsConfiguration { get } - var isSkeletonsHidden: Bool { get } - var viewsToSkeletone: [UIView] { get } +extension UIView { - func showSkeletons() - func hideSkeletons() - func startAnimation() - func stopAnimation() -} - -// MARK: - SkeletonsPresenter + Default implemetation - -extension SkeletonsPresenter { - - public var skeletonsConfiguration: SkeletonsConfiguration { - SkeletonsConfiguration() + @objc open var baseView: UIView? { + self } - public func showSkeletons() { + @objc open var isSkeletonsHidden: Bool { + (layer.sublayers ?? []).first { $0 is SkeletonLayer } == nil + } + + @objc open var viewsToSkeletone: [UIView] { + skeletonableViews + } + + // MARK: - Public methods + + public func showSkeletons(_ config: SkeletonsConfiguration = .init(), + viewsToSkeletone: [UIView]? = nil) { + guard let baseView = baseView else { return } + let viewsToSkeletone = viewsToSkeletone ?? self.viewsToSkeletone + baseView.isUserInteractionEnabled = false viewsToSkeletone .flatMap { view in view.isHidden = true - return getSkeletonLayer(forView: view) + return getSkeletonLayer(forView: view, withConfiguration: config) } .map { layer in layer.startAnimation() @@ -64,7 +64,7 @@ extension SkeletonsPresenter { } public func hideSkeletons() { - guard let baseView = baseView else { + guard let baseView = baseView ?? nil else { return } @@ -95,17 +95,19 @@ extension SkeletonsPresenter { // MARK: - Private methods - private func getSkeletonLayer(forView view: UIView) -> [SkeletonLayer] { - let skeletonLayer = skeletonsConfiguration.createSkeletonLayer(for: baseView) + private func getSkeletonLayer(forView view: UIView, + withConfiguration conf: SkeletonsConfiguration) -> [SkeletonLayer] { + + let skeletonLayer = conf.createSkeletonLayer(for: baseView) var subviewSkeletonLayers = [SkeletonLayer]() if view.isSkeletonsContainer { - if skeletonsConfiguration.borderWidth != .zero { + if conf.borderWidth != .zero { skeletonLayer.bind(to: .container(view)) } subviewSkeletonLayers = view.skeletonableViews - .map(getSkeletonLayer(forView:)) + .map { getSkeletonLayer(forView: $0, withConfiguration: conf) } .flatMap { $0 } } else { @@ -116,38 +118,6 @@ extension SkeletonsPresenter { } } -// MARK: - UIView + SkeletonsPresenter - -extension SkeletonsPresenter where Self: UIView { - public var baseView: UIView? { - self - } - - public var isSkeletonsHidden: Bool { - (layer.sublayers ?? []).first { $0 is SkeletonLayer } == nil - } - - public var viewsToSkeletone: [UIView] { - skeletonableViews - } -} - -// MARK: - UIViewController + SkeletonsPresenter - -extension SkeletonsPresenter where Self: UIViewController { - public var baseView: UIView? { - view - } - - public var isSkeletonsHidden: Bool { - (view.layer.sublayers ?? []).first { $0 is SkeletonLayer } == nil - } - - public var viewsToSkeletone: [UIView] { - baseView?.skeletonableViews ?? view.skeletonableViews - } -} - // MARK: - Helper extension extension Array where Element: CALayer { diff --git a/TIUIElements/Sources/Views/Skeletons/UIView+PresetingSkeletons.swift b/TIUIElements/Sources/Views/Skeletons/UIView+PresetingSkeletons.swift new file mode 100644 index 00000000..11d2ff8a --- /dev/null +++ b/TIUIElements/Sources/Views/Skeletons/UIView+PresetingSkeletons.swift @@ -0,0 +1,8 @@ +// +// File.swift +// +// +// Created by Nikita Semenov on 07.03.2023. +// + +import Foundation diff --git a/TIUIElements/Sources/Views/Skeletons/UIViewController+PresentingSkeletons.swift b/TIUIElements/Sources/Views/Skeletons/UIViewController+PresentingSkeletons.swift new file mode 100644 index 00000000..48a9d031 --- /dev/null +++ b/TIUIElements/Sources/Views/Skeletons/UIViewController+PresentingSkeletons.swift @@ -0,0 +1,53 @@ +// +// 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 UIKit + +extension UIViewController { + @objc open var baseView: UIView? { + view + } + + @objc open var isSkeletonsHidden: Bool { + (view.layer.sublayers ?? []).first { $0 is SkeletonLayer } == nil + } + + @objc open var viewsToSkeletone: [UIView] { + baseView?.skeletonableViews ?? view.skeletonableViews + } + + public func showSkeletons(_ conf: SkeletonsConfiguration = .init()) { + baseView?.showSkeletons(conf, viewsToSkeletone: viewsToSkeletone) + } + + public func hideSkeletons() { + baseView?.hideSkeletons() + } + + public func startAnimation() { + baseView?.startAnimation() + } + + public func stopAnimation() { + baseView?.stopAnimation() + } +} From 7a0747843a38d99841b0c781aa567bcf407630f0 Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Tue, 7 Mar 2023 11:38:09 +0300 Subject: [PATCH 11/15] feat: removed computed @objc properties --- .../Protocols/SkeletonsPresenter.swift | 94 +++++++++++++++++++ .../UIView+PresentingSkeletons.swift | 39 +++----- .../Skeletons/UIView+PresetingSkeletons.swift | 8 -- ...UIViewController+PresentingSkeletons.swift | 31 +++--- 4 files changed, 117 insertions(+), 55 deletions(-) create mode 100644 TIUIElements/Sources/Views/Skeletons/Protocols/SkeletonsPresenter.swift delete mode 100644 TIUIElements/Sources/Views/Skeletons/UIView+PresetingSkeletons.swift diff --git a/TIUIElements/Sources/Views/Skeletons/Protocols/SkeletonsPresenter.swift b/TIUIElements/Sources/Views/Skeletons/Protocols/SkeletonsPresenter.swift new file mode 100644 index 00000000..31cf529a --- /dev/null +++ b/TIUIElements/Sources/Views/Skeletons/Protocols/SkeletonsPresenter.swift @@ -0,0 +1,94 @@ +// +// 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 UIKit + +public protocol SkeletonsPresenter { + var baseView: UIView? { get } + var skeletonsConfiguration: SkeletonsConfiguration { get } + var isSkeletonsHidden: Bool { get } + var viewsToSkeletone: [UIView] { get } + + func showSkeletons() + func hideSkeletons() + func startAnimation() + func stopAnimation() +} + +// MARK: - SkeletonsPresenter + Default implemetation + +extension SkeletonsPresenter { + + public var skeletonsConfiguration: SkeletonsConfiguration { + SkeletonsConfiguration() + } + + public func showSkeletons() { + baseView?.showSkeletons(on: nil, + viewsToSkeletone: viewsToSkeletone, + skeletonsConfiguration) + } + + public func hideSkeletons() { + baseView?.hideSkeletons(baseView: nil) + } + + public func startAnimation() { + baseView?.startAnimation(baseView: nil) + } + + public func stopAnimation() { + baseView?.stopAnimation(baseView: nil) + } +} + +// MARK: - UIView + SkeletonsPresenter + +extension SkeletonsPresenter where Self: UIView { + public var baseView: UIView? { + self + } + + public var isSkeletonsHidden: Bool { + (layer.sublayers ?? []).first { $0 is SkeletonLayer } == nil + } + + public var viewsToSkeletone: [UIView] { + skeletonableViews + } +} + +// MARK: - UIViewController + SkeletonsPresenter + +extension SkeletonsPresenter where Self: UIViewController { + public var baseView: UIView? { + view + } + + public var isSkeletonsHidden: Bool { + (view.layer.sublayers ?? []).first { $0 is SkeletonLayer } == nil + } + + public var viewsToSkeletone: [UIView] { + baseView?.skeletonableViews ?? view.skeletonableViews + } +} diff --git a/TIUIElements/Sources/Views/Skeletons/UIView+PresentingSkeletons.swift b/TIUIElements/Sources/Views/Skeletons/UIView+PresentingSkeletons.swift index e044e72b..c1838cf0 100644 --- a/TIUIElements/Sources/Views/Skeletons/UIView+PresentingSkeletons.swift +++ b/TIUIElements/Sources/Views/Skeletons/UIView+PresentingSkeletons.swift @@ -24,28 +24,14 @@ import UIKit extension UIView { - @objc open var baseView: UIView? { - self - } - - @objc open var isSkeletonsHidden: Bool { - (layer.sublayers ?? []).first { $0 is SkeletonLayer } == nil - } - - @objc open var viewsToSkeletone: [UIView] { - skeletonableViews - } - // MARK: - Public methods - public func showSkeletons(_ config: SkeletonsConfiguration = .init(), - viewsToSkeletone: [UIView]? = nil) { + public func showSkeletons(on baseView: UIView?, + viewsToSkeletone: [UIView]? = nil, + _ config: SkeletonsConfiguration = .init()) { - guard let baseView = baseView else { - return - } - - let viewsToSkeletone = viewsToSkeletone ?? self.viewsToSkeletone + let baseView = baseView ?? self + let viewsToSkeletone = viewsToSkeletone ?? skeletonableViews baseView.isUserInteractionEnabled = false @@ -53,7 +39,7 @@ extension UIView { .flatMap { view in view.isHidden = true - return getSkeletonLayer(forView: view, withConfiguration: config) + return getSkeletonLayer(forView: view, baseView: baseView, withConfiguration: config) } .map { layer in layer.startAnimation() @@ -63,10 +49,8 @@ extension UIView { .insert(onto: baseView) } - public func hideSkeletons() { - guard let baseView = baseView ?? nil else { - return - } + public func hideSkeletons(baseView: UIView?) { + let baseView = baseView ?? self baseView.isUserInteractionEnabled = true @@ -81,13 +65,13 @@ extension UIView { } } - public func startAnimation() { + public func startAnimation(baseView: UIView?) { baseView?.layer.skeletonLayers.forEach { layer in layer.startAnimation() } } - public func stopAnimation() { + public func stopAnimation(baseView: UIView?) { baseView?.layer.skeletonLayers.forEach { layer in layer.stopAnimation() } @@ -96,6 +80,7 @@ extension UIView { // MARK: - Private methods private func getSkeletonLayer(forView view: UIView, + baseView: UIView, withConfiguration conf: SkeletonsConfiguration) -> [SkeletonLayer] { let skeletonLayer = conf.createSkeletonLayer(for: baseView) @@ -107,7 +92,7 @@ extension UIView { } subviewSkeletonLayers = view.skeletonableViews - .map { getSkeletonLayer(forView: $0, withConfiguration: conf) } + .map { getSkeletonLayer(forView: $0, baseView: baseView, withConfiguration: conf) } .flatMap { $0 } } else { diff --git a/TIUIElements/Sources/Views/Skeletons/UIView+PresetingSkeletons.swift b/TIUIElements/Sources/Views/Skeletons/UIView+PresetingSkeletons.swift deleted file mode 100644 index 11d2ff8a..00000000 --- a/TIUIElements/Sources/Views/Skeletons/UIView+PresetingSkeletons.swift +++ /dev/null @@ -1,8 +0,0 @@ -// -// File.swift -// -// -// Created by Nikita Semenov on 07.03.2023. -// - -import Foundation diff --git a/TIUIElements/Sources/Views/Skeletons/UIViewController+PresentingSkeletons.swift b/TIUIElements/Sources/Views/Skeletons/UIViewController+PresentingSkeletons.swift index 48a9d031..a4eb1ee0 100644 --- a/TIUIElements/Sources/Views/Skeletons/UIViewController+PresentingSkeletons.swift +++ b/TIUIElements/Sources/Views/Skeletons/UIViewController+PresentingSkeletons.swift @@ -23,31 +23,22 @@ import UIKit extension UIViewController { - @objc open var baseView: UIView? { - view + public func showSkeletons(on baseView: UIView?, + viewsToSkeletone: [UIView]? = nil, + _ config: SkeletonsConfiguration = .init()) { + + (baseView ?? view).showSkeletons(on: nil, viewsToSkeletone: viewsToSkeletone, config) } - @objc open var isSkeletonsHidden: Bool { - (view.layer.sublayers ?? []).first { $0 is SkeletonLayer } == nil + public func hideSkeletons(baseView: UIView?) { + (baseView ?? view).hideSkeletons(baseView: nil) } - @objc open var viewsToSkeletone: [UIView] { - baseView?.skeletonableViews ?? view.skeletonableViews + public func startAnimation(baseView: UIView?) { + (baseView ?? view).startAnimation(baseView: nil) } - public func showSkeletons(_ conf: SkeletonsConfiguration = .init()) { - baseView?.showSkeletons(conf, viewsToSkeletone: viewsToSkeletone) - } - - public func hideSkeletons() { - baseView?.hideSkeletons() - } - - public func startAnimation() { - baseView?.startAnimation() - } - - public func stopAnimation() { - baseView?.stopAnimation() + public func stopAnimation(baseView: UIView?) { + (baseView ?? view).stopAnimation(baseView: nil) } } From c8a4b0bd51e87d006393bd4df5c6ddf03d63f7d0 Mon Sep 17 00:00:00 2001 From: Vladimir Makarov Date: Tue, 7 Mar 2023 09:41:18 +0100 Subject: [PATCH 12/15] `YandexMapsMobile` version updated, map manager memory leak removed --- TIMapUtils/Sources/Managers/BaseMapManager.swift | 14 +++++++++----- TIYandexMapUtils/TIYandexMapUtils.podspec | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/TIMapUtils/Sources/Managers/BaseMapManager.swift b/TIMapUtils/Sources/Managers/BaseMapManager.swift index a8dc5b37..43345bf0 100644 --- a/TIMapUtils/Sources/Managers/BaseMapManager.swift +++ b/TIMapUtils/Sources/Managers/BaseMapManager.swift @@ -23,7 +23,7 @@ import Foundation import UIKit.UIGeometry -open class BaseMapManager where PM.Position: LocationCoordinate, @@ -79,16 +79,20 @@ open class BaseMapManager 'x86_64' } s.dependency 'TIMapUtils', s.version.to_s - s.dependency 'YandexMapsMobile', '4.0.0-lite' + s.dependency 'YandexMapsMobile', '4.3.1-lite' end From cbd38b84e2158f8ce53c176f9bbced624d703a3e Mon Sep 17 00:00:00 2001 From: Vladimir Makarov Date: Tue, 7 Mar 2023 09:44:26 +0100 Subject: [PATCH 13/15] Podspec versions updated --- TIAppleMapUtils/TIAppleMapUtils.podspec | 2 +- TIAuth/TIAuth.podspec | 2 +- TIDeveloperUtils/TIDeveloperUtils.podspec | 2 +- TIEcommerce/TIEcommerce.podspec | 2 +- TIFoundationUtils/TIFoundationUtils.podspec | 2 +- TIGoogleMapUtils/TIGoogleMapUtils.podspec | 2 +- TIKeychainUtils/TIKeychainUtils.podspec | 2 +- TIMapUtils/TIMapUtils.podspec | 2 +- TIMoyaNetworking/TIMoyaNetworking.podspec | 2 +- TINetworking/TINetworking.podspec | 2 +- TINetworkingCache/TINetworkingCache.podspec | 2 +- TIPagination/TIPagination.podspec | 2 +- TISwiftUICore/TISwiftUICore.podspec | 2 +- TISwiftUtils/TISwiftUtils.podspec | 2 +- TITableKitUtils/TITableKitUtils.podspec | 2 +- TIUIElements/TIUIElements.podspec | 2 +- TIUIKitCore/TIUIKitCore.podspec | 2 +- TIWebView/TIWebView.podspec | 2 +- TIYandexMapUtils/TIYandexMapUtils.podspec | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/TIAppleMapUtils/TIAppleMapUtils.podspec b/TIAppleMapUtils/TIAppleMapUtils.podspec index c0516d66..0cf82b4a 100644 --- a/TIAppleMapUtils/TIAppleMapUtils.podspec +++ b/TIAppleMapUtils/TIAppleMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIAppleMapUtils' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Set of helpers for map objects clustering and interacting using Apple MapKit.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIAuth/TIAuth.podspec b/TIAuth/TIAuth.podspec index 0f8cbf2d..2a5733dd 100644 --- a/TIAuth/TIAuth.podspec +++ b/TIAuth/TIAuth.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIAuth' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Login, registration, confirmation and other related actions' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIDeveloperUtils/TIDeveloperUtils.podspec b/TIDeveloperUtils/TIDeveloperUtils.podspec index aa6495a1..1386269f 100644 --- a/TIDeveloperUtils/TIDeveloperUtils.podspec +++ b/TIDeveloperUtils/TIDeveloperUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIDeveloperUtils' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Universal web view API' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIEcommerce/TIEcommerce.podspec b/TIEcommerce/TIEcommerce.podspec index 80684688..2c6b3cfc 100644 --- a/TIEcommerce/TIEcommerce.podspec +++ b/TIEcommerce/TIEcommerce.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIEcommerce' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Cart, products, promocodes, bonuses and other related actions' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIFoundationUtils/TIFoundationUtils.podspec b/TIFoundationUtils/TIFoundationUtils.podspec index 814dae4d..c0017dcf 100644 --- a/TIFoundationUtils/TIFoundationUtils.podspec +++ b/TIFoundationUtils/TIFoundationUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIFoundationUtils' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Set of helpers for Foundation framework classes.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIGoogleMapUtils/TIGoogleMapUtils.podspec b/TIGoogleMapUtils/TIGoogleMapUtils.podspec index 3a31c891..85aa6953 100644 --- a/TIGoogleMapUtils/TIGoogleMapUtils.podspec +++ b/TIGoogleMapUtils/TIGoogleMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIGoogleMapUtils' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Set of helpers for map objects clustering and interacting using Google Maps SDK.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIKeychainUtils/TIKeychainUtils.podspec b/TIKeychainUtils/TIKeychainUtils.podspec index 9dcc348d..242a9151 100644 --- a/TIKeychainUtils/TIKeychainUtils.podspec +++ b/TIKeychainUtils/TIKeychainUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIKeychainUtils' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Set of helpers for Keychain classes.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIMapUtils/TIMapUtils.podspec b/TIMapUtils/TIMapUtils.podspec index bd226a6b..0da3fd72 100644 --- a/TIMapUtils/TIMapUtils.podspec +++ b/TIMapUtils/TIMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIMapUtils' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Set of helpers for map objects clustering and interacting.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIMoyaNetworking/TIMoyaNetworking.podspec b/TIMoyaNetworking/TIMoyaNetworking.podspec index 1ccd3939..eef07140 100644 --- a/TIMoyaNetworking/TIMoyaNetworking.podspec +++ b/TIMoyaNetworking/TIMoyaNetworking.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIMoyaNetworking' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Moya + Swagger network service.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TINetworking/TINetworking.podspec b/TINetworking/TINetworking.podspec index 1b35c434..9ac652b1 100644 --- a/TINetworking/TINetworking.podspec +++ b/TINetworking/TINetworking.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TINetworking' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Swagger-frendly networking layer helpers.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TINetworkingCache/TINetworkingCache.podspec b/TINetworkingCache/TINetworkingCache.podspec index f2a1ad6c..8d99096c 100644 --- a/TINetworkingCache/TINetworkingCache.podspec +++ b/TINetworkingCache/TINetworkingCache.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TINetworkingCache' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Caching results of EndpointRequests.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIPagination/TIPagination.podspec b/TIPagination/TIPagination.podspec index faa154dd..a6842dff 100644 --- a/TIPagination/TIPagination.podspec +++ b/TIPagination/TIPagination.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIPagination' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Generic pagination component.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TISwiftUICore/TISwiftUICore.podspec b/TISwiftUICore/TISwiftUICore.podspec index dca66b9c..0c9e4c24 100644 --- a/TISwiftUICore/TISwiftUICore.podspec +++ b/TISwiftUICore/TISwiftUICore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TISwiftUICore' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Core UI elements: protocols, views and helpers.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TISwiftUtils/TISwiftUtils.podspec b/TISwiftUtils/TISwiftUtils.podspec index b171f9b3..75ceb559 100644 --- a/TISwiftUtils/TISwiftUtils.podspec +++ b/TISwiftUtils/TISwiftUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TISwiftUtils' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Bunch of useful helpers for Swift development.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TITableKitUtils/TITableKitUtils.podspec b/TITableKitUtils/TITableKitUtils.podspec index fdcca1e6..32ccee41 100644 --- a/TITableKitUtils/TITableKitUtils.podspec +++ b/TITableKitUtils/TITableKitUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TITableKitUtils' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Set of helpers for TableKit classes.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIUIElements/TIUIElements.podspec b/TIUIElements/TIUIElements.podspec index 7b76d25c..92f1292c 100644 --- a/TIUIElements/TIUIElements.podspec +++ b/TIUIElements/TIUIElements.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIUIElements' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Bunch of useful protocols and views.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIUIKitCore/TIUIKitCore.podspec b/TIUIKitCore/TIUIKitCore.podspec index f8bc46cc..c9f10082 100644 --- a/TIUIKitCore/TIUIKitCore.podspec +++ b/TIUIKitCore/TIUIKitCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIUIKitCore' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Core UI elements: protocols, views and helpers.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIWebView/TIWebView.podspec b/TIWebView/TIWebView.podspec index 4ad75015..55d6fb1d 100644 --- a/TIWebView/TIWebView.podspec +++ b/TIWebView/TIWebView.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIWebView' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Universal web view API' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/TIYandexMapUtils/TIYandexMapUtils.podspec b/TIYandexMapUtils/TIYandexMapUtils.podspec index 2ec203a1..4d529020 100644 --- a/TIYandexMapUtils/TIYandexMapUtils.podspec +++ b/TIYandexMapUtils/TIYandexMapUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'TIYandexMapUtils' - s.version = '1.36.0' + s.version = '1.36.1' s.summary = 'Set of helpers for map objects clustering and interacting using Yandex Maps SDK.' s.homepage = 'https://gitlab.ti/touchinstinct/LeadKit/tree/' + s.version.to_s + '/' + s.name s.license = { :type => 'MIT', :file => 'LICENSE' } From e4c84ca5110d12b5d873bd6b05f103209d8870e2 Mon Sep 17 00:00:00 2001 From: Vladimir Makarov Date: Tue, 7 Mar 2023 10:32:35 +0100 Subject: [PATCH 14/15] `TIYandexMapUtils` min deployment target updated --- TIYandexMapUtils/TIYandexMapUtils.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TIYandexMapUtils/TIYandexMapUtils.podspec b/TIYandexMapUtils/TIYandexMapUtils.podspec index 4d529020..02e78c07 100644 --- a/TIYandexMapUtils/TIYandexMapUtils.podspec +++ b/TIYandexMapUtils/TIYandexMapUtils.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| s.author = { 'petropavel13' => 'ivan.smolin@touchin.ru' } s.source = { :git => 'https://gitlab.ti/touchinstinct/LeadKit.git', :tag => s.version.to_s } - s.ios.deployment_target = '10.0' + s.ios.deployment_target = '12.0' s.swift_versions = ['5.3'] s.source_files = s.name + '/Sources/**/*' From b533eaaae69cb1870bde67770a1291870e98a718 Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Tue, 7 Mar 2023 13:00:34 +0300 Subject: [PATCH 15/15] fix: remove useless baseView --- .../Protocols/SkeletonsPresenter.swift | 39 +++++---------- .../UIView+PresentingSkeletons.swift | 47 +++++++++---------- ...UIViewController+PresentingSkeletons.swift | 25 ++++++---- 3 files changed, 48 insertions(+), 63 deletions(-) diff --git a/TIUIElements/Sources/Views/Skeletons/Protocols/SkeletonsPresenter.swift b/TIUIElements/Sources/Views/Skeletons/Protocols/SkeletonsPresenter.swift index 31cf529a..b808a121 100644 --- a/TIUIElements/Sources/Views/Skeletons/Protocols/SkeletonsPresenter.swift +++ b/TIUIElements/Sources/Views/Skeletons/Protocols/SkeletonsPresenter.swift @@ -23,7 +23,6 @@ import UIKit public protocol SkeletonsPresenter { - var baseView: UIView? { get } var skeletonsConfiguration: SkeletonsConfiguration { get } var isSkeletonsHidden: Bool { get } var viewsToSkeletone: [UIView] { get } @@ -41,33 +40,11 @@ extension SkeletonsPresenter { public var skeletonsConfiguration: SkeletonsConfiguration { SkeletonsConfiguration() } - - public func showSkeletons() { - baseView?.showSkeletons(on: nil, - viewsToSkeletone: viewsToSkeletone, - skeletonsConfiguration) - } - - public func hideSkeletons() { - baseView?.hideSkeletons(baseView: nil) - } - - public func startAnimation() { - baseView?.startAnimation(baseView: nil) - } - - public func stopAnimation() { - baseView?.stopAnimation(baseView: nil) - } } // MARK: - UIView + SkeletonsPresenter extension SkeletonsPresenter where Self: UIView { - public var baseView: UIView? { - self - } - public var isSkeletonsHidden: Bool { (layer.sublayers ?? []).first { $0 is SkeletonLayer } == nil } @@ -75,20 +52,26 @@ extension SkeletonsPresenter where Self: UIView { public var viewsToSkeletone: [UIView] { skeletonableViews } + + public func showSkeletons() { + showSkeletons(viewsToSkeletone: viewsToSkeletone, + skeletonsConfiguration) + } } // MARK: - UIViewController + SkeletonsPresenter extension SkeletonsPresenter where Self: UIViewController { - public var baseView: UIView? { - view - } - public var isSkeletonsHidden: Bool { (view.layer.sublayers ?? []).first { $0 is SkeletonLayer } == nil } public var viewsToSkeletone: [UIView] { - baseView?.skeletonableViews ?? view.skeletonableViews + view.skeletonableViews + } + + public func showSkeletons() { + showSkeletons(viewsToSkeletone: viewsToSkeletone, + skeletonsConfiguration) } } diff --git a/TIUIElements/Sources/Views/Skeletons/UIView+PresentingSkeletons.swift b/TIUIElements/Sources/Views/Skeletons/UIView+PresentingSkeletons.swift index c1838cf0..9addca50 100644 --- a/TIUIElements/Sources/Views/Skeletons/UIView+PresentingSkeletons.swift +++ b/TIUIElements/Sources/Views/Skeletons/UIView+PresentingSkeletons.swift @@ -26,53 +26,51 @@ extension UIView { // MARK: - Public methods - public func showSkeletons(on baseView: UIView?, - viewsToSkeletone: [UIView]? = nil, - _ config: SkeletonsConfiguration = .init()) { + /// Shows skeletons on the view + /// + /// - Parameters: + /// - viewsToSkeletone: views that will be converted to skeletones. If nil was passed subviews will be converted to skeletons + /// - config: configuration of the skeletons' layers + public func showSkeletons(viewsToSkeletone: [UIView]?, + _ config: SkeletonsConfiguration) { - let baseView = baseView ?? self let viewsToSkeletone = viewsToSkeletone ?? skeletonableViews + isUserInteractionEnabled = false - baseView.isUserInteractionEnabled = false + subviews.forEach { $0.isHidden = true } viewsToSkeletone .flatMap { view in - view.isHidden = true - - return getSkeletonLayer(forView: view, baseView: baseView, withConfiguration: config) + getSkeletonLayer(forView: view, withConfiguration: config) } .map { layer in layer.startAnimation() return layer } - .insert(onto: baseView) + .insert(onto: self) } - public func hideSkeletons(baseView: UIView?) { - let baseView = baseView ?? self + public func hideSkeletons() { + isUserInteractionEnabled = true - baseView.isUserInteractionEnabled = true - - baseView.layer.sublayers?.forEach { layer in + layer.sublayers?.forEach { layer in if let layer = layer as? SkeletonLayer { - layer.remove(from: baseView) + layer.remove(from: self) } } - baseView.skeletonableViews.forEach { - $0.isHidden = false - } + subviews.forEach { $0.isHidden = false} } - public func startAnimation(baseView: UIView?) { - baseView?.layer.skeletonLayers.forEach { layer in + public func startAnimation() { + layer.skeletonLayers.forEach { layer in layer.startAnimation() } } - public func stopAnimation(baseView: UIView?) { - baseView?.layer.skeletonLayers.forEach { layer in + public func stopAnimation() { + layer.skeletonLayers.forEach { layer in layer.stopAnimation() } } @@ -80,10 +78,9 @@ extension UIView { // MARK: - Private methods private func getSkeletonLayer(forView view: UIView, - baseView: UIView, withConfiguration conf: SkeletonsConfiguration) -> [SkeletonLayer] { - let skeletonLayer = conf.createSkeletonLayer(for: baseView) + let skeletonLayer = conf.createSkeletonLayer(for: self) var subviewSkeletonLayers = [SkeletonLayer]() if view.isSkeletonsContainer { @@ -92,7 +89,7 @@ extension UIView { } subviewSkeletonLayers = view.skeletonableViews - .map { getSkeletonLayer(forView: $0, baseView: baseView, withConfiguration: conf) } + .map { getSkeletonLayer(forView: $0, withConfiguration: conf) } .flatMap { $0 } } else { diff --git a/TIUIElements/Sources/Views/Skeletons/UIViewController+PresentingSkeletons.swift b/TIUIElements/Sources/Views/Skeletons/UIViewController+PresentingSkeletons.swift index a4eb1ee0..3af38aa4 100644 --- a/TIUIElements/Sources/Views/Skeletons/UIViewController+PresentingSkeletons.swift +++ b/TIUIElements/Sources/Views/Skeletons/UIViewController+PresentingSkeletons.swift @@ -23,22 +23,27 @@ import UIKit extension UIViewController { - public func showSkeletons(on baseView: UIView?, - viewsToSkeletone: [UIView]? = nil, - _ config: SkeletonsConfiguration = .init()) { - (baseView ?? view).showSkeletons(on: nil, viewsToSkeletone: viewsToSkeletone, config) + /// Shows skeletons + /// + /// - Parameters: + /// - viewsToSkeletone: views that will be converted to skeletones. If nil was passed subviews of the view will be converted to skeletons + /// - config: configuration of the skeletons' layers + public func showSkeletons(viewsToSkeletone: [UIView]?, + _ config: SkeletonsConfiguration) { + + view.showSkeletons(viewsToSkeletone: viewsToSkeletone, config) } - public func hideSkeletons(baseView: UIView?) { - (baseView ?? view).hideSkeletons(baseView: nil) + public func hideSkeletons() { + view.hideSkeletons() } - public func startAnimation(baseView: UIView?) { - (baseView ?? view).startAnimation(baseView: nil) + public func startAnimation() { + view.startAnimation() } - public func stopAnimation(baseView: UIView?) { - (baseView ?? view).stopAnimation(baseView: nil) + public func stopAnimation() { + view.stopAnimation() } }