From 1d811cd2ab9653860edceee6b5d66b28d46b0fd6 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Mon, 23 Dec 2024 16:24:25 +0100 Subject: [PATCH 1/2] reorganize helpers folder --- .../Helpers/{ => Swift}/Array+Safe.swift | 0 .../{ => Swift}/Collection+Helpers.swift | 0 .../{ => Swift}/Optional+Helpers.swift | 0 .../Helpers/SwiftUI/View+Observe.swift | 17 +++++++++++++++++ .../{ => UIKit}/UIEdgeInsets+Helpers.swift | 0 .../Helpers/{ => UIKit}/UIView+Helpers.swift | 0 .../Modal/SwiftUI/Helpers/View+Helpers.swift | 19 ------------------- .../{Helpers => Shared/Types}/Paddings.swift | 0 8 files changed, 17 insertions(+), 19 deletions(-) rename Sources/ComponentsKit/Helpers/{ => Swift}/Array+Safe.swift (100%) rename Sources/ComponentsKit/Helpers/{ => Swift}/Collection+Helpers.swift (100%) rename Sources/ComponentsKit/Helpers/{ => Swift}/Optional+Helpers.swift (100%) create mode 100644 Sources/ComponentsKit/Helpers/SwiftUI/View+Observe.swift rename Sources/ComponentsKit/Helpers/{ => UIKit}/UIEdgeInsets+Helpers.swift (100%) rename Sources/ComponentsKit/Helpers/{ => UIKit}/UIView+Helpers.swift (100%) rename Sources/ComponentsKit/{Helpers => Shared/Types}/Paddings.swift (100%) diff --git a/Sources/ComponentsKit/Helpers/Array+Safe.swift b/Sources/ComponentsKit/Helpers/Swift/Array+Safe.swift similarity index 100% rename from Sources/ComponentsKit/Helpers/Array+Safe.swift rename to Sources/ComponentsKit/Helpers/Swift/Array+Safe.swift diff --git a/Sources/ComponentsKit/Helpers/Collection+Helpers.swift b/Sources/ComponentsKit/Helpers/Swift/Collection+Helpers.swift similarity index 100% rename from Sources/ComponentsKit/Helpers/Collection+Helpers.swift rename to Sources/ComponentsKit/Helpers/Swift/Collection+Helpers.swift diff --git a/Sources/ComponentsKit/Helpers/Optional+Helpers.swift b/Sources/ComponentsKit/Helpers/Swift/Optional+Helpers.swift similarity index 100% rename from Sources/ComponentsKit/Helpers/Optional+Helpers.swift rename to Sources/ComponentsKit/Helpers/Swift/Optional+Helpers.swift diff --git a/Sources/ComponentsKit/Helpers/SwiftUI/View+Observe.swift b/Sources/ComponentsKit/Helpers/SwiftUI/View+Observe.swift new file mode 100644 index 00000000..45e25d79 --- /dev/null +++ b/Sources/ComponentsKit/Helpers/SwiftUI/View+Observe.swift @@ -0,0 +1,17 @@ +import SwiftUI + +extension View { + func observeSize(_ closure: @escaping (_ size: CGSize) -> Void) -> some View { + return self.overlay( + GeometryReader { geometry in + Color.clear + .onAppear { + closure(geometry.size) + } + .onChange(of: geometry.size) { newValue in + closure(newValue) + } + } + ) + } +} diff --git a/Sources/ComponentsKit/Helpers/UIEdgeInsets+Helpers.swift b/Sources/ComponentsKit/Helpers/UIKit/UIEdgeInsets+Helpers.swift similarity index 100% rename from Sources/ComponentsKit/Helpers/UIEdgeInsets+Helpers.swift rename to Sources/ComponentsKit/Helpers/UIKit/UIEdgeInsets+Helpers.swift diff --git a/Sources/ComponentsKit/Helpers/UIView+Helpers.swift b/Sources/ComponentsKit/Helpers/UIKit/UIView+Helpers.swift similarity index 100% rename from Sources/ComponentsKit/Helpers/UIView+Helpers.swift rename to Sources/ComponentsKit/Helpers/UIKit/UIView+Helpers.swift diff --git a/Sources/ComponentsKit/Modal/SwiftUI/Helpers/View+Helpers.swift b/Sources/ComponentsKit/Modal/SwiftUI/Helpers/View+Helpers.swift index 0bfef577..5f874ce9 100644 --- a/Sources/ComponentsKit/Modal/SwiftUI/Helpers/View+Helpers.swift +++ b/Sources/ComponentsKit/Modal/SwiftUI/Helpers/View+Helpers.swift @@ -36,22 +36,3 @@ extension View { } } } - -// MARK: - Observe Size - -// TODO: Move to Shared Helpers -extension View { - func observeSize(_ closure: @escaping (_ size: CGSize) -> Void) -> some View { - return self.overlay( - GeometryReader { geometry in - Color.clear - .onAppear { - closure(geometry.size) - } - .onChange(of: geometry.size) { newValue in - closure(newValue) - } - } - ) - } -} diff --git a/Sources/ComponentsKit/Helpers/Paddings.swift b/Sources/ComponentsKit/Shared/Types/Paddings.swift similarity index 100% rename from Sources/ComponentsKit/Helpers/Paddings.swift rename to Sources/ComponentsKit/Shared/Types/Paddings.swift From 8b6414d4b0e7d3bba275df9f51905c7cb04994af Mon Sep 17 00:00:00 2001 From: Mikhail Date: Mon, 23 Dec 2024 18:13:36 +0100 Subject: [PATCH 2/2] move modal to components --- .../{ => Components}/Modal/Models/BottomModalVM.swift | 0 .../{ => Components}/Modal/Models/CenterModalVM.swift | 0 .../{ => Components}/Modal/Models/ModalOverlayStyle.swift | 0 .../ComponentsKit/{ => Components}/Modal/Models/ModalSize.swift | 0 .../{ => Components}/Modal/Models/ModalTransition.swift | 0 Sources/ComponentsKit/{ => Components}/Modal/Models/ModalVM.swift | 0 .../{ => Components}/Modal/SharedHelpers/ModalAnimation.swift | 0 .../Modal/SwiftUI/Helpers/ModalPresentationModifier.swift | 0 .../Modal/SwiftUI/Helpers/ModalPresentationWithItemModifier.swift | 0 .../{ => Components}/Modal/SwiftUI/Helpers/View+Helpers.swift | 0 .../{ => Components}/Modal/SwiftUI/ModalContent.swift | 0 .../{ => Components}/Modal/SwiftUI/ModalOverlay.swift | 0 .../{ => Components}/Modal/SwiftUI/SUBottomModal.swift | 0 .../{ => Components}/Modal/SwiftUI/SUCenterModal.swift | 0 .../Modal/UIKit/Helpers/ContentSizedScrollView.swift | 0 .../{ => Components}/Modal/UIKit/UKBottomModalController.swift | 0 .../{ => Components}/Modal/UIKit/UKCenterModalController.swift | 0 .../{ => Components}/Modal/UIKit/UKModalController.swift | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename Sources/ComponentsKit/{ => Components}/Modal/Models/BottomModalVM.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/Models/CenterModalVM.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/Models/ModalOverlayStyle.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/Models/ModalSize.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/Models/ModalTransition.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/Models/ModalVM.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/SharedHelpers/ModalAnimation.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/SwiftUI/Helpers/ModalPresentationModifier.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/SwiftUI/Helpers/ModalPresentationWithItemModifier.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/SwiftUI/Helpers/View+Helpers.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/SwiftUI/ModalContent.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/SwiftUI/ModalOverlay.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/SwiftUI/SUBottomModal.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/SwiftUI/SUCenterModal.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/UIKit/Helpers/ContentSizedScrollView.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/UIKit/UKBottomModalController.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/UIKit/UKCenterModalController.swift (100%) rename Sources/ComponentsKit/{ => Components}/Modal/UIKit/UKModalController.swift (100%) diff --git a/Sources/ComponentsKit/Modal/Models/BottomModalVM.swift b/Sources/ComponentsKit/Components/Modal/Models/BottomModalVM.swift similarity index 100% rename from Sources/ComponentsKit/Modal/Models/BottomModalVM.swift rename to Sources/ComponentsKit/Components/Modal/Models/BottomModalVM.swift diff --git a/Sources/ComponentsKit/Modal/Models/CenterModalVM.swift b/Sources/ComponentsKit/Components/Modal/Models/CenterModalVM.swift similarity index 100% rename from Sources/ComponentsKit/Modal/Models/CenterModalVM.swift rename to Sources/ComponentsKit/Components/Modal/Models/CenterModalVM.swift diff --git a/Sources/ComponentsKit/Modal/Models/ModalOverlayStyle.swift b/Sources/ComponentsKit/Components/Modal/Models/ModalOverlayStyle.swift similarity index 100% rename from Sources/ComponentsKit/Modal/Models/ModalOverlayStyle.swift rename to Sources/ComponentsKit/Components/Modal/Models/ModalOverlayStyle.swift diff --git a/Sources/ComponentsKit/Modal/Models/ModalSize.swift b/Sources/ComponentsKit/Components/Modal/Models/ModalSize.swift similarity index 100% rename from Sources/ComponentsKit/Modal/Models/ModalSize.swift rename to Sources/ComponentsKit/Components/Modal/Models/ModalSize.swift diff --git a/Sources/ComponentsKit/Modal/Models/ModalTransition.swift b/Sources/ComponentsKit/Components/Modal/Models/ModalTransition.swift similarity index 100% rename from Sources/ComponentsKit/Modal/Models/ModalTransition.swift rename to Sources/ComponentsKit/Components/Modal/Models/ModalTransition.swift diff --git a/Sources/ComponentsKit/Modal/Models/ModalVM.swift b/Sources/ComponentsKit/Components/Modal/Models/ModalVM.swift similarity index 100% rename from Sources/ComponentsKit/Modal/Models/ModalVM.swift rename to Sources/ComponentsKit/Components/Modal/Models/ModalVM.swift diff --git a/Sources/ComponentsKit/Modal/SharedHelpers/ModalAnimation.swift b/Sources/ComponentsKit/Components/Modal/SharedHelpers/ModalAnimation.swift similarity index 100% rename from Sources/ComponentsKit/Modal/SharedHelpers/ModalAnimation.swift rename to Sources/ComponentsKit/Components/Modal/SharedHelpers/ModalAnimation.swift diff --git a/Sources/ComponentsKit/Modal/SwiftUI/Helpers/ModalPresentationModifier.swift b/Sources/ComponentsKit/Components/Modal/SwiftUI/Helpers/ModalPresentationModifier.swift similarity index 100% rename from Sources/ComponentsKit/Modal/SwiftUI/Helpers/ModalPresentationModifier.swift rename to Sources/ComponentsKit/Components/Modal/SwiftUI/Helpers/ModalPresentationModifier.swift diff --git a/Sources/ComponentsKit/Modal/SwiftUI/Helpers/ModalPresentationWithItemModifier.swift b/Sources/ComponentsKit/Components/Modal/SwiftUI/Helpers/ModalPresentationWithItemModifier.swift similarity index 100% rename from Sources/ComponentsKit/Modal/SwiftUI/Helpers/ModalPresentationWithItemModifier.swift rename to Sources/ComponentsKit/Components/Modal/SwiftUI/Helpers/ModalPresentationWithItemModifier.swift diff --git a/Sources/ComponentsKit/Modal/SwiftUI/Helpers/View+Helpers.swift b/Sources/ComponentsKit/Components/Modal/SwiftUI/Helpers/View+Helpers.swift similarity index 100% rename from Sources/ComponentsKit/Modal/SwiftUI/Helpers/View+Helpers.swift rename to Sources/ComponentsKit/Components/Modal/SwiftUI/Helpers/View+Helpers.swift diff --git a/Sources/ComponentsKit/Modal/SwiftUI/ModalContent.swift b/Sources/ComponentsKit/Components/Modal/SwiftUI/ModalContent.swift similarity index 100% rename from Sources/ComponentsKit/Modal/SwiftUI/ModalContent.swift rename to Sources/ComponentsKit/Components/Modal/SwiftUI/ModalContent.swift diff --git a/Sources/ComponentsKit/Modal/SwiftUI/ModalOverlay.swift b/Sources/ComponentsKit/Components/Modal/SwiftUI/ModalOverlay.swift similarity index 100% rename from Sources/ComponentsKit/Modal/SwiftUI/ModalOverlay.swift rename to Sources/ComponentsKit/Components/Modal/SwiftUI/ModalOverlay.swift diff --git a/Sources/ComponentsKit/Modal/SwiftUI/SUBottomModal.swift b/Sources/ComponentsKit/Components/Modal/SwiftUI/SUBottomModal.swift similarity index 100% rename from Sources/ComponentsKit/Modal/SwiftUI/SUBottomModal.swift rename to Sources/ComponentsKit/Components/Modal/SwiftUI/SUBottomModal.swift diff --git a/Sources/ComponentsKit/Modal/SwiftUI/SUCenterModal.swift b/Sources/ComponentsKit/Components/Modal/SwiftUI/SUCenterModal.swift similarity index 100% rename from Sources/ComponentsKit/Modal/SwiftUI/SUCenterModal.swift rename to Sources/ComponentsKit/Components/Modal/SwiftUI/SUCenterModal.swift diff --git a/Sources/ComponentsKit/Modal/UIKit/Helpers/ContentSizedScrollView.swift b/Sources/ComponentsKit/Components/Modal/UIKit/Helpers/ContentSizedScrollView.swift similarity index 100% rename from Sources/ComponentsKit/Modal/UIKit/Helpers/ContentSizedScrollView.swift rename to Sources/ComponentsKit/Components/Modal/UIKit/Helpers/ContentSizedScrollView.swift diff --git a/Sources/ComponentsKit/Modal/UIKit/UKBottomModalController.swift b/Sources/ComponentsKit/Components/Modal/UIKit/UKBottomModalController.swift similarity index 100% rename from Sources/ComponentsKit/Modal/UIKit/UKBottomModalController.swift rename to Sources/ComponentsKit/Components/Modal/UIKit/UKBottomModalController.swift diff --git a/Sources/ComponentsKit/Modal/UIKit/UKCenterModalController.swift b/Sources/ComponentsKit/Components/Modal/UIKit/UKCenterModalController.swift similarity index 100% rename from Sources/ComponentsKit/Modal/UIKit/UKCenterModalController.swift rename to Sources/ComponentsKit/Components/Modal/UIKit/UKCenterModalController.swift diff --git a/Sources/ComponentsKit/Modal/UIKit/UKModalController.swift b/Sources/ComponentsKit/Components/Modal/UIKit/UKModalController.swift similarity index 100% rename from Sources/ComponentsKit/Modal/UIKit/UKModalController.swift rename to Sources/ComponentsKit/Components/Modal/UIKit/UKModalController.swift