TouchInstinct
/
LeadKit
305
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: code review notes

This commit is contained in:
Nikita Semenov 2022-11-10 17:46:25 +03:00
parent f8b7934204
commit dffb4c6015
2 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
TILogging/Sources/Views/LoggerWindow/LoggingTogglingViewController.swift
View File

@ -117,32 +117,31 @@ open class LoggingTogglingViewController: BaseInitializeableViewController {
private func clipButtonIfNeeded() {
let viewFrame = view.safeAreaLayoutGuide.layoutFrame
let buttonFrame = button.frame
var x: CGFloat = buttonFrame.minX
var y: CGFloat = buttonFrame.minY
if buttonFrame.maxX > viewFrame.maxX {
button.frame = .init(x: viewFrame.maxX - buttonFrame.width,
y: buttonFrame.minY,
width: buttonFrame.width,
height: buttonFrame.height)
x = viewFrame.maxX - buttonFrame.width
y = buttonFrame.minY
} else if buttonFrame.minX < viewFrame.minX {
button.frame = .init(x: viewFrame.minX,
y: buttonFrame.minY,
width: buttonFrame.width,
height: buttonFrame.height)
x = viewFrame.minX
y = buttonFrame.minY
}
if buttonFrame.maxY > viewFrame.maxY {
button.frame = .init(x: button.frame.minX,
y: viewFrame.maxY - button.frame.height,
width: button.frame.width,
height: button.frame.height)
x = buttonFrame.minX
y = viewFrame.maxY - buttonFrame.height
} else if buttonFrame.minY < viewFrame.minY {
button.frame = .init(x: buttonFrame.minX,
y: viewFrame.minY,
width: buttonFrame.width,
height: buttonFrame.height)
x = buttonFrame.minX
y = viewFrame.minY
}
button.frame = .init(x: x,
y: y,
width: buttonFrame.width,
height: buttonFrame.height)
}
// MARK: - Actions

18
TILogging/Sources/Views/ViewModels/Helpers/DefaultLogsListManipulator.swift
View File

@ -25,12 +25,20 @@ import OSLog
@available(iOS 15, *)
public actor DefaultLogsListManipulator: LogsListManipulatorProtocol {
public func fetchLogs() async -> [OSLogEntryLog]? {
let logStore = try? OSLogStore(scope: .currentProcessIdentifier)
let entries = try? logStore?.getEntries()
let logsResult = Result { try OSLogStore(scope: .currentProcessIdentifier) }
.flatMap { logStore in
Result {
try logStore
.getEntries()
.reversed()
.compactMap { $0 as? OSLogEntryLog }
}
}
if case let .success(logs) = logsResult {
return logs
}
return entries?
.reversed()
.compactMap { $0 as? OSLogEntryLog }
return nil
}
public func filter(_ logs: [OSLogEntryLog], byText text: String) async -> [OSLogEntryLog] {