ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Workaround #418 - Allow swiping back from file previews (#499)

Browse Source
This commit is contained in:
Stefan Ceriu
2023-01-30 18:53:05 +02:00
committed by GitHub
parent 59b61dc61f
commit 70cff446cf
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/FilePreview/View/FilePreviewScreen.swift
+14 -10
View File
@@ -22,10 +22,20 @@ struct FilePreviewScreen: View {
@ObservedObject var context: FilePreviewViewModel.Context @ObservedObject var context: FilePreviewViewModel.Context
var body: some View { var body: some View {
PreviewView(context: context, ZStack(alignment: .leading) {
fileURL: context.viewState.fileURL, PreviewView(context: context,
title: context.viewState.title) fileURL: context.viewState.fileURL,
.ignoresSafeArea() title: context.viewState.title)
.ignoresSafeArea(edges: .bottom)
// Drop a random view on top to make QLPreviewController stop
// swallowing all gestures and allow swiping backwards
Rectangle()
.frame(maxWidth: 20.0)
.foregroundColor(.red)
.opacity(0.005)
.ignoresSafeArea()
}
} }
} }
@@ -38,12 +48,6 @@ private struct PreviewView: UIViewControllerRepresentable {
let controller = QLPreviewController() let controller = QLPreviewController()
controller.dataSource = context.coordinator controller.dataSource = context.coordinator
let doneButton = UIBarButtonItem(title: "Done",
style: .done,
target: context.coordinator,
action: #selector(Coordinator.done))
controller.navigationItem.rightBarButtonItem = doneButton
return UINavigationController(rootViewController: controller) return UINavigationController(rootViewController: controller)
} }
ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift
+2 -2
View File
@@ -84,10 +84,10 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
let params = FilePreviewCoordinatorParameters(fileURL: fileURL, title: title) let params = FilePreviewCoordinatorParameters(fileURL: fileURL, title: title)
let coordinator = FilePreviewCoordinator(parameters: params) let coordinator = FilePreviewCoordinator(parameters: params)
coordinator.callback = { [weak self] _ in coordinator.callback = { [weak self] _ in
self?.navigationStackCoordinator.setFullScreenCoverCoordinator(nil) self?.navigationStackCoordinator.pop()
} }
navigationStackCoordinator.setFullScreenCoverCoordinator(coordinator) navigationStackCoordinator.push(coordinator)
} }
private func displayEmojiPickerScreen(for itemId: String) { private func displayEmojiPickerScreen(for itemId: String) {