Skip to content

Transfer project navigator#1208

Merged
austincondiff merged 12 commits intoCodeEditApp:refactor/workspace-clientfrom
KaiTheRedNinja:transfer-ae-project-navigator
Apr 26, 2023
Merged

Transfer project navigator#1208
austincondiff merged 12 commits intoCodeEditApp:refactor/workspace-clientfrom
KaiTheRedNinja:transfer-ae-project-navigator

Conversation

@KaiTheRedNinja
Copy link
Copy Markdown
Contributor

@KaiTheRedNinja KaiTheRedNinja commented Mar 26, 2023

Description

Transfers the Project Navigator from AuroraEditor over to CodeEdit, making use of the revamped WorkspaceClient

The following sidebar features still need implementation (for future PRs):

  • Vscode style sidebar
  • Sidebar splitting
  • Project navigator file filtering

This PR also removes the fileItems property of WorkspaceDocument, as it is now redundant.

Related Issues

Checklist

  • Project Navigator bottom toolbar

  • Outline View abstractions

  • Project navigator outline view fixes to get

  • Rename OutlineView -> ProjectNavigatorOutlineView for clarity

  • I read and understood the contributing guide as well as the code of conduct

  • The issues this PR addresses are related to each other

  • My changes generate no new warnings

  • My code builds and runs on my machine

  • My changes are all related to the related issue above

  • I documented my code

Screenshots

Does not modify UI or behaviour, functionally similar to main branch.

Comment thread CodeEdit/Features/CEWorkspace/Models/CEWorkspaceFile.swift Outdated
@KaiTheRedNinja KaiTheRedNinja changed the title Transfer project navigator bottom toolbar Transfer project navigator Mar 26, 2023
Copy link
Copy Markdown
Member

@Wouter01 Wouter01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like the folder icons got a darker shade of blue. I'm assuming this is a bug?
For all the other things: great work!
image

@0xWDG
Copy link
Copy Markdown
Collaborator

0xWDG commented Mar 26, 2023

It seems like the folder icons got a darker shade of blue. I'm assuming this is a bug?
For all the other things: great work!
image

I believe this is because of the fact that AE uses the accent color of the system.
https://github.com/CodeEditApp/CodeEdit/pull/1208/files#diff-d2bc0a8fe4d0c1410957b69c0f50ddad19cd7fc847ee9b720f4189907a16efa8R112

@KaiTheRedNinja
Copy link
Copy Markdown
Contributor Author

I could reduce the saturation by about 50%

Copy link
Copy Markdown
Contributor

@matthijseikelenboom matthijseikelenboom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of the files have comments at the top with AuroraEditor in it

@austincondiff
Copy link
Copy Markdown
Collaborator

austincondiff commented Mar 26, 2023

@KaiTheRedNinja Nice work! Yeah, don’t change the saturation, we were using the folderBlue color from our xcassets file, the same blue Xcode.

The project root folder icon uses the folder.fill.badge.gearshape symbol in the same folderBlue color.

Please change here and here.

Comment thread CodeEdit/Features/NavigatorSidebar/OutlineView/FileSystemTableViewCell.swift Outdated
Comment thread CodeEdit/Features/NavigatorSidebar/OutlineView/FileSystemTableViewCell.swift Outdated
Comment thread CodeEdit/Features/NavigatorSidebar/OutlineView/FileSystemTableViewCell.swift Outdated
Comment thread CodeEdit/Features/NavigatorSidebar/OutlineView/StandardTableViewCell.swift Outdated
Comment thread CodeEdit/Features/NavigatorSidebar/OutlineView/TextTableViewCell.swift Outdated
Comment thread CodeEdit/Features/NavigatorSidebar/OutlineView/TextTableViewCell.swift Outdated
@austincondiff
Copy link
Copy Markdown
Collaborator

austincondiff commented Apr 19, 2023

@KaiTheRedNinja were you ever able to make those recommended changes? Where are we with this?

Copy link
Copy Markdown
Collaborator

@austincondiff austincondiff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In CodeEdit...

Deleting a file
image

Deleting a folder
image

The wording might need to change here. For reference, here is Xcodes...

Deleting a file
image

Deleting a folder
image

Maybe something like:

Do you want to move [file or folder name] to the Trash?
This operation cannot be undone.
[ Move to Trash ]
[ Cancel ]

Also, the bottom filter text field does not work. Is this expected from this PR?

@KaiTheRedNinja
Copy link
Copy Markdown
Contributor Author

Yes, the bottom filter is not expected to work. AE's implementation is extremely buggy since it entails saving the outlineview's expansion states.

@austincondiff
Copy link
Copy Markdown
Collaborator

This may be out of scope but there is a few UI tweaks that could be made

image

  1. Disclosure arrow: move it up 1.5pt
  2. Spacing between disclosure arrow and icon needs to be reduced by 3pt

@KaiTheRedNinja
Copy link
Copy Markdown
Contributor Author

By eyeballing it, it looks like all the items are in about the right position.

@austincondiff austincondiff merged commit 13ebefe into CodeEditApp:refactor/workspace-client Apr 26, 2023
matthijseikelenboom pushed a commit to matthijseikelenboom/CodeEdit that referenced this pull request Apr 28, 2023
* Transfer project navigator bottom

* Transfer TableViewCell abstractions

* Transfer over project manager outline view

* Get proj navigator sidebar working again

* Rename OutlineView -> ProjectNavigatorOutlineView for clarity

* Remove debug statements

* Fix incorrect comment headers

* Change old AE assets to new CE assets

* Add vscode-style toolbar

* Disable vertical sidebar by default

* Make deletion messages more descriptive

* Fix table view cell alignments
austincondiff pushed a commit that referenced this pull request May 2, 2023
* 🧹 Refactor of the WorkspaceClient (#1157)

* Transfer project navigator (#1208)

* Transfer project navigator bottom

* Transfer TableViewCell abstractions

* Transfer over project manager outline view

* Get proj navigator sidebar working again

* Rename OutlineView -> ProjectNavigatorOutlineView for clarity

* Remove debug statements

* Fix incorrect comment headers

* Change old AE assets to new CE assets

* Add vscode-style toolbar

* Disable vertical sidebar by default

* Make deletion messages more descriptive

* Fix table view cell alignments

* Swiftlint fixes and code clean up

* Test fixes

---------

Co-authored-by: KaiTheRedNinja <88234730+KaiTheRedNinja@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants