Compare commits

..

No commits in common. "0b6c16b0a6cd7a479e3163437db95719ff08947e" and "56a0518c80acb44b30793b3ec6f38103d89a6899" have entirely different histories.

4 changed files with 1 additions and 16 deletions

View File

@ -61,7 +61,6 @@ extension AccountMO {
convenience init(apiAccount account: Pachyderm.Account, container: MastodonCachePersistentStore, context: NSManagedObjectContext) { convenience init(apiAccount account: Pachyderm.Account, container: MastodonCachePersistentStore, context: NSManagedObjectContext) {
self.init(context: context) self.init(context: context)
self.updateFrom(apiAccount: account, container: container) self.updateFrom(apiAccount: account, container: container)
self.lastFetchedAt = Date()
} }
func updateFrom(apiAccount account: Pachyderm.Account, container: MastodonCachePersistentStore) { func updateFrom(apiAccount account: Pachyderm.Account, container: MastodonCachePersistentStore) {

View File

@ -91,7 +91,6 @@ extension StatusMO {
convenience init(apiStatus status: Pachyderm.Status, container: MastodonCachePersistentStore, context: NSManagedObjectContext) { convenience init(apiStatus status: Pachyderm.Status, container: MastodonCachePersistentStore, context: NSManagedObjectContext) {
self.init(context: context) self.init(context: context)
self.updateFrom(apiStatus: status, container: container) self.updateFrom(apiStatus: status, container: container)
self.lastFetchedAt = Date()
} }
func updateFrom(apiStatus status: Pachyderm.Status, container: MastodonCachePersistentStore) { func updateFrom(apiStatus status: Pachyderm.Status, container: MastodonCachePersistentStore) {

View File

@ -52,9 +52,6 @@ struct ComposeEmojiTextField: UIViewRepresentable {
view.backgroundColor = backgroundColor view.backgroundColor = backgroundColor
// otherwise when the text gets too wide it starts expanding the ComposeView
view.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
context.coordinator.textField = view context.coordinator.textField = view
context.coordinator.uiState = uiState context.coordinator.uiState = uiState
context.coordinator.text = $text context.coordinator.text = $text

View File

@ -59,7 +59,7 @@ extension MenuActionProvider {
draft.visibility = .direct draft.visibility = .direct
self.navigationDelegate?.compose(editing: draft) self.navigationDelegate?.compose(editing: draft)
}), }),
UIDeferredMenuElement.uncachedIfPossible({ (elementHandler) in UIDeferredMenuElement({ (elementHandler) in
Task { @MainActor in Task { @MainActor in
if let action = await self.followAction(for: accountID, mastodonController: mastodonController) { if let action = await self.followAction(for: accountID, mastodonController: mastodonController) {
elementHandler([action]) elementHandler([action])
@ -339,13 +339,3 @@ extension SFSafariViewController: CustomPreviewPresenting {
presenter.present(self, animated: true) presenter.present(self, animated: true)
} }
} }
private extension UIDeferredMenuElement {
static func uncachedIfPossible(_ elementProvider: @escaping (@escaping ([UIMenuElement]) -> Void) -> Void) -> UIDeferredMenuElement {
if #available(iOS 15.0, *) {
return UIDeferredMenuElement.uncached(elementProvider)
} else {
return UIDeferredMenuElement(elementProvider)
}
}
}