diff --git a/WordPress/Classes/System/WordPress-Bridging-Header.h b/WordPress/Classes/System/WordPress-Bridging-Header.h index 7b4ed9c4fd21..edb53eda397d 100644 --- a/WordPress/Classes/System/WordPress-Bridging-Header.h +++ b/WordPress/Classes/System/WordPress-Bridging-Header.h @@ -46,6 +46,7 @@ #import "PostCategoryService.h" #import "PostContentProvider.h" #import "PostListFooterView.h" +#import "PostMetaButton.h" #import "PostService.h" #import "PostServiceOptions.h" #import "PostSettingsViewController.h" diff --git a/WordPress/Classes/ViewRelated/Post/PostMetaButton.swift b/WordPress/Classes/ViewRelated/Post/PostMetaButton+Swift.swift similarity index 54% rename from WordPress/Classes/ViewRelated/Post/PostMetaButton.swift rename to WordPress/Classes/ViewRelated/Post/PostMetaButton+Swift.swift index 69ed7886c7ed..09507ae0fe06 100644 --- a/WordPress/Classes/ViewRelated/Post/PostMetaButton.swift +++ b/WordPress/Classes/ViewRelated/Post/PostMetaButton+Swift.swift @@ -1,9 +1,7 @@ import UIKit -// Temporary converted to Swift silence the compiler warnings that are treated -// as errors in Objective-C files. -final class PostMetaButton: UIButton { - override var intrinsicContentSize: CGSize { +extension PostMetaButton { + open override var intrinsicContentSize: CGSize { var newSize = super.intrinsicContentSize newSize.width += (imageEdgeInsets.left + imageEdgeInsets.right) newSize.width += (titleEdgeInsets.left + titleEdgeInsets.right) diff --git a/WordPress/Classes/ViewRelated/Post/PostMetaButton.h b/WordPress/Classes/ViewRelated/Post/PostMetaButton.h new file mode 100644 index 000000000000..c25ca7ea4376 --- /dev/null +++ b/WordPress/Classes/ViewRelated/Post/PostMetaButton.h @@ -0,0 +1,5 @@ +#import + +@interface PostMetaButton : UIButton + +@end diff --git a/WordPress/Classes/ViewRelated/Post/PostMetaButton.m b/WordPress/Classes/ViewRelated/Post/PostMetaButton.m new file mode 100644 index 000000000000..81f026c1d7e2 --- /dev/null +++ b/WordPress/Classes/ViewRelated/Post/PostMetaButton.m @@ -0,0 +1,4 @@ +#import "PostMetaButton.h" + +@implementation PostMetaButton +@end diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index f69f52e6ad6c..011f609f9cfa 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -351,8 +351,10 @@ 0C391E622A3002950040EA91 /* BlazeCampaignStatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C391E602A3002950040EA91 /* BlazeCampaignStatusView.swift */; }; 0C391E642A312DB20040EA91 /* BlazeCampaignViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C391E632A312DB20040EA91 /* BlazeCampaignViewModelTests.swift */; }; 0C63266F2A3D1305000B8C57 /* GutenbergFilesAppMediaSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C63266E2A3D1305000B8C57 /* GutenbergFilesAppMediaSourceTests.swift */; }; - 0C71959E2A3CDC8B002EA18C /* PostMetaButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C71959D2A3CDC8B002EA18C /* PostMetaButton.swift */; }; - 0C71959F2A3CDC8B002EA18C /* PostMetaButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C71959D2A3CDC8B002EA18C /* PostMetaButton.swift */; }; + 0C7E09202A4286A00052324C /* PostMetaButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C7E091F2A4286A00052324C /* PostMetaButton.m */; }; + 0C7E09212A4286A00052324C /* PostMetaButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C7E091F2A4286A00052324C /* PostMetaButton.m */; }; + 0C7E09242A4286F40052324C /* PostMetaButton+Swift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C7E09232A4286F40052324C /* PostMetaButton+Swift.swift */; }; + 0C7E09252A4286F40052324C /* PostMetaButton+Swift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C7E09232A4286F40052324C /* PostMetaButton+Swift.swift */; }; 0CB4056B29C78F06008EED0A /* BlogDashboardPersonalizationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB4056A29C78F06008EED0A /* BlogDashboardPersonalizationService.swift */; }; 0CB4056C29C78F06008EED0A /* BlogDashboardPersonalizationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB4056A29C78F06008EED0A /* BlogDashboardPersonalizationService.swift */; }; 0CB4056E29C7BA63008EED0A /* BlogDashboardPersonalizationServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB4056D29C7BA63008EED0A /* BlogDashboardPersonalizationServiceTests.swift */; }; @@ -6044,7 +6046,9 @@ 0C391E602A3002950040EA91 /* BlazeCampaignStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlazeCampaignStatusView.swift; sourceTree = ""; }; 0C391E632A312DB20040EA91 /* BlazeCampaignViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlazeCampaignViewModelTests.swift; sourceTree = ""; }; 0C63266E2A3D1305000B8C57 /* GutenbergFilesAppMediaSourceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GutenbergFilesAppMediaSourceTests.swift; sourceTree = ""; }; - 0C71959D2A3CDC8B002EA18C /* PostMetaButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostMetaButton.swift; sourceTree = ""; }; + 0C7E091F2A4286A00052324C /* PostMetaButton.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PostMetaButton.m; sourceTree = ""; }; + 0C7E09222A4286AA0052324C /* PostMetaButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PostMetaButton.h; sourceTree = ""; }; + 0C7E09232A4286F40052324C /* PostMetaButton+Swift.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PostMetaButton+Swift.swift"; sourceTree = ""; }; 0CB4056A29C78F06008EED0A /* BlogDashboardPersonalizationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlogDashboardPersonalizationService.swift; sourceTree = ""; }; 0CB4056D29C7BA63008EED0A /* BlogDashboardPersonalizationServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlogDashboardPersonalizationServiceTests.swift; sourceTree = ""; }; 0CB4057029C8DCF4008EED0A /* BlogDashboardPersonalizationViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlogDashboardPersonalizationViewModel.swift; sourceTree = ""; }; @@ -12388,7 +12392,9 @@ 5D732F951AE84E3C00CD89E7 /* PostListFooterView.h */, 5D732F961AE84E3C00CD89E7 /* PostListFooterView.m */, 5D732F981AE84E5400CD89E7 /* PostListFooterView.xib */, - 0C71959D2A3CDC8B002EA18C /* PostMetaButton.swift */, + 0C7E09222A4286AA0052324C /* PostMetaButton.h */, + 0C7E091F2A4286A00052324C /* PostMetaButton.m */, + 0C7E09232A4286F40052324C /* PostMetaButton+Swift.swift */, 17F67C55203D81430072001E /* PostCardStatusViewModel.swift */, 17A28DC42050404C00EA6D9E /* AuthorFilterButton.swift */, 17A28DCA2052FB5D00EA6D9E /* AuthorFilterViewController.swift */, @@ -21001,9 +21007,11 @@ 986CC4D220E1B2F6004F300E /* CustomLogFormatter.swift in Sources */, 3236F77524ABB7770088E8F3 /* ReaderInterestsCollectionViewCell.swift in Sources */, 40A71C6A220E1952002E3D25 /* StatsRecord+CoreDataClass.swift in Sources */, + 0C7E09202A4286A00052324C /* PostMetaButton.m in Sources */, 9826AE8221B5C6A700C851FA /* LatestPostSummaryCell.swift in Sources */, F47E154A29E84A9300B6E426 /* DomainPurchasingWebFlowController.swift in Sources */, 433432521E9ED18900915988 /* LoginEpilogueViewController.swift in Sources */, + 0C7E09242A4286F40052324C /* PostMetaButton+Swift.swift in Sources */, 4395A1592106389800844E8E /* QuickStartTours.swift in Sources */, 9A2B28EE2191B50500458F2A /* RevisionsTableViewFooter.swift in Sources */, 80EF671F27F135EB0063B138 /* WhatIsNewViewAppearance.swift in Sources */, @@ -21144,7 +21152,6 @@ 98BFF57E23984345008A1DCB /* AllTimeWidgetStats.swift in Sources */, 7E40713A2372AD54003627FA /* GutenbergFilesAppMediaSource.swift in Sources */, B532D4EC199D4357006E4DF6 /* NoteBlockTextTableViewCell.swift in Sources */, - 0C71959E2A3CDC8B002EA18C /* PostMetaButton.swift in Sources */, 8B15CDAB27EB89AD00A75749 /* BlogDashboardPostsParser.swift in Sources */, B52F8CD81B43260C00D36025 /* NotificationSettingStreamsViewController.swift in Sources */, 464688D8255C71D200ECA61C /* SiteDesignPreviewViewController.swift in Sources */, @@ -23806,6 +23813,7 @@ FABB211E2602FC2C00C8785C /* UIView+Subviews.m in Sources */, FABB211F2602FC2C00C8785C /* WordPress-20-21.xcmappingmodel in Sources */, 8B55FA002614D980007D618E /* UnifiedPrologueNotificationsContentView.swift in Sources */, + 0C7E09252A4286F40052324C /* PostMetaButton+Swift.swift in Sources */, FABB21202602FC2C00C8785C /* TenorClient.swift in Sources */, FABB21212602FC2C00C8785C /* LoginEpilogueTableViewController.swift in Sources */, FABB21222602FC2C00C8785C /* JetpackRemoteInstallViewModel.swift in Sources */, @@ -24308,6 +24316,7 @@ 1770BD0E267A368100D5F8C0 /* BloggingRemindersPushPromptViewController.swift in Sources */, C7BB601A2863AF9700748FD9 /* QRLoginProtocols.swift in Sources */, FABB22912602FC2C00C8785C /* FilterProvider.swift in Sources */, + 0C7E09212A4286A00052324C /* PostMetaButton.m in Sources */, FABB22922602FC2C00C8785C /* DomainCreditEligibilityChecker.swift in Sources */, FABB22932602FC2C00C8785C /* SiteSettingsViewController.m in Sources */, 987E79CC261F8858000192B7 /* UserProfileSheetViewController.swift in Sources */, @@ -25206,7 +25215,6 @@ FABB25262602FC2C00C8785C /* String+RegEx.swift in Sources */, 175CC17A27230DC900622FB4 /* Bool+StringRepresentation.swift in Sources */, F1BC842F27035A1800C39993 /* BlogService+Domains.swift in Sources */, - 0C71959F2A3CDC8B002EA18C /* PostMetaButton.swift in Sources */, FE7FAABF299A998F0032A6F2 /* EventTracker.swift in Sources */, 8B33BC9627A0C14C00DB5985 /* BlogDetailsViewController+QuickActions.swift in Sources */, FABB25272602FC2C00C8785C /* UIImage+Exporters.swift in Sources */,