From 0440216bcf0828c476ccedbb49ec8e4299c65d14 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 18 May 2022 15:56:43 +1000 Subject: [PATCH 1/6] Move all sources in `WordPressUI/Sources/` folder Will tidy things up in here before moving out to the root to comply with the SPM standards. --- WordPressUI.xcodeproj/project.pbxproj | 30 +++++++++++------- .../BottomSheetAnimationController.swift | 0 .../BottomSheetViewController.swift | 0 .../DrawerPresentationController.swift | 0 .../BottomSheet/GripButton.swift | 0 .../Categories/UIColor+Helpers.h | 0 .../Categories/UIColor+Helpers.m | 0 .../{ => Sources}/Categories/UIImage+Resize.h | 0 .../{ => Sources}/Categories/UIImage+Resize.m | 0 .../{ => Sources}/Categories/UIImage+Util.h | 0 .../{ => Sources}/Categories/UIImage+Util.m | 0 .../Categories/UILabel+SuggestSize.h | 0 .../Categories/UILabel+SuggestSize.m | 0 .../Constants/UIKitConstants.swift | 0 .../UIBarButtonItem+BlockEvents.swift | 0 .../BlockEvents/UIControl+BlockEvents.swift | 0 .../UIGestureRecognizer+BlockEvents.swift | 0 .../CGAffineTransform+Helpers.swift | 0 .../Extensions/Gravatar/Gravatar.swift | 0 .../Extensions/Gravatar/NSString+Gravatar.h | 0 .../Extensions/Gravatar/NSString+Gravatar.m | 0 .../Extensions/NSBundle+ResourceBundle.swift | 0 .../NSMutableAttributedString+Helpers.swift | 0 .../UIAlertController+Helpers.swift | 0 .../Extensions/UIControl+Helpers.swift | 0 .../Extensions/UIDevice+Helpers.swift | 0 .../Extensions/UIImage+Assets.swift | 0 .../Extensions/UIImage+Crop.swift | 0 .../Extensions/UIImage+Rotation.swift | 0 .../Extensions/UIImage+Tint.swift | 0 .../Extensions/UIImageView+Blavatar.swift | 0 .../Extensions/UIImageView+Gravatar.swift | 0 .../Extensions/UIImageView+Networking.swift | 0 .../Extensions/UITableView+Helpers.swift | 0 .../UITableViewController+Helpers.swift | 0 .../Extensions/UITextField+TextHelper.swift | 0 .../Extensions/UIView+Animations.swift | 0 .../Extensions/UIView+Helpers.swift | 0 ...UIViewController+ChildViewController.swift | 0 .../Extensions/UIViewController+Helpers.swift | 0 .../Extensions/UIWindow+Helpers.swift | 0 .../FancyAlertPresentationController.swift | 0 .../FancyAlert/FancyAlertView.swift | 0 .../FancyAlert/FancyAlertViewController.swift | 0 .../FancyAlert/FancyAlerts.storyboard | 0 .../FancyAlert/FancyButton.swift | 0 .../FlingableView/FlingableViewHandler.swift | 0 .../{ => Sources}/Ghosts/GhostOptions.swift | 0 .../{ => Sources}/Ghosts/GhostStyle.swift | 0 .../{ => Sources}/Ghosts/GhostableView.swift | 0 .../Ghosts/Internal/GhostAnimation.swift | 0 .../Internal/GhostCollectionViewHandler.swift | 0 .../Ghosts/Internal/GhostLayer.swift | 0 .../Internal/GhostTableViewHandler.swift | 0 .../Ghosts/Internal/UIView+InnerGhost.swift | 0 .../Ghosts/UICollectionView+Ghost.swift | 0 .../Ghosts/UITableView+Ghost.swift | 0 .../{ => Sources}/Ghosts/UIView+Ghost.swift | 0 WordPressUI/{ => Sources}/Info.plist | 0 .../Resources/Assets.xcassets/Contents.json | 0 .../blavatar.imageset/Contents.json | 0 .../blavatar.imageset/blavatar-default.pdf | Bin .../gravatar.imageset/Contents.json | 0 .../gravatar.imageset/gravatar.pdf | Bin .../icon-url-field.imageset/Contents.json | 0 .../icon-url-field.pdf | Bin .../{ => Sources}/Tools/GradientView.swift | 0 ...otationAwareNavigationViewController.swift | 0 WordPressUI/{ => Sources}/WordPressUI.h | 0 69 files changed, 19 insertions(+), 11 deletions(-) rename WordPressUI/{ => Sources}/BottomSheet/BottomSheetAnimationController.swift (100%) rename WordPressUI/{ => Sources}/BottomSheet/BottomSheetViewController.swift (100%) rename WordPressUI/{ => Sources}/BottomSheet/DrawerPresentationController.swift (100%) rename WordPressUI/{ => Sources}/BottomSheet/GripButton.swift (100%) rename WordPressUI/{ => Sources}/Categories/UIColor+Helpers.h (100%) rename WordPressUI/{ => Sources}/Categories/UIColor+Helpers.m (100%) rename WordPressUI/{ => Sources}/Categories/UIImage+Resize.h (100%) rename WordPressUI/{ => Sources}/Categories/UIImage+Resize.m (100%) rename WordPressUI/{ => Sources}/Categories/UIImage+Util.h (100%) rename WordPressUI/{ => Sources}/Categories/UIImage+Util.m (100%) rename WordPressUI/{ => Sources}/Categories/UILabel+SuggestSize.h (100%) rename WordPressUI/{ => Sources}/Categories/UILabel+SuggestSize.m (100%) rename WordPressUI/{ => Sources}/Constants/UIKitConstants.swift (100%) rename WordPressUI/{ => Sources}/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift (100%) rename WordPressUI/{ => Sources}/Extensions/BlockEvents/UIControl+BlockEvents.swift (100%) rename WordPressUI/{ => Sources}/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift (100%) rename WordPressUI/{ => Sources}/Extensions/CGAffineTransform+Helpers.swift (100%) rename WordPressUI/{ => Sources}/Extensions/Gravatar/Gravatar.swift (100%) rename WordPressUI/{ => Sources}/Extensions/Gravatar/NSString+Gravatar.h (100%) rename WordPressUI/{ => Sources}/Extensions/Gravatar/NSString+Gravatar.m (100%) rename WordPressUI/{ => Sources}/Extensions/NSBundle+ResourceBundle.swift (100%) rename WordPressUI/{ => Sources}/Extensions/NSMutableAttributedString+Helpers.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UIAlertController+Helpers.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UIControl+Helpers.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UIDevice+Helpers.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UIImage+Assets.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UIImage+Crop.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UIImage+Rotation.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UIImage+Tint.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UIImageView+Blavatar.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UIImageView+Gravatar.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UIImageView+Networking.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UITableView+Helpers.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UITableViewController+Helpers.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UITextField+TextHelper.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UIView+Animations.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UIView+Helpers.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UIViewController+ChildViewController.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UIViewController+Helpers.swift (100%) rename WordPressUI/{ => Sources}/Extensions/UIWindow+Helpers.swift (100%) rename WordPressUI/{ => Sources}/FancyAlert/FancyAlertPresentationController.swift (100%) rename WordPressUI/{ => Sources}/FancyAlert/FancyAlertView.swift (100%) rename WordPressUI/{ => Sources}/FancyAlert/FancyAlertViewController.swift (100%) rename WordPressUI/{ => Sources}/FancyAlert/FancyAlerts.storyboard (100%) rename WordPressUI/{ => Sources}/FancyAlert/FancyButton.swift (100%) rename WordPressUI/{ => Sources}/FlingableView/FlingableViewHandler.swift (100%) rename WordPressUI/{ => Sources}/Ghosts/GhostOptions.swift (100%) rename WordPressUI/{ => Sources}/Ghosts/GhostStyle.swift (100%) rename WordPressUI/{ => Sources}/Ghosts/GhostableView.swift (100%) rename WordPressUI/{ => Sources}/Ghosts/Internal/GhostAnimation.swift (100%) rename WordPressUI/{ => Sources}/Ghosts/Internal/GhostCollectionViewHandler.swift (100%) rename WordPressUI/{ => Sources}/Ghosts/Internal/GhostLayer.swift (100%) rename WordPressUI/{ => Sources}/Ghosts/Internal/GhostTableViewHandler.swift (100%) rename WordPressUI/{ => Sources}/Ghosts/Internal/UIView+InnerGhost.swift (100%) rename WordPressUI/{ => Sources}/Ghosts/UICollectionView+Ghost.swift (100%) rename WordPressUI/{ => Sources}/Ghosts/UITableView+Ghost.swift (100%) rename WordPressUI/{ => Sources}/Ghosts/UIView+Ghost.swift (100%) rename WordPressUI/{ => Sources}/Info.plist (100%) rename WordPressUI/{ => Sources}/Resources/Assets.xcassets/Contents.json (100%) rename WordPressUI/{ => Sources}/Resources/Assets.xcassets/blavatar.imageset/Contents.json (100%) rename WordPressUI/{ => Sources}/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf (100%) rename WordPressUI/{ => Sources}/Resources/Assets.xcassets/gravatar.imageset/Contents.json (100%) rename WordPressUI/{ => Sources}/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf (100%) rename WordPressUI/{ => Sources}/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json (100%) rename WordPressUI/{ => Sources}/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf (100%) rename WordPressUI/{ => Sources}/Tools/GradientView.swift (100%) rename WordPressUI/{ => Sources}/Tools/RotationAwareNavigationViewController.swift (100%) rename WordPressUI/{ => Sources}/WordPressUI.h (100%) diff --git a/WordPressUI.xcodeproj/project.pbxproj b/WordPressUI.xcodeproj/project.pbxproj index d19de2e..7aa6b71 100644 --- a/WordPressUI.xcodeproj/project.pbxproj +++ b/WordPressUI.xcodeproj/project.pbxproj @@ -189,6 +189,24 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 3FC095F42834C1E200C8477D /* Sources */ = { + isa = PBXGroup; + children = ( + 8B5100D0244F6C0200672D74 /* BottomSheet */, + B534CB3521398609000D5F8D /* Ghosts */, + B592B4482064296500FF568E /* FancyAlert */, + B518D76B20742ADB00F05DB4 /* FlingableView */, + B5A787CB202B2AA6007874FB /* Categories */, + B5A787F3202B3587007874FB /* Constants */, + B5A78799202B1A93007874FB /* Extensions */, + B5393FE8206D7047007BF9D4 /* Tools */, + B58C4EC8207C594300E32E4D /* Resources */, + B59DCB5F202B146D00BEBD8A /* WordPressUI.h */, + B59DCB60202B146D00BEBD8A /* Info.plist */, + ); + path = Sources; + sourceTree = ""; + }; 43067E29203C8CA4001DD610 /* BlockEvents */ = { isa = PBXGroup; children = ( @@ -335,17 +353,7 @@ B59DCB5E202B146D00BEBD8A /* WordPressUI */ = { isa = PBXGroup; children = ( - 8B5100D0244F6C0200672D74 /* BottomSheet */, - B534CB3521398609000D5F8D /* Ghosts */, - B592B4482064296500FF568E /* FancyAlert */, - B518D76B20742ADB00F05DB4 /* FlingableView */, - B5A787CB202B2AA6007874FB /* Categories */, - B5A787F3202B3587007874FB /* Constants */, - B5A78799202B1A93007874FB /* Extensions */, - B5393FE8206D7047007BF9D4 /* Tools */, - B58C4EC8207C594300E32E4D /* Resources */, - B59DCB5F202B146D00BEBD8A /* WordPressUI.h */, - B59DCB60202B146D00BEBD8A /* Info.plist */, + 3FC095F42834C1E200C8477D /* Sources */, ); path = WordPressUI; sourceTree = ""; diff --git a/WordPressUI/BottomSheet/BottomSheetAnimationController.swift b/WordPressUI/Sources/BottomSheet/BottomSheetAnimationController.swift similarity index 100% rename from WordPressUI/BottomSheet/BottomSheetAnimationController.swift rename to WordPressUI/Sources/BottomSheet/BottomSheetAnimationController.swift diff --git a/WordPressUI/BottomSheet/BottomSheetViewController.swift b/WordPressUI/Sources/BottomSheet/BottomSheetViewController.swift similarity index 100% rename from WordPressUI/BottomSheet/BottomSheetViewController.swift rename to WordPressUI/Sources/BottomSheet/BottomSheetViewController.swift diff --git a/WordPressUI/BottomSheet/DrawerPresentationController.swift b/WordPressUI/Sources/BottomSheet/DrawerPresentationController.swift similarity index 100% rename from WordPressUI/BottomSheet/DrawerPresentationController.swift rename to WordPressUI/Sources/BottomSheet/DrawerPresentationController.swift diff --git a/WordPressUI/BottomSheet/GripButton.swift b/WordPressUI/Sources/BottomSheet/GripButton.swift similarity index 100% rename from WordPressUI/BottomSheet/GripButton.swift rename to WordPressUI/Sources/BottomSheet/GripButton.swift diff --git a/WordPressUI/Categories/UIColor+Helpers.h b/WordPressUI/Sources/Categories/UIColor+Helpers.h similarity index 100% rename from WordPressUI/Categories/UIColor+Helpers.h rename to WordPressUI/Sources/Categories/UIColor+Helpers.h diff --git a/WordPressUI/Categories/UIColor+Helpers.m b/WordPressUI/Sources/Categories/UIColor+Helpers.m similarity index 100% rename from WordPressUI/Categories/UIColor+Helpers.m rename to WordPressUI/Sources/Categories/UIColor+Helpers.m diff --git a/WordPressUI/Categories/UIImage+Resize.h b/WordPressUI/Sources/Categories/UIImage+Resize.h similarity index 100% rename from WordPressUI/Categories/UIImage+Resize.h rename to WordPressUI/Sources/Categories/UIImage+Resize.h diff --git a/WordPressUI/Categories/UIImage+Resize.m b/WordPressUI/Sources/Categories/UIImage+Resize.m similarity index 100% rename from WordPressUI/Categories/UIImage+Resize.m rename to WordPressUI/Sources/Categories/UIImage+Resize.m diff --git a/WordPressUI/Categories/UIImage+Util.h b/WordPressUI/Sources/Categories/UIImage+Util.h similarity index 100% rename from WordPressUI/Categories/UIImage+Util.h rename to WordPressUI/Sources/Categories/UIImage+Util.h diff --git a/WordPressUI/Categories/UIImage+Util.m b/WordPressUI/Sources/Categories/UIImage+Util.m similarity index 100% rename from WordPressUI/Categories/UIImage+Util.m rename to WordPressUI/Sources/Categories/UIImage+Util.m diff --git a/WordPressUI/Categories/UILabel+SuggestSize.h b/WordPressUI/Sources/Categories/UILabel+SuggestSize.h similarity index 100% rename from WordPressUI/Categories/UILabel+SuggestSize.h rename to WordPressUI/Sources/Categories/UILabel+SuggestSize.h diff --git a/WordPressUI/Categories/UILabel+SuggestSize.m b/WordPressUI/Sources/Categories/UILabel+SuggestSize.m similarity index 100% rename from WordPressUI/Categories/UILabel+SuggestSize.m rename to WordPressUI/Sources/Categories/UILabel+SuggestSize.m diff --git a/WordPressUI/Constants/UIKitConstants.swift b/WordPressUI/Sources/Constants/UIKitConstants.swift similarity index 100% rename from WordPressUI/Constants/UIKitConstants.swift rename to WordPressUI/Sources/Constants/UIKitConstants.swift diff --git a/WordPressUI/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift b/WordPressUI/Sources/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift similarity index 100% rename from WordPressUI/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift rename to WordPressUI/Sources/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift diff --git a/WordPressUI/Extensions/BlockEvents/UIControl+BlockEvents.swift b/WordPressUI/Sources/Extensions/BlockEvents/UIControl+BlockEvents.swift similarity index 100% rename from WordPressUI/Extensions/BlockEvents/UIControl+BlockEvents.swift rename to WordPressUI/Sources/Extensions/BlockEvents/UIControl+BlockEvents.swift diff --git a/WordPressUI/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift b/WordPressUI/Sources/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift similarity index 100% rename from WordPressUI/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift rename to WordPressUI/Sources/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift diff --git a/WordPressUI/Extensions/CGAffineTransform+Helpers.swift b/WordPressUI/Sources/Extensions/CGAffineTransform+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/CGAffineTransform+Helpers.swift rename to WordPressUI/Sources/Extensions/CGAffineTransform+Helpers.swift diff --git a/WordPressUI/Extensions/Gravatar/Gravatar.swift b/WordPressUI/Sources/Extensions/Gravatar/Gravatar.swift similarity index 100% rename from WordPressUI/Extensions/Gravatar/Gravatar.swift rename to WordPressUI/Sources/Extensions/Gravatar/Gravatar.swift diff --git a/WordPressUI/Extensions/Gravatar/NSString+Gravatar.h b/WordPressUI/Sources/Extensions/Gravatar/NSString+Gravatar.h similarity index 100% rename from WordPressUI/Extensions/Gravatar/NSString+Gravatar.h rename to WordPressUI/Sources/Extensions/Gravatar/NSString+Gravatar.h diff --git a/WordPressUI/Extensions/Gravatar/NSString+Gravatar.m b/WordPressUI/Sources/Extensions/Gravatar/NSString+Gravatar.m similarity index 100% rename from WordPressUI/Extensions/Gravatar/NSString+Gravatar.m rename to WordPressUI/Sources/Extensions/Gravatar/NSString+Gravatar.m diff --git a/WordPressUI/Extensions/NSBundle+ResourceBundle.swift b/WordPressUI/Sources/Extensions/NSBundle+ResourceBundle.swift similarity index 100% rename from WordPressUI/Extensions/NSBundle+ResourceBundle.swift rename to WordPressUI/Sources/Extensions/NSBundle+ResourceBundle.swift diff --git a/WordPressUI/Extensions/NSMutableAttributedString+Helpers.swift b/WordPressUI/Sources/Extensions/NSMutableAttributedString+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/NSMutableAttributedString+Helpers.swift rename to WordPressUI/Sources/Extensions/NSMutableAttributedString+Helpers.swift diff --git a/WordPressUI/Extensions/UIAlertController+Helpers.swift b/WordPressUI/Sources/Extensions/UIAlertController+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/UIAlertController+Helpers.swift rename to WordPressUI/Sources/Extensions/UIAlertController+Helpers.swift diff --git a/WordPressUI/Extensions/UIControl+Helpers.swift b/WordPressUI/Sources/Extensions/UIControl+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/UIControl+Helpers.swift rename to WordPressUI/Sources/Extensions/UIControl+Helpers.swift diff --git a/WordPressUI/Extensions/UIDevice+Helpers.swift b/WordPressUI/Sources/Extensions/UIDevice+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/UIDevice+Helpers.swift rename to WordPressUI/Sources/Extensions/UIDevice+Helpers.swift diff --git a/WordPressUI/Extensions/UIImage+Assets.swift b/WordPressUI/Sources/Extensions/UIImage+Assets.swift similarity index 100% rename from WordPressUI/Extensions/UIImage+Assets.swift rename to WordPressUI/Sources/Extensions/UIImage+Assets.swift diff --git a/WordPressUI/Extensions/UIImage+Crop.swift b/WordPressUI/Sources/Extensions/UIImage+Crop.swift similarity index 100% rename from WordPressUI/Extensions/UIImage+Crop.swift rename to WordPressUI/Sources/Extensions/UIImage+Crop.swift diff --git a/WordPressUI/Extensions/UIImage+Rotation.swift b/WordPressUI/Sources/Extensions/UIImage+Rotation.swift similarity index 100% rename from WordPressUI/Extensions/UIImage+Rotation.swift rename to WordPressUI/Sources/Extensions/UIImage+Rotation.swift diff --git a/WordPressUI/Extensions/UIImage+Tint.swift b/WordPressUI/Sources/Extensions/UIImage+Tint.swift similarity index 100% rename from WordPressUI/Extensions/UIImage+Tint.swift rename to WordPressUI/Sources/Extensions/UIImage+Tint.swift diff --git a/WordPressUI/Extensions/UIImageView+Blavatar.swift b/WordPressUI/Sources/Extensions/UIImageView+Blavatar.swift similarity index 100% rename from WordPressUI/Extensions/UIImageView+Blavatar.swift rename to WordPressUI/Sources/Extensions/UIImageView+Blavatar.swift diff --git a/WordPressUI/Extensions/UIImageView+Gravatar.swift b/WordPressUI/Sources/Extensions/UIImageView+Gravatar.swift similarity index 100% rename from WordPressUI/Extensions/UIImageView+Gravatar.swift rename to WordPressUI/Sources/Extensions/UIImageView+Gravatar.swift diff --git a/WordPressUI/Extensions/UIImageView+Networking.swift b/WordPressUI/Sources/Extensions/UIImageView+Networking.swift similarity index 100% rename from WordPressUI/Extensions/UIImageView+Networking.swift rename to WordPressUI/Sources/Extensions/UIImageView+Networking.swift diff --git a/WordPressUI/Extensions/UITableView+Helpers.swift b/WordPressUI/Sources/Extensions/UITableView+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/UITableView+Helpers.swift rename to WordPressUI/Sources/Extensions/UITableView+Helpers.swift diff --git a/WordPressUI/Extensions/UITableViewController+Helpers.swift b/WordPressUI/Sources/Extensions/UITableViewController+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/UITableViewController+Helpers.swift rename to WordPressUI/Sources/Extensions/UITableViewController+Helpers.swift diff --git a/WordPressUI/Extensions/UITextField+TextHelper.swift b/WordPressUI/Sources/Extensions/UITextField+TextHelper.swift similarity index 100% rename from WordPressUI/Extensions/UITextField+TextHelper.swift rename to WordPressUI/Sources/Extensions/UITextField+TextHelper.swift diff --git a/WordPressUI/Extensions/UIView+Animations.swift b/WordPressUI/Sources/Extensions/UIView+Animations.swift similarity index 100% rename from WordPressUI/Extensions/UIView+Animations.swift rename to WordPressUI/Sources/Extensions/UIView+Animations.swift diff --git a/WordPressUI/Extensions/UIView+Helpers.swift b/WordPressUI/Sources/Extensions/UIView+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/UIView+Helpers.swift rename to WordPressUI/Sources/Extensions/UIView+Helpers.swift diff --git a/WordPressUI/Extensions/UIViewController+ChildViewController.swift b/WordPressUI/Sources/Extensions/UIViewController+ChildViewController.swift similarity index 100% rename from WordPressUI/Extensions/UIViewController+ChildViewController.swift rename to WordPressUI/Sources/Extensions/UIViewController+ChildViewController.swift diff --git a/WordPressUI/Extensions/UIViewController+Helpers.swift b/WordPressUI/Sources/Extensions/UIViewController+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/UIViewController+Helpers.swift rename to WordPressUI/Sources/Extensions/UIViewController+Helpers.swift diff --git a/WordPressUI/Extensions/UIWindow+Helpers.swift b/WordPressUI/Sources/Extensions/UIWindow+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/UIWindow+Helpers.swift rename to WordPressUI/Sources/Extensions/UIWindow+Helpers.swift diff --git a/WordPressUI/FancyAlert/FancyAlertPresentationController.swift b/WordPressUI/Sources/FancyAlert/FancyAlertPresentationController.swift similarity index 100% rename from WordPressUI/FancyAlert/FancyAlertPresentationController.swift rename to WordPressUI/Sources/FancyAlert/FancyAlertPresentationController.swift diff --git a/WordPressUI/FancyAlert/FancyAlertView.swift b/WordPressUI/Sources/FancyAlert/FancyAlertView.swift similarity index 100% rename from WordPressUI/FancyAlert/FancyAlertView.swift rename to WordPressUI/Sources/FancyAlert/FancyAlertView.swift diff --git a/WordPressUI/FancyAlert/FancyAlertViewController.swift b/WordPressUI/Sources/FancyAlert/FancyAlertViewController.swift similarity index 100% rename from WordPressUI/FancyAlert/FancyAlertViewController.swift rename to WordPressUI/Sources/FancyAlert/FancyAlertViewController.swift diff --git a/WordPressUI/FancyAlert/FancyAlerts.storyboard b/WordPressUI/Sources/FancyAlert/FancyAlerts.storyboard similarity index 100% rename from WordPressUI/FancyAlert/FancyAlerts.storyboard rename to WordPressUI/Sources/FancyAlert/FancyAlerts.storyboard diff --git a/WordPressUI/FancyAlert/FancyButton.swift b/WordPressUI/Sources/FancyAlert/FancyButton.swift similarity index 100% rename from WordPressUI/FancyAlert/FancyButton.swift rename to WordPressUI/Sources/FancyAlert/FancyButton.swift diff --git a/WordPressUI/FlingableView/FlingableViewHandler.swift b/WordPressUI/Sources/FlingableView/FlingableViewHandler.swift similarity index 100% rename from WordPressUI/FlingableView/FlingableViewHandler.swift rename to WordPressUI/Sources/FlingableView/FlingableViewHandler.swift diff --git a/WordPressUI/Ghosts/GhostOptions.swift b/WordPressUI/Sources/Ghosts/GhostOptions.swift similarity index 100% rename from WordPressUI/Ghosts/GhostOptions.swift rename to WordPressUI/Sources/Ghosts/GhostOptions.swift diff --git a/WordPressUI/Ghosts/GhostStyle.swift b/WordPressUI/Sources/Ghosts/GhostStyle.swift similarity index 100% rename from WordPressUI/Ghosts/GhostStyle.swift rename to WordPressUI/Sources/Ghosts/GhostStyle.swift diff --git a/WordPressUI/Ghosts/GhostableView.swift b/WordPressUI/Sources/Ghosts/GhostableView.swift similarity index 100% rename from WordPressUI/Ghosts/GhostableView.swift rename to WordPressUI/Sources/Ghosts/GhostableView.swift diff --git a/WordPressUI/Ghosts/Internal/GhostAnimation.swift b/WordPressUI/Sources/Ghosts/Internal/GhostAnimation.swift similarity index 100% rename from WordPressUI/Ghosts/Internal/GhostAnimation.swift rename to WordPressUI/Sources/Ghosts/Internal/GhostAnimation.swift diff --git a/WordPressUI/Ghosts/Internal/GhostCollectionViewHandler.swift b/WordPressUI/Sources/Ghosts/Internal/GhostCollectionViewHandler.swift similarity index 100% rename from WordPressUI/Ghosts/Internal/GhostCollectionViewHandler.swift rename to WordPressUI/Sources/Ghosts/Internal/GhostCollectionViewHandler.swift diff --git a/WordPressUI/Ghosts/Internal/GhostLayer.swift b/WordPressUI/Sources/Ghosts/Internal/GhostLayer.swift similarity index 100% rename from WordPressUI/Ghosts/Internal/GhostLayer.swift rename to WordPressUI/Sources/Ghosts/Internal/GhostLayer.swift diff --git a/WordPressUI/Ghosts/Internal/GhostTableViewHandler.swift b/WordPressUI/Sources/Ghosts/Internal/GhostTableViewHandler.swift similarity index 100% rename from WordPressUI/Ghosts/Internal/GhostTableViewHandler.swift rename to WordPressUI/Sources/Ghosts/Internal/GhostTableViewHandler.swift diff --git a/WordPressUI/Ghosts/Internal/UIView+InnerGhost.swift b/WordPressUI/Sources/Ghosts/Internal/UIView+InnerGhost.swift similarity index 100% rename from WordPressUI/Ghosts/Internal/UIView+InnerGhost.swift rename to WordPressUI/Sources/Ghosts/Internal/UIView+InnerGhost.swift diff --git a/WordPressUI/Ghosts/UICollectionView+Ghost.swift b/WordPressUI/Sources/Ghosts/UICollectionView+Ghost.swift similarity index 100% rename from WordPressUI/Ghosts/UICollectionView+Ghost.swift rename to WordPressUI/Sources/Ghosts/UICollectionView+Ghost.swift diff --git a/WordPressUI/Ghosts/UITableView+Ghost.swift b/WordPressUI/Sources/Ghosts/UITableView+Ghost.swift similarity index 100% rename from WordPressUI/Ghosts/UITableView+Ghost.swift rename to WordPressUI/Sources/Ghosts/UITableView+Ghost.swift diff --git a/WordPressUI/Ghosts/UIView+Ghost.swift b/WordPressUI/Sources/Ghosts/UIView+Ghost.swift similarity index 100% rename from WordPressUI/Ghosts/UIView+Ghost.swift rename to WordPressUI/Sources/Ghosts/UIView+Ghost.swift diff --git a/WordPressUI/Info.plist b/WordPressUI/Sources/Info.plist similarity index 100% rename from WordPressUI/Info.plist rename to WordPressUI/Sources/Info.plist diff --git a/WordPressUI/Resources/Assets.xcassets/Contents.json b/WordPressUI/Sources/Resources/Assets.xcassets/Contents.json similarity index 100% rename from WordPressUI/Resources/Assets.xcassets/Contents.json rename to WordPressUI/Sources/Resources/Assets.xcassets/Contents.json diff --git a/WordPressUI/Resources/Assets.xcassets/blavatar.imageset/Contents.json b/WordPressUI/Sources/Resources/Assets.xcassets/blavatar.imageset/Contents.json similarity index 100% rename from WordPressUI/Resources/Assets.xcassets/blavatar.imageset/Contents.json rename to WordPressUI/Sources/Resources/Assets.xcassets/blavatar.imageset/Contents.json diff --git a/WordPressUI/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf b/WordPressUI/Sources/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf similarity index 100% rename from WordPressUI/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf rename to WordPressUI/Sources/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf diff --git a/WordPressUI/Resources/Assets.xcassets/gravatar.imageset/Contents.json b/WordPressUI/Sources/Resources/Assets.xcassets/gravatar.imageset/Contents.json similarity index 100% rename from WordPressUI/Resources/Assets.xcassets/gravatar.imageset/Contents.json rename to WordPressUI/Sources/Resources/Assets.xcassets/gravatar.imageset/Contents.json diff --git a/WordPressUI/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf b/WordPressUI/Sources/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf similarity index 100% rename from WordPressUI/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf rename to WordPressUI/Sources/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf diff --git a/WordPressUI/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json b/WordPressUI/Sources/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json similarity index 100% rename from WordPressUI/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json rename to WordPressUI/Sources/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json diff --git a/WordPressUI/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf b/WordPressUI/Sources/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf similarity index 100% rename from WordPressUI/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf rename to WordPressUI/Sources/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf diff --git a/WordPressUI/Tools/GradientView.swift b/WordPressUI/Sources/Tools/GradientView.swift similarity index 100% rename from WordPressUI/Tools/GradientView.swift rename to WordPressUI/Sources/Tools/GradientView.swift diff --git a/WordPressUI/Tools/RotationAwareNavigationViewController.swift b/WordPressUI/Sources/Tools/RotationAwareNavigationViewController.swift similarity index 100% rename from WordPressUI/Tools/RotationAwareNavigationViewController.swift rename to WordPressUI/Sources/Tools/RotationAwareNavigationViewController.swift diff --git a/WordPressUI/WordPressUI.h b/WordPressUI/Sources/WordPressUI.h similarity index 100% rename from WordPressUI/WordPressUI.h rename to WordPressUI/Sources/WordPressUI.h From 75c450e29bf007c16a7df45627e658ed50e00de5 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 18 May 2022 15:59:15 +1000 Subject: [PATCH 2/6] Move all tests in `WordPressUITests/Tests/` folder Will tidy things up here before moving things in the root to comply with the SPM standards. --- WordPressUI.xcodeproj/project.pbxproj | 32 ++++++++++++------- .../BottomSheetViewControllerTests.swift | 0 .../{ => Tests}/Extensions/GravatarTest.swift | 0 .../Extensions/UIColorHelpersTests.swift | 0 .../UIView+AutoLayoutHelperTests.swift | 0 .../UIView+ChangeLayoutMarginsTests.swift | 0 .../UIViewControllerHelperTest.swift | 0 .../Ghosts/UITableView+GhostTests.swift | 0 .../Ghosts/UIView+GhostTests.swift | 0 WordPressUITests/{ => Tests}/Info.plist | 0 10 files changed, 20 insertions(+), 12 deletions(-) rename WordPressUITests/{ => Tests}/BottomSheet/BottomSheetViewControllerTests.swift (100%) rename WordPressUITests/{ => Tests}/Extensions/GravatarTest.swift (100%) rename WordPressUITests/{ => Tests}/Extensions/UIColorHelpersTests.swift (100%) rename WordPressUITests/{ => Tests}/Extensions/UIView+AutoLayoutHelperTests.swift (100%) rename WordPressUITests/{ => Tests}/Extensions/UIView+ChangeLayoutMarginsTests.swift (100%) rename WordPressUITests/{ => Tests}/Extensions/UIViewControllerHelperTest.swift (100%) rename WordPressUITests/{ => Tests}/Ghosts/UITableView+GhostTests.swift (100%) rename WordPressUITests/{ => Tests}/Ghosts/UIView+GhostTests.swift (100%) rename WordPressUITests/{ => Tests}/Info.plist (100%) diff --git a/WordPressUI.xcodeproj/project.pbxproj b/WordPressUI.xcodeproj/project.pbxproj index 7aa6b71..6bf5dc9 100644 --- a/WordPressUI.xcodeproj/project.pbxproj +++ b/WordPressUI.xcodeproj/project.pbxproj @@ -207,6 +207,17 @@ path = Sources; sourceTree = ""; }; + 3FC095F52834C29100C8477D /* Tests */ = { + isa = PBXGroup; + children = ( + 8B91476F2451CBEB0028B0AE /* BottomSheet */, + 57BC0C6B228DF1BA00C1F070 /* Ghosts */, + B529F287202C855B00895D88 /* Extensions */, + B59DCB6C202B146D00BEBD8A /* Info.plist */, + ); + path = Tests; + sourceTree = ""; + }; 43067E29203C8CA4001DD610 /* BlockEvents */ = { isa = PBXGroup; children = ( @@ -361,10 +372,7 @@ B59DCB69202B146D00BEBD8A /* WordPressUITests */ = { isa = PBXGroup; children = ( - 8B91476F2451CBEB0028B0AE /* BottomSheet */, - 57BC0C6B228DF1BA00C1F070 /* Ghosts */, - B529F287202C855B00895D88 /* Extensions */, - B59DCB6C202B146D00BEBD8A /* Info.plist */, + 3FC095F52834C29100C8477D /* Tests */, ); path = WordPressUITests; sourceTree = ""; @@ -699,7 +707,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = WordPressUI/Info.plist; + INFOPLIST_FILE = WordPressUI/Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -717,7 +725,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = PZYM8XX95Q; - INFOPLIST_FILE = WordPressUITests/Info.plist; + INFOPLIST_FILE = WordPressUITests/Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -793,7 +801,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = WordPressUI/Info.plist; + INFOPLIST_FILE = WordPressUI/Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -811,7 +819,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = PZYM8XX95Q; - INFOPLIST_FILE = WordPressUITests/Info.plist; + INFOPLIST_FILE = WordPressUITests/Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -950,7 +958,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = WordPressUI/Info.plist; + INFOPLIST_FILE = WordPressUI/Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -973,7 +981,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = WordPressUI/Info.plist; + INFOPLIST_FILE = WordPressUI/Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -991,7 +999,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = PZYM8XX95Q; - INFOPLIST_FILE = WordPressUITests/Info.plist; + INFOPLIST_FILE = WordPressUITests/Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1006,7 +1014,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = PZYM8XX95Q; - INFOPLIST_FILE = WordPressUITests/Info.plist; + INFOPLIST_FILE = WordPressUITests/Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressUITests; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/WordPressUITests/BottomSheet/BottomSheetViewControllerTests.swift b/WordPressUITests/Tests/BottomSheet/BottomSheetViewControllerTests.swift similarity index 100% rename from WordPressUITests/BottomSheet/BottomSheetViewControllerTests.swift rename to WordPressUITests/Tests/BottomSheet/BottomSheetViewControllerTests.swift diff --git a/WordPressUITests/Extensions/GravatarTest.swift b/WordPressUITests/Tests/Extensions/GravatarTest.swift similarity index 100% rename from WordPressUITests/Extensions/GravatarTest.swift rename to WordPressUITests/Tests/Extensions/GravatarTest.swift diff --git a/WordPressUITests/Extensions/UIColorHelpersTests.swift b/WordPressUITests/Tests/Extensions/UIColorHelpersTests.swift similarity index 100% rename from WordPressUITests/Extensions/UIColorHelpersTests.swift rename to WordPressUITests/Tests/Extensions/UIColorHelpersTests.swift diff --git a/WordPressUITests/Extensions/UIView+AutoLayoutHelperTests.swift b/WordPressUITests/Tests/Extensions/UIView+AutoLayoutHelperTests.swift similarity index 100% rename from WordPressUITests/Extensions/UIView+AutoLayoutHelperTests.swift rename to WordPressUITests/Tests/Extensions/UIView+AutoLayoutHelperTests.swift diff --git a/WordPressUITests/Extensions/UIView+ChangeLayoutMarginsTests.swift b/WordPressUITests/Tests/Extensions/UIView+ChangeLayoutMarginsTests.swift similarity index 100% rename from WordPressUITests/Extensions/UIView+ChangeLayoutMarginsTests.swift rename to WordPressUITests/Tests/Extensions/UIView+ChangeLayoutMarginsTests.swift diff --git a/WordPressUITests/Extensions/UIViewControllerHelperTest.swift b/WordPressUITests/Tests/Extensions/UIViewControllerHelperTest.swift similarity index 100% rename from WordPressUITests/Extensions/UIViewControllerHelperTest.swift rename to WordPressUITests/Tests/Extensions/UIViewControllerHelperTest.swift diff --git a/WordPressUITests/Ghosts/UITableView+GhostTests.swift b/WordPressUITests/Tests/Ghosts/UITableView+GhostTests.swift similarity index 100% rename from WordPressUITests/Ghosts/UITableView+GhostTests.swift rename to WordPressUITests/Tests/Ghosts/UITableView+GhostTests.swift diff --git a/WordPressUITests/Ghosts/UIView+GhostTests.swift b/WordPressUITests/Tests/Ghosts/UIView+GhostTests.swift similarity index 100% rename from WordPressUITests/Ghosts/UIView+GhostTests.swift rename to WordPressUITests/Tests/Ghosts/UIView+GhostTests.swift diff --git a/WordPressUITests/Info.plist b/WordPressUITests/Tests/Info.plist similarity index 100% rename from WordPressUITests/Info.plist rename to WordPressUITests/Tests/Info.plist From 221fe8c70c4d608150d55c03094a5fe1012a7067 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 18 May 2022 16:01:19 +1000 Subject: [PATCH 3/6] Move `Sources/` and `Tests/` to the root folder --- .../BottomSheetAnimationController.swift | 0 .../BottomSheetViewController.swift | 0 .../DrawerPresentationController.swift | 0 .../BottomSheet/GripButton.swift | 0 .../Categories/UIColor+Helpers.h | 0 .../Categories/UIColor+Helpers.m | 0 .../Categories/UIImage+Resize.h | 0 .../Categories/UIImage+Resize.m | 0 .../Categories/UIImage+Util.h | 0 .../Categories/UIImage+Util.m | 0 .../Categories/UILabel+SuggestSize.h | 0 .../Categories/UILabel+SuggestSize.m | 0 .../Constants/UIKitConstants.swift | 0 .../UIBarButtonItem+BlockEvents.swift | 0 .../BlockEvents/UIControl+BlockEvents.swift | 0 .../UIGestureRecognizer+BlockEvents.swift | 0 .../CGAffineTransform+Helpers.swift | 0 .../Extensions/Gravatar/Gravatar.swift | 0 .../Extensions/Gravatar/NSString+Gravatar.h | 0 .../Extensions/Gravatar/NSString+Gravatar.m | 0 .../Extensions/NSBundle+ResourceBundle.swift | 0 .../NSMutableAttributedString+Helpers.swift | 0 .../UIAlertController+Helpers.swift | 0 .../Extensions/UIControl+Helpers.swift | 0 .../Extensions/UIDevice+Helpers.swift | 0 .../Extensions/UIImage+Assets.swift | 0 .../Extensions/UIImage+Crop.swift | 0 .../Extensions/UIImage+Rotation.swift | 0 .../Extensions/UIImage+Tint.swift | 0 .../Extensions/UIImageView+Blavatar.swift | 0 .../Extensions/UIImageView+Gravatar.swift | 0 .../Extensions/UIImageView+Networking.swift | 0 .../Extensions/UITableView+Helpers.swift | 0 .../UITableViewController+Helpers.swift | 0 .../Extensions/UITextField+TextHelper.swift | 0 .../Extensions/UIView+Animations.swift | 0 .../Extensions/UIView+Helpers.swift | 0 ...UIViewController+ChildViewController.swift | 0 .../Extensions/UIViewController+Helpers.swift | 0 .../Extensions/UIWindow+Helpers.swift | 0 .../FancyAlertPresentationController.swift | 0 .../FancyAlert/FancyAlertView.swift | 0 .../FancyAlert/FancyAlertViewController.swift | 0 .../FancyAlert/FancyAlerts.storyboard | 0 .../FancyAlert/FancyButton.swift | 0 .../FlingableView/FlingableViewHandler.swift | 0 .../Ghosts/GhostOptions.swift | 0 .../Ghosts/GhostStyle.swift | 0 .../Ghosts/GhostableView.swift | 0 .../Ghosts/Internal/GhostAnimation.swift | 0 .../Internal/GhostCollectionViewHandler.swift | 0 .../Ghosts/Internal/GhostLayer.swift | 0 .../Internal/GhostTableViewHandler.swift | 0 .../Ghosts/Internal/UIView+InnerGhost.swift | 0 .../Ghosts/UICollectionView+Ghost.swift | 0 .../Ghosts/UITableView+Ghost.swift | 0 .../Ghosts/UIView+Ghost.swift | 0 {WordPressUI/Sources => Sources}/Info.plist | 0 .../Resources/Assets.xcassets/Contents.json | 0 .../blavatar.imageset/Contents.json | 0 .../blavatar.imageset/blavatar-default.pdf | Bin .../gravatar.imageset/Contents.json | 0 .../gravatar.imageset/gravatar.pdf | Bin .../icon-url-field.imageset/Contents.json | 0 .../icon-url-field.pdf | Bin .../Tools/GradientView.swift | 0 ...otationAwareNavigationViewController.swift | 0 .../Sources => Sources}/WordPressUI.h | 0 .../BottomSheetViewControllerTests.swift | 0 .../Extensions/GravatarTest.swift | 0 .../Extensions/UIColorHelpersTests.swift | 0 .../UIView+AutoLayoutHelperTests.swift | 0 .../UIView+ChangeLayoutMarginsTests.swift | 0 .../UIViewControllerHelperTest.swift | 0 .../Ghosts/UITableView+GhostTests.swift | 0 .../Ghosts/UIView+GhostTests.swift | 0 {WordPressUITests/Tests => Tests}/Info.plist | 0 WordPressUI.podspec | 6 +++--- WordPressUI.xcodeproj/project.pbxproj | 20 +++++++++--------- 79 files changed, 13 insertions(+), 13 deletions(-) rename {WordPressUI/Sources => Sources}/BottomSheet/BottomSheetAnimationController.swift (100%) rename {WordPressUI/Sources => Sources}/BottomSheet/BottomSheetViewController.swift (100%) rename {WordPressUI/Sources => Sources}/BottomSheet/DrawerPresentationController.swift (100%) rename {WordPressUI/Sources => Sources}/BottomSheet/GripButton.swift (100%) rename {WordPressUI/Sources => Sources}/Categories/UIColor+Helpers.h (100%) rename {WordPressUI/Sources => Sources}/Categories/UIColor+Helpers.m (100%) rename {WordPressUI/Sources => Sources}/Categories/UIImage+Resize.h (100%) rename {WordPressUI/Sources => Sources}/Categories/UIImage+Resize.m (100%) rename {WordPressUI/Sources => Sources}/Categories/UIImage+Util.h (100%) rename {WordPressUI/Sources => Sources}/Categories/UIImage+Util.m (100%) rename {WordPressUI/Sources => Sources}/Categories/UILabel+SuggestSize.h (100%) rename {WordPressUI/Sources => Sources}/Categories/UILabel+SuggestSize.m (100%) rename {WordPressUI/Sources => Sources}/Constants/UIKitConstants.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/BlockEvents/UIControl+BlockEvents.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/CGAffineTransform+Helpers.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/Gravatar/Gravatar.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/Gravatar/NSString+Gravatar.h (100%) rename {WordPressUI/Sources => Sources}/Extensions/Gravatar/NSString+Gravatar.m (100%) rename {WordPressUI/Sources => Sources}/Extensions/NSBundle+ResourceBundle.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/NSMutableAttributedString+Helpers.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UIAlertController+Helpers.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UIControl+Helpers.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UIDevice+Helpers.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UIImage+Assets.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UIImage+Crop.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UIImage+Rotation.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UIImage+Tint.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UIImageView+Blavatar.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UIImageView+Gravatar.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UIImageView+Networking.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UITableView+Helpers.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UITableViewController+Helpers.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UITextField+TextHelper.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UIView+Animations.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UIView+Helpers.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UIViewController+ChildViewController.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UIViewController+Helpers.swift (100%) rename {WordPressUI/Sources => Sources}/Extensions/UIWindow+Helpers.swift (100%) rename {WordPressUI/Sources => Sources}/FancyAlert/FancyAlertPresentationController.swift (100%) rename {WordPressUI/Sources => Sources}/FancyAlert/FancyAlertView.swift (100%) rename {WordPressUI/Sources => Sources}/FancyAlert/FancyAlertViewController.swift (100%) rename {WordPressUI/Sources => Sources}/FancyAlert/FancyAlerts.storyboard (100%) rename {WordPressUI/Sources => Sources}/FancyAlert/FancyButton.swift (100%) rename {WordPressUI/Sources => Sources}/FlingableView/FlingableViewHandler.swift (100%) rename {WordPressUI/Sources => Sources}/Ghosts/GhostOptions.swift (100%) rename {WordPressUI/Sources => Sources}/Ghosts/GhostStyle.swift (100%) rename {WordPressUI/Sources => Sources}/Ghosts/GhostableView.swift (100%) rename {WordPressUI/Sources => Sources}/Ghosts/Internal/GhostAnimation.swift (100%) rename {WordPressUI/Sources => Sources}/Ghosts/Internal/GhostCollectionViewHandler.swift (100%) rename {WordPressUI/Sources => Sources}/Ghosts/Internal/GhostLayer.swift (100%) rename {WordPressUI/Sources => Sources}/Ghosts/Internal/GhostTableViewHandler.swift (100%) rename {WordPressUI/Sources => Sources}/Ghosts/Internal/UIView+InnerGhost.swift (100%) rename {WordPressUI/Sources => Sources}/Ghosts/UICollectionView+Ghost.swift (100%) rename {WordPressUI/Sources => Sources}/Ghosts/UITableView+Ghost.swift (100%) rename {WordPressUI/Sources => Sources}/Ghosts/UIView+Ghost.swift (100%) rename {WordPressUI/Sources => Sources}/Info.plist (100%) rename {WordPressUI/Sources => Sources}/Resources/Assets.xcassets/Contents.json (100%) rename {WordPressUI/Sources => Sources}/Resources/Assets.xcassets/blavatar.imageset/Contents.json (100%) rename {WordPressUI/Sources => Sources}/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf (100%) rename {WordPressUI/Sources => Sources}/Resources/Assets.xcassets/gravatar.imageset/Contents.json (100%) rename {WordPressUI/Sources => Sources}/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf (100%) rename {WordPressUI/Sources => Sources}/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json (100%) rename {WordPressUI/Sources => Sources}/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf (100%) rename {WordPressUI/Sources => Sources}/Tools/GradientView.swift (100%) rename {WordPressUI/Sources => Sources}/Tools/RotationAwareNavigationViewController.swift (100%) rename {WordPressUI/Sources => Sources}/WordPressUI.h (100%) rename {WordPressUITests/Tests => Tests}/BottomSheet/BottomSheetViewControllerTests.swift (100%) rename {WordPressUITests/Tests => Tests}/Extensions/GravatarTest.swift (100%) rename {WordPressUITests/Tests => Tests}/Extensions/UIColorHelpersTests.swift (100%) rename {WordPressUITests/Tests => Tests}/Extensions/UIView+AutoLayoutHelperTests.swift (100%) rename {WordPressUITests/Tests => Tests}/Extensions/UIView+ChangeLayoutMarginsTests.swift (100%) rename {WordPressUITests/Tests => Tests}/Extensions/UIViewControllerHelperTest.swift (100%) rename {WordPressUITests/Tests => Tests}/Ghosts/UITableView+GhostTests.swift (100%) rename {WordPressUITests/Tests => Tests}/Ghosts/UIView+GhostTests.swift (100%) rename {WordPressUITests/Tests => Tests}/Info.plist (100%) diff --git a/WordPressUI/Sources/BottomSheet/BottomSheetAnimationController.swift b/Sources/BottomSheet/BottomSheetAnimationController.swift similarity index 100% rename from WordPressUI/Sources/BottomSheet/BottomSheetAnimationController.swift rename to Sources/BottomSheet/BottomSheetAnimationController.swift diff --git a/WordPressUI/Sources/BottomSheet/BottomSheetViewController.swift b/Sources/BottomSheet/BottomSheetViewController.swift similarity index 100% rename from WordPressUI/Sources/BottomSheet/BottomSheetViewController.swift rename to Sources/BottomSheet/BottomSheetViewController.swift diff --git a/WordPressUI/Sources/BottomSheet/DrawerPresentationController.swift b/Sources/BottomSheet/DrawerPresentationController.swift similarity index 100% rename from WordPressUI/Sources/BottomSheet/DrawerPresentationController.swift rename to Sources/BottomSheet/DrawerPresentationController.swift diff --git a/WordPressUI/Sources/BottomSheet/GripButton.swift b/Sources/BottomSheet/GripButton.swift similarity index 100% rename from WordPressUI/Sources/BottomSheet/GripButton.swift rename to Sources/BottomSheet/GripButton.swift diff --git a/WordPressUI/Sources/Categories/UIColor+Helpers.h b/Sources/Categories/UIColor+Helpers.h similarity index 100% rename from WordPressUI/Sources/Categories/UIColor+Helpers.h rename to Sources/Categories/UIColor+Helpers.h diff --git a/WordPressUI/Sources/Categories/UIColor+Helpers.m b/Sources/Categories/UIColor+Helpers.m similarity index 100% rename from WordPressUI/Sources/Categories/UIColor+Helpers.m rename to Sources/Categories/UIColor+Helpers.m diff --git a/WordPressUI/Sources/Categories/UIImage+Resize.h b/Sources/Categories/UIImage+Resize.h similarity index 100% rename from WordPressUI/Sources/Categories/UIImage+Resize.h rename to Sources/Categories/UIImage+Resize.h diff --git a/WordPressUI/Sources/Categories/UIImage+Resize.m b/Sources/Categories/UIImage+Resize.m similarity index 100% rename from WordPressUI/Sources/Categories/UIImage+Resize.m rename to Sources/Categories/UIImage+Resize.m diff --git a/WordPressUI/Sources/Categories/UIImage+Util.h b/Sources/Categories/UIImage+Util.h similarity index 100% rename from WordPressUI/Sources/Categories/UIImage+Util.h rename to Sources/Categories/UIImage+Util.h diff --git a/WordPressUI/Sources/Categories/UIImage+Util.m b/Sources/Categories/UIImage+Util.m similarity index 100% rename from WordPressUI/Sources/Categories/UIImage+Util.m rename to Sources/Categories/UIImage+Util.m diff --git a/WordPressUI/Sources/Categories/UILabel+SuggestSize.h b/Sources/Categories/UILabel+SuggestSize.h similarity index 100% rename from WordPressUI/Sources/Categories/UILabel+SuggestSize.h rename to Sources/Categories/UILabel+SuggestSize.h diff --git a/WordPressUI/Sources/Categories/UILabel+SuggestSize.m b/Sources/Categories/UILabel+SuggestSize.m similarity index 100% rename from WordPressUI/Sources/Categories/UILabel+SuggestSize.m rename to Sources/Categories/UILabel+SuggestSize.m diff --git a/WordPressUI/Sources/Constants/UIKitConstants.swift b/Sources/Constants/UIKitConstants.swift similarity index 100% rename from WordPressUI/Sources/Constants/UIKitConstants.swift rename to Sources/Constants/UIKitConstants.swift diff --git a/WordPressUI/Sources/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift b/Sources/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift similarity index 100% rename from WordPressUI/Sources/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift rename to Sources/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift diff --git a/WordPressUI/Sources/Extensions/BlockEvents/UIControl+BlockEvents.swift b/Sources/Extensions/BlockEvents/UIControl+BlockEvents.swift similarity index 100% rename from WordPressUI/Sources/Extensions/BlockEvents/UIControl+BlockEvents.swift rename to Sources/Extensions/BlockEvents/UIControl+BlockEvents.swift diff --git a/WordPressUI/Sources/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift b/Sources/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift similarity index 100% rename from WordPressUI/Sources/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift rename to Sources/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift diff --git a/WordPressUI/Sources/Extensions/CGAffineTransform+Helpers.swift b/Sources/Extensions/CGAffineTransform+Helpers.swift similarity index 100% rename from WordPressUI/Sources/Extensions/CGAffineTransform+Helpers.swift rename to Sources/Extensions/CGAffineTransform+Helpers.swift diff --git a/WordPressUI/Sources/Extensions/Gravatar/Gravatar.swift b/Sources/Extensions/Gravatar/Gravatar.swift similarity index 100% rename from WordPressUI/Sources/Extensions/Gravatar/Gravatar.swift rename to Sources/Extensions/Gravatar/Gravatar.swift diff --git a/WordPressUI/Sources/Extensions/Gravatar/NSString+Gravatar.h b/Sources/Extensions/Gravatar/NSString+Gravatar.h similarity index 100% rename from WordPressUI/Sources/Extensions/Gravatar/NSString+Gravatar.h rename to Sources/Extensions/Gravatar/NSString+Gravatar.h diff --git a/WordPressUI/Sources/Extensions/Gravatar/NSString+Gravatar.m b/Sources/Extensions/Gravatar/NSString+Gravatar.m similarity index 100% rename from WordPressUI/Sources/Extensions/Gravatar/NSString+Gravatar.m rename to Sources/Extensions/Gravatar/NSString+Gravatar.m diff --git a/WordPressUI/Sources/Extensions/NSBundle+ResourceBundle.swift b/Sources/Extensions/NSBundle+ResourceBundle.swift similarity index 100% rename from WordPressUI/Sources/Extensions/NSBundle+ResourceBundle.swift rename to Sources/Extensions/NSBundle+ResourceBundle.swift diff --git a/WordPressUI/Sources/Extensions/NSMutableAttributedString+Helpers.swift b/Sources/Extensions/NSMutableAttributedString+Helpers.swift similarity index 100% rename from WordPressUI/Sources/Extensions/NSMutableAttributedString+Helpers.swift rename to Sources/Extensions/NSMutableAttributedString+Helpers.swift diff --git a/WordPressUI/Sources/Extensions/UIAlertController+Helpers.swift b/Sources/Extensions/UIAlertController+Helpers.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UIAlertController+Helpers.swift rename to Sources/Extensions/UIAlertController+Helpers.swift diff --git a/WordPressUI/Sources/Extensions/UIControl+Helpers.swift b/Sources/Extensions/UIControl+Helpers.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UIControl+Helpers.swift rename to Sources/Extensions/UIControl+Helpers.swift diff --git a/WordPressUI/Sources/Extensions/UIDevice+Helpers.swift b/Sources/Extensions/UIDevice+Helpers.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UIDevice+Helpers.swift rename to Sources/Extensions/UIDevice+Helpers.swift diff --git a/WordPressUI/Sources/Extensions/UIImage+Assets.swift b/Sources/Extensions/UIImage+Assets.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UIImage+Assets.swift rename to Sources/Extensions/UIImage+Assets.swift diff --git a/WordPressUI/Sources/Extensions/UIImage+Crop.swift b/Sources/Extensions/UIImage+Crop.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UIImage+Crop.swift rename to Sources/Extensions/UIImage+Crop.swift diff --git a/WordPressUI/Sources/Extensions/UIImage+Rotation.swift b/Sources/Extensions/UIImage+Rotation.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UIImage+Rotation.swift rename to Sources/Extensions/UIImage+Rotation.swift diff --git a/WordPressUI/Sources/Extensions/UIImage+Tint.swift b/Sources/Extensions/UIImage+Tint.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UIImage+Tint.swift rename to Sources/Extensions/UIImage+Tint.swift diff --git a/WordPressUI/Sources/Extensions/UIImageView+Blavatar.swift b/Sources/Extensions/UIImageView+Blavatar.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UIImageView+Blavatar.swift rename to Sources/Extensions/UIImageView+Blavatar.swift diff --git a/WordPressUI/Sources/Extensions/UIImageView+Gravatar.swift b/Sources/Extensions/UIImageView+Gravatar.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UIImageView+Gravatar.swift rename to Sources/Extensions/UIImageView+Gravatar.swift diff --git a/WordPressUI/Sources/Extensions/UIImageView+Networking.swift b/Sources/Extensions/UIImageView+Networking.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UIImageView+Networking.swift rename to Sources/Extensions/UIImageView+Networking.swift diff --git a/WordPressUI/Sources/Extensions/UITableView+Helpers.swift b/Sources/Extensions/UITableView+Helpers.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UITableView+Helpers.swift rename to Sources/Extensions/UITableView+Helpers.swift diff --git a/WordPressUI/Sources/Extensions/UITableViewController+Helpers.swift b/Sources/Extensions/UITableViewController+Helpers.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UITableViewController+Helpers.swift rename to Sources/Extensions/UITableViewController+Helpers.swift diff --git a/WordPressUI/Sources/Extensions/UITextField+TextHelper.swift b/Sources/Extensions/UITextField+TextHelper.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UITextField+TextHelper.swift rename to Sources/Extensions/UITextField+TextHelper.swift diff --git a/WordPressUI/Sources/Extensions/UIView+Animations.swift b/Sources/Extensions/UIView+Animations.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UIView+Animations.swift rename to Sources/Extensions/UIView+Animations.swift diff --git a/WordPressUI/Sources/Extensions/UIView+Helpers.swift b/Sources/Extensions/UIView+Helpers.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UIView+Helpers.swift rename to Sources/Extensions/UIView+Helpers.swift diff --git a/WordPressUI/Sources/Extensions/UIViewController+ChildViewController.swift b/Sources/Extensions/UIViewController+ChildViewController.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UIViewController+ChildViewController.swift rename to Sources/Extensions/UIViewController+ChildViewController.swift diff --git a/WordPressUI/Sources/Extensions/UIViewController+Helpers.swift b/Sources/Extensions/UIViewController+Helpers.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UIViewController+Helpers.swift rename to Sources/Extensions/UIViewController+Helpers.swift diff --git a/WordPressUI/Sources/Extensions/UIWindow+Helpers.swift b/Sources/Extensions/UIWindow+Helpers.swift similarity index 100% rename from WordPressUI/Sources/Extensions/UIWindow+Helpers.swift rename to Sources/Extensions/UIWindow+Helpers.swift diff --git a/WordPressUI/Sources/FancyAlert/FancyAlertPresentationController.swift b/Sources/FancyAlert/FancyAlertPresentationController.swift similarity index 100% rename from WordPressUI/Sources/FancyAlert/FancyAlertPresentationController.swift rename to Sources/FancyAlert/FancyAlertPresentationController.swift diff --git a/WordPressUI/Sources/FancyAlert/FancyAlertView.swift b/Sources/FancyAlert/FancyAlertView.swift similarity index 100% rename from WordPressUI/Sources/FancyAlert/FancyAlertView.swift rename to Sources/FancyAlert/FancyAlertView.swift diff --git a/WordPressUI/Sources/FancyAlert/FancyAlertViewController.swift b/Sources/FancyAlert/FancyAlertViewController.swift similarity index 100% rename from WordPressUI/Sources/FancyAlert/FancyAlertViewController.swift rename to Sources/FancyAlert/FancyAlertViewController.swift diff --git a/WordPressUI/Sources/FancyAlert/FancyAlerts.storyboard b/Sources/FancyAlert/FancyAlerts.storyboard similarity index 100% rename from WordPressUI/Sources/FancyAlert/FancyAlerts.storyboard rename to Sources/FancyAlert/FancyAlerts.storyboard diff --git a/WordPressUI/Sources/FancyAlert/FancyButton.swift b/Sources/FancyAlert/FancyButton.swift similarity index 100% rename from WordPressUI/Sources/FancyAlert/FancyButton.swift rename to Sources/FancyAlert/FancyButton.swift diff --git a/WordPressUI/Sources/FlingableView/FlingableViewHandler.swift b/Sources/FlingableView/FlingableViewHandler.swift similarity index 100% rename from WordPressUI/Sources/FlingableView/FlingableViewHandler.swift rename to Sources/FlingableView/FlingableViewHandler.swift diff --git a/WordPressUI/Sources/Ghosts/GhostOptions.swift b/Sources/Ghosts/GhostOptions.swift similarity index 100% rename from WordPressUI/Sources/Ghosts/GhostOptions.swift rename to Sources/Ghosts/GhostOptions.swift diff --git a/WordPressUI/Sources/Ghosts/GhostStyle.swift b/Sources/Ghosts/GhostStyle.swift similarity index 100% rename from WordPressUI/Sources/Ghosts/GhostStyle.swift rename to Sources/Ghosts/GhostStyle.swift diff --git a/WordPressUI/Sources/Ghosts/GhostableView.swift b/Sources/Ghosts/GhostableView.swift similarity index 100% rename from WordPressUI/Sources/Ghosts/GhostableView.swift rename to Sources/Ghosts/GhostableView.swift diff --git a/WordPressUI/Sources/Ghosts/Internal/GhostAnimation.swift b/Sources/Ghosts/Internal/GhostAnimation.swift similarity index 100% rename from WordPressUI/Sources/Ghosts/Internal/GhostAnimation.swift rename to Sources/Ghosts/Internal/GhostAnimation.swift diff --git a/WordPressUI/Sources/Ghosts/Internal/GhostCollectionViewHandler.swift b/Sources/Ghosts/Internal/GhostCollectionViewHandler.swift similarity index 100% rename from WordPressUI/Sources/Ghosts/Internal/GhostCollectionViewHandler.swift rename to Sources/Ghosts/Internal/GhostCollectionViewHandler.swift diff --git a/WordPressUI/Sources/Ghosts/Internal/GhostLayer.swift b/Sources/Ghosts/Internal/GhostLayer.swift similarity index 100% rename from WordPressUI/Sources/Ghosts/Internal/GhostLayer.swift rename to Sources/Ghosts/Internal/GhostLayer.swift diff --git a/WordPressUI/Sources/Ghosts/Internal/GhostTableViewHandler.swift b/Sources/Ghosts/Internal/GhostTableViewHandler.swift similarity index 100% rename from WordPressUI/Sources/Ghosts/Internal/GhostTableViewHandler.swift rename to Sources/Ghosts/Internal/GhostTableViewHandler.swift diff --git a/WordPressUI/Sources/Ghosts/Internal/UIView+InnerGhost.swift b/Sources/Ghosts/Internal/UIView+InnerGhost.swift similarity index 100% rename from WordPressUI/Sources/Ghosts/Internal/UIView+InnerGhost.swift rename to Sources/Ghosts/Internal/UIView+InnerGhost.swift diff --git a/WordPressUI/Sources/Ghosts/UICollectionView+Ghost.swift b/Sources/Ghosts/UICollectionView+Ghost.swift similarity index 100% rename from WordPressUI/Sources/Ghosts/UICollectionView+Ghost.swift rename to Sources/Ghosts/UICollectionView+Ghost.swift diff --git a/WordPressUI/Sources/Ghosts/UITableView+Ghost.swift b/Sources/Ghosts/UITableView+Ghost.swift similarity index 100% rename from WordPressUI/Sources/Ghosts/UITableView+Ghost.swift rename to Sources/Ghosts/UITableView+Ghost.swift diff --git a/WordPressUI/Sources/Ghosts/UIView+Ghost.swift b/Sources/Ghosts/UIView+Ghost.swift similarity index 100% rename from WordPressUI/Sources/Ghosts/UIView+Ghost.swift rename to Sources/Ghosts/UIView+Ghost.swift diff --git a/WordPressUI/Sources/Info.plist b/Sources/Info.plist similarity index 100% rename from WordPressUI/Sources/Info.plist rename to Sources/Info.plist diff --git a/WordPressUI/Sources/Resources/Assets.xcassets/Contents.json b/Sources/Resources/Assets.xcassets/Contents.json similarity index 100% rename from WordPressUI/Sources/Resources/Assets.xcassets/Contents.json rename to Sources/Resources/Assets.xcassets/Contents.json diff --git a/WordPressUI/Sources/Resources/Assets.xcassets/blavatar.imageset/Contents.json b/Sources/Resources/Assets.xcassets/blavatar.imageset/Contents.json similarity index 100% rename from WordPressUI/Sources/Resources/Assets.xcassets/blavatar.imageset/Contents.json rename to Sources/Resources/Assets.xcassets/blavatar.imageset/Contents.json diff --git a/WordPressUI/Sources/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf b/Sources/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf similarity index 100% rename from WordPressUI/Sources/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf rename to Sources/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf diff --git a/WordPressUI/Sources/Resources/Assets.xcassets/gravatar.imageset/Contents.json b/Sources/Resources/Assets.xcassets/gravatar.imageset/Contents.json similarity index 100% rename from WordPressUI/Sources/Resources/Assets.xcassets/gravatar.imageset/Contents.json rename to Sources/Resources/Assets.xcassets/gravatar.imageset/Contents.json diff --git a/WordPressUI/Sources/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf b/Sources/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf similarity index 100% rename from WordPressUI/Sources/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf rename to Sources/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf diff --git a/WordPressUI/Sources/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json b/Sources/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json similarity index 100% rename from WordPressUI/Sources/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json rename to Sources/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json diff --git a/WordPressUI/Sources/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf b/Sources/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf similarity index 100% rename from WordPressUI/Sources/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf rename to Sources/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf diff --git a/WordPressUI/Sources/Tools/GradientView.swift b/Sources/Tools/GradientView.swift similarity index 100% rename from WordPressUI/Sources/Tools/GradientView.swift rename to Sources/Tools/GradientView.swift diff --git a/WordPressUI/Sources/Tools/RotationAwareNavigationViewController.swift b/Sources/Tools/RotationAwareNavigationViewController.swift similarity index 100% rename from WordPressUI/Sources/Tools/RotationAwareNavigationViewController.swift rename to Sources/Tools/RotationAwareNavigationViewController.swift diff --git a/WordPressUI/Sources/WordPressUI.h b/Sources/WordPressUI.h similarity index 100% rename from WordPressUI/Sources/WordPressUI.h rename to Sources/WordPressUI.h diff --git a/WordPressUITests/Tests/BottomSheet/BottomSheetViewControllerTests.swift b/Tests/BottomSheet/BottomSheetViewControllerTests.swift similarity index 100% rename from WordPressUITests/Tests/BottomSheet/BottomSheetViewControllerTests.swift rename to Tests/BottomSheet/BottomSheetViewControllerTests.swift diff --git a/WordPressUITests/Tests/Extensions/GravatarTest.swift b/Tests/Extensions/GravatarTest.swift similarity index 100% rename from WordPressUITests/Tests/Extensions/GravatarTest.swift rename to Tests/Extensions/GravatarTest.swift diff --git a/WordPressUITests/Tests/Extensions/UIColorHelpersTests.swift b/Tests/Extensions/UIColorHelpersTests.swift similarity index 100% rename from WordPressUITests/Tests/Extensions/UIColorHelpersTests.swift rename to Tests/Extensions/UIColorHelpersTests.swift diff --git a/WordPressUITests/Tests/Extensions/UIView+AutoLayoutHelperTests.swift b/Tests/Extensions/UIView+AutoLayoutHelperTests.swift similarity index 100% rename from WordPressUITests/Tests/Extensions/UIView+AutoLayoutHelperTests.swift rename to Tests/Extensions/UIView+AutoLayoutHelperTests.swift diff --git a/WordPressUITests/Tests/Extensions/UIView+ChangeLayoutMarginsTests.swift b/Tests/Extensions/UIView+ChangeLayoutMarginsTests.swift similarity index 100% rename from WordPressUITests/Tests/Extensions/UIView+ChangeLayoutMarginsTests.swift rename to Tests/Extensions/UIView+ChangeLayoutMarginsTests.swift diff --git a/WordPressUITests/Tests/Extensions/UIViewControllerHelperTest.swift b/Tests/Extensions/UIViewControllerHelperTest.swift similarity index 100% rename from WordPressUITests/Tests/Extensions/UIViewControllerHelperTest.swift rename to Tests/Extensions/UIViewControllerHelperTest.swift diff --git a/WordPressUITests/Tests/Ghosts/UITableView+GhostTests.swift b/Tests/Ghosts/UITableView+GhostTests.swift similarity index 100% rename from WordPressUITests/Tests/Ghosts/UITableView+GhostTests.swift rename to Tests/Ghosts/UITableView+GhostTests.swift diff --git a/WordPressUITests/Tests/Ghosts/UIView+GhostTests.swift b/Tests/Ghosts/UIView+GhostTests.swift similarity index 100% rename from WordPressUITests/Tests/Ghosts/UIView+GhostTests.swift rename to Tests/Ghosts/UIView+GhostTests.swift diff --git a/WordPressUITests/Tests/Info.plist b/Tests/Info.plist similarity index 100% rename from WordPressUITests/Tests/Info.plist rename to Tests/Info.plist diff --git a/WordPressUI.podspec b/WordPressUI.podspec index 4007952..b75314b 100644 --- a/WordPressUI.podspec +++ b/WordPressUI.podspec @@ -17,11 +17,11 @@ Pod::Spec.new do |s| s.swift_version = '5.0' s.source = { git: 'https://github.com/wordpress-mobile/WordPressUI-iOS.git', tag: s.version.to_s } - s.source_files = 'WordPressUI/**/*.{h,m,swift}' + s.source_files = 'Sources/**/*.{h,m,swift}' s.resource_bundles = { WordPressUIResources: [ - 'WordPressUI/Resources/*.{xcassets}', - 'WordPressUI/**/*.{storyboard}' + 'Sources/Resources/*.{xcassets}', + 'Sources/**/*.{storyboard}' ] } s.header_dir = 'WordPressUI' diff --git a/WordPressUI.xcodeproj/project.pbxproj b/WordPressUI.xcodeproj/project.pbxproj index 6bf5dc9..208e2c2 100644 --- a/WordPressUI.xcodeproj/project.pbxproj +++ b/WordPressUI.xcodeproj/project.pbxproj @@ -345,6 +345,8 @@ isa = PBXGroup; children = ( FF20AD1620B76A2300082398 /* WordPressUI.podspec */, + 3FC095F42834C1E200C8477D /* Sources */, + 3FC095F52834C29100C8477D /* Tests */, B59DCB5E202B146D00BEBD8A /* WordPressUI */, B59DCB69202B146D00BEBD8A /* WordPressUITests */, B59DCB5D202B146D00BEBD8A /* Products */, @@ -364,7 +366,6 @@ B59DCB5E202B146D00BEBD8A /* WordPressUI */ = { isa = PBXGroup; children = ( - 3FC095F42834C1E200C8477D /* Sources */, ); path = WordPressUI; sourceTree = ""; @@ -372,7 +373,6 @@ B59DCB69202B146D00BEBD8A /* WordPressUITests */ = { isa = PBXGroup; children = ( - 3FC095F52834C29100C8477D /* Tests */, ); path = WordPressUITests; sourceTree = ""; @@ -707,7 +707,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = WordPressUI/Sources/Info.plist; + INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -725,7 +725,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = PZYM8XX95Q; - INFOPLIST_FILE = WordPressUITests/Tests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -801,7 +801,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = WordPressUI/Sources/Info.plist; + INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -819,7 +819,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = PZYM8XX95Q; - INFOPLIST_FILE = WordPressUITests/Tests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -958,7 +958,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = WordPressUI/Sources/Info.plist; + INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -981,7 +981,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = WordPressUI/Sources/Info.plist; + INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -999,7 +999,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = PZYM8XX95Q; - INFOPLIST_FILE = WordPressUITests/Tests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1014,7 +1014,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = PZYM8XX95Q; - INFOPLIST_FILE = WordPressUITests/Tests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressUITests; PRODUCT_NAME = "$(TARGET_NAME)"; From f1b3973f885b9d48afc0dd2bf2b1e7b8af859d89 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 18 May 2022 16:02:42 +1000 Subject: [PATCH 4/6] Remove empty and redundant `WordPressUI/` and `WordPressUITests/` --- WordPressUI.xcodeproj/project.pbxproj | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/WordPressUI.xcodeproj/project.pbxproj b/WordPressUI.xcodeproj/project.pbxproj index 208e2c2..70236ed 100644 --- a/WordPressUI.xcodeproj/project.pbxproj +++ b/WordPressUI.xcodeproj/project.pbxproj @@ -347,8 +347,6 @@ FF20AD1620B76A2300082398 /* WordPressUI.podspec */, 3FC095F42834C1E200C8477D /* Sources */, 3FC095F52834C29100C8477D /* Tests */, - B59DCB5E202B146D00BEBD8A /* WordPressUI */, - B59DCB69202B146D00BEBD8A /* WordPressUITests */, B59DCB5D202B146D00BEBD8A /* Products */, B5A78796202B1A58007874FB /* Frameworks */, ); @@ -363,20 +361,6 @@ name = Products; sourceTree = ""; }; - B59DCB5E202B146D00BEBD8A /* WordPressUI */ = { - isa = PBXGroup; - children = ( - ); - path = WordPressUI; - sourceTree = ""; - }; - B59DCB69202B146D00BEBD8A /* WordPressUITests */ = { - isa = PBXGroup; - children = ( - ); - path = WordPressUITests; - sourceTree = ""; - }; B5A78796202B1A58007874FB /* Frameworks */ = { isa = PBXGroup; children = ( From 13d147d31d6f6d5eecfd86a5191fd668c7bb543d Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 18 May 2022 16:20:32 +1000 Subject: [PATCH 5/6] Split WordPressUI source files (for SPM) from its `Info.plist` --- Sources/{ => Supporting Files}/Info.plist | 0 .../BottomSheetAnimationController.swift | 0 .../BottomSheetViewController.swift | 0 .../DrawerPresentationController.swift | 0 .../BottomSheet/GripButton.swift | 0 .../Categories/UIColor+Helpers.h | 0 .../Categories/UIColor+Helpers.m | 0 .../Categories/UIImage+Resize.h | 0 .../Categories/UIImage+Resize.m | 0 .../Categories/UIImage+Util.h | 0 .../Categories/UIImage+Util.m | 0 .../Categories/UILabel+SuggestSize.h | 0 .../Categories/UILabel+SuggestSize.m | 0 .../Constants/UIKitConstants.swift | 0 .../UIBarButtonItem+BlockEvents.swift | 0 .../BlockEvents/UIControl+BlockEvents.swift | 0 .../UIGestureRecognizer+BlockEvents.swift | 0 .../CGAffineTransform+Helpers.swift | 0 .../Extensions/Gravatar/Gravatar.swift | 0 .../Extensions/Gravatar/NSString+Gravatar.h | 0 .../Extensions/Gravatar/NSString+Gravatar.m | 0 .../Extensions/NSBundle+ResourceBundle.swift | 0 .../NSMutableAttributedString+Helpers.swift | 0 .../UIAlertController+Helpers.swift | 0 .../Extensions/UIControl+Helpers.swift | 0 .../Extensions/UIDevice+Helpers.swift | 0 .../Extensions/UIImage+Assets.swift | 0 .../Extensions/UIImage+Crop.swift | 0 .../Extensions/UIImage+Rotation.swift | 0 .../Extensions/UIImage+Tint.swift | 0 .../Extensions/UIImageView+Blavatar.swift | 0 .../Extensions/UIImageView+Gravatar.swift | 0 .../Extensions/UIImageView+Networking.swift | 0 .../Extensions/UITableView+Helpers.swift | 0 .../UITableViewController+Helpers.swift | 0 .../Extensions/UITextField+TextHelper.swift | 0 .../Extensions/UIView+Animations.swift | 0 .../Extensions/UIView+Helpers.swift | 0 ...UIViewController+ChildViewController.swift | 0 .../Extensions/UIViewController+Helpers.swift | 0 .../Extensions/UIWindow+Helpers.swift | 0 .../FancyAlertPresentationController.swift | 0 .../FancyAlert/FancyAlertView.swift | 0 .../FancyAlert/FancyAlertViewController.swift | 0 .../FancyAlert/FancyAlerts.storyboard | 0 .../FancyAlert/FancyButton.swift | 0 .../FlingableView/FlingableViewHandler.swift | 0 .../Ghosts/GhostOptions.swift | 0 .../{ => WordPressUI}/Ghosts/GhostStyle.swift | 0 .../Ghosts/GhostableView.swift | 0 .../Ghosts/Internal/GhostAnimation.swift | 0 .../Internal/GhostCollectionViewHandler.swift | 0 .../Ghosts/Internal/GhostLayer.swift | 0 .../Internal/GhostTableViewHandler.swift | 0 .../Ghosts/Internal/UIView+InnerGhost.swift | 0 .../Ghosts/UICollectionView+Ghost.swift | 0 .../Ghosts/UITableView+Ghost.swift | 0 .../Ghosts/UIView+Ghost.swift | 0 .../Resources/Assets.xcassets/Contents.json | 0 .../blavatar.imageset/Contents.json | 0 .../blavatar.imageset/blavatar-default.pdf | Bin .../gravatar.imageset/Contents.json | 0 .../gravatar.imageset/gravatar.pdf | Bin .../icon-url-field.imageset/Contents.json | 0 .../icon-url-field.pdf | Bin .../Tools/GradientView.swift | 0 ...otationAwareNavigationViewController.swift | 0 Sources/{ => WordPressUI}/WordPressUI.h | 0 WordPressUI.xcodeproj/project.pbxproj | 40 ++++++++++++------ 69 files changed, 28 insertions(+), 12 deletions(-) rename Sources/{ => Supporting Files}/Info.plist (100%) rename Sources/{ => WordPressUI}/BottomSheet/BottomSheetAnimationController.swift (100%) rename Sources/{ => WordPressUI}/BottomSheet/BottomSheetViewController.swift (100%) rename Sources/{ => WordPressUI}/BottomSheet/DrawerPresentationController.swift (100%) rename Sources/{ => WordPressUI}/BottomSheet/GripButton.swift (100%) rename Sources/{ => WordPressUI}/Categories/UIColor+Helpers.h (100%) rename Sources/{ => WordPressUI}/Categories/UIColor+Helpers.m (100%) rename Sources/{ => WordPressUI}/Categories/UIImage+Resize.h (100%) rename Sources/{ => WordPressUI}/Categories/UIImage+Resize.m (100%) rename Sources/{ => WordPressUI}/Categories/UIImage+Util.h (100%) rename Sources/{ => WordPressUI}/Categories/UIImage+Util.m (100%) rename Sources/{ => WordPressUI}/Categories/UILabel+SuggestSize.h (100%) rename Sources/{ => WordPressUI}/Categories/UILabel+SuggestSize.m (100%) rename Sources/{ => WordPressUI}/Constants/UIKitConstants.swift (100%) rename Sources/{ => WordPressUI}/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift (100%) rename Sources/{ => WordPressUI}/Extensions/BlockEvents/UIControl+BlockEvents.swift (100%) rename Sources/{ => WordPressUI}/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift (100%) rename Sources/{ => WordPressUI}/Extensions/CGAffineTransform+Helpers.swift (100%) rename Sources/{ => WordPressUI}/Extensions/Gravatar/Gravatar.swift (100%) rename Sources/{ => WordPressUI}/Extensions/Gravatar/NSString+Gravatar.h (100%) rename Sources/{ => WordPressUI}/Extensions/Gravatar/NSString+Gravatar.m (100%) rename Sources/{ => WordPressUI}/Extensions/NSBundle+ResourceBundle.swift (100%) rename Sources/{ => WordPressUI}/Extensions/NSMutableAttributedString+Helpers.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UIAlertController+Helpers.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UIControl+Helpers.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UIDevice+Helpers.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UIImage+Assets.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UIImage+Crop.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UIImage+Rotation.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UIImage+Tint.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UIImageView+Blavatar.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UIImageView+Gravatar.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UIImageView+Networking.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UITableView+Helpers.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UITableViewController+Helpers.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UITextField+TextHelper.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UIView+Animations.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UIView+Helpers.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UIViewController+ChildViewController.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UIViewController+Helpers.swift (100%) rename Sources/{ => WordPressUI}/Extensions/UIWindow+Helpers.swift (100%) rename Sources/{ => WordPressUI}/FancyAlert/FancyAlertPresentationController.swift (100%) rename Sources/{ => WordPressUI}/FancyAlert/FancyAlertView.swift (100%) rename Sources/{ => WordPressUI}/FancyAlert/FancyAlertViewController.swift (100%) rename Sources/{ => WordPressUI}/FancyAlert/FancyAlerts.storyboard (100%) rename Sources/{ => WordPressUI}/FancyAlert/FancyButton.swift (100%) rename Sources/{ => WordPressUI}/FlingableView/FlingableViewHandler.swift (100%) rename Sources/{ => WordPressUI}/Ghosts/GhostOptions.swift (100%) rename Sources/{ => WordPressUI}/Ghosts/GhostStyle.swift (100%) rename Sources/{ => WordPressUI}/Ghosts/GhostableView.swift (100%) rename Sources/{ => WordPressUI}/Ghosts/Internal/GhostAnimation.swift (100%) rename Sources/{ => WordPressUI}/Ghosts/Internal/GhostCollectionViewHandler.swift (100%) rename Sources/{ => WordPressUI}/Ghosts/Internal/GhostLayer.swift (100%) rename Sources/{ => WordPressUI}/Ghosts/Internal/GhostTableViewHandler.swift (100%) rename Sources/{ => WordPressUI}/Ghosts/Internal/UIView+InnerGhost.swift (100%) rename Sources/{ => WordPressUI}/Ghosts/UICollectionView+Ghost.swift (100%) rename Sources/{ => WordPressUI}/Ghosts/UITableView+Ghost.swift (100%) rename Sources/{ => WordPressUI}/Ghosts/UIView+Ghost.swift (100%) rename Sources/{ => WordPressUI}/Resources/Assets.xcassets/Contents.json (100%) rename Sources/{ => WordPressUI}/Resources/Assets.xcassets/blavatar.imageset/Contents.json (100%) rename Sources/{ => WordPressUI}/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf (100%) rename Sources/{ => WordPressUI}/Resources/Assets.xcassets/gravatar.imageset/Contents.json (100%) rename Sources/{ => WordPressUI}/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf (100%) rename Sources/{ => WordPressUI}/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json (100%) rename Sources/{ => WordPressUI}/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf (100%) rename Sources/{ => WordPressUI}/Tools/GradientView.swift (100%) rename Sources/{ => WordPressUI}/Tools/RotationAwareNavigationViewController.swift (100%) rename Sources/{ => WordPressUI}/WordPressUI.h (100%) diff --git a/Sources/Info.plist b/Sources/Supporting Files/Info.plist similarity index 100% rename from Sources/Info.plist rename to Sources/Supporting Files/Info.plist diff --git a/Sources/BottomSheet/BottomSheetAnimationController.swift b/Sources/WordPressUI/BottomSheet/BottomSheetAnimationController.swift similarity index 100% rename from Sources/BottomSheet/BottomSheetAnimationController.swift rename to Sources/WordPressUI/BottomSheet/BottomSheetAnimationController.swift diff --git a/Sources/BottomSheet/BottomSheetViewController.swift b/Sources/WordPressUI/BottomSheet/BottomSheetViewController.swift similarity index 100% rename from Sources/BottomSheet/BottomSheetViewController.swift rename to Sources/WordPressUI/BottomSheet/BottomSheetViewController.swift diff --git a/Sources/BottomSheet/DrawerPresentationController.swift b/Sources/WordPressUI/BottomSheet/DrawerPresentationController.swift similarity index 100% rename from Sources/BottomSheet/DrawerPresentationController.swift rename to Sources/WordPressUI/BottomSheet/DrawerPresentationController.swift diff --git a/Sources/BottomSheet/GripButton.swift b/Sources/WordPressUI/BottomSheet/GripButton.swift similarity index 100% rename from Sources/BottomSheet/GripButton.swift rename to Sources/WordPressUI/BottomSheet/GripButton.swift diff --git a/Sources/Categories/UIColor+Helpers.h b/Sources/WordPressUI/Categories/UIColor+Helpers.h similarity index 100% rename from Sources/Categories/UIColor+Helpers.h rename to Sources/WordPressUI/Categories/UIColor+Helpers.h diff --git a/Sources/Categories/UIColor+Helpers.m b/Sources/WordPressUI/Categories/UIColor+Helpers.m similarity index 100% rename from Sources/Categories/UIColor+Helpers.m rename to Sources/WordPressUI/Categories/UIColor+Helpers.m diff --git a/Sources/Categories/UIImage+Resize.h b/Sources/WordPressUI/Categories/UIImage+Resize.h similarity index 100% rename from Sources/Categories/UIImage+Resize.h rename to Sources/WordPressUI/Categories/UIImage+Resize.h diff --git a/Sources/Categories/UIImage+Resize.m b/Sources/WordPressUI/Categories/UIImage+Resize.m similarity index 100% rename from Sources/Categories/UIImage+Resize.m rename to Sources/WordPressUI/Categories/UIImage+Resize.m diff --git a/Sources/Categories/UIImage+Util.h b/Sources/WordPressUI/Categories/UIImage+Util.h similarity index 100% rename from Sources/Categories/UIImage+Util.h rename to Sources/WordPressUI/Categories/UIImage+Util.h diff --git a/Sources/Categories/UIImage+Util.m b/Sources/WordPressUI/Categories/UIImage+Util.m similarity index 100% rename from Sources/Categories/UIImage+Util.m rename to Sources/WordPressUI/Categories/UIImage+Util.m diff --git a/Sources/Categories/UILabel+SuggestSize.h b/Sources/WordPressUI/Categories/UILabel+SuggestSize.h similarity index 100% rename from Sources/Categories/UILabel+SuggestSize.h rename to Sources/WordPressUI/Categories/UILabel+SuggestSize.h diff --git a/Sources/Categories/UILabel+SuggestSize.m b/Sources/WordPressUI/Categories/UILabel+SuggestSize.m similarity index 100% rename from Sources/Categories/UILabel+SuggestSize.m rename to Sources/WordPressUI/Categories/UILabel+SuggestSize.m diff --git a/Sources/Constants/UIKitConstants.swift b/Sources/WordPressUI/Constants/UIKitConstants.swift similarity index 100% rename from Sources/Constants/UIKitConstants.swift rename to Sources/WordPressUI/Constants/UIKitConstants.swift diff --git a/Sources/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift b/Sources/WordPressUI/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift similarity index 100% rename from Sources/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift rename to Sources/WordPressUI/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift diff --git a/Sources/Extensions/BlockEvents/UIControl+BlockEvents.swift b/Sources/WordPressUI/Extensions/BlockEvents/UIControl+BlockEvents.swift similarity index 100% rename from Sources/Extensions/BlockEvents/UIControl+BlockEvents.swift rename to Sources/WordPressUI/Extensions/BlockEvents/UIControl+BlockEvents.swift diff --git a/Sources/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift b/Sources/WordPressUI/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift similarity index 100% rename from Sources/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift rename to Sources/WordPressUI/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift diff --git a/Sources/Extensions/CGAffineTransform+Helpers.swift b/Sources/WordPressUI/Extensions/CGAffineTransform+Helpers.swift similarity index 100% rename from Sources/Extensions/CGAffineTransform+Helpers.swift rename to Sources/WordPressUI/Extensions/CGAffineTransform+Helpers.swift diff --git a/Sources/Extensions/Gravatar/Gravatar.swift b/Sources/WordPressUI/Extensions/Gravatar/Gravatar.swift similarity index 100% rename from Sources/Extensions/Gravatar/Gravatar.swift rename to Sources/WordPressUI/Extensions/Gravatar/Gravatar.swift diff --git a/Sources/Extensions/Gravatar/NSString+Gravatar.h b/Sources/WordPressUI/Extensions/Gravatar/NSString+Gravatar.h similarity index 100% rename from Sources/Extensions/Gravatar/NSString+Gravatar.h rename to Sources/WordPressUI/Extensions/Gravatar/NSString+Gravatar.h diff --git a/Sources/Extensions/Gravatar/NSString+Gravatar.m b/Sources/WordPressUI/Extensions/Gravatar/NSString+Gravatar.m similarity index 100% rename from Sources/Extensions/Gravatar/NSString+Gravatar.m rename to Sources/WordPressUI/Extensions/Gravatar/NSString+Gravatar.m diff --git a/Sources/Extensions/NSBundle+ResourceBundle.swift b/Sources/WordPressUI/Extensions/NSBundle+ResourceBundle.swift similarity index 100% rename from Sources/Extensions/NSBundle+ResourceBundle.swift rename to Sources/WordPressUI/Extensions/NSBundle+ResourceBundle.swift diff --git a/Sources/Extensions/NSMutableAttributedString+Helpers.swift b/Sources/WordPressUI/Extensions/NSMutableAttributedString+Helpers.swift similarity index 100% rename from Sources/Extensions/NSMutableAttributedString+Helpers.swift rename to Sources/WordPressUI/Extensions/NSMutableAttributedString+Helpers.swift diff --git a/Sources/Extensions/UIAlertController+Helpers.swift b/Sources/WordPressUI/Extensions/UIAlertController+Helpers.swift similarity index 100% rename from Sources/Extensions/UIAlertController+Helpers.swift rename to Sources/WordPressUI/Extensions/UIAlertController+Helpers.swift diff --git a/Sources/Extensions/UIControl+Helpers.swift b/Sources/WordPressUI/Extensions/UIControl+Helpers.swift similarity index 100% rename from Sources/Extensions/UIControl+Helpers.swift rename to Sources/WordPressUI/Extensions/UIControl+Helpers.swift diff --git a/Sources/Extensions/UIDevice+Helpers.swift b/Sources/WordPressUI/Extensions/UIDevice+Helpers.swift similarity index 100% rename from Sources/Extensions/UIDevice+Helpers.swift rename to Sources/WordPressUI/Extensions/UIDevice+Helpers.swift diff --git a/Sources/Extensions/UIImage+Assets.swift b/Sources/WordPressUI/Extensions/UIImage+Assets.swift similarity index 100% rename from Sources/Extensions/UIImage+Assets.swift rename to Sources/WordPressUI/Extensions/UIImage+Assets.swift diff --git a/Sources/Extensions/UIImage+Crop.swift b/Sources/WordPressUI/Extensions/UIImage+Crop.swift similarity index 100% rename from Sources/Extensions/UIImage+Crop.swift rename to Sources/WordPressUI/Extensions/UIImage+Crop.swift diff --git a/Sources/Extensions/UIImage+Rotation.swift b/Sources/WordPressUI/Extensions/UIImage+Rotation.swift similarity index 100% rename from Sources/Extensions/UIImage+Rotation.swift rename to Sources/WordPressUI/Extensions/UIImage+Rotation.swift diff --git a/Sources/Extensions/UIImage+Tint.swift b/Sources/WordPressUI/Extensions/UIImage+Tint.swift similarity index 100% rename from Sources/Extensions/UIImage+Tint.swift rename to Sources/WordPressUI/Extensions/UIImage+Tint.swift diff --git a/Sources/Extensions/UIImageView+Blavatar.swift b/Sources/WordPressUI/Extensions/UIImageView+Blavatar.swift similarity index 100% rename from Sources/Extensions/UIImageView+Blavatar.swift rename to Sources/WordPressUI/Extensions/UIImageView+Blavatar.swift diff --git a/Sources/Extensions/UIImageView+Gravatar.swift b/Sources/WordPressUI/Extensions/UIImageView+Gravatar.swift similarity index 100% rename from Sources/Extensions/UIImageView+Gravatar.swift rename to Sources/WordPressUI/Extensions/UIImageView+Gravatar.swift diff --git a/Sources/Extensions/UIImageView+Networking.swift b/Sources/WordPressUI/Extensions/UIImageView+Networking.swift similarity index 100% rename from Sources/Extensions/UIImageView+Networking.swift rename to Sources/WordPressUI/Extensions/UIImageView+Networking.swift diff --git a/Sources/Extensions/UITableView+Helpers.swift b/Sources/WordPressUI/Extensions/UITableView+Helpers.swift similarity index 100% rename from Sources/Extensions/UITableView+Helpers.swift rename to Sources/WordPressUI/Extensions/UITableView+Helpers.swift diff --git a/Sources/Extensions/UITableViewController+Helpers.swift b/Sources/WordPressUI/Extensions/UITableViewController+Helpers.swift similarity index 100% rename from Sources/Extensions/UITableViewController+Helpers.swift rename to Sources/WordPressUI/Extensions/UITableViewController+Helpers.swift diff --git a/Sources/Extensions/UITextField+TextHelper.swift b/Sources/WordPressUI/Extensions/UITextField+TextHelper.swift similarity index 100% rename from Sources/Extensions/UITextField+TextHelper.swift rename to Sources/WordPressUI/Extensions/UITextField+TextHelper.swift diff --git a/Sources/Extensions/UIView+Animations.swift b/Sources/WordPressUI/Extensions/UIView+Animations.swift similarity index 100% rename from Sources/Extensions/UIView+Animations.swift rename to Sources/WordPressUI/Extensions/UIView+Animations.swift diff --git a/Sources/Extensions/UIView+Helpers.swift b/Sources/WordPressUI/Extensions/UIView+Helpers.swift similarity index 100% rename from Sources/Extensions/UIView+Helpers.swift rename to Sources/WordPressUI/Extensions/UIView+Helpers.swift diff --git a/Sources/Extensions/UIViewController+ChildViewController.swift b/Sources/WordPressUI/Extensions/UIViewController+ChildViewController.swift similarity index 100% rename from Sources/Extensions/UIViewController+ChildViewController.swift rename to Sources/WordPressUI/Extensions/UIViewController+ChildViewController.swift diff --git a/Sources/Extensions/UIViewController+Helpers.swift b/Sources/WordPressUI/Extensions/UIViewController+Helpers.swift similarity index 100% rename from Sources/Extensions/UIViewController+Helpers.swift rename to Sources/WordPressUI/Extensions/UIViewController+Helpers.swift diff --git a/Sources/Extensions/UIWindow+Helpers.swift b/Sources/WordPressUI/Extensions/UIWindow+Helpers.swift similarity index 100% rename from Sources/Extensions/UIWindow+Helpers.swift rename to Sources/WordPressUI/Extensions/UIWindow+Helpers.swift diff --git a/Sources/FancyAlert/FancyAlertPresentationController.swift b/Sources/WordPressUI/FancyAlert/FancyAlertPresentationController.swift similarity index 100% rename from Sources/FancyAlert/FancyAlertPresentationController.swift rename to Sources/WordPressUI/FancyAlert/FancyAlertPresentationController.swift diff --git a/Sources/FancyAlert/FancyAlertView.swift b/Sources/WordPressUI/FancyAlert/FancyAlertView.swift similarity index 100% rename from Sources/FancyAlert/FancyAlertView.swift rename to Sources/WordPressUI/FancyAlert/FancyAlertView.swift diff --git a/Sources/FancyAlert/FancyAlertViewController.swift b/Sources/WordPressUI/FancyAlert/FancyAlertViewController.swift similarity index 100% rename from Sources/FancyAlert/FancyAlertViewController.swift rename to Sources/WordPressUI/FancyAlert/FancyAlertViewController.swift diff --git a/Sources/FancyAlert/FancyAlerts.storyboard b/Sources/WordPressUI/FancyAlert/FancyAlerts.storyboard similarity index 100% rename from Sources/FancyAlert/FancyAlerts.storyboard rename to Sources/WordPressUI/FancyAlert/FancyAlerts.storyboard diff --git a/Sources/FancyAlert/FancyButton.swift b/Sources/WordPressUI/FancyAlert/FancyButton.swift similarity index 100% rename from Sources/FancyAlert/FancyButton.swift rename to Sources/WordPressUI/FancyAlert/FancyButton.swift diff --git a/Sources/FlingableView/FlingableViewHandler.swift b/Sources/WordPressUI/FlingableView/FlingableViewHandler.swift similarity index 100% rename from Sources/FlingableView/FlingableViewHandler.swift rename to Sources/WordPressUI/FlingableView/FlingableViewHandler.swift diff --git a/Sources/Ghosts/GhostOptions.swift b/Sources/WordPressUI/Ghosts/GhostOptions.swift similarity index 100% rename from Sources/Ghosts/GhostOptions.swift rename to Sources/WordPressUI/Ghosts/GhostOptions.swift diff --git a/Sources/Ghosts/GhostStyle.swift b/Sources/WordPressUI/Ghosts/GhostStyle.swift similarity index 100% rename from Sources/Ghosts/GhostStyle.swift rename to Sources/WordPressUI/Ghosts/GhostStyle.swift diff --git a/Sources/Ghosts/GhostableView.swift b/Sources/WordPressUI/Ghosts/GhostableView.swift similarity index 100% rename from Sources/Ghosts/GhostableView.swift rename to Sources/WordPressUI/Ghosts/GhostableView.swift diff --git a/Sources/Ghosts/Internal/GhostAnimation.swift b/Sources/WordPressUI/Ghosts/Internal/GhostAnimation.swift similarity index 100% rename from Sources/Ghosts/Internal/GhostAnimation.swift rename to Sources/WordPressUI/Ghosts/Internal/GhostAnimation.swift diff --git a/Sources/Ghosts/Internal/GhostCollectionViewHandler.swift b/Sources/WordPressUI/Ghosts/Internal/GhostCollectionViewHandler.swift similarity index 100% rename from Sources/Ghosts/Internal/GhostCollectionViewHandler.swift rename to Sources/WordPressUI/Ghosts/Internal/GhostCollectionViewHandler.swift diff --git a/Sources/Ghosts/Internal/GhostLayer.swift b/Sources/WordPressUI/Ghosts/Internal/GhostLayer.swift similarity index 100% rename from Sources/Ghosts/Internal/GhostLayer.swift rename to Sources/WordPressUI/Ghosts/Internal/GhostLayer.swift diff --git a/Sources/Ghosts/Internal/GhostTableViewHandler.swift b/Sources/WordPressUI/Ghosts/Internal/GhostTableViewHandler.swift similarity index 100% rename from Sources/Ghosts/Internal/GhostTableViewHandler.swift rename to Sources/WordPressUI/Ghosts/Internal/GhostTableViewHandler.swift diff --git a/Sources/Ghosts/Internal/UIView+InnerGhost.swift b/Sources/WordPressUI/Ghosts/Internal/UIView+InnerGhost.swift similarity index 100% rename from Sources/Ghosts/Internal/UIView+InnerGhost.swift rename to Sources/WordPressUI/Ghosts/Internal/UIView+InnerGhost.swift diff --git a/Sources/Ghosts/UICollectionView+Ghost.swift b/Sources/WordPressUI/Ghosts/UICollectionView+Ghost.swift similarity index 100% rename from Sources/Ghosts/UICollectionView+Ghost.swift rename to Sources/WordPressUI/Ghosts/UICollectionView+Ghost.swift diff --git a/Sources/Ghosts/UITableView+Ghost.swift b/Sources/WordPressUI/Ghosts/UITableView+Ghost.swift similarity index 100% rename from Sources/Ghosts/UITableView+Ghost.swift rename to Sources/WordPressUI/Ghosts/UITableView+Ghost.swift diff --git a/Sources/Ghosts/UIView+Ghost.swift b/Sources/WordPressUI/Ghosts/UIView+Ghost.swift similarity index 100% rename from Sources/Ghosts/UIView+Ghost.swift rename to Sources/WordPressUI/Ghosts/UIView+Ghost.swift diff --git a/Sources/Resources/Assets.xcassets/Contents.json b/Sources/WordPressUI/Resources/Assets.xcassets/Contents.json similarity index 100% rename from Sources/Resources/Assets.xcassets/Contents.json rename to Sources/WordPressUI/Resources/Assets.xcassets/Contents.json diff --git a/Sources/Resources/Assets.xcassets/blavatar.imageset/Contents.json b/Sources/WordPressUI/Resources/Assets.xcassets/blavatar.imageset/Contents.json similarity index 100% rename from Sources/Resources/Assets.xcassets/blavatar.imageset/Contents.json rename to Sources/WordPressUI/Resources/Assets.xcassets/blavatar.imageset/Contents.json diff --git a/Sources/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf b/Sources/WordPressUI/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf similarity index 100% rename from Sources/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf rename to Sources/WordPressUI/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf diff --git a/Sources/Resources/Assets.xcassets/gravatar.imageset/Contents.json b/Sources/WordPressUI/Resources/Assets.xcassets/gravatar.imageset/Contents.json similarity index 100% rename from Sources/Resources/Assets.xcassets/gravatar.imageset/Contents.json rename to Sources/WordPressUI/Resources/Assets.xcassets/gravatar.imageset/Contents.json diff --git a/Sources/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf b/Sources/WordPressUI/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf similarity index 100% rename from Sources/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf rename to Sources/WordPressUI/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf diff --git a/Sources/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json b/Sources/WordPressUI/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json similarity index 100% rename from Sources/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json rename to Sources/WordPressUI/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json diff --git a/Sources/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf b/Sources/WordPressUI/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf similarity index 100% rename from Sources/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf rename to Sources/WordPressUI/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf diff --git a/Sources/Tools/GradientView.swift b/Sources/WordPressUI/Tools/GradientView.swift similarity index 100% rename from Sources/Tools/GradientView.swift rename to Sources/WordPressUI/Tools/GradientView.swift diff --git a/Sources/Tools/RotationAwareNavigationViewController.swift b/Sources/WordPressUI/Tools/RotationAwareNavigationViewController.swift similarity index 100% rename from Sources/Tools/RotationAwareNavigationViewController.swift rename to Sources/WordPressUI/Tools/RotationAwareNavigationViewController.swift diff --git a/Sources/WordPressUI.h b/Sources/WordPressUI/WordPressUI.h similarity index 100% rename from Sources/WordPressUI.h rename to Sources/WordPressUI/WordPressUI.h diff --git a/WordPressUI.xcodeproj/project.pbxproj b/WordPressUI.xcodeproj/project.pbxproj index 70236ed..ea97777 100644 --- a/WordPressUI.xcodeproj/project.pbxproj +++ b/WordPressUI.xcodeproj/project.pbxproj @@ -190,6 +190,26 @@ /* Begin PBXGroup section */ 3FC095F42834C1E200C8477D /* Sources */ = { + isa = PBXGroup; + children = ( + 3FC095F72834C76C00C8477D /* Supporting Files */, + 3FC095F62834C74B00C8477D /* WordPressUI */, + ); + path = Sources; + sourceTree = ""; + }; + 3FC095F52834C29100C8477D /* Tests */ = { + isa = PBXGroup; + children = ( + 8B91476F2451CBEB0028B0AE /* BottomSheet */, + 57BC0C6B228DF1BA00C1F070 /* Ghosts */, + B529F287202C855B00895D88 /* Extensions */, + B59DCB6C202B146D00BEBD8A /* Info.plist */, + ); + path = Tests; + sourceTree = ""; + }; + 3FC095F62834C74B00C8477D /* WordPressUI */ = { isa = PBXGroup; children = ( 8B5100D0244F6C0200672D74 /* BottomSheet */, @@ -202,20 +222,16 @@ B5393FE8206D7047007BF9D4 /* Tools */, B58C4EC8207C594300E32E4D /* Resources */, B59DCB5F202B146D00BEBD8A /* WordPressUI.h */, - B59DCB60202B146D00BEBD8A /* Info.plist */, ); - path = Sources; + path = WordPressUI; sourceTree = ""; }; - 3FC095F52834C29100C8477D /* Tests */ = { + 3FC095F72834C76C00C8477D /* Supporting Files */ = { isa = PBXGroup; children = ( - 8B91476F2451CBEB0028B0AE /* BottomSheet */, - 57BC0C6B228DF1BA00C1F070 /* Ghosts */, - B529F287202C855B00895D88 /* Extensions */, - B59DCB6C202B146D00BEBD8A /* Info.plist */, + B59DCB60202B146D00BEBD8A /* Info.plist */, ); - path = Tests; + path = "Supporting Files"; sourceTree = ""; }; 43067E29203C8CA4001DD610 /* BlockEvents */ = { @@ -691,7 +707,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Sources/Info.plist; + INFOPLIST_FILE = "Sources/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -785,7 +801,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Sources/Info.plist; + INFOPLIST_FILE = "Sources/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -942,7 +958,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Sources/Info.plist; + INFOPLIST_FILE = "Sources/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -965,7 +981,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Sources/Info.plist; + INFOPLIST_FILE = "Sources/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; From e9bf7eb9ecbf96ffb35074506441a2f7a98a76e8 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 18 May 2022 20:33:22 +1000 Subject: [PATCH 6/6] Move all Objective-C sources in a dedicated folder --- .../NSString+Gravatar.h | 0 .../NSString+Gravatar.m | 0 .../UIColor+Helpers.h | 0 .../UIColor+Helpers.m | 0 .../UIImage+Resize.h | 0 .../UIImage+Resize.m | 0 .../UIImage+Util.h | 0 .../UIImage+Util.m | 0 .../UILabel+SuggestSize.h | 0 .../UILabel+SuggestSize.m | 0 WordPressUI.xcodeproj/project.pbxproj | 28 ++++++++++++------- 11 files changed, 18 insertions(+), 10 deletions(-) rename Sources/{WordPressUI/Extensions/Gravatar => WordPressUI-Objective-C}/NSString+Gravatar.h (100%) rename Sources/{WordPressUI/Extensions/Gravatar => WordPressUI-Objective-C}/NSString+Gravatar.m (100%) rename Sources/{WordPressUI/Categories => WordPressUI-Objective-C}/UIColor+Helpers.h (100%) rename Sources/{WordPressUI/Categories => WordPressUI-Objective-C}/UIColor+Helpers.m (100%) rename Sources/{WordPressUI/Categories => WordPressUI-Objective-C}/UIImage+Resize.h (100%) rename Sources/{WordPressUI/Categories => WordPressUI-Objective-C}/UIImage+Resize.m (100%) rename Sources/{WordPressUI/Categories => WordPressUI-Objective-C}/UIImage+Util.h (100%) rename Sources/{WordPressUI/Categories => WordPressUI-Objective-C}/UIImage+Util.m (100%) rename Sources/{WordPressUI/Categories => WordPressUI-Objective-C}/UILabel+SuggestSize.h (100%) rename Sources/{WordPressUI/Categories => WordPressUI-Objective-C}/UILabel+SuggestSize.m (100%) diff --git a/Sources/WordPressUI/Extensions/Gravatar/NSString+Gravatar.h b/Sources/WordPressUI-Objective-C/NSString+Gravatar.h similarity index 100% rename from Sources/WordPressUI/Extensions/Gravatar/NSString+Gravatar.h rename to Sources/WordPressUI-Objective-C/NSString+Gravatar.h diff --git a/Sources/WordPressUI/Extensions/Gravatar/NSString+Gravatar.m b/Sources/WordPressUI-Objective-C/NSString+Gravatar.m similarity index 100% rename from Sources/WordPressUI/Extensions/Gravatar/NSString+Gravatar.m rename to Sources/WordPressUI-Objective-C/NSString+Gravatar.m diff --git a/Sources/WordPressUI/Categories/UIColor+Helpers.h b/Sources/WordPressUI-Objective-C/UIColor+Helpers.h similarity index 100% rename from Sources/WordPressUI/Categories/UIColor+Helpers.h rename to Sources/WordPressUI-Objective-C/UIColor+Helpers.h diff --git a/Sources/WordPressUI/Categories/UIColor+Helpers.m b/Sources/WordPressUI-Objective-C/UIColor+Helpers.m similarity index 100% rename from Sources/WordPressUI/Categories/UIColor+Helpers.m rename to Sources/WordPressUI-Objective-C/UIColor+Helpers.m diff --git a/Sources/WordPressUI/Categories/UIImage+Resize.h b/Sources/WordPressUI-Objective-C/UIImage+Resize.h similarity index 100% rename from Sources/WordPressUI/Categories/UIImage+Resize.h rename to Sources/WordPressUI-Objective-C/UIImage+Resize.h diff --git a/Sources/WordPressUI/Categories/UIImage+Resize.m b/Sources/WordPressUI-Objective-C/UIImage+Resize.m similarity index 100% rename from Sources/WordPressUI/Categories/UIImage+Resize.m rename to Sources/WordPressUI-Objective-C/UIImage+Resize.m diff --git a/Sources/WordPressUI/Categories/UIImage+Util.h b/Sources/WordPressUI-Objective-C/UIImage+Util.h similarity index 100% rename from Sources/WordPressUI/Categories/UIImage+Util.h rename to Sources/WordPressUI-Objective-C/UIImage+Util.h diff --git a/Sources/WordPressUI/Categories/UIImage+Util.m b/Sources/WordPressUI-Objective-C/UIImage+Util.m similarity index 100% rename from Sources/WordPressUI/Categories/UIImage+Util.m rename to Sources/WordPressUI-Objective-C/UIImage+Util.m diff --git a/Sources/WordPressUI/Categories/UILabel+SuggestSize.h b/Sources/WordPressUI-Objective-C/UILabel+SuggestSize.h similarity index 100% rename from Sources/WordPressUI/Categories/UILabel+SuggestSize.h rename to Sources/WordPressUI-Objective-C/UILabel+SuggestSize.h diff --git a/Sources/WordPressUI/Categories/UILabel+SuggestSize.m b/Sources/WordPressUI-Objective-C/UILabel+SuggestSize.m similarity index 100% rename from Sources/WordPressUI/Categories/UILabel+SuggestSize.m rename to Sources/WordPressUI-Objective-C/UILabel+SuggestSize.m diff --git a/WordPressUI.xcodeproj/project.pbxproj b/WordPressUI.xcodeproj/project.pbxproj index ea97777..f8ca6c8 100644 --- a/WordPressUI.xcodeproj/project.pbxproj +++ b/WordPressUI.xcodeproj/project.pbxproj @@ -194,6 +194,7 @@ children = ( 3FC095F72834C76C00C8477D /* Supporting Files */, 3FC095F62834C74B00C8477D /* WordPressUI */, + 3FC095FA2834FFBA00C8477D /* WordPressUI-Objective-C */, ); path = Sources; sourceTree = ""; @@ -234,6 +235,23 @@ path = "Supporting Files"; sourceTree = ""; }; + 3FC095FA2834FFBA00C8477D /* WordPressUI-Objective-C */ = { + isa = PBXGroup; + children = ( + B58C4EC0207C570000E32E4D /* NSString+Gravatar.h */, + B58C4EC1207C570000E32E4D /* NSString+Gravatar.m */, + B5A787CD202B2AA6007874FB /* UIColor+Helpers.h */, + B5A787D1202B2AA6007874FB /* UIColor+Helpers.m */, + B5A787CF202B2AA6007874FB /* UIImage+Resize.h */, + B5A787D5202B2AA6007874FB /* UIImage+Resize.m */, + B5A787CC202B2AA6007874FB /* UIImage+Util.h */, + B5A787D2202B2AA6007874FB /* UIImage+Util.m */, + B5C82AE22077C01B00DB2E78 /* UILabel+SuggestSize.h */, + B5C82AE42077C02100DB2E78 /* UILabel+SuggestSize.m */, + ); + path = "WordPressUI-Objective-C"; + sourceTree = ""; + }; 43067E29203C8CA4001DD610 /* BlockEvents */ = { isa = PBXGroup; children = ( @@ -331,8 +349,6 @@ isa = PBXGroup; children = ( B58C4EBF207C570000E32E4D /* Gravatar.swift */, - B58C4EC0207C570000E32E4D /* NSString+Gravatar.h */, - B58C4EC1207C570000E32E4D /* NSString+Gravatar.m */, ); path = Gravatar; sourceTree = ""; @@ -418,14 +434,6 @@ B5A787CB202B2AA6007874FB /* Categories */ = { isa = PBXGroup; children = ( - B5A787CD202B2AA6007874FB /* UIColor+Helpers.h */, - B5A787D1202B2AA6007874FB /* UIColor+Helpers.m */, - B5A787CF202B2AA6007874FB /* UIImage+Resize.h */, - B5A787D5202B2AA6007874FB /* UIImage+Resize.m */, - B5A787CC202B2AA6007874FB /* UIImage+Util.h */, - B5A787D2202B2AA6007874FB /* UIImage+Util.m */, - B5C82AE22077C01B00DB2E78 /* UILabel+SuggestSize.h */, - B5C82AE42077C02100DB2E78 /* UILabel+SuggestSize.m */, ); path = Categories; sourceTree = "";