From a90d5ea084b989f7b67b2a81489a4a8a91254a8d Mon Sep 17 00:00:00 2001 From: Nathan Mattes Date: Fri, 9 Feb 2024 11:12:15 +0100 Subject: [PATCH 1/2] Fix Follow-Button in App-Dark Mode (#1218) (#1222) * Don't set colors (#1218 * Use UIButton.configuration for ... configuration (#1218) * Fix activity indicator (#1218) --- .../ProfileRelationshipActionButton.swift | 89 ++++++------------- 1 file changed, 26 insertions(+), 63 deletions(-) diff --git a/MastodonSDK/Sources/MastodonUI/View/Control/ProfileRelationshipActionButton.swift b/MastodonSDK/Sources/MastodonUI/View/Control/ProfileRelationshipActionButton.swift index 46ec8b5dd..1a3637b49 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Control/ProfileRelationshipActionButton.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Control/ProfileRelationshipActionButton.swift @@ -9,76 +9,39 @@ import UIKit import MastodonAsset import MastodonLocalization -public final class ProfileRelationshipActionButton: RoundedEdgesButton { - - public let activityIndicatorView: UIActivityIndicatorView = { - let activityIndicatorView = UIActivityIndicatorView(style: .medium) - activityIndicatorView.color = Asset.Colors.Label.primaryReverse.color - return activityIndicatorView - }() - - public override init(frame: CGRect) { - super.init(frame: frame) - _init() - } - - public required init?(coder: NSCoder) { - super.init(coder: coder) - _init() - } - -} - -extension ProfileRelationshipActionButton { - private func _init() { - cornerRadius = 10 - titleLabel?.font = .systemFont(ofSize: 17, weight: .semibold) - - activityIndicatorView.translatesAutoresizingMaskIntoConstraints = false - addSubview(activityIndicatorView) - NSLayoutConstraint.activate([ - activityIndicatorView.centerXAnchor.constraint(equalTo: centerXAnchor), - activityIndicatorView.centerYAnchor.constraint(equalTo: centerYAnchor), - ]) - - activityIndicatorView.hidesWhenStopped = true - activityIndicatorView.stopAnimating() - - configureAppearance() - } - - public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { - super.traitCollectionDidChange(previousTraitCollection) - - configureAppearance() - } -} - -extension ProfileRelationshipActionButton { +public final class ProfileRelationshipActionButton: UIButton { public func configure(actionOptionSet: RelationshipActionOptionSet) { - setTitle(actionOptionSet.title, for: .normal) - - configureAppearance() - - titleEdgeInsets = UIEdgeInsets(top: 0, left: 4, bottom: 0, right: 4) - - activityIndicatorView.stopAnimating() - + + var configuration = UIButton.Configuration.filled() + + configuration.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: 4, bottom: 0, trailing: 4) + configuration.baseBackgroundColor = Asset.Scene.Profile.RelationshipButton.background.color + configuration.activityIndicatorColorTransformer = UIConfigurationColorTransformer({ _ in return Asset.Colors.Label.primaryReverse.color }) + configuration.background.cornerRadius = 10 + + let title: String if let option = actionOptionSet.highPriorityAction(except: .editOptions), option == .blocked || option == .suspended { isEnabled = false + configuration.showsActivityIndicator = false + title = actionOptionSet.title } else if actionOptionSet.contains(.updating) { isEnabled = false - activityIndicatorView.startAnimating() + configuration.showsActivityIndicator = true + title = "" } else { isEnabled = true + configuration.showsActivityIndicator = false + title = actionOptionSet.title } - } - - private func configureAppearance() { - setTitleColor(Asset.Colors.Label.primaryReverse.color, for: .normal) - setTitleColor(Asset.Colors.Label.primaryReverse.color.withAlphaComponent(0.5), for: .highlighted) - setBackgroundImage(.placeholder(color: Asset.Scene.Profile.RelationshipButton.background.color), for: .normal) - setBackgroundImage(.placeholder(color: Asset.Scene.Profile.RelationshipButton.backgroundHighlighted.color), for: .highlighted) - setBackgroundImage(.placeholder(color: Asset.Scene.Profile.RelationshipButton.backgroundHighlighted.color), for: .disabled) + + configuration.attributedTitle = AttributedString( + title, + attributes: AttributeContainer([ + .font: UIFont.systemFont(ofSize: 17, weight: .semibold), + .foregroundColor: Asset.Colors.Label.primaryReverse.color + ]) + ) + + self.configuration = configuration } } From 23a505b321ea42417a1f9f1227bad8f48f065ff8 Mon Sep 17 00:00:00 2001 From: Nathan Mattes Date: Fri, 9 Feb 2024 11:14:51 +0100 Subject: [PATCH 2/2] Show more metadata for posts (#1200) * Show first image when sharing (#1199) * Don't share custom metadata (#1199) :facepalm: that was way to easy, thanks docs! * If we only share an URL, we don't need metadata (#1199) --- Mastodon.xcodeproj/project.pbxproj | 8 ++--- Mastodon/Helper/URLActivityItem.swift | 25 ++++++++++++++ .../Helper/URLActivityItemWithMetadata.swift | 33 ------------------- .../Provider/DataSourceFacade+Status.swift | 15 +++------ ...Provider+StatusTableViewCellDelegate.swift | 8 +---- 5 files changed, 34 insertions(+), 55 deletions(-) create mode 100644 Mastodon/Helper/URLActivityItem.swift delete mode 100644 Mastodon/Helper/URLActivityItemWithMetadata.swift diff --git a/Mastodon.xcodeproj/project.pbxproj b/Mastodon.xcodeproj/project.pbxproj index ca2738797..46fb7fa44 100644 --- a/Mastodon.xcodeproj/project.pbxproj +++ b/Mastodon.xcodeproj/project.pbxproj @@ -122,7 +122,7 @@ 855149C8295F1C5F00943D96 /* UIInterfaceOrientationMask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 855149C7295F1C5F00943D96 /* UIInterfaceOrientationMask.swift */; }; 855149CA29606D6400943D96 /* PortraitAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 855149C929606D6400943D96 /* PortraitAlertController.swift */; }; 85904C02293BC0EB0011C817 /* ImageProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85904C01293BC0EB0011C817 /* ImageProvider.swift */; }; - 85904C04293BC1940011C817 /* URLActivityItemWithMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85904C03293BC1940011C817 /* URLActivityItemWithMetadata.swift */; }; + 85904C04293BC1940011C817 /* URLActivityItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85904C03293BC1940011C817 /* URLActivityItem.swift */; }; 85BC11B32932414900E191CD /* AltTextViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85BC11B22932414900E191CD /* AltTextViewController.swift */; }; 9E44C7202967AD17004B2A72 /* MastodonSDKDynamic in Frameworks */ = {isa = PBXBuildFile; productRef = 9E44C71F2967AD17004B2A72 /* MastodonSDKDynamic */; }; 9E44C7222967AD17004B2A72 /* MastodonSDKDynamic in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 9E44C71F2967AD17004B2A72 /* MastodonSDKDynamic */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; @@ -766,7 +766,7 @@ 855149C7295F1C5F00943D96 /* UIInterfaceOrientationMask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIInterfaceOrientationMask.swift; sourceTree = ""; }; 855149C929606D6400943D96 /* PortraitAlertController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PortraitAlertController.swift; sourceTree = ""; }; 85904C01293BC0EB0011C817 /* ImageProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageProvider.swift; sourceTree = ""; }; - 85904C03293BC1940011C817 /* URLActivityItemWithMetadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLActivityItemWithMetadata.swift; sourceTree = ""; }; + 85904C03293BC1940011C817 /* URLActivityItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLActivityItem.swift; sourceTree = ""; }; 85BC11B22932414900E191CD /* AltTextViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AltTextViewController.swift; sourceTree = ""; }; 8850E70A1D5FF51432E43653 /* Pods-Mastodon-MastodonUITests.asdk - release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mastodon-MastodonUITests.asdk - release.xcconfig"; path = "Target Support Files/Pods-Mastodon-MastodonUITests/Pods-Mastodon-MastodonUITests.asdk - release.xcconfig"; sourceTree = ""; }; 89FE8B85A00419CEF4678056 /* Pods_MastodonTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MastodonTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -2921,7 +2921,7 @@ children = ( DBF3B7402733EB9400E21627 /* MastodonLocalCode.swift */, 85904C01293BC0EB0011C817 /* ImageProvider.swift */, - 85904C03293BC1940011C817 /* URLActivityItemWithMetadata.swift */, + 85904C03293BC1940011C817 /* URLActivityItem.swift */, 855149C929606D6400943D96 /* PortraitAlertController.swift */, ); path = Helper; @@ -3650,7 +3650,7 @@ 62FD27D52893708A00B205C5 /* BookmarkViewModel+Diffable.swift in Sources */, DB72602725E36A6F00235243 /* MastodonServerRulesViewModel.swift in Sources */, 2D364F7225E66D7500204FDC /* MastodonResendEmailViewController.swift in Sources */, - 85904C04293BC1940011C817 /* URLActivityItemWithMetadata.swift in Sources */, + 85904C04293BC1940011C817 /* URLActivityItem.swift in Sources */, DB68A06325E905E000CFDF14 /* UIApplication.swift in Sources */, DB02CDAB26256A9500D0A2AF /* ThreadReplyLoaderTableViewCell.swift in Sources */, DBEFCD80282A2AA900C0ABEA /* ReportServerRulesViewModel.swift in Sources */, diff --git a/Mastodon/Helper/URLActivityItem.swift b/Mastodon/Helper/URLActivityItem.swift new file mode 100644 index 000000000..7e63a781c --- /dev/null +++ b/Mastodon/Helper/URLActivityItem.swift @@ -0,0 +1,25 @@ +// +// URLActivityItem.swift +// Mastodon +// +// Created by Jed Fox on 2022-12-03. +// + +import UIKit +import LinkPresentation + +class URLActivityItem: NSObject, UIActivityItemSource { + let url: URL + + init(url: URL) { + self.url = url + } + + func activityViewControllerPlaceholderItem(_ activityViewController: UIActivityViewController) -> Any { + return url + } + + func activityViewController(_ activityViewController: UIActivityViewController, itemForActivityType activityType: UIActivity.ActivityType?) -> Any? { + return url + } +} diff --git a/Mastodon/Helper/URLActivityItemWithMetadata.swift b/Mastodon/Helper/URLActivityItemWithMetadata.swift deleted file mode 100644 index 82d1747fe..000000000 --- a/Mastodon/Helper/URLActivityItemWithMetadata.swift +++ /dev/null @@ -1,33 +0,0 @@ -// -// URLActivityItemWithMetadata.swift -// Mastodon -// -// Created by Jed Fox on 2022-12-03. -// - -import UIKit -import LinkPresentation - -class URLActivityItemWithMetadata: NSObject, UIActivityItemSource { - init(url: URL, configureMetadata: (LPLinkMetadata) -> Void) { - self.url = url - self.metadata = LPLinkMetadata() - metadata.url = url - configureMetadata(metadata) - } - - let url: URL - let metadata: LPLinkMetadata - - func activityViewControllerPlaceholderItem(_ activityViewController: UIActivityViewController) -> Any { - url - } - - func activityViewController(_ activityViewController: UIActivityViewController, itemForActivityType activityType: UIActivity.ActivityType?) -> Any? { - url - } - - func activityViewControllerLinkMetadata(_ activityViewController: UIActivityViewController) -> LPLinkMetadata? { - metadata - } -} diff --git a/Mastodon/Protocol/Provider/DataSourceFacade+Status.swift b/Mastodon/Protocol/Provider/DataSourceFacade+Status.swift index 090d9b0c3..3140dc70c 100644 --- a/Mastodon/Protocol/Provider/DataSourceFacade+Status.swift +++ b/Mastodon/Protocol/Provider/DataSourceFacade+Status.swift @@ -62,19 +62,12 @@ extension DataSourceFacade { status: MastodonStatus ) async throws -> UIActivityViewController { var activityItems: [Any] = { - guard let url = URL(string: status.entity.url ?? status.entity.uri) - else { return [] } + guard let url = URL(string: status.entity.url ?? status.entity.uri) else { return [] } return [ - URLActivityItemWithMetadata(url: url) { metadata in - metadata.title = "\(status.entity.account.displayName) (@\(status.entity.account.acctWithDomain))" - metadata.iconProvider = ImageProvider( - url: status.entity.account.avatarImageURLWithFallback(domain: status.entity.account.domain ?? ""), - filter: ScaledToSizeFilter(size: CGSize.authorAvatarButtonSize) - ).itemProvider - } - ] as [Any] + URLActivityItem(url: url) + ] }() - + var applicationActivities: [UIActivity] = [ SafariActivity(sceneCoordinator: dependency.coordinator), // open URL ] diff --git a/Mastodon/Protocol/Provider/DataSourceProvider+StatusTableViewCellDelegate.swift b/Mastodon/Protocol/Provider/DataSourceProvider+StatusTableViewCellDelegate.swift index 57360f0c6..8ae264a20 100644 --- a/Mastodon/Protocol/Provider/DataSourceProvider+StatusTableViewCellDelegate.swift +++ b/Mastodon/Protocol/Provider/DataSourceProvider+StatusTableViewCellDelegate.swift @@ -202,13 +202,7 @@ extension StatusTableViewCellDelegate where Self: DataSourceProvider & AuthConte DispatchQueue.main.async { let activityViewController = UIActivityViewController( activityItems: [ - URLActivityItemWithMetadata(url: url) { metadata in - metadata.title = card.title - - if let image = card.image, let url = URL(string: image) { - metadata.iconProvider = ImageProvider(url: url, filter: nil).itemProvider - } - } + URLActivityItem(url: url) ], applicationActivities: [] )