diff --git a/CHDataManagement.xcodeproj/project.pbxproj b/CHDataManagement.xcodeproj/project.pbxproj index 3185fa1..42cece0 100644 --- a/CHDataManagement.xcodeproj/project.pbxproj +++ b/CHDataManagement.xcodeproj/project.pbxproj @@ -189,6 +189,9 @@ E2B85F452C429ED60047CD0C /* ImageGallery.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2B85F442C429ED60047CD0C /* ImageGallery.swift */; }; E2B85F572C4BD0BB0047CD0C /* Binding+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2B85F562C4BD0BB0047CD0C /* Binding+Extension.swift */; }; E2BF1BC62D6B16FF003089F1 /* HeadlineLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2BF1BC52D6B16FA003089F1 /* HeadlineLink.swift */; }; + E2BF1BC82D6FC880003089F1 /* Insert+Link.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2BF1BC72D6FC87C003089F1 /* Insert+Link.swift */; }; + E2BF1BCA2D70EDF8003089F1 /* TagPropertyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2BF1BC92D70EDF3003089F1 /* TagPropertyView.swift */; }; + E2BF1BCC2D70EE59003089F1 /* TagPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2BF1BCB2D70EE55003089F1 /* TagPickerView.swift */; }; E2DD04742C276F31003BFF1F /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2DD04732C276F31003BFF1F /* MainView.swift */; }; E2DD047A2C276F32003BFF1F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2DD04792C276F32003BFF1F /* Assets.xcassets */; }; E2DD047E2C276F32003BFF1F /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2DD047D2C276F32003BFF1F /* Preview Assets.xcassets */; }; @@ -457,6 +460,9 @@ E2B85F442C429ED60047CD0C /* ImageGallery.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageGallery.swift; sourceTree = ""; }; E2B85F562C4BD0BB0047CD0C /* Binding+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Binding+Extension.swift"; sourceTree = ""; }; E2BF1BC52D6B16FA003089F1 /* HeadlineLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadlineLink.swift; sourceTree = ""; }; + E2BF1BC72D6FC87C003089F1 /* Insert+Link.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Insert+Link.swift"; sourceTree = ""; }; + E2BF1BC92D70EDF3003089F1 /* TagPropertyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagPropertyView.swift; sourceTree = ""; }; + E2BF1BCB2D70EE55003089F1 /* TagPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagPickerView.swift; sourceTree = ""; }; E2DD04702C276F31003BFF1F /* CHDataManagement.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CHDataManagement.app; sourceTree = BUILT_PRODUCTS_DIR; }; E2DD04732C276F31003BFF1F /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = ""; }; E2DD04792C276F32003BFF1F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -789,11 +795,6 @@ E2A21C372CB9A4F10060935B /* Generic */ = { isa = PBXGroup; children = ( - E20BCC9E2D53850A00B8DBEB /* SelectableListItem.swift */, - E2FD1D2B2D35B76D00B48627 /* ListPopup.swift */, - E2FD1D292D35B74C00B48627 /* TextWithPopup.swift */, - E2FE0F6F2D2D5231002963B7 /* TextIndicator.swift */, - E2FE0F232D2A8C1A002963B7 /* TagDisplayView.swift */, E229902F2D0F75CF009F8D77 /* BoolPropertyView.swift */, E22990312D0F7678009F8D77 /* DatePropertyView.swift */, E29D312F2D03A2BD0051B7F4 /* DescriptionField.swift */, @@ -807,14 +808,21 @@ E229902D2D0F7278009F8D77 /* IdPropertyView.swift */, E25DA5902D023A7E00AEF16D /* IntegerField.swift */, E22990272D0F5967009F8D77 /* IntegerPropertyView.swift */, + E2FD1D2B2D35B76D00B48627 /* ListPopup.swift */, E29D31622D06E95A0051B7F4 /* NavigationIcon.swift */, E22990372D0F7B2C009F8D77 /* OptionalImagePropertyView.swift */, E22990352D0F79CC009F8D77 /* OptionalStringPropertyView.swift */, E2A37D2C2CED2EEE0000979F /* OptionalTextField.swift */, E229903B2D0F8A74009F8D77 /* OptionalTextFieldPropertyView.swift */, E22990332D0F77E4009F8D77 /* PagePropertyView.swift */, + E20BCC9E2D53850A00B8DBEB /* SelectableListItem.swift */, E229903D2D0F8EFD009F8D77 /* StringPropertyView.swift */, + E2FE0F232D2A8C1A002963B7 /* TagDisplayView.swift */, + E2BF1BC92D70EDF3003089F1 /* TagPropertyView.swift */, + E2BF1BCB2D70EE55003089F1 /* TagPickerView.swift */, E2FE0F052D26734E002963B7 /* TextFieldPropertyView.swift */, + E2FE0F6F2D2D5231002963B7 /* TextIndicator.swift */, + E2FD1D292D35B74C00B48627 /* TextWithPopup.swift */, E218501C2CEE6CB30090B18B /* VerticalCenter.swift */, ); path = Generic; @@ -1060,6 +1068,7 @@ E2FD1D352D3BBCAF00B48627 /* Commands */ = { isa = PBXGroup; children = ( + E2BF1BC72D6FC87C003089F1 /* Insert+Link.swift */, E2FD1D592D477AB200B48627 /* InsertableItemsView.swift */, E2FD1D572D477A9400B48627 /* InsertableCommand.swift */, E2FD1D3A2D3BC40500B48627 /* InsertableCommandSheet.swift */, @@ -1324,10 +1333,12 @@ E2FE0F6E2D2D3689002963B7 /* LocalizedAudioPlayerSettings.swift in Sources */, E2A21C082CB17B870060935B /* TagView.swift in Sources */, E29D313D2D047C1B0051B7F4 /* LocalizedPageContentView.swift in Sources */, + E2BF1BC82D6FC880003089F1 /* Insert+Link.swift in Sources */, E2FE0F242D2A8C21002963B7 /* TagDisplayView.swift in Sources */, E2A37D2D2CED2EF10000979F /* OptionalTextField.swift in Sources */, E2B4821C2D63B062005C309D /* NotificationRequest.swift in Sources */, E2FE0F702D2D5235002963B7 /* TextIndicator.swift in Sources */, + E2BF1BCC2D70EE59003089F1 /* TagPickerView.swift in Sources */, E2A37D2B2CED2CC30000979F /* TagDetailView.swift in Sources */, E2FD1D3D2D463CD800B48627 /* ContentLabel.swift in Sources */, E2A21C282CB29B2A0060935B /* FeedEntryData.swift in Sources */, @@ -1367,6 +1378,7 @@ E2FE0EF82D1D8110002963B7 /* IconCommand.swift in Sources */, E21850272CF3B42D0090B18B /* PostDetailView.swift in Sources */, E22990242D0EDBD0009F8D77 /* HeaderElement.swift in Sources */, + E2BF1BCA2D70EDF8003089F1 /* TagPropertyView.swift in Sources */, E29D31BC2D0DB5120051B7F4 /* CommandProcessor.swift in Sources */, E2FE0F662D2C3B3A002963B7 /* LabelsBlock.swift in Sources */, E20BCCAF2D53F4A500B8DBEB /* GenerationStringIssuesView.swift in Sources */, diff --git a/CHDataManagement/Views/Generic/TagPickerView.swift b/CHDataManagement/Views/Generic/TagPickerView.swift new file mode 100644 index 0000000..54c221f --- /dev/null +++ b/CHDataManagement/Views/Generic/TagPickerView.swift @@ -0,0 +1,60 @@ +import SwiftUI + +struct TagPickerView: View { + + @EnvironmentObject + private var content: Content + + @Environment(\.language) + private var language + + @Environment(\.dismiss) + var dismiss + + @Binding var selectedTag: Tag? + + @State + private var newSelection: Tag? + + init(selectedTag: Binding) { + self._selectedTag = selectedTag + self.newSelection = selectedTag.wrappedValue + // TODO: Fix assignment not working + } + + var body: some View { + VStack { + Text("Select a tag to link to") + List(content.tags, selection: $newSelection) { tag in + let loc = tag.localized(in: language) + Text("\(loc.title) (\(tag.id))") + .tag(tag) + } + .frame(minHeight: 300) + HStack { + Button("Use selection") { + DispatchQueue.main.async { + self.selectedTag = self.newSelection + dismiss() + } + } + Button("Remove tag", role: .destructive) { + DispatchQueue.main.async { + self.selectedTag = nil + dismiss() + } + } + Button("Cancel", role: .cancel) { + dismiss() + } + } + } + .navigationTitle("Pick a tag") + .padding() + } +} + +#Preview { + TagPickerView(selectedTag: .constant(nil)) + .environmentObject(Content.mock) +} diff --git a/CHDataManagement/Views/Generic/TagPropertyView.swift b/CHDataManagement/Views/Generic/TagPropertyView.swift new file mode 100644 index 0000000..db394c9 --- /dev/null +++ b/CHDataManagement/Views/Generic/TagPropertyView.swift @@ -0,0 +1,30 @@ +import SwiftUI + +struct TagPropertyView: View { + + let title: LocalizedStringKey + + @Binding + var selectedTag: Tag? + + let footer: LocalizedStringKey + + @State + private var showTagSelectionSheet = false + + var body: some View { + GenericPropertyView(title: title, footer: footer) { + HStack { + Text(selectedTag?.id ?? "No tag selected") + Spacer() + Button("Select") { + showTagSelectionSheet = true + } + } + } + .sheet(isPresented: $showTagSelectionSheet) { + TagPickerView(selectedTag: $selectedTag) + } + } +} + diff --git a/CHDataManagement/Views/Pages/Commands/Insert+Link.swift b/CHDataManagement/Views/Pages/Commands/Insert+Link.swift new file mode 100644 index 0000000..88ff85e --- /dev/null +++ b/CHDataManagement/Views/Pages/Commands/Insert+Link.swift @@ -0,0 +1,118 @@ +import SwiftUI +import SFSafeSymbols + +struct InsertableLink: View, InsertableCommandView { + + final class Model: ObservableObject, InsertableCommandModel { + + @Published + var selectedType: ItemType = .page + + @Published + var selectedFile: FileResource? + + @Published + var selectedPage: Page? + + @Published + var selectedTag: Tag? + + @Published + var isInlineLink = false + + @Published + var inlineText = "" + + var isReady: Bool { + switch selectedType { + case .post, .tagOverview: + return false + case .page: + return selectedPage != nil + case .tag: + return selectedTag != nil + case .file: + return selectedFile != nil + } + } + + init() { + + } + + private var linkContent: String? { + switch selectedType { + case .post, .tagOverview: + return nil + case .page: + return selectedPage?.id + case .tag: + return selectedTag?.id + case .file: + return selectedFile?.id + } + } + + var command: String? { + guard let linkContent else { + return nil + } + guard isInlineLink else { + return "![\(selectedType.rawValue)](\(linkContent))" + } + return "[\(inlineText)](\(selectedType.rawValue):\(linkContent))" + } + } + + static let title = "Link" + + static let sheetTitle = "Insert a link to a tag, page or file" + + static let icon: SFSymbol = .photo + + @ObservedObject + private var model: Model + + init(model: Model) { + self.model = model + } + + var body: some View { + VStack { + Picker("", selection: $model.selectedType) { + Text("Page").tag(ItemType.page) + Text("Tag").tag(ItemType.tag) + Text("File").tag(ItemType.file) + } + .pickerStyle(.segmented) + Toggle("Inline Link", isOn: $model.isInlineLink) + if model.isInlineLink { + StringPropertyView( + title: "Link text", + text: $model.inlineText, + footer: "The text to show") + } + switch model.selectedType { + case .post: + Text("Linking posts is not supported") + case .page: + PagePropertyView( + title: "Linked page", + selectedPage: $model.selectedPage, + footer: "Select the page to link to") + case .tag: + TagPropertyView( + title: "Linked tag", + selectedTag: $model.selectedTag, + footer: "Select the tag to link to") + case .file: + FilePropertyView( + title: "File", + footer: "Select the image to insert", + selectedFile: $model.selectedFile) + case .tagOverview: + Text("Linking tag overview is not supported") + } + } + } +} diff --git a/CHDataManagement/Views/Pages/Commands/InsertableItemsView.swift b/CHDataManagement/Views/Pages/Commands/InsertableItemsView.swift index 441bf3a..a16e36d 100644 --- a/CHDataManagement/Views/Pages/Commands/InsertableItemsView.swift +++ b/CHDataManagement/Views/Pages/Commands/InsertableItemsView.swift @@ -9,6 +9,7 @@ struct InsertableItemsView: View { InsertableView() InsertableView() InsertableView() + InsertableView() } } }