Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork1.1k
Correctly preview non-text files#1707
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
austincondiff merged 66 commits intoCodeEditApp:mainfromplbstl:view-non-text-files-correctlyMay 11, 2024
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
66 commits Select commitHold shift + click to select a range
6f30d92 Package.resolved changed
plbstl7113389 progress
plbstl9a85005 minor doc change in CodeEditUI EffectView
plbstl6749915 add WorkspacePdfFileView
plbstl3d3893e allow WorkspacePdfFileView to be able to send data to SwiftUI
plbstlbd3fe37 properly name `WorkspacePdfFileView` to `WorkspacePDFView`
plbstla12e51c improve WorkspacePDFView docs
plbstl2b59534 add guards to WorkspacePDFView (makeNSView, updateNSView)
plbstl6797552 wip
plbstl15291c0 wip 2
plbstl2fd13b4 correct padding
plbstl7ae71a0 progress? not
plbstlff47ae8 add attachPDFDocumentToView helper in WorkspacePDFView
plbstld820eb9 update WorkspacePDFView docs
plbstlb5f1614 remove WorkspaceNonTextFileView
plbstl7ef3116 fix SwiftLint violations in WorkspacePDFView, WorkspaceCodeFileView
plbstl6d7f7d8 add magic numbers comment to WorkspaceCodeFileView
plbstl2192c70 update WorkspacePDFView docs
plbstl74cd22b before i forget
plbstl8ef8461 progressss
plbstla643b43 too slow
plbstlf583df0 wip: the best work yet
plbstl410f62d it really works!!
plbstlb80dc31 add WorkspaceImageView
plbstla9ed5ad add WorkspaceCannotPreviewFileView
plbstlff57cc8 its working very predictably but showing/hiding navigator pane isn't …
plbstl1813416 remove the use of canPreview as it can cause unexpected behaviour
plbstl6106b64 remove computeFrame helper in WorkspaceCodeFileView
plbstldc7bcad update PDF preview's background color
plbstl2e4dd02 add note for when PDF preview cannot create PDF document
plbstlc2fcacc improve docs for WorkspaceImageView & WorkspacePDFView
plbstl2d448f6 use unnamed parameter for imageUrl in WorkspaceImageView
plbstlf2ca164 implement `WorkspaceCannotPreviewFileView`
plbstlc248a9d change url variables in `WorkspaceImageView`, `WorkspacePDFView` & `W…
plbstl82ef086 add `WorkspaceLoadingView`
plbstleb15141 spacing violation
plbstld32436a change onAppear modifier in WorkspaceCannotPreviewFileView
plbstl4238f2c remove `WorkspaceCannotPreviewFileView` as it creates a bug that make…
plbstl5c5c81b improve docs in `WorkspacePDFView` & `WorkspaceImageView`
plbstl752fe3b use `WorkspaceAnyFileView` to preview GIF images
plbstl40d52c6 add a note to the documentation for `CodeFileDocument.utType`
plbstlb24b6ff add `WorkspaceAnyFileView` to properly preview files of different fil…
plbstld2664bd rearrange files in `CodeEdit/Features/Documents/Views`
plbstl2fbc351 add `WorkspaceAnyFileView`, `WorkspaceLoadingView`, `WorkspaceImageVi…
plbstlafc0a82 update docs in `WorkspaceAnyFileView`, `WorkspaceLoadingView`, `Works…
plbstlccc79b3 rename `CodeFileDocument.typeOfFile` to `CodeFileDocument.utType`
plbstl6561d25 fix: allow GIF previews to play, and with their proper dimensions
plbstl12aa788 do not return
plbstlf039914 update docs for CodeFileDocument.utType
plbstlb660ac7 change conformance from movie to audiovisualContent in CodeFileDocume…
plbstld0c2671 properly display CodeFileView contents by undo-ing the padding in its…
plbstl1b8c8b3 remove text, image, PDF, video restrictions on `CodeFileDocument.utType`
plbstl2ac22a7 update docs in WorkspaceImageView
plbstlc3d31a6 WorkspaceCodeFileView: group non-text files, so they inherit modifier…
plbstl12e0ba1 WorkspaceCodeFileView: add important note on document.utType
plbstl8f04013 remove SwiftUI VideoPlayer view for now, it creates a bug that I can'…
plbstlacb8a63 add `NonTextFileView` to clean up code
plbstl9688746 remove QLPreviewItem subclass from CodeFileDocument
plbstl425f806 rename `WorkspaceCodeFileView` to `EditorAreaFileView`
plbstl151e345 rename `EditorView` to `EditorAreaView`
plbstlfe1f7bb rename 4 Workspace view files
plbstlcb88ec2 move views for opening files to `CodeEdit/Features/Editor`
plbstl096bb68 move `CodeFileDocument` to `CodeEdit/Features/Documents`
plbstlcf17bc7 NSTableViewWrapper: minor change in comment
plbstl950d7ed move `WindowCodeFileView` to `CodeEdit/Features/Editor/Views`
plbstlb373bb6 use `AnyFileView` to view all images
plbstlFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
add
NonTextFileView to clean up code- NonTextFileView, OtherFileView, URL+isImage, are not needed anymore
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commitacb8a63bb20a922f15c74013a400027a8f2425c4
There are no files selected for viewing
48 changes: 12 additions & 36 deletionsCodeEdit.xcodeproj/project.pbxproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
34 changes: 0 additions & 34 deletionsCodeEdit/Features/CodeFile/Image/ImageFileView.swift
This file was deleted.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
46 changes: 0 additions & 46 deletionsCodeEdit/Features/CodeFile/Other/OtherFileView.swift
This file was deleted.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
46 changes: 46 additions & 0 deletionsCodeEdit/Features/Documents/NonTextFile/NonTextFileView.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // | ||
| // NonTextFileView.swift | ||
| // CodeEdit | ||
| // | ||
| // Created by Paul Ebose on 2024/5/10. | ||
| // | ||
| import SwiftUI | ||
| /// Determines what type of file is passed in, and previews it accordingly. | ||
| /// | ||
| /// ```swift | ||
| /// NonTextFileView(fileDocument) | ||
| /// ``` | ||
| struct NonTextFileView: View { | ||
| /// The file document you wish to open. | ||
| let fileDocument: CodeFileDocument | ||
| var body: some View { | ||
| if let fileURL = fileDocument.fileURL { | ||
| switch fileDocument.utType { | ||
| case .some(.gif): | ||
| // GIF conforms to image, so to differentiate, the GIF check has to come before the image check. | ||
| WorkspaceImageView(fileURL, isGif: true) | ||
| case .some(.image): | ||
| WorkspaceImageView(fileURL) | ||
| case .some(.pdf): | ||
| WorkspacePDFView(fileURL) | ||
| default: | ||
| WorkspaceAnyFileView(fileURL) | ||
| } | ||
| } else { | ||
| ZStack { | ||
| Text("Cannot retrieve URL to the file you opened.") | ||
| } | ||
| } | ||
| } | ||
| } |
62 changes: 7 additions & 55 deletionsCodeEdit/Features/Documents/Views/WorkspaceCodeFileView.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.