mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-11-22 16:31:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bigger media viewer window

Browse source
This commit is contained in:
Thomas Ricouard 2023-11-14 19:48:14 +01:00
parent bf618d3c5f
commit f451d7cb8c
14 changed files with 68 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
IceCubesApp/App/Main/IceCubesApp+Menu.swift
View file

@ -11,7 +11,7 @@ extension IceCubesApp {
.keyboardShortcut("n", modifiers: .shift)
Button("menu.new-post") {
if ProcessInfo.processInfo.isMacCatalystApp {
openWindow(value: WindowDestination.newStatusEditor(visibility: userPreferences.postVisibility))
openWindow(value: WindowDestinationEditor.newStatusEditor(visibility: userPreferences.postVisibility))
} else {
sidebarRouterPath.presentedSheet = .newStatusEditor(visibility: userPreferences.postVisibility)
}

23
IceCubesApp/App/Main/IceCubesApp+Scene.swift
View file

@ -72,8 +72,9 @@ extension IceCubesApp {
}
}
@SceneBuilder
var otherScenes: some Scene {
WindowGroup(for: WindowDestination.self) { destination in
WindowGroup(for: WindowDestinationEditor.self) { destination in
Group {
switch destination.wrappedValue {
case let .newStatusEditor(visibility):
@ -84,6 +85,21 @@ extension IceCubesApp {
StatusEditorView(mode: .quote(status: status))
case let .replyToStatusEditor(status):
StatusEditorView(mode: .replyTo(status: status))
case .none:
EmptyView()
}
}
.withEnvironments()
.withModelContainer()
.applyTheme(theme)
.frame(minWidth: 300, minHeight: 400)
}
.defaultSize(width: 600, height: 800)
.windowResizability(.contentMinSize)
WindowGroup(for: WindowDestinationMedia.self) { destination in
Group {
switch destination.wrappedValue {
case let .mediaViewer(attachments, selectedAttachment):
MediaUIView(selectedAttachment: selectedAttachment,
attachments: attachments)
@ -94,8 +110,9 @@ extension IceCubesApp {
.withEnvironments()
.withModelContainer()
.applyTheme(theme)
.frame(minWidth: 300, minHeight: 400)
}
.defaultSize(width: 600, height: 800)
.windowResizability(.automatic)
.defaultSize(width: 1200, height: 1000)
.windowResizability(.contentMinSize)
}
}

2
IceCubesApp/App/SideBarView.swift
View file

@ -58,7 +58,7 @@ struct SideBarView<Content: View>: View {
private var postButton: some View {
Button {
if ProcessInfo.processInfo.isMacCatalystApp {
openWindow(value: WindowDestination.newStatusEditor(visibility: userPreferences.postVisibility))
openWindow(value: WindowDestinationEditor.newStatusEditor(visibility: userPreferences.postVisibility))
} else {
routerPath.presentedSheet = .newStatusEditor(visibility: userPreferences.postVisibility)
}

4
Packages/Account/Sources/Account/AccountDetailHeaderView.swift
View file

@ -83,7 +83,7 @@ struct AccountDetailHeaderView: View {
let attachement = MediaAttachment.imageWith(url: account.header)
if ProcessInfo.processInfo.isMacCatalystApp {
openWindow(value: WindowDestination.mediaViewer(attachments: [attachement],
openWindow(value: WindowDestinationMedia.mediaViewer(attachments: [attachement],
selectedAttachment: attachement))
} else {
quickLook.prepareFor(selectedMediaAttachment: attachement, mediaAttachments: [attachement])
@ -118,7 +118,7 @@ struct AccountDetailHeaderView: View {
}
let attachement = MediaAttachment.imageWith(url: account.avatar)
if ProcessInfo.processInfo.isMacCatalystApp {
openWindow(value: WindowDestination.mediaViewer(attachments: [attachement],
openWindow(value: WindowDestinationMedia.mediaViewer(attachments: [attachement],
selectedAttachment: attachement))
} else {
quickLook.prepareFor(selectedMediaAttachment: attachement, mediaAttachments: [attachement])

2
Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift
View file

@ -202,7 +202,7 @@ struct ConversationMessageView: View {
.contentShape(Rectangle())
.onTapGesture {
if ProcessInfo.processInfo.isMacCatalystApp {
openWindow(value: WindowDestination.mediaViewer(attachments: [attachement],
openWindow(value: WindowDestinationMedia.mediaViewer(attachments: [attachement],
selectedAttachment: attachement))
} else {
quickLook.prepareFor(selectedMediaAttachment: attachement, mediaAttachments: [attachement])

2
Packages/DesignSystem/Sources/DesignSystem/Views/StatusEditorToolbarItem.swift
View file

@ -27,7 +27,7 @@ public struct StatusEditorToolbarItem: ToolbarContent {
Button {
Task { @MainActor in
if ProcessInfo.processInfo.isMacCatalystApp {
openWindow(value: WindowDestination.newStatusEditor(visibility: visibility))
openWindow(value: WindowDestinationEditor.newStatusEditor(visibility: visibility))
} else {
routerPath.presentedSheet = .newStatusEditor(visibility: visibility)
HapticManager.shared.fireHaptic(.buttonPress)

7
Packages/Env/Sources/Env/Router.swift
View file

@ -25,14 +25,17 @@ public enum RouterDestination: Hashable {
case tagsList(tags: [Tag])
}
public enum WindowDestination: Hashable, Codable {
public enum WindowDestinationEditor: Hashable, Codable {
case newStatusEditor(visibility: Models.Visibility)
case mediaViewer(attachments: [MediaAttachment], selectedAttachment: MediaAttachment)
case editStatusEditor(status: Status)
case replyToStatusEditor(status: Status)
case quoteStatusEditor(status: Status)
}
public enum WindowDestinationMedia: Hashable, Codable {
case mediaViewer(attachments: [MediaAttachment], selectedAttachment: MediaAttachment)
}
public enum SheetDestination: Identifiable {
case newStatusEditor(visibility: Models.Visibility)
case editStatusEditor(status: Status)

2
Packages/Explore/Sources/Explore/ExploreView.swift
View file

@ -89,7 +89,7 @@ public struct ExploreView: View {
SoundEffectManager.shared.playSound(.refresh)
}
}
.listStyle(.grouped)
.listStyle(.plain)
.scrollContentBackground(.hidden)
.background(theme.secondaryBackgroundColor)
.navigationTitle("explore.navigation-title")

29
Packages/MediaUI/Sources/MediaUI/MediaUIView.swift
View file

@ -7,6 +7,7 @@ public struct MediaUIView: View, @unchecked Sendable {
private let data: [DisplayData]
private let initialItem: DisplayData?
@State private var scrolledItem: DisplayData?
@FocusState private var isFocused: Bool
public var body: some View {
NavigationStack {
@ -20,6 +21,17 @@ public struct MediaUIView: View, @unchecked Sendable {
}
.scrollTargetLayout()
}
.focusable()
.focused($isFocused)
.focusEffectDisabled()
.onKeyPress(.leftArrow, action: {
scrollToPrevious()
return .handled
})
.onKeyPress(.rightArrow, action: {
scrollToNext()
return .handled
})
.scrollTargetBehavior(.viewAligned)
.scrollPosition(id: $scrolledItem)
.toolbar {
@ -30,6 +42,7 @@ public struct MediaUIView: View, @unchecked Sendable {
.onAppear {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) {
scrolledItem = initialItem
isFocused = true
}
}
}
@ -39,6 +52,22 @@ public struct MediaUIView: View, @unchecked Sendable {
data = attachments.compactMap { DisplayData(from: $0) }
initialItem = DisplayData(from: selectedAttachment)
}
private func scrollToPrevious() {
if let scrolledItem, let index = data.firstIndex(of: scrolledItem), index > 0 {
withAnimation {
self.scrolledItem = data[index - 1]
}
}
}
private func scrollToNext() {
if let scrolledItem, let index = data.firstIndex(of: scrolledItem), index < data.count - 1{
withAnimation {
self.scrolledItem = data[index + 1]
}
}
}
}
private struct MediaToolBar: ToolbarContent {

2
Packages/Status/Sources/Status/Row/StatusRowView.swift
View file

@ -210,7 +210,7 @@ public struct StatusRowView: View {
HapticManager.shared.fireHaptic(.notification(.success))
let attachments = viewModel.finalStatus.mediaAttachments
if ProcessInfo.processInfo.isMacCatalystApp {
openWindow(value: WindowDestination.mediaViewer(attachments: attachments,
openWindow(value: WindowDestinationMedia.mediaViewer(attachments: attachments,
selectedAttachment: attachments[0]))
} else {
quickLook.prepareFor(selectedMediaAttachment: attachments[0], mediaAttachments: attachments)

2
Packages/Status/Sources/Status/Row/Subviews/StatusRowActionsView.swift
View file

@ -206,7 +206,7 @@ struct StatusRowActionsView: View {
case .respond:
SoundEffectManager.shared.playSound(.share)
if ProcessInfo.processInfo.isMacCatalystApp {
openWindow(value: WindowDestination.replyToStatusEditor(status: viewModel.localStatus ?? viewModel.status))
openWindow(value: WindowDestinationEditor.replyToStatusEditor(status: viewModel.localStatus ?? viewModel.status))
} else {
viewModel.routerPath.presentedSheet = .replyToStatusEditor(status: viewModel.localStatus ?? viewModel.status)
}

6
Packages/Status/Sources/Status/Row/Subviews/StatusRowContextMenu.swift
View file

@ -54,7 +54,7 @@ struct StatusRowContextMenu: View {
}
Button {
if ProcessInfo.processInfo.isMacCatalystApp {
openWindow(value: WindowDestination.replyToStatusEditor(status: viewModel.status))
openWindow(value: WindowDestinationEditor.replyToStatusEditor(status: viewModel.status))
} else {
viewModel.routerPath.presentedSheet = .replyToStatusEditor(status: viewModel.status)
}
@ -63,7 +63,7 @@ struct StatusRowContextMenu: View {
}
Button {
if ProcessInfo.processInfo.isMacCatalystApp {
openWindow(value: WindowDestination.quoteStatusEditor(status: viewModel.status))
openWindow(value: WindowDestinationEditor.quoteStatusEditor(status: viewModel.status))
} else {
viewModel.routerPath.presentedSheet = .quoteStatusEditor(status: viewModel.status)
}
@ -164,7 +164,7 @@ struct StatusRowContextMenu: View {
if currentInstance.isEditSupported {
Button {
if ProcessInfo.processInfo.isMacCatalystApp {
openWindow(value: WindowDestination.editStatusEditor(status: viewModel.status.reblogAsAsStatus ?? viewModel.status))
openWindow(value: WindowDestinationEditor.editStatusEditor(status: viewModel.status.reblogAsAsStatus ?? viewModel.status))
} else {
viewModel.routerPath.presentedSheet = .editStatusEditor(status: viewModel.status.reblogAsAsStatus ?? viewModel.status)
}

2
Packages/Status/Sources/Status/Row/Subviews/StatusRowMediaPreviewView.swift
View file

@ -116,7 +116,7 @@ public struct StatusRowMediaPreviewView: View {
private func tabAction(for index: Int) {
if ProcessInfo.processInfo.isMacCatalystApp {
openWindow(
value: WindowDestination.mediaViewer(
value: WindowDestinationMedia.mediaViewer(
attachments: attachments,
selectedAttachment: attachments[index]
)

2
Packages/Timeline/Package.swift
View file

@ -22,7 +22,7 @@ let package = Package(
.package(name: "Status", path: "../Status"),
.package(name: "DesignSystem", path: "../DesignSystem"),
.package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "1.0.0"),
.package(url: "https://github.com/mergesort/Bodega", from: "2.0.2"),
.package(url: "https://github.com/mergesort/Bodega", exact: "2.1.0"),
],
targets: [
.target(