diff --git a/WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+Aztec.swift b/WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+Aztec.swift index f8c77aae9f21..1113a7253722 100644 --- a/WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+Aztec.swift +++ b/WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+Aztec.swift @@ -24,12 +24,4 @@ extension WPStyleGuide { return (UIDevice.isPad()) ? .basicBackground : .neutral(.shade0) } } - - static func configureBetaButton(_ button: UIButton) { - button.setImage(.gridicon(.helpOutline), for: .normal) - button.tintColor = .neutral(.shade20) - - let edgeInsets = UIEdgeInsets(top: 2.0, left: 2.0, bottom: 2.0, right: 2.0) - button.contentEdgeInsets = edgeInsets - } } diff --git a/WordPress/Classes/System/WordPress-Bridging-Header.h b/WordPress/Classes/System/WordPress-Bridging-Header.h index a3d01a6326aa..7b4ed9c4fd21 100644 --- a/WordPress/Classes/System/WordPress-Bridging-Header.h +++ b/WordPress/Classes/System/WordPress-Bridging-Header.h @@ -37,7 +37,6 @@ #import "MenuItemsViewController.h" #import "MenusViewController.h" -#import "NavBarTitleDropdownButton.h" #import "NSObject+Helpers.h" #import "PageListTableViewCell.h" @@ -47,7 +46,6 @@ #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/Menus/MenuDetailsViewController.m b/WordPress/Classes/ViewRelated/Menus/MenuDetailsViewController.m index ed13fb04b209..39c8a314ff0f 100644 --- a/WordPress/Classes/ViewRelated/Menus/MenuDetailsViewController.m +++ b/WordPress/Classes/ViewRelated/Menus/MenuDetailsViewController.m @@ -79,7 +79,6 @@ - (void)setupTrashButton [trashButton setImage:[UIImage gridiconOfType:GridiconTypeTrash] forState:UIControlStateNormal]; [trashButton addTarget:self action:@selector(trashButtonPressed) forControlEvents:UIControlEventTouchUpInside]; trashButton.backgroundColor = [UIColor clearColor]; - trashButton.adjustsImageWhenHighlighted = YES; trashButton.accessibilityLabel = NSLocalizedString(@"Delete menu", @"Screen Reader: Button that deletes a menu."); } diff --git a/WordPress/Classes/ViewRelated/Menus/MenuItemAbstractView.m b/WordPress/Classes/ViewRelated/Menus/MenuItemAbstractView.m index c81ae039d481..d615a09f09ce 100644 --- a/WordPress/Classes/ViewRelated/Menus/MenuItemAbstractView.m +++ b/WordPress/Classes/ViewRelated/Menus/MenuItemAbstractView.m @@ -217,28 +217,18 @@ - (UIButton *)addAccessoryButtonIconViewWithImage:(UIImage *)image button.translatesAutoresizingMaskIntoConstraints = NO; button.backgroundColor = [UIColor clearColor]; - [button setImage:image forState:UIControlStateNormal]; + UIImage *resizedImage = [image resizedImageWithContentMode:UIViewContentModeScaleAspectFit bounds:CGSizeMake(MenusDesignItemIconSize, MenusDesignItemIconSize) interpolationQuality:kCGInterpolationDefault]; + [button setImage:[resizedImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forState:UIControlStateNormal]; button.tintColor = [UIColor murielTextTertiary]; CGFloat padding = 6.0; - CGFloat width = MenusDesignItemIconSize + (padding * 2); - CGFloat height = MenusDesignItemIconSize + (padding * 2); + CGFloat side = MenusDesignItemIconSize + (padding * 2); - UIEdgeInsets inset = button.imageEdgeInsets; - inset.top = padding; - inset.bottom = padding; - inset.left = padding; - inset.right = padding; - button.imageEdgeInsets = inset; - - NSLayoutConstraint *widthConstraint = [button.widthAnchor constraintEqualToConstant:width]; + NSLayoutConstraint *widthConstraint = [button.widthAnchor constraintEqualToConstant:side]; widthConstraint.priority = 999; - NSLayoutConstraint *heightConstraint = [button.heightAnchor constraintEqualToConstant:height]; + NSLayoutConstraint *heightConstraint = [button.heightAnchor constraintEqualToConstant:side]; heightConstraint.priority = 999; - [NSLayoutConstraint activateConstraints:@[ - widthConstraint, - heightConstraint - ]]; + [NSLayoutConstraint activateConstraints:@[widthConstraint, heightConstraint]]; [self addAccessoryButton:button]; return button; diff --git a/WordPress/Classes/ViewRelated/Menus/MenuItemEditingFooterView.m b/WordPress/Classes/ViewRelated/Menus/MenuItemEditingFooterView.m index 7e85a405dd1e..5244acbc4e61 100644 --- a/WordPress/Classes/ViewRelated/Menus/MenuItemEditingFooterView.m +++ b/WordPress/Classes/ViewRelated/Menus/MenuItemEditingFooterView.m @@ -39,7 +39,6 @@ - (void)setupCancelButton - (void)setupTrashButton { UIButton *button = self.trashButton; - button.adjustsImageWhenHighlighted = YES; [button setTitle:nil forState:UIControlStateNormal]; button.tintColor = [UIColor murielNeutral30]; [button setImage:[UIImage gridiconOfType:GridiconTypeTrash] forState:UIControlStateNormal]; diff --git a/WordPress/Classes/ViewRelated/Menus/MenuItemView.m b/WordPress/Classes/ViewRelated/Menus/MenuItemView.m index 23e9cd8b7743..f9f6908e8b20 100644 --- a/WordPress/Classes/ViewRelated/Menus/MenuItemView.m +++ b/WordPress/Classes/ViewRelated/Menus/MenuItemView.m @@ -64,14 +64,20 @@ - (void)setupCancelButton button.titleLabel.adjustsFontForContentSizeCategory = YES; [button setTitle:NSLocalizedString(@"Cancel", @"") forState:UIControlStateNormal]; - UIEdgeInsets inset = button.contentEdgeInsets; - inset.left = 6.0; - inset.right = inset.left; - button.contentEdgeInsets = inset; + if (@available(iOS 15, *)) { + UIButtonConfiguration *configuration = [UIButtonConfiguration plainButtonConfiguration]; + configuration.contentInsets = NSDirectionalEdgeInsetsMake(0, 6, 0, 6); + button.configuration = configuration; + } else { + UIEdgeInsets inset = button.contentEdgeInsets; + inset.left = 6.0; + inset.right = inset.left; + button.contentEdgeInsets = inset; + } button.hidden = YES; [self.accessoryStackView addArrangedSubview:button]; - [button setContentHuggingPriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal]; + [button setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; [button setContentCompressionResistancePriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal]; NSLayoutConstraint *heightConstraint = [button.heightAnchor constraintEqualToAnchor:self.accessoryStackView.heightAnchor]; diff --git a/WordPress/Classes/ViewRelated/Post/NavBarTitleDropdownButton.h b/WordPress/Classes/ViewRelated/Post/NavBarTitleDropdownButton.h deleted file mode 100644 index 76b86daea9c2..000000000000 --- a/WordPress/Classes/ViewRelated/Post/NavBarTitleDropdownButton.h +++ /dev/null @@ -1,7 +0,0 @@ -#import - -@interface NavBarTitleDropdownButton : UIButton - -- (void)setAttributedTitleForTitle:(NSString *)title; - -@end diff --git a/WordPress/Classes/ViewRelated/Post/NavBarTitleDropdownButton.m b/WordPress/Classes/ViewRelated/Post/NavBarTitleDropdownButton.m deleted file mode 100644 index fa1d173f28eb..000000000000 --- a/WordPress/Classes/ViewRelated/Post/NavBarTitleDropdownButton.m +++ /dev/null @@ -1,75 +0,0 @@ -#import "NavBarTitleDropdownButton.h" -#import "WordPress-Swift.h" -#import -#import - - - -@implementation NavBarTitleDropdownButton - -- (instancetype)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self setupStyle]; - } - - return self; -} - -- (void)awakeFromNib -{ - [super awakeFromNib]; - [self setupStyle]; - [self adjustInsetsForTextDirection]; -} - -- (void)setupStyle -{ - self.titleLabel.textColor = [UIColor whiteColor]; - self.titleLabel.adjustsFontSizeToFitWidth = NO; - self.titleLabel.lineBreakMode = NSLineBreakByTruncatingTail; - [self setImage:[UIImage imageNamed:@"icon-nav-chevron"] forState:UIControlStateNormal]; - [self setImage:[UIImage imageNamed:@"icon-nav-chevron-highlight"] forState:UIControlStateHighlighted]; -} - -- (void)adjustInsetsForTextDirection -{ - [self flipInsetsForRightToLeftLayoutDirection]; -} - -- (CGRect)imageRectForContentRect:(CGRect)contentRect -{ - CGRect frame = [super imageRectForContentRect:contentRect]; - if ([self userInterfaceLayoutDirection] == UIUserInterfaceLayoutDirectionLeftToRight) { - frame.origin.x = CGRectGetMaxX(contentRect) - CGRectGetWidth(frame) - self.imageEdgeInsets.right + self.imageEdgeInsets.left; - } else { - frame.origin.x = CGRectGetMinX(contentRect); - } - return frame; -} - -- (CGRect)titleRectForContentRect:(CGRect)contentRect -{ - CGRect frame = [super titleRectForContentRect:contentRect]; - if ([self userInterfaceLayoutDirection] == UIUserInterfaceLayoutDirectionLeftToRight) { - frame.origin.x = CGRectGetMinX(frame) - CGRectGetWidth([self imageRectForContentRect:contentRect]); - } else { - frame.origin.x = CGRectGetMaxX([self imageRectForContentRect:contentRect]) + self.imageEdgeInsets.right - self.imageEdgeInsets.left; - } - return frame; -} - -- (void)setAttributedTitleForTitle:(NSString *)title -{ - NSDictionary *attributes = @{NSForegroundColorAttributeName : [UIColor whiteColor], - NSFontAttributeName : [WPFontManager systemBoldFontOfSize:16.0] }; - NSMutableAttributedString *titleText = [[NSMutableAttributedString alloc] initWithString:title - attributes:attributes]; - - [self setAttributedTitle:titleText forState:UIControlStateNormal]; - [self setAttributedTitle:titleText forState:UIControlStateHighlighted]; - [self sizeToFit]; -} - -@end diff --git a/WordPress/Classes/ViewRelated/Post/PostMetaButton.h b/WordPress/Classes/ViewRelated/Post/PostMetaButton.h deleted file mode 100644 index c25ca7ea4376..000000000000 --- a/WordPress/Classes/ViewRelated/Post/PostMetaButton.h +++ /dev/null @@ -1,5 +0,0 @@ -#import - -@interface PostMetaButton : UIButton - -@end diff --git a/WordPress/Classes/ViewRelated/Post/PostMetaButton.m b/WordPress/Classes/ViewRelated/Post/PostMetaButton.m deleted file mode 100644 index 259f6a94051d..000000000000 --- a/WordPress/Classes/ViewRelated/Post/PostMetaButton.m +++ /dev/null @@ -1,13 +0,0 @@ -#import "PostMetaButton.h" - -@implementation PostMetaButton - -- (CGSize)intrinsicContentSize -{ - CGSize newSize = [super intrinsicContentSize]; - newSize.width += (self.imageEdgeInsets.left + self.imageEdgeInsets.right); - newSize.width += (self.titleEdgeInsets.left + self.titleEdgeInsets.right); - return newSize; -} - -@end diff --git a/WordPress/Classes/ViewRelated/Post/PostMetaButton.swift b/WordPress/Classes/ViewRelated/Post/PostMetaButton.swift new file mode 100644 index 000000000000..69ed7886c7ed --- /dev/null +++ b/WordPress/Classes/ViewRelated/Post/PostMetaButton.swift @@ -0,0 +1,12 @@ +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 { + var newSize = super.intrinsicContentSize + newSize.width += (imageEdgeInsets.left + imageEdgeInsets.right) + newSize.width += (titleEdgeInsets.left + titleEdgeInsets.right) + return newSize + } +} diff --git a/WordPress/Classes/ViewRelated/Views/VerticallyStackedButton.m b/WordPress/Classes/ViewRelated/Views/VerticallyStackedButton.m index 2dc7f550a088..8a559b76bafb 100644 --- a/WordPress/Classes/ViewRelated/Views/VerticallyStackedButton.m +++ b/WordPress/Classes/ViewRelated/Views/VerticallyStackedButton.m @@ -40,8 +40,6 @@ - (void)layoutSubviews { CGRectGetMaxY(self.imageView.frame) + ImageLabelSeparation, titleSize.width, titleSize.height)); - - self.contentEdgeInsets = UIEdgeInsetsMake(5.0f, 0.0f, 5.0f, 0.0f); } @end diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index 5a6ffd931d52..196c4418d038 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -350,6 +350,8 @@ 0C391E612A3002950040EA91 /* DashboardBlazeCampaignStatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C391E602A3002950040EA91 /* DashboardBlazeCampaignStatusView.swift */; }; 0C391E622A3002950040EA91 /* DashboardBlazeCampaignStatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C391E602A3002950040EA91 /* DashboardBlazeCampaignStatusView.swift */; }; 0C391E642A312DB20040EA91 /* DashboardBlazeCampaignViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C391E632A312DB20040EA91 /* DashboardBlazeCampaignViewModelTests.swift */; }; + 0C71959E2A3CDC8B002EA18C /* PostMetaButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C71959D2A3CDC8B002EA18C /* PostMetaButton.swift */; }; + 0C71959F2A3CDC8B002EA18C /* PostMetaButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C71959D2A3CDC8B002EA18C /* PostMetaButton.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 */; }; @@ -1318,7 +1320,6 @@ 5D1D04751B7A50B100CDE646 /* Reader.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5D1D04731B7A50B100CDE646 /* Reader.storyboard */; }; 5D1D04761B7A50B100CDE646 /* ReaderStreamViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D1D04741B7A50B100CDE646 /* ReaderStreamViewController.swift */; }; 5D2B30B91B7411C700DA15F3 /* ReaderCardDiscoverAttributionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D2B30B81B7411C700DA15F3 /* ReaderCardDiscoverAttributionView.swift */; }; - 5D2C05561AD2F56200A753FE /* NavBarTitleDropdownButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D2C05551AD2F56200A753FE /* NavBarTitleDropdownButton.m */; }; 5D2FB2831AE98C4600F1D4ED /* RestorePostTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5D2FB2821AE98C4600F1D4ED /* RestorePostTableViewCell.xib */; }; 5D3D559718F88C3500782892 /* ReaderPostService.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D3D559618F88C3500782892 /* ReaderPostService.m */; }; 5D3E334E15EEBB6B005FC6F2 /* ReachabilityUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D3E334D15EEBB6B005FC6F2 /* ReachabilityUtils.m */; }; @@ -1348,7 +1349,6 @@ 5D97C2F315CAF8D8009B44DD /* UINavigationController+KeyboardFix.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D97C2F215CAF8D8009B44DD /* UINavigationController+KeyboardFix.m */; }; 5DA3EE161925090A00294E0B /* MediaService.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DA3EE151925090A00294E0B /* MediaService.m */; }; 5DA5BF4418E32DCF005F11F9 /* Theme.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DA5BF3418E32DCF005F11F9 /* Theme.m */; }; - 5DAFEAB81AF2CA6E00B3E1D7 /* PostMetaButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DAFEAB71AF2CA6E00B3E1D7 /* PostMetaButton.m */; }; 5DB3BA0518D0E7B600F3F3E9 /* WPPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DB3BA0418D0E7B600F3F3E9 /* WPPickerView.m */; }; 5DB4683B18A2E718004A89A9 /* LocationService.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DB4683A18A2E718004A89A9 /* LocationService.m */; }; 5DB767411588F64D00EBE36C /* postPreview.html in Resources */ = {isa = PBXBuildFile; fileRef = 5DB767401588F64D00EBE36C /* postPreview.html */; }; @@ -4255,7 +4255,6 @@ FABB21842602FC2C00C8785C /* WhatIsNewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F73BE5E24EB3B4400BE99FF /* WhatIsNewView.swift */; }; FABB21852602FC2C00C8785C /* GravatarService.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5772AC31C9C7A070031F97E /* GravatarService.swift */; }; FABB21862602FC2C00C8785C /* CountriesCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 981676D4221B7A4300B81C3F /* CountriesCell.swift */; }; - FABB21872602FC2C00C8785C /* NavBarTitleDropdownButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D2C05551AD2F56200A753FE /* NavBarTitleDropdownButton.m */; }; FABB21882602FC2C00C8785C /* ReaderTopicsCardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BCF957924C6044000712056 /* ReaderTopicsCardCell.swift */; }; FABB21892602FC2C00C8785C /* Post+RefreshStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF0F722B206E5345000DAAB5 /* Post+RefreshStatus.swift */; }; FABB218A2602FC2C00C8785C /* ImageDimensionParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 326E281A250AC4A50029EBF0 /* ImageDimensionParser.swift */; }; @@ -4945,7 +4944,6 @@ FABB24582602FC2C00C8785C /* ReaderManageScenePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F52CACC9244FA7AA00661380 /* ReaderManageScenePresenter.swift */; }; FABB24592602FC2C00C8785C /* MediaService.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF5371621FDFF64F00619A3F /* MediaService.swift */; }; FABB245A2602FC2C00C8785C /* TopViewedPostStatsRecordValue+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40C403F12215D66A00E8C894 /* TopViewedPostStatsRecordValue+CoreDataClass.swift */; }; - FABB245B2602FC2C00C8785C /* PostMetaButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DAFEAB71AF2CA6E00B3E1D7 /* PostMetaButton.m */; }; FABB245C2602FC2C00C8785C /* PluginStore+Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40ADB15420686870009A9161 /* PluginStore+Persistence.swift */; }; FABB245D2602FC2C00C8785C /* ResultsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = D83CA3A620842CD90060E310 /* ResultsPage.swift */; }; FABB245E2602FC2C00C8785C /* FormattableRangesFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E929CD02110D4F200BCAD88 /* FormattableRangesFactory.swift */; }; @@ -6046,6 +6044,7 @@ 0C391E5D2A2FE5350040EA91 /* DashboardBlazeCampaignView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashboardBlazeCampaignView.swift; sourceTree = ""; }; 0C391E602A3002950040EA91 /* DashboardBlazeCampaignStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashboardBlazeCampaignStatusView.swift; sourceTree = ""; }; 0C391E632A312DB20040EA91 /* DashboardBlazeCampaignViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashboardBlazeCampaignViewModelTests.swift; sourceTree = ""; }; + 0C71959D2A3CDC8B002EA18C /* PostMetaButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostMetaButton.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 = ""; }; @@ -6918,8 +6917,6 @@ 5D1D04741B7A50B100CDE646 /* ReaderStreamViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReaderStreamViewController.swift; sourceTree = ""; }; 5D229A78199AB74F00685123 /* WordPress 21.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "WordPress 21.xcdatamodel"; sourceTree = ""; }; 5D2B30B81B7411C700DA15F3 /* ReaderCardDiscoverAttributionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReaderCardDiscoverAttributionView.swift; sourceTree = ""; }; - 5D2C05541AD2F56200A753FE /* NavBarTitleDropdownButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavBarTitleDropdownButton.h; sourceTree = ""; }; - 5D2C05551AD2F56200A753FE /* NavBarTitleDropdownButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = NavBarTitleDropdownButton.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 5D2FB2821AE98C4600F1D4ED /* RestorePostTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RestorePostTableViewCell.xib; sourceTree = ""; }; 5D3D559518F88C3500782892 /* ReaderPostService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderPostService.h; sourceTree = ""; }; 5D3D559618F88C3500782892 /* ReaderPostService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReaderPostService.m; sourceTree = ""; }; @@ -6972,8 +6969,6 @@ 5DA5BF3318E32DCF005F11F9 /* Theme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Theme.h; sourceTree = ""; }; 5DA5BF3418E32DCF005F11F9 /* Theme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Theme.m; sourceTree = ""; }; 5DA5BF4B18E331D8005F11F9 /* WordPress 16.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "WordPress 16.xcdatamodel"; sourceTree = ""; }; - 5DAFEAB61AF2CA6E00B3E1D7 /* PostMetaButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PostMetaButton.h; sourceTree = ""; }; - 5DAFEAB71AF2CA6E00B3E1D7 /* PostMetaButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PostMetaButton.m; sourceTree = ""; }; 5DB3BA0318D0E7B600F3F3E9 /* WPPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WPPickerView.h; sourceTree = ""; usesTabs = 0; }; 5DB3BA0418D0E7B600F3F3E9 /* WPPickerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WPPickerView.m; sourceTree = ""; usesTabs = 0; }; 5DB4683918A2E718004A89A9 /* LocationService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocationService.h; sourceTree = ""; }; @@ -12391,13 +12386,10 @@ 57D6C83F229498C4003DDC7E /* InteractivePostView.swift */, 575E126E229779E70041B3EB /* RestorePostTableViewCell.swift */, 5D2FB2821AE98C4600F1D4ED /* RestorePostTableViewCell.xib */, - 5D2C05541AD2F56200A753FE /* NavBarTitleDropdownButton.h */, - 5D2C05551AD2F56200A753FE /* NavBarTitleDropdownButton.m */, 5D732F951AE84E3C00CD89E7 /* PostListFooterView.h */, 5D732F961AE84E3C00CD89E7 /* PostListFooterView.m */, 5D732F981AE84E5400CD89E7 /* PostListFooterView.xib */, - 5DAFEAB61AF2CA6E00B3E1D7 /* PostMetaButton.h */, - 5DAFEAB71AF2CA6E00B3E1D7 /* PostMetaButton.m */, + 0C71959D2A3CDC8B002EA18C /* PostMetaButton.swift */, 17F67C55203D81430072001E /* PostCardStatusViewModel.swift */, 17A28DC42050404C00EA6D9E /* AuthorFilterButton.swift */, 17A28DCA2052FB5D00EA6D9E /* AuthorFilterViewController.swift */, @@ -21101,7 +21093,6 @@ FADFBD26265F580500039C41 /* MultilineButton.swift in Sources */, B5772AC41C9C7A070031F97E /* GravatarService.swift in Sources */, 981676D6221B7A4300B81C3F /* CountriesCell.swift in Sources */, - 5D2C05561AD2F56200A753FE /* NavBarTitleDropdownButton.m in Sources */, 8BCF957A24C6044000712056 /* ReaderTopicsCardCell.swift in Sources */, FF0F722C206E5345000DAAB5 /* Post+RefreshStatus.swift in Sources */, 326E281C250AC4A50029EBF0 /* ImageDimensionParser.swift in Sources */, @@ -21148,6 +21139,7 @@ 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 */, @@ -22062,7 +22054,6 @@ F52CACCA244FA7AA00661380 /* ReaderManageScenePresenter.swift in Sources */, FF5371631FDFF64F00619A3F /* MediaService.swift in Sources */, 40C403F52215D66A00E8C894 /* TopViewedPostStatsRecordValue+CoreDataClass.swift in Sources */, - 5DAFEAB81AF2CA6E00B3E1D7 /* PostMetaButton.m in Sources */, 40ADB15520686870009A9161 /* PluginStore+Persistence.swift in Sources */, FE4DC5A3293A75FC008F322F /* MigrationDeepLinkRouter.swift in Sources */, D83CA3A720842CD90060E310 /* ResultsPage.swift in Sources */, @@ -23948,7 +23939,6 @@ FABB21842602FC2C00C8785C /* WhatIsNewView.swift in Sources */, FABB21852602FC2C00C8785C /* GravatarService.swift in Sources */, FABB21862602FC2C00C8785C /* CountriesCell.swift in Sources */, - FABB21872602FC2C00C8785C /* NavBarTitleDropdownButton.m in Sources */, FABB21882602FC2C00C8785C /* ReaderTopicsCardCell.swift in Sources */, FA25FA342609AAAA0005E08F /* AppConfiguration.swift in Sources */, 83C972E1281C45AB0049E1FE /* Post+BloggingPrompts.swift in Sources */, @@ -24921,7 +24911,6 @@ FABB24592602FC2C00C8785C /* MediaService.swift in Sources */, 839B150C2795DEE0009F5E77 /* UIView+Margins.swift in Sources */, FABB245A2602FC2C00C8785C /* TopViewedPostStatsRecordValue+CoreDataClass.swift in Sources */, - FABB245B2602FC2C00C8785C /* PostMetaButton.m in Sources */, FABB245C2602FC2C00C8785C /* PluginStore+Persistence.swift in Sources */, FABB245D2602FC2C00C8785C /* ResultsPage.swift in Sources */, FABB245E2602FC2C00C8785C /* FormattableRangesFactory.swift in Sources */, @@ -25211,6 +25200,7 @@ 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 */,