mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2025-02-04 12:02:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into iOS-18

Browse source
This commit is contained in:
Thomas Ricouard 2024-07-29 08:45:38 +02:00
commit 1ca8fefa87
8 changed files with 45 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
IceCubesApp/App/Main/AppView.swift
View file

@ -119,6 +119,7 @@ struct AppView: View {
.tag(tab)
}
}
.id(availableTabs.count) /// Resets the TabView state when the number of tabs changes to avoid navigation bar issues and prevent crashes
.introspect(.tabView, on: .iOS(.v17, .v18)) { (tabview: UITabBarController) in
tabview.tabBar.isHidden = horizontalSizeClass == .regular
tabview.customizableViewControllers = []

17
Packages/MediaUI/Sources/MediaUI/MediaUIAttachmentImageView.swift
View file

@ -22,6 +22,23 @@ struct MediaUIAttachmentImageView: View {
.progressViewStyle(.circular)
}
}
.draggable(MediaUIImageTransferable(url: url))
.contextMenu {
MediaUIShareLink(url: url, type: .image)
Button {
Task {
let transferable = MediaUIImageTransferable(url: url)
UIPasteboard.general.image = UIImage(data: await transferable.fetchData())
}
} label: {
Label("status.media.contextmenu.copy", systemImage: "doc.on.doc")
}
Button {
UIPasteboard.general.url = url
} label: {
Label("status.action.copy-link", systemImage: "link")
}
}
}
}
}

16
Packages/MediaUI/Sources/MediaUI/MediaUIShareLink.swift Normal file
View file

@ -0,0 +1,16 @@
import SwiftUI
struct MediaUIShareLink: View, @unchecked Sendable {
let url: URL
let type: DisplayType
var body: some View {
if type == .image {
let transferable = MediaUIImageTransferable(url: url)
ShareLink(item: transferable, preview: .init("status.media.contextmenu.share",
image: transferable))
} else {
ShareLink(item: url)
}
}
}

8
Packages/MediaUI/Sources/MediaUI/ShareToolbarItem.swift
View file

@ -6,13 +6,7 @@ struct ShareToolbarItem: ToolbarContent, @unchecked Sendable {
var body: some ToolbarContent {
ToolbarItem(placement: .topBarTrailing) {
if type == .image {
let transferable = MediaUIImageTransferable(url: url)
ShareLink(item: transferable, preview: .init("status.media.contextmenu.share",
image: transferable))
} else {
ShareLink(item: url)
}
MediaUIShareLink(url: url, type: type)
}
}
}

1
Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift
View file

@ -124,6 +124,7 @@ public struct StatusRowView: View {
}
}
}
.if(viewModel.url != nil) { $0.draggable(viewModel.url!) }
.contextMenu {
contextMenu
.onAppear {

6
Packages/StatusKit/Sources/StatusKit/Row/StatusRowViewModel.swift
View file

@ -105,7 +105,11 @@ import SwiftUI
status.reblog?.inReplyToId != nil || status.reblog?.inReplyToAccountId != nil ||
status.inReplyToId != nil || status.inReplyToAccountId != nil
}
var url: URL? {
(status.reblog?.url ?? status.url).flatMap(URL.init(string:))
}
@ViewBuilder
func makeBackgroundColor(isHomeTimeline: Bool) -> some View {
if isHomeTimeline, theme.showContentGradient {

1
Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowCardView.swift
View file

@ -81,6 +81,7 @@ public struct StatusRowCardView: View {
.stroke(.gray.opacity(0.35), lineWidth: 1)
}
}
.draggable(url)
.contextMenu {
ShareLink(item: url) {
Label("status.card.share", systemImage: "square.and.arrow.up")

8
Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowContextMenu.swift
View file

@ -88,9 +88,7 @@ struct StatusRowContextMenu: View {
Divider()
Menu("status.action.share-title") {
if let urlString = viewModel.status.reblog?.url ?? viewModel.status.url,
let url = URL(string: urlString)
{
if let url = viewModel.url {
ShareLink(item: url,
subject: Text(viewModel.status.reblog?.account.safeDisplayName ?? viewModel.status.account.safeDisplayName),
message: Text(viewModel.status.reblog?.content.asRawText ?? viewModel.status.content.asRawText))
@ -133,7 +131,7 @@ struct StatusRowContextMenu: View {
}
}
if let url = URL(string: viewModel.status.reblog?.url ?? viewModel.status.url ?? "") {
if let url = viewModel.url {
Button { UIApplication.shared.open(url) } label: {
Label("status.action.view-in-browser", systemImage: "safari")
}
@ -152,7 +150,7 @@ struct StatusRowContextMenu: View {
}
Button {
UIPasteboard.general.string = viewModel.status.reblog?.url ?? viewModel.status.url
UIPasteboard.general.url = viewModel.url
} label: {
Label("status.action.copy-link", systemImage: "link")
}