Various initial tweaks following code review.

element-hq · Nov 13, 2024 · 5256b58 · 5256b58
1 parent 8dd7890
commit 5256b58
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 17 deletions.
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
@@ -184,6 +184,7 @@
 		25C4C1100B6EA79F5CC7CBB5 /* AppLockSetupPINScreenViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 989D7380D9C86B3A10D30B13 /* AppLockSetupPINScreenViewModelTests.swift */; };
 		260FFC1475EE94F641C3F3F9 /* PollFormScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A40F1985065500F0E7F61A27 /* PollFormScreenViewModelProtocol.swift */; };
 		261261778DEFAEFC042B875E /* JoinedRoomProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07C6B0B087FE6601C3F77816 /* JoinedRoomProxy.swift */; };
+		26252AA9AED64010788F4C26 /* UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05A3E8741D199CD1A37F4CBF /* UIView.swift */; };
 		2689D22EF1D10D22B0A4DAEA /* NotificationContentBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7BB243B26D54EF1A0C422C0 /* NotificationContentBuilder.swift */; };
 		273AB64B9A26B61C51858867 /* AsyncSequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = A73A07BAEDD74C48795A996A /* AsyncSequence.swift */; };
 		274CE3C986841D15FD530BF5 /* ShimmerModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CE98208321C4D66E363612 /* ShimmerModifier.swift */; };
@@ -6446,6 +6447,7 @@
 				5AC5CD6D893073EE4D9A277E /* ShareExtensionViewController.swift in Sources */,
 				069358C2C825A19DE6CB127E /* TracingConfiguration.swift in Sources */,
 				03BD83E8BDD23AE059802E0D /* UITestsScreenIdentifier.swift in Sources */,
+				26252AA9AED64010788F4C26 /* UIView.swift in Sources */,
 				66E9202BED03B5BB00E812A1 /* URL.swift in Sources */,
 				4E22086585CB3B35FEEFBBB9 /* UserPreference.swift in Sources */,
 			);

diff --git a/ElementX/Sources/Application/AppCoordinator.swift b/ElementX/Sources/Application/AppCoordinator.swift
@@ -235,7 +235,7 @@ class AppCoordinator: AppCoordinatorProtocol, AuthenticationFlowCoordinatorDeleg
                 } else {
                     handleAppRoute(.childEventOnRoomAlias(eventID: eventID, alias: alias))
                 }
-            case .share(let payload):
+            case .share:
                 guard isExternalURL else {
                     MXLog.error("Received unexpected internal share route")
                     break

diff --git a/ElementX/Sources/Application/Navigation/AppRoutes.swift b/ElementX/Sources/Application/Navigation/AppRoutes.swift
@@ -84,7 +84,7 @@ struct AppGroupURLParser: URLParser {
             return nil
         }
 
-        guard let query = url.query()?.removingPercentEncoding,
+        guard let query = url.query(percentEncoded: false),
               let queryData = query.data(using: .utf8) else {
             MXLog.error("Failed processing share parameters")
             return nil

diff --git a/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift
@@ -497,9 +497,9 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
                 break
 
             case (.mediaUploadPicker, .presentMediaUploadPreview, .mediaUploadPreview(let fileURL)):
-                presentMediaUploadPreviewScreen(for: fileURL)
+                presentMediaUploadPreviewScreen(for: fileURL, animated: animated)
             case (.room, .presentMediaUploadPreview, .mediaUploadPreview(let fileURL)):
-                presentMediaUploadPreviewScreen(for: fileURL)
+                presentMediaUploadPreviewScreen(for: fileURL, animated: animated)
             case (.mediaUploadPreview, .dismissMediaUploadPreview, .room):
                 break
 
@@ -715,7 +715,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
 
         switch presentationAction {
         case .share(.mediaFile(_, let mediaFile)):
-            stateMachine.tryEvent(.presentMediaUploadPreview(fileURL: mediaFile.url))
+            stateMachine.tryEvent(.presentMediaUploadPreview(fileURL: mediaFile.url), userInfo: EventUserInfo(animated: animated))
         default:
             break
         }
@@ -958,7 +958,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
         }
     }
 
-    private func presentMediaUploadPreviewScreen(for url: URL) {
+    private func presentMediaUploadPreviewScreen(for url: URL, animated: Bool) {
         let stackCoordinator = NavigationStackCoordinator()
 
         let parameters = MediaUploadPreviewScreenCoordinatorParameters(userIndicatorController: userIndicatorController,
@@ -982,7 +982,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
 
         stackCoordinator.setRootCoordinator(mediaUploadPreviewScreenCoordinator)
 
-        navigationStackCoordinator.setSheetCoordinator(stackCoordinator) { [weak self] in
+        navigationStackCoordinator.setSheetCoordinator(stackCoordinator, animated: animated) { [weak self] in
             self?.stateMachine.tryEvent(.dismissMediaUploadPreview)
         }
     }

diff --git a/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
@@ -940,7 +940,8 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
                     ShareExtensionPayload.mediaFile(roomID: roomID, mediaFile: mediaFile)
                 }
 
-                stateMachine.processEvent(.dismissedRoomSelectionScreen)
+                navigationSplitCoordinator.setSheetCoordinator(nil)
+
                 stateMachine.processEvent(.selectRoom(roomID: roomID,
                                                       via: [],
                                                       entryPoint: .share(sharePayload)),

diff --git a/ElementX/Sources/Other/Extensions/UNNotificationContent.swift b/ElementX/Sources/Other/Extensions/UNNotificationContent.swift
@@ -191,6 +191,8 @@ extension UNMutableNotificationContent {
             return data
         }
 
+        MXLog.info("Generating notification icon placeholder")
+
         let data = Avatars.generatePlaceholderAvatarImageData(name: name, id: id, size: .init(width: 50, height: 50))
 
         if let data {

diff --git a/ElementX/Sources/Other/Extensions/URL.swift b/ElementX/Sources/Other/Extensions/URL.swift
@@ -78,7 +78,7 @@ extension URL: @retroactive ExpressibleByStringLiteral {
     /// The app group temporary directory
     static var appGroupTemporaryDirectory: URL {
         let url = appGroupContainerDirectory
-            .appendingPathComponent("Temp", isDirectory: true)
+            .appendingPathComponent("tmp", isDirectory: true)
 
         try? FileManager.default.createDirectoryIfNeeded(at: url)
 

diff --git a/ShareExtension/Sources/ShareExtensionViewController.swift b/ShareExtension/Sources/ShareExtensionViewController.swift
@@ -16,15 +16,9 @@ class ShareExtensionViewController: UIViewController {
         super.viewDidLoad()
 
         addChild(hostingController)
-        hostingController.view.translatesAutoresizingMaskIntoConstraints = false
-        view.addSubview(hostingController.view)
+        view.addMatchedSubview(hostingController.view)
         hostingController.didMove(toParent: self)
 
-        NSLayoutConstraint.activate([view.topAnchor.constraint(equalTo: hostingController.view.topAnchor),
-                                     view.leftAnchor.constraint(equalTo: hostingController.view.leftAnchor),
-                                     view.bottomAnchor.constraint(equalTo: hostingController.view.bottomAnchor),
-                                     view.rightAnchor.constraint(equalTo: hostingController.view.rightAnchor)])
-
         MXLog.configure(currentTarget: "shareextension", filePrefix: "shareextension", logLevel: appSettings.logLevel)
     }
 

diff --git a/ShareExtension/Sources/View/ShareExtensionView.swift b/ShareExtension/Sources/View/ShareExtensionView.swift
@@ -12,7 +12,12 @@ struct ShareExtensionView: View {
     var body: some View {
         ZStack {
             ProgressView()
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
         }
         .background(.compound.bgCanvasDefault)
     }
 }
+
+#Preview {
+    ShareExtensionView()
+}
diff --git a/ShareExtension/SupportingFiles/target.yml b/ShareExtension/SupportingFiles/target.yml
@@ -77,8 +77,9 @@ targets:
     - path: ../../ElementX/Sources/Other/Extensions/FileManager.swift
     - path: ../../ElementX/Sources/Other/Extensions/NSItemProvider.swift
     - path: ../../ElementX/Sources/Other/Extensions/ProcessInfo.swift
+    - path: ../../ElementX/Sources/Other/Extensions/UIView.swift
     - path: ../../ElementX/Sources/Other/Extensions/URL.swift
     - path: ../../ElementX/Sources/Other/InfoPlistReader.swift
     - path: ../../ElementX/Sources/Other/Logging
-    - path: ../../ElementX/Sources/UITests/UITestsScreenIdentifier.swift
     - path: ../../ElementX/Sources/Other/UserPreference.swift
+    - path: ../../ElementX/Sources/UITests/UITestsScreenIdentifier.swift