mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-10-31 16:24:11 +00:00
Fixes #2001 - Simplify room and user avatar preview screens
This commit is contained in:
committed by
Stefan Ceriu
parent
003b494c90
commit
6c9ed73e67
@@ -21,20 +21,23 @@ import SwiftUI
|
|||||||
extension View {
|
extension View {
|
||||||
/// Preview a media file using a QuickLook Preview Controller. The preview is interactive with
|
/// Preview a media file using a QuickLook Preview Controller. The preview is interactive with
|
||||||
/// the dismiss gesture working as expected if it was presented from UIKit.
|
/// the dismiss gesture working as expected if it was presented from UIKit.
|
||||||
func interactiveQuickLook(item: Binding<MediaPreviewItem?>) -> some View {
|
func interactiveQuickLook(item: Binding<MediaPreviewItem?>, shouldHideControls: Bool = false) -> some View {
|
||||||
modifier(InteractiveQuickLookModifier(item: item))
|
modifier(InteractiveQuickLookModifier(item: item, shouldHideControls: shouldHideControls))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private struct InteractiveQuickLookModifier: ViewModifier {
|
private struct InteractiveQuickLookModifier: ViewModifier {
|
||||||
@Binding var item: MediaPreviewItem?
|
@Binding var item: MediaPreviewItem?
|
||||||
|
let shouldHideControls: Bool
|
||||||
|
|
||||||
@State private var dismissalPublisher = PassthroughSubject<Void, Never>()
|
@State private var dismissalPublisher = PassthroughSubject<Void, Never>()
|
||||||
|
|
||||||
func body(content: Content) -> some View {
|
func body(content: Content) -> some View {
|
||||||
content.background {
|
content.background {
|
||||||
if let item {
|
if let item {
|
||||||
MediaPreviewViewController(previewItem: item, dismissalPublisher: dismissalPublisher) { self.item = nil }
|
MediaPreviewViewController(previewItem: item,
|
||||||
|
shouldHideControls: shouldHideControls,
|
||||||
|
dismissalPublisher: dismissalPublisher) { self.item = nil }
|
||||||
} else {
|
} else {
|
||||||
// Work around QLPreviewController dismissal issues, see below.
|
// Work around QLPreviewController dismissal issues, see below.
|
||||||
let _ = dismissalPublisher.send(())
|
let _ = dismissalPublisher.send(())
|
||||||
@@ -45,11 +48,15 @@ private struct InteractiveQuickLookModifier: ViewModifier {
|
|||||||
|
|
||||||
private struct MediaPreviewViewController: UIViewControllerRepresentable {
|
private struct MediaPreviewViewController: UIViewControllerRepresentable {
|
||||||
let previewItem: MediaPreviewItem
|
let previewItem: MediaPreviewItem
|
||||||
|
let shouldHideControls: Bool
|
||||||
let dismissalPublisher: PassthroughSubject<Void, Never>
|
let dismissalPublisher: PassthroughSubject<Void, Never>
|
||||||
let onDismiss: () -> Void
|
let onDismiss: () -> Void
|
||||||
|
|
||||||
func makeUIViewController(context: Context) -> PreviewHostingController {
|
func makeUIViewController(context: Context) -> PreviewHostingController {
|
||||||
PreviewHostingController(previewItem: previewItem, dismissalPublisher: dismissalPublisher, onDismiss: onDismiss)
|
PreviewHostingController(previewItem: previewItem,
|
||||||
|
shouldHideControls: shouldHideControls,
|
||||||
|
dismissalPublisher: dismissalPublisher,
|
||||||
|
onDismiss: onDismiss)
|
||||||
}
|
}
|
||||||
|
|
||||||
func updateUIViewController(_ uiViewController: PreviewHostingController, context: Context) { }
|
func updateUIViewController(_ uiViewController: PreviewHostingController, context: Context) { }
|
||||||
@@ -60,6 +67,7 @@ private struct MediaPreviewViewController: UIViewControllerRepresentable {
|
|||||||
/// animations and interactions which don't work if you represent it directly to SwiftUI 🤷♂️
|
/// animations and interactions which don't work if you represent it directly to SwiftUI 🤷♂️
|
||||||
class PreviewHostingController: UIViewController, QLPreviewControllerDataSource, QLPreviewControllerDelegate {
|
class PreviewHostingController: UIViewController, QLPreviewControllerDataSource, QLPreviewControllerDelegate {
|
||||||
let previewItem: MediaPreviewItem
|
let previewItem: MediaPreviewItem
|
||||||
|
let shouldHideControls: Bool
|
||||||
let dismissalPublisher: PassthroughSubject<Void, Never>
|
let dismissalPublisher: PassthroughSubject<Void, Never>
|
||||||
let onDismiss: () -> Void
|
let onDismiss: () -> Void
|
||||||
|
|
||||||
@@ -67,8 +75,12 @@ private struct MediaPreviewViewController: UIViewControllerRepresentable {
|
|||||||
|
|
||||||
var previewController: QLPreviewController?
|
var previewController: QLPreviewController?
|
||||||
|
|
||||||
init(previewItem: MediaPreviewItem, dismissalPublisher: PassthroughSubject<Void, Never>, onDismiss: @escaping () -> Void) {
|
init(previewItem: MediaPreviewItem,
|
||||||
|
shouldHideControls: Bool,
|
||||||
|
dismissalPublisher: PassthroughSubject<Void, Never>,
|
||||||
|
onDismiss: @escaping () -> Void) {
|
||||||
self.previewItem = previewItem
|
self.previewItem = previewItem
|
||||||
|
self.shouldHideControls = shouldHideControls
|
||||||
self.dismissalPublisher = dismissalPublisher
|
self.dismissalPublisher = dismissalPublisher
|
||||||
self.onDismiss = onDismiss
|
self.onDismiss = onDismiss
|
||||||
|
|
||||||
@@ -96,7 +108,7 @@ private struct MediaPreviewViewController: UIViewControllerRepresentable {
|
|||||||
|
|
||||||
guard self.previewController == nil else { return }
|
guard self.previewController == nil else { return }
|
||||||
|
|
||||||
let previewController = QLPreviewController()
|
let previewController = (shouldHideControls ? NoControlsPreviewController() : QLPreviewController())
|
||||||
previewController.dataSource = self
|
previewController.dataSource = self
|
||||||
previewController.delegate = self
|
previewController.delegate = self
|
||||||
present(previewController, animated: true)
|
present(previewController, animated: true)
|
||||||
@@ -135,6 +147,28 @@ class MediaPreviewItem: NSObject, QLPreviewItem {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private class NoControlsPreviewController: QLPreviewController {
|
||||||
|
override func viewDidLayoutSubviews() {
|
||||||
|
super.viewDidLayoutSubviews()
|
||||||
|
|
||||||
|
guard let navigationController = children.first as? UINavigationController else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove top file details bar
|
||||||
|
navigationController.navigationBar.isHidden = true
|
||||||
|
|
||||||
|
// Remove the toolbars and their buttons
|
||||||
|
navigationController.view.subviews.compactMap { $0 as? UIToolbar }.forEach { toolbar in
|
||||||
|
toolbar.subviews.forEach { item in
|
||||||
|
item.isHidden = true
|
||||||
|
}
|
||||||
|
|
||||||
|
toolbar.isHidden = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// MARK: - Previews
|
// MARK: - Previews
|
||||||
|
|
||||||
struct PreviewView_Previews: PreviewProvider {
|
struct PreviewView_Previews: PreviewProvider {
|
||||||
@@ -143,6 +177,8 @@ struct PreviewView_Previews: PreviewProvider {
|
|||||||
title: "Important Document")
|
title: "Important Document")
|
||||||
|
|
||||||
static var previews: some View {
|
static var previews: some View {
|
||||||
MediaPreviewViewController(previewItem: previewItem, dismissalPublisher: .init()) { }
|
MediaPreviewViewController(previewItem: previewItem,
|
||||||
|
shouldHideControls: false,
|
||||||
|
dismissalPublisher: .init()) { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ struct RoomDetailsScreen: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.track(screen: .roomDetails)
|
.track(screen: .roomDetails)
|
||||||
.interactiveQuickLook(item: $context.mediaPreviewItem)
|
.interactiveQuickLook(item: $context.mediaPreviewItem, shouldHideControls: true)
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: - Private
|
// MARK: - Private
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ struct RoomMemberDetailsScreen: View {
|
|||||||
.alert(item: $context.ignoreUserAlert, actions: blockUserAlertActions, message: blockUserAlertMessage)
|
.alert(item: $context.ignoreUserAlert, actions: blockUserAlertActions, message: blockUserAlertMessage)
|
||||||
.alert(item: $context.alertInfo)
|
.alert(item: $context.alertInfo)
|
||||||
.track(screen: .user)
|
.track(screen: .user)
|
||||||
.interactiveQuickLook(item: $context.mediaPreviewItem)
|
.interactiveQuickLook(item: $context.mediaPreviewItem, shouldHideControls: true)
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: - Private
|
// MARK: - Private
|
||||||
|
|||||||
Reference in New Issue
Block a user