Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update deps to resolve iOS18 issues

Browse Source
This commit is contained in:
Jackson Harper
2024-07-01 13:54:14 +08:00
parent ba28e54f7c
commit 8ccce365e4
9 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -32,8 +32,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/nathantannar4/Engine",
"state" : {
"revision" : "e9867eb6df013abc65c3437d295e594077469a13",
"version" : "1.5.1"
"revision" : "0d2d5647921473be4aac40cb70ad13900f56ed2b",
"version" : "1.8.1"
}
},
{
@ -167,8 +167,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/PSPDFKit/PSPDFKit-SP",
"state" : {
"revision" : "fcff39b2b7741662286dc4323ea255a0ea53fcd3",
"version" : "13.1.0"
"revision" : "fff37620437d93571e38675440da5257ff4a9fd5",
"version" : "13.7.0"
}
},
{
@ -239,8 +239,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/nathantannar4/Transmission",
"state" : {
"revision" : "9517912f8f528c777f86f7896b5c35d7e43fa916",
"version" : "1.0.1"
"revision" : "6b3e6b46f34d0d18715d27c46e0053f1eda1bcd1",
"version" : "1.3.1"
}
},
{
@ -248,8 +248,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/nathantannar4/Turbocharger",
"state" : {
"revision" : "095344c0cac57873e1552f30d3561ab1bec5ae35",
"version" : "1.1.4"
"revision" : "9420e40f902021469ee7b4c5a0c7849f5bb26290",
"version" : "1.3.1"
}
},
{

4
apple/OmnivoreKit/Package.swift
View File

@ -73,9 +73,9 @@ var dependencies: [Package.Dependency] {
.package(url: "https://github.com/PostHog/posthog-ios.git", from: "2.0.0"),
// .package(url: "https://github.com/nathantannar4/Engine", exact: "1.0.1"),
// .package(url: "https://github.com/nathantannar4/Turbocharger", exact: "1.1.4"),
.package(url: "https://github.com/nathantannar4/Transmission", exact: "1.0.1")
.package(url: "https://github.com/nathantannar4/Transmission", exact: "1.3.1")
]
// Comment out following line for macOS build
deps.append(.package(url: "https://github.com/PSPDFKit/PSPDFKit-SP", from: "13.1.0"))
deps.append(.package(url: "https://github.com/PSPDFKit/PSPDFKit-SP", from: "13.7.0"))
return deps
}

4
apple/OmnivoreKit/Sources/App/PDFSupport/PDFViewer.swift
View File

@ -54,7 +54,7 @@ import Utils
@State private var showAnnotationModal = false
@State private var showSettingsModal = false
@Environment(\.dismiss) private var dismiss
@Environment(\.presentationCoordinator) var presentationCoordinator
init(viewModel: PDFViewerViewModel) {
self.viewModel = viewModel
@ -479,7 +479,7 @@ import Utils
@objc public func pop() {
if let viewer = self.viewer {
viewer.dismiss()
viewer.presentationCoordinator.dismiss()
}
}

4
apple/OmnivoreKit/Sources/App/Views/AI/FullScreenDigestView.swift
View File

@ -112,7 +112,7 @@ struct FullScreenDigestView: View {
let dataService: DataService
let audioController: AudioController
@Environment(\.dismiss) private var dismiss
@Environment(\.presentationCoordinator) var presentationCoordinator
public init(dataService: DataService, audioController: AudioController) {
self.dataService = dataService
@ -221,7 +221,7 @@ struct FullScreenDigestView: View {
var closeButton: some View {
Button(action: {
dismiss()
presentationCoordinator.dismiss()
}, label: {
Text("Close")
.foregroundColor(Color.blue)

1
apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift
View File

@ -546,6 +546,7 @@ struct AnimatingCellHeight: AnimatableModifier {
if presentingItem.isPDF {
PDFContainerView(item: presentingItem)
} else {
let too = print("$viewModel.linkIsActive", viewModel.linkIsActive)
WebReaderContainerView(item: presentingItem)
}
} else {

1
apple/OmnivoreKit/Sources/App/Views/RootView/RootView.swift
View File

@ -89,3 +89,4 @@ struct InnerRootView: View {
// }
#endif
}

6
apple/OmnivoreKit/Sources/App/Views/SelfHostSettingsView.swift
View File

@ -10,9 +10,9 @@ class SelfHostSettingsViewModel: ObservableObject {
}
struct SelfHostSettingsView: View {
@State var apiServerAddress = UserDefaults(suiteName: "group.app.omnivoreapp").string(forKey: AppEnvironmentUserDefaultKey.serverBaseURL.rawValue) ?? ""
@State var webServerAddress = UserDefaults(suiteName: "group.app.omnivoreapp").string(forKey: AppEnvironmentUserDefaultKey.webAppBaseURL.rawValue) ?? ""
@State var ttsServerAddress = UserDefaults(suiteName: "group.app.omnivoreapp").string(forKey: AppEnvironmentUserDefaultKey.ttsBaseURL.rawValue) ?? ""
@State var apiServerAddress = UserDefaults(suiteName: "group.app.omnivoreapp")?.string(forKey: AppEnvironmentUserDefaultKey.serverBaseURL.rawValue) ?? ""
@State var webServerAddress = UserDefaults(suiteName: "group.app.omnivoreapp")?.string(forKey: AppEnvironmentUserDefaultKey.webAppBaseURL.rawValue) ?? ""
@State var ttsServerAddress = UserDefaults(suiteName: "group.app.omnivoreapp")?.string(forKey: AppEnvironmentUserDefaultKey.ttsBaseURL.rawValue) ?? ""
@State var showConfirmAlert = false

10
apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift
View File

@ -10,7 +10,7 @@ import WebKit
// swiftlint:disable file_length type_body_length
struct WebReaderContainerView: View {
@State var item: Models.LibraryItem
@Environment(\.dismiss) private var dismiss
@Environment(\.presentationCoordinator) var presentationCoordinator
@State private var showPreferencesPopover = false
@State private var showPreferencesFormsheet = false
@ -268,7 +268,7 @@ struct WebReaderContainerView: View {
#if os(iOS)
Button(
action: {
dismiss()
presentationCoordinator.dismiss()
},
label: {
Image.chevronRight
@ -679,7 +679,7 @@ struct WebReaderContainerView: View {
WebViewManager.shared().loadHTMLString(WebReaderContent.emptyContent(isDark: Color.isDarkMode), baseURL: nil)
}
.onReceive(NotificationCenter.default.publisher(for: Notification.Name("PopToRoot"))) { _ in
dismiss()
presentationCoordinator.dismiss()
}
.ignoresSafeArea(.all, edges: .bottom)
}
@ -699,7 +699,7 @@ struct WebReaderContainerView: View {
let isArchived = item.isArchived
dataService.archiveLink(objectID: item.objectID, archived: !isArchived)
#if os(iOS)
dismiss()
presentationCoordinator.dismiss()
Snackbar.show(message: isArchived ? "Unarchived" : "Archived", undoAction: {
dataService.archiveLink(objectID: item.objectID, archived: isArchived)
@ -736,7 +736,7 @@ struct WebReaderContainerView: View {
}
func delete() {
dismiss()
presentationCoordinator.dismiss()
#if os(iOS)
DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100)) {

4
apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderLoadingContainer.swift
View File

@ -41,11 +41,11 @@ import Views
public struct WebReaderLoadingContainer: View {
let requestID: String
@Environment(\.dismiss) private var dismiss
@EnvironmentObject var dataService: DataService
@EnvironmentObject var audioController: AudioController
@StateObject var viewModel = WebReaderLoadingContainerViewModel()
@Environment(\.presentationCoordinator) var presentationCoordinator
public var body: some View {
if let item = viewModel.item {
@ -76,7 +76,7 @@ public struct WebReaderLoadingContainer: View {
VStack(spacing: 15) {
Text(errorMessage)
Button(action: {
dismiss()
presentationCoordinator.dismiss()
}, label: {
Text("Dismiss")
})