fix: Share extension title extraction and theme persistence
- Enable text support in share extension to extract page titles - Extract titles from attributedTitle and attributedContentText - Prevent titles from being used as URLs with proper validation - Fix theme settings persistence using SettingsRepository instead of UserDefaults - Theme changes now properly notify the app for immediate updates
This commit is contained in:
parent
ba74430d10
commit
dcbe0515fc
@ -8,6 +8,8 @@
|
|||||||
<dict>
|
<dict>
|
||||||
<key>NSExtensionActivationRule</key>
|
<key>NSExtensionActivationRule</key>
|
||||||
<dict>
|
<dict>
|
||||||
|
<key>NSExtensionActivationSupportsText</key>
|
||||||
|
<true/>
|
||||||
<key>NSExtensionActivationSupportsWebURLWithMaxCount</key>
|
<key>NSExtensionActivationSupportsWebURLWithMaxCount</key>
|
||||||
<integer>1</integer>
|
<integer>1</integer>
|
||||||
</dict>
|
</dict>
|
||||||
|
|||||||
@ -67,8 +67,22 @@ class ShareBookmarkViewModel: ObservableObject {
|
|||||||
logger.warning("No extension context available for content extraction")
|
logger.warning("No extension context available for content extraction")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var extractedUrl: String?
|
||||||
|
var extractedTitle: String?
|
||||||
|
|
||||||
for item in extensionContext.inputItems {
|
for item in extensionContext.inputItems {
|
||||||
guard let inputItem = item as? NSExtensionItem else { continue }
|
guard let inputItem = item as? NSExtensionItem else { continue }
|
||||||
|
|
||||||
|
// Use the inputItem's attributedTitle or attributedContentText as potential title
|
||||||
|
if let attributedTitle = inputItem.attributedTitle?.string, !attributedTitle.isEmpty {
|
||||||
|
extractedTitle = attributedTitle
|
||||||
|
logger.info("Extracted title from input item: \(attributedTitle)")
|
||||||
|
} else if let attributedContent = inputItem.attributedContentText?.string, !attributedContent.isEmpty {
|
||||||
|
extractedTitle = attributedContent
|
||||||
|
logger.info("Extracted title from content text: \(attributedContent)")
|
||||||
|
}
|
||||||
|
|
||||||
for attachment in inputItem.attachments ?? [] {
|
for attachment in inputItem.attachments ?? [] {
|
||||||
if attachment.hasItemConformingToTypeIdentifier(UTType.url.identifier) {
|
if attachment.hasItemConformingToTypeIdentifier(UTType.url.identifier) {
|
||||||
attachment.loadItem(forTypeIdentifier: UTType.url.identifier, options: nil) { [weak self] (url, error) in
|
attachment.loadItem(forTypeIdentifier: UTType.url.identifier, options: nil) { [weak self] (url, error) in
|
||||||
@ -76,6 +90,12 @@ class ShareBookmarkViewModel: ObservableObject {
|
|||||||
if let url = url as? URL {
|
if let url = url as? URL {
|
||||||
self?.url = url.absoluteString
|
self?.url = url.absoluteString
|
||||||
self?.logger.info("Extracted URL from shared content: \(url.absoluteString)")
|
self?.logger.info("Extracted URL from shared content: \(url.absoluteString)")
|
||||||
|
|
||||||
|
// Set title if we extracted one and current title is empty
|
||||||
|
if let title = extractedTitle, self?.title.isEmpty == true {
|
||||||
|
self?.title = title
|
||||||
|
self?.logger.info("Set title from shared content: \(title)")
|
||||||
|
}
|
||||||
} else if let error = error {
|
} else if let error = error {
|
||||||
self?.logger.error("Failed to extract URL: \(error.localizedDescription)")
|
self?.logger.error("Failed to extract URL: \(error.localizedDescription)")
|
||||||
}
|
}
|
||||||
@ -85,9 +105,18 @@ class ShareBookmarkViewModel: ObservableObject {
|
|||||||
if attachment.hasItemConformingToTypeIdentifier(UTType.plainText.identifier) {
|
if attachment.hasItemConformingToTypeIdentifier(UTType.plainText.identifier) {
|
||||||
attachment.loadItem(forTypeIdentifier: UTType.plainText.identifier, options: nil) { [weak self] (text, error) in
|
attachment.loadItem(forTypeIdentifier: UTType.plainText.identifier, options: nil) { [weak self] (text, error) in
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
if let text = text as? String, let url = URL(string: text) {
|
if let text = text as? String {
|
||||||
|
// Only treat as URL if it's a valid URL and we don't have one yet
|
||||||
|
if self?.url == nil, let url = URL(string: text), url.scheme != nil {
|
||||||
self?.url = url.absoluteString
|
self?.url = url.absoluteString
|
||||||
self?.logger.info("Extracted URL from shared text: \(url.absoluteString)")
|
self?.logger.info("Extracted URL from shared text: \(url.absoluteString)")
|
||||||
|
} else {
|
||||||
|
// If not a valid URL or we already have a URL, treat as potential title
|
||||||
|
if self?.title.isEmpty == true {
|
||||||
|
self?.title = text
|
||||||
|
self?.logger.info("Set title from shared text: \(text)")
|
||||||
|
}
|
||||||
|
}
|
||||||
} else if let error = error {
|
} else if let error = error {
|
||||||
self?.logger.error("Failed to extract text: \(error.localizedDescription)")
|
self?.logger.error("Failed to extract text: \(error.localizedDescription)")
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,10 +6,12 @@ struct AppearanceSettingsView: View {
|
|||||||
|
|
||||||
private let loadCardLayoutUseCase: PLoadCardLayoutUseCase
|
private let loadCardLayoutUseCase: PLoadCardLayoutUseCase
|
||||||
private let saveCardLayoutUseCase: PSaveCardLayoutUseCase
|
private let saveCardLayoutUseCase: PSaveCardLayoutUseCase
|
||||||
|
private let settingsRepository: PSettingsRepository
|
||||||
|
|
||||||
init(factory: UseCaseFactory = DefaultUseCaseFactory.shared) {
|
init(factory: UseCaseFactory = DefaultUseCaseFactory.shared) {
|
||||||
self.loadCardLayoutUseCase = factory.makeLoadCardLayoutUseCase()
|
self.loadCardLayoutUseCase = factory.makeLoadCardLayoutUseCase()
|
||||||
self.saveCardLayoutUseCase = factory.makeSaveCardLayoutUseCase()
|
self.saveCardLayoutUseCase = factory.makeSaveCardLayoutUseCase()
|
||||||
|
self.settingsRepository = SettingsRepository()
|
||||||
}
|
}
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
@ -58,18 +60,29 @@ struct AppearanceSettingsView: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private func loadSettings() {
|
private func loadSettings() {
|
||||||
// Load theme setting
|
|
||||||
let themeString = UserDefaults.standard.string(forKey: "selectedTheme") ?? "system"
|
|
||||||
selectedTheme = Theme(rawValue: themeString) ?? .system
|
|
||||||
|
|
||||||
// Load card layout setting
|
|
||||||
Task {
|
Task {
|
||||||
|
// Load both theme and card layout from repository
|
||||||
|
if let settings = try? await settingsRepository.loadSettings() {
|
||||||
|
await MainActor.run {
|
||||||
|
selectedTheme = settings.theme ?? .system
|
||||||
|
}
|
||||||
|
}
|
||||||
selectedCardLayout = await loadCardLayoutUseCase.execute()
|
selectedCardLayout = await loadCardLayoutUseCase.execute()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private func saveThemeSettings() {
|
private func saveThemeSettings() {
|
||||||
UserDefaults.standard.set(selectedTheme.rawValue, forKey: "selectedTheme")
|
Task {
|
||||||
|
// Load current settings, update theme, and save back
|
||||||
|
var settings = (try? await settingsRepository.loadSettings()) ?? Settings()
|
||||||
|
settings.theme = selectedTheme
|
||||||
|
try? await settingsRepository.saveSettings(settings)
|
||||||
|
|
||||||
|
// Notify app about theme change
|
||||||
|
await MainActor.run {
|
||||||
|
NotificationCenter.default.post(name: .settingsChanged, object: nil)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private func saveCardLayoutSettings() {
|
private func saveCardLayoutSettings() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user