From 8ffd2b589b3f4d3b210f5684fb826674b5cee7d3 Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Tue, 8 Nov 2022 15:08:29 +0300 Subject: [PATCH] fix: check on shacking motion in toggling window --- TILogging/Sources/Logger/Logger.swift | 2 +- .../Views/LoggerWindow/LoggingTogglingWindow.swift | 12 ++++++++++++ .../Views/ViewModels/LogsStorageViewModel.swift | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/TILogging/Sources/Logger/Logger.swift b/TILogging/Sources/Logger/Logger.swift index 07507989..4b9e25cc 100644 --- a/TILogging/Sources/Logger/Logger.swift +++ b/TILogging/Sources/Logger/Logger.swift @@ -30,7 +30,7 @@ public struct TILogger: LoggerRepresentable { @available(iOS 12, *) public static let defaultLogger = TILogger(subsystem: .defaultSubsystem ?? "", category: .pointsOfInterest) - public let logInfo: OSLog + public let logInfo: NSLog // MARK: - Init diff --git a/TILogging/Sources/Views/LoggerWindow/LoggingTogglingWindow.swift b/TILogging/Sources/Views/LoggerWindow/LoggingTogglingWindow.swift index 15a82d82..ff3b1995 100644 --- a/TILogging/Sources/Views/LoggerWindow/LoggingTogglingWindow.swift +++ b/TILogging/Sources/Views/LoggerWindow/LoggingTogglingWindow.swift @@ -37,6 +37,18 @@ class LoggingTogglingWindow: UIWindow { fatalError("init(coder:) has not been implemented") } + open override func motionEnded(_ motion: UIEvent.EventSubtype, with event: UIEvent?) { + guard let rootView = rootViewController else { return } + + guard let loggingController = rootView.presentedViewController as? LoggingTogglingViewController else { + return + } + + if motion == .motionShake { + loggingController.openLoggingScreen() + } + } + override func point(inside point: CGPoint, with event: UIEvent?) -> Bool { guard let rootView = rootViewController else { return false } diff --git a/TILogging/Sources/Views/ViewModels/LogsStorageViewModel.swift b/TILogging/Sources/Views/ViewModels/LogsStorageViewModel.swift index bda8398b..5373c814 100644 --- a/TILogging/Sources/Views/ViewModels/LogsStorageViewModel.swift +++ b/TILogging/Sources/Views/ViewModels/LogsStorageViewModel.swift @@ -68,7 +68,7 @@ open class LogsStorageViewModel { preCompletion?() DispatchQueue.global(qos: .userInitiated).async { [weak self] in - let logStore = try? OSLogStore(scope: .currentProcessIdentifier) + let logStore = try? OSLogStore(scope: .system) let entries = try? logStore?.getEntries() let logs = entries?