From fea940c69d50a750748d15556f3cd5131330a5df Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Thu, 6 Jun 2024 10:09:54 +1000 Subject: [PATCH] fix an issue that the screen stack is odd when sending message requests --- Session.xcodeproj/project.pbxproj | 15 +- Session/Home/HomeVC.swift | 6 +- .../New Conversation/NewMessageScreen.swift | 1 + Session/Settings/QRCodeScreen.swift | 1 + Session/Settings/QRCodeVC.swift | 328 ------------------ 5 files changed, 9 insertions(+), 342 deletions(-) delete mode 100644 Session/Settings/QRCodeVC.swift diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index de77efca8..79c2f0e7b 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -181,8 +181,8 @@ 7BFD1A8A2745C4F000FB91B9 /* Permissions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFD1A892745C4F000FB91B9 /* Permissions.swift */; }; 7BFD1A8C2747150E00FB91B9 /* TurnServerInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFD1A8B2747150E00FB91B9 /* TurnServerInfo.swift */; }; 7BFD1A972747689000FB91B9 /* Session-Turn-Server in Resources */ = {isa = PBXBuildFile; fileRef = 7BFD1A962747689000FB91B9 /* Session-Turn-Server */; }; - 941061402BBE45EB0056C084 /* ActivityView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9410613F2BBE45EB0056C084 /* ActivityView.swift */; }; 88C614F4223F9BE0CB94E4E5 /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SessionUtilitiesKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35C5EF2AACD4A39D6E0E2C49 /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SessionUtilitiesKit.framework */; }; + 941061402BBE45EB0056C084 /* ActivityView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9410613F2BBE45EB0056C084 /* ActivityView.swift */; }; 9422EE2B2B8C3A97004C740D /* String+Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9422EE2A2B8C3A97004C740D /* String+Utilities.swift */; }; 942C9CA22B67769000B5153A /* SessionSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 942C9CA12B67769000B5153A /* SessionSearchBar.swift */; }; 943C6D762B705B7D004ACE64 /* CompatibleScrollingVStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943C6D752B705B7D004ACE64 /* CompatibleScrollingVStack.swift */; }; @@ -241,7 +241,6 @@ B8856DE6256F15F2001CE70E /* String+SSK.swift in Sources */ = {isa = PBXBuildFile; fileRef = C33FDB3F255A580C00E217F9 /* String+SSK.swift */; }; B8856E09256F1676001CE70E /* UIDevice+featureSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF237255B6D65007E1867 /* UIDevice+featureSupport.swift */; }; B8856E1A256F1700001CE70E /* OWSMath.h in Headers */ = {isa = PBXBuildFile; fileRef = C33FDB14255A580800E217F9 /* OWSMath.h */; settings = {ATTRIBUTES = (Public, ); }; }; - B886B4A72398B23E00211ABE /* QRCodeVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B886B4A62398B23E00211ABE /* QRCodeVC.swift */; }; B886B4A92398BA1500211ABE /* QRCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = B886B4A82398BA1500211ABE /* QRCode.swift */; }; B88FA7F2260C3EB10049422F /* OpenGroupSuggestionGrid.swift in Sources */ = {isa = PBXBuildFile; fileRef = B88FA7F1260C3EB10049422F /* OpenGroupSuggestionGrid.swift */; }; B88FA7FB26114EA70049422F /* Hex.swift in Sources */ = {isa = PBXBuildFile; fileRef = B88FA7FA26114EA70049422F /* Hex.swift */; }; @@ -1363,18 +1362,11 @@ 7BFD1A892745C4F000FB91B9 /* Permissions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Permissions.swift; sourceTree = ""; }; 7BFD1A8B2747150E00FB91B9 /* TurnServerInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TurnServerInfo.swift; sourceTree = ""; }; 7BFD1A962747689000FB91B9 /* Session-Turn-Server */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Session-Turn-Server"; sourceTree = ""; }; - 8448EFF76CD3CA5B2283B8A0 /* Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit-SessionUtilitiesKitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit-SessionUtilitiesKitTests.debug.xcconfig"; path = "Target Support Files/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit-SessionUtilitiesKitTests/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit-SessionUtilitiesKitTests.debug.xcconfig"; sourceTree = ""; }; - 847091A12D82E41B1EBB8FB3 /* Pods-GlobalDependencies-FrameworkAndExtensionDependencies-SessionSnodeKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GlobalDependencies-FrameworkAndExtensionDependencies-SessionSnodeKit.debug.xcconfig"; path = "Target Support Files/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-SessionSnodeKit/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-SessionSnodeKit.debug.xcconfig"; sourceTree = ""; }; - 8603226ED1C6F61F1F2D3734 /* Pods-GlobalDependencies-Session.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GlobalDependencies-Session.app store release.xcconfig"; path = "Target Support Files/Pods-GlobalDependencies-Session/Pods-GlobalDependencies-Session.app store release.xcconfig"; sourceTree = ""; }; - 8727C47348B6EFA767EE583A /* Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionMessagingKit-SessionMessagingKitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionMessagingKit-SessionMessagingKitTests.debug.xcconfig"; path = "Target Support Files/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionMessagingKit-SessionMessagingKitTests/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionMessagingKit-SessionMessagingKitTests.debug.xcconfig"; sourceTree = ""; }; - 8E946CB54A221018E23599DE /* Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit.debug.xcconfig"; path = "Target Support Files/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit.debug.xcconfig"; sourceTree = ""; }; - 92E8569C96285EE3CDB5960D /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SignalUtilitiesKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SignalUtilitiesKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 93359C81CF2660040B7CD106 /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SessionUtilitiesKit_SessionUtilitiesKitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SessionUtilitiesKit_SessionUtilitiesKitTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 9410613F2BBE45EB0056C084 /* ActivityView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityView.swift; sourceTree = ""; }; 7C0E07EB26851D7BB4CF060E /* Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit.app store release.xcconfig"; path = "Target Support Files/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit.app store release.xcconfig"; sourceTree = ""; }; 7FE80FEC012334C282A6C8CB /* Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit-SessionUtilitiesKitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit-SessionUtilitiesKitTests.debug.xcconfig"; path = "Target Support Files/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit-SessionUtilitiesKitTests/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit-SessionUtilitiesKitTests.debug.xcconfig"; sourceTree = ""; }; 89EE44A6174C653D2F4DB573 /* Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SignalUtilitiesKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SignalUtilitiesKit.debug.xcconfig"; path = "Target Support Files/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SignalUtilitiesKit/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SignalUtilitiesKit.debug.xcconfig"; sourceTree = ""; }; 91271A534D1D4AB949B1319E /* Pods-GlobalDependencies-FrameworkAndExtensionDependencies-SessionNotificationServiceExtension.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GlobalDependencies-FrameworkAndExtensionDependencies-SessionNotificationServiceExtension.app store release.xcconfig"; path = "Target Support Files/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-SessionNotificationServiceExtension/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-SessionNotificationServiceExtension.app store release.xcconfig"; sourceTree = ""; }; + 9410613F2BBE45EB0056C084 /* ActivityView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityView.swift; sourceTree = ""; }; 9422EE2A2B8C3A97004C740D /* String+Utilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Utilities.swift"; sourceTree = ""; }; 942C9CA12B67769000B5153A /* SessionSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionSearchBar.swift; sourceTree = ""; }; 943C6D752B705B7D004ACE64 /* CompatibleScrollingVStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompatibleScrollingVStack.swift; sourceTree = ""; }; @@ -1435,7 +1427,6 @@ B87EF17026367CF800124B3C /* FileServerAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileServerAPI.swift; sourceTree = ""; }; B87EF18026377A1D00124B3C /* Features.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Features.swift; sourceTree = ""; }; B885D5F52334A32100EE0D8E /* UIView+Constraints.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Constraints.swift"; sourceTree = ""; }; - B886B4A62398B23E00211ABE /* QRCodeVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeVC.swift; sourceTree = ""; }; B886B4A82398BA1500211ABE /* QRCode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCode.swift; sourceTree = ""; }; B88FA7B726045D100049422F /* OpenGroupAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenGroupAPI.swift; sourceTree = ""; }; B88FA7F1260C3EB10049422F /* OpenGroupSuggestionGrid.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenGroupSuggestionGrid.swift; sourceTree = ""; }; @@ -3161,7 +3152,6 @@ 946B34462B5DF0B7004CB4A3 /* QRCodeScreen.swift */, FD37E9CD28A1E682003AE748 /* Views */, FD71162D28E168C700B47552 /* SettingsViewModel.swift */, - B886B4A62398B23E00211ABE /* QRCodeVC.swift */, FD52090428B4915F006098F6 /* PrivacySettingsViewModel.swift */, FD37EA0428AA00C1003AE748 /* NotificationSettingsViewModel.swift */, FD37EA1828AC5CCA003AE748 /* NotificationSoundViewModel.swift */, @@ -6436,7 +6426,6 @@ 34B6A903218B3F63007C4606 /* TypingIndicatorView.swift in Sources */, 7BAF54CF27ACCEEC003D12F8 /* GlobalSearchViewController.swift in Sources */, FD37EA1728AC5605003AE748 /* NotificationContentViewModel.swift in Sources */, - B886B4A72398B23E00211ABE /* QRCodeVC.swift in Sources */, 7B87EF4C2A933355002A0E8F /* LoadingScreen.swift in Sources */, 94B3DC172AF8592200C88531 /* QuoteView_SwiftUI.swift in Sources */, 4C4AE6A1224AF35700D4AF6F /* SendMediaNavigationController.swift in Sources */, diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift index 22e1850df..530e2688c 100644 --- a/Session/Home/HomeVC.swift +++ b/Session/Home/HomeVC.swift @@ -859,7 +859,11 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS let finalViewControllers: [UIViewController] = [ self, - (isMessageRequest ? SessionTableViewController(viewModel: MessageRequestsViewModel()) : nil), + ( + (isMessageRequest && action != .compose) ? + SessionTableViewController(viewModel: MessageRequestsViewModel()) : + nil + ), ConversationVC( threadId: threadId, threadVariant: variant, diff --git a/Session/Home/New Conversation/NewMessageScreen.swift b/Session/Home/New Conversation/NewMessageScreen.swift index 72519040e..4d77bb3a8 100644 --- a/Session/Home/New Conversation/NewMessageScreen.swift +++ b/Session/Home/New Conversation/NewMessageScreen.swift @@ -125,6 +125,7 @@ struct NewMessageScreen: View { SessionApp.presentConversationCreatingIfNeeded( for: sessionId, variant: .contact, + action: .compose, dismissing: self.host.controller, animated: false ) diff --git a/Session/Settings/QRCodeScreen.swift b/Session/Settings/QRCodeScreen.swift index 4b8187211..9663ad66f 100644 --- a/Session/Settings/QRCodeScreen.swift +++ b/Session/Settings/QRCodeScreen.swift @@ -49,6 +49,7 @@ struct QRCodeScreen: View { SessionApp.presentConversationCreatingIfNeeded( for: hexEncodedPublicKey, variant: .contact, + action: .compose, dismissing: self.host.controller, animated: false ) diff --git a/Session/Settings/QRCodeVC.swift b/Session/Settings/QRCodeVC.swift deleted file mode 100644 index 0eea2efa8..000000000 --- a/Session/Settings/QRCodeVC.swift +++ /dev/null @@ -1,328 +0,0 @@ -// Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. - -import UIKit -import AVFoundation -import SessionUIKit -import SessionMessagingKit -import SessionUtilitiesKit - -final class QRCodeVC : BaseVC, UIPageViewControllerDataSource, UIPageViewControllerDelegate, QRScannerDelegate { - private let pageVC = UIPageViewController(transitionStyle: .scroll, navigationOrientation: .horizontal, options: nil) - private var pages: [UIViewController] = [] - private var targetVCIndex: Int? - - // MARK: - Components - - private lazy var tabBar: TabBar = { - let tabs = [ - TabBar.Tab(title: "vc_qr_code_view_my_qr_code_tab_title".localized()) { [weak self] in - guard let self = self else { return } - self.pageVC.setViewControllers([ self.pages[0] ], direction: .forward, animated: false, completion: nil) - }, - TabBar.Tab(title: "vc_qr_code_view_scan_qr_code_tab_title".localized()) { [weak self] in - guard let self = self else { return } - self.pageVC.setViewControllers([ self.pages[1] ], direction: .forward, animated: false, completion: nil) - } - ] - return TabBar(tabs: tabs) - }() - - private lazy var viewMyQRCodeVC: ViewMyQRCodeVC = { - let result = ViewMyQRCodeVC() - result.qrCodeVC = self - - return result - }() - - private lazy var scanQRCodePlaceholderVC: ScanQRCodePlaceholderVC = { - let result = ScanQRCodePlaceholderVC() - result.qrCodeVC = self - - return result - }() - - private lazy var scanQRCodeWrapperVC: ScanQRCodeWrapperVC = { - let message = "vc_qr_code_view_scan_qr_code_explanation".localized() - let result = ScanQRCodeWrapperVC(message: message) - result.delegate = self - - return result - }() - - // MARK: - Lifecycle - - override func viewDidLoad() { - super.viewDidLoad() - - setNavBarTitle("vc_qr_code_title".localized()) - - // Set up tab bar - view.addSubview(tabBar) - tabBar.pin(.top, to: .top, of: view.safeAreaLayoutGuide) - tabBar.pin(.leading, to: .leading, of: view) - tabBar.pin(.trailing, to: .trailing, of: view) - - // Set up page VC - let containerView: UIView = UIView() - view.addSubview(containerView) - containerView.pin(.top, to: .bottom, of: tabBar) - containerView.pin(.leading, to: .leading, of: view) - containerView.pin(.trailing, to: .trailing, of: view) - containerView.pin(.bottom, to: .bottom, of: view) - - let hasCameraAccess = (AVCaptureDevice.authorizationStatus(for: .video) == .authorized) - pages = [ viewMyQRCodeVC, (hasCameraAccess ? scanQRCodeWrapperVC : scanQRCodePlaceholderVC) ] - pageVC.dataSource = self - pageVC.delegate = self - pageVC.setViewControllers([ viewMyQRCodeVC ], direction: .forward, animated: false, completion: nil) - addChild(pageVC) - containerView.addSubview(pageVC.view) - - pageVC.view.pin(to: containerView) - pageVC.didMove(toParent: self) - } - - // MARK: - General - - func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? { - guard let index = pages.firstIndex(of: viewController), index != 0 else { return nil } - return pages[index - 1] - } - - func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? { - guard let index = pages.firstIndex(of: viewController), index != (pages.count - 1) else { return nil } - return pages[index + 1] - } - - fileprivate func handleCameraAccessGranted() { - DispatchQueue.main.async { - self.pages[1] = self.scanQRCodeWrapperVC - self.pageVC.setViewControllers([ self.scanQRCodeWrapperVC ], direction: .forward, animated: false, completion: nil) - } - } - - // MARK: - Updating - - func pageViewController(_ pageViewController: UIPageViewController, willTransitionTo pendingViewControllers: [UIViewController]) { - guard let targetVC = pendingViewControllers.first, let index = pages.firstIndex(of: targetVC) else { return } - targetVCIndex = index - } - - func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating isFinished: Bool, previousViewControllers: [UIViewController], transitionCompleted isCompleted: Bool) { - guard isCompleted, let index = targetVCIndex else { return } - tabBar.selectTab(at: index) - } - - // MARK: - Interaction - - @objc private func close() { - dismiss(animated: true, completion: nil) - } - - func controller(_ controller: QRCodeScanningViewController, didDetectQRCodeWith string: String, onError: (() -> ())?) { - let hexEncodedPublicKey = string - startNewPrivateChatIfPossible(with: hexEncodedPublicKey, onError: onError) - } - - fileprivate func startNewPrivateChatIfPossible(with hexEncodedPublicKey: String, onError: (() -> ())?) { - if !KeyPair.isValidHexEncodedPublicKey(candidate: hexEncodedPublicKey) { - let modal: ConfirmationModal = ConfirmationModal( - targetView: self.view, - info: ConfirmationModal.Info( - title: "invalid_session_id".localized(), - body: .text("INVALID_SESSION_ID_MESSAGE".localized()), - cancelTitle: "BUTTON_OK".localized(), - cancelStyle: .alert_text, - afterClosed: onError - ) - ) - self.present(modal, animated: true) - } - else { - SessionApp.presentConversationCreatingIfNeeded( - for: hexEncodedPublicKey, - variant: .contact, - dismissing: presentingViewController, - animated: false - ) - } - } -} - -private final class ViewMyQRCodeVC : UIViewController { - weak var qrCodeVC: QRCodeVC! - - // MARK: - Lifecycle - - override func viewDidLoad() { - // Remove background color - view.themeBackgroundColor = .clear - - // Set up title label - let titleLabel = UILabel() - titleLabel.font = .boldSystemFont(ofSize: isIPhone5OrSmaller ? CGFloat(40) : Values.massiveFontSize) - titleLabel.text = "Scan Me" - titleLabel.themeTextColor = .textPrimary - titleLabel.textAlignment = .center - titleLabel.lineBreakMode = .byWordWrapping - titleLabel.numberOfLines = 1 - titleLabel.set(.height, to: isIPhone5OrSmaller ? CGFloat(40) : Values.massiveFontSize) - - // Set up QR code image view - let qrCodeImageView = UIImageView( - image: QRCode.generate(for: getUserHexEncodedPublicKey(), hasBackground: false) - .withRenderingMode(.alwaysTemplate) - ) - qrCodeImageView.setContentCompressionResistancePriority(.defaultLow, for: .vertical) - qrCodeImageView.set(.width, to: .height, of: qrCodeImageView) - qrCodeImageView.heightAnchor - .constraint(lessThanOrEqualToConstant: (isIPhone5OrSmaller ? 180 : 240)) - .isActive = true - -#if targetEnvironment(simulator) -#else - // Note: For some reason setting this seems to stop the QRCode from rendering on the - // simulator so only doing it on device - qrCodeImageView.contentMode = .scaleAspectFit -#endif - - let qrCodeImageViewBackgroundView = UIView() - qrCodeImageViewBackgroundView.layer.cornerRadius = 8 - qrCodeImageViewBackgroundView.addSubview(qrCodeImageView) - qrCodeImageView.pin( - to: qrCodeImageViewBackgroundView, - withInset: 5 // The QRCode image has about 6pt of padding and we want 11 in total - ) - - ThemeManager.onThemeChange(observer: qrCodeImageView) { [weak qrCodeImageView, weak qrCodeImageViewBackgroundView] theme, _ in - switch theme.interfaceStyle { - case .light: - qrCodeImageView?.themeTintColorForced = .theme(theme, color: .textPrimary) - qrCodeImageViewBackgroundView?.themeBackgroundColorForced = nil - - default: - qrCodeImageView?.themeTintColorForced = .theme(theme, color: .backgroundPrimary) - qrCodeImageViewBackgroundView?.themeBackgroundColorForced = .color(.white) - } - - } - - // Set up QR code image view container - let qrCodeImageViewContainer = UIView() - qrCodeImageViewContainer.accessibilityLabel = "Your QR code" - qrCodeImageViewContainer.isAccessibilityElement = true - qrCodeImageViewContainer.addSubview(qrCodeImageViewBackgroundView) - qrCodeImageViewBackgroundView.center(.horizontal, in: qrCodeImageViewContainer) - qrCodeImageViewBackgroundView.pin(.top, to: .top, of: qrCodeImageViewContainer) - qrCodeImageViewBackgroundView.pin(.bottom, to: .bottom, of: qrCodeImageViewContainer) - - // Set up explanation label - let explanationLabel = UILabel() - explanationLabel.font = .systemFont(ofSize: Values.mediumFontSize) - explanationLabel.text = "vc_view_my_qr_code_explanation".localized() - explanationLabel.themeTextColor = .textPrimary - explanationLabel.textAlignment = .center - explanationLabel.lineBreakMode = .byWordWrapping - explanationLabel.numberOfLines = 0 - - // Set up share button - let shareButton = SessionButton(style: .bordered, size: .large) - shareButton.setTitle("share".localized(), for: .normal) - shareButton.addTarget(self, action: #selector(shareQRCode), for: .touchUpInside) - - // Set up share button container - let shareButtonContainer = UIView() - shareButtonContainer.addSubview(shareButton) - shareButton.pin(.top, to: .top, of: shareButtonContainer) - shareButton.pin(.bottom, to: .bottom, of: shareButtonContainer) - if UIDevice.current.isIPad { - shareButton.center(in: shareButtonContainer) - shareButton.set(.width, to: Values.iPadButtonWidth) - } else { - shareButton.pin(.leading, to: .leading, of: shareButtonContainer, withInset: 80) - shareButton.pin(.trailing, to: .trailing, of: shareButtonContainer, withInset: -80) - } - - // Set up stack view - let spacing = (isIPhone5OrSmaller ? Values.mediumSpacing : Values.largeSpacing) - let stackView = UIStackView( - arrangedSubviews: [ - titleLabel, - UIView.spacer(withHeight: spacing), - qrCodeImageViewContainer, - UIView.spacer(withHeight: spacing), - explanationLabel, - UIView.vStretchingSpacer(), - shareButtonContainer - ] - ) - stackView.axis = .vertical - stackView.alignment = .fill - stackView.layoutMargins = UIEdgeInsets( - top: Values.largeSpacing, - left: Values.largeSpacing, - bottom: Values.smallSpacing, - right: Values.largeSpacing - ) - stackView.isLayoutMarginsRelativeArrangement = true - view.addSubview(stackView) - stackView.pin(to: view) - } - - // MARK: - Interaction - - @objc private func shareQRCode() { - let qrCode = QRCode.generate(for: getUserHexEncodedPublicKey(), hasBackground: true) - let shareVC = UIActivityViewController(activityItems: [ qrCode ], applicationActivities: nil) - if UIDevice.current.isIPad { - shareVC.excludedActivityTypes = [] - shareVC.popoverPresentationController?.permittedArrowDirections = [] - shareVC.popoverPresentationController?.sourceView = self.view - shareVC.popoverPresentationController?.sourceRect = self.view.bounds - } - qrCodeVC.navigationController!.present(shareVC, animated: true, completion: nil) - } -} - -private final class ScanQRCodePlaceholderVC : UIViewController { - weak var qrCodeVC: QRCodeVC! - - override func viewDidLoad() { - // Remove background color - view.themeBackgroundColor = .clear - - // Set up explanation label - let explanationLabel = UILabel() - explanationLabel.font = .systemFont(ofSize: Values.smallFontSize) - explanationLabel.text = "vc_scan_qr_code_camera_access_explanation".localized() - explanationLabel.themeTextColor = .textPrimary - explanationLabel.textAlignment = .center - explanationLabel.lineBreakMode = .byWordWrapping - explanationLabel.numberOfLines = 0 - - // Set up call to action button - let callToActionButton = UIButton() - callToActionButton.titleLabel?.font = .boldSystemFont(ofSize: Values.mediumFontSize) - callToActionButton.setTitle("continue_2".localized(), for: .normal) - callToActionButton.setThemeTitleColor(.primary, for: .normal) - callToActionButton.addTarget(self, action: #selector(requestCameraAccess), for: UIControl.Event.touchUpInside) - - // Set up stack view - let stackView = UIStackView(arrangedSubviews: [ explanationLabel, callToActionButton ]) - stackView.axis = .vertical - stackView.spacing = Values.mediumSpacing - stackView.alignment = .center - - // Set up constraints - view.addSubview(stackView) - stackView.pin(.leading, to: .leading, of: view, withInset: Values.massiveSpacing) - stackView.pin(.trailing, to: .trailing, of: view, withInset: -Values.massiveSpacing) - stackView.center(.vertical, in: view, withInset: -16) // Makes things appear centered visually - } - - @objc private func requestCameraAccess() { - Permissions.requestCameraPermissionIfNeeded { [weak self] in - self?.qrCodeVC.handleCameraAccessGranted() - } - } -}