Skip to content
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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move to macOS Ventura-style Settings in place of Preferences #1215

Merged
merged 54 commits into from
Apr 26, 2023
Merged

Move to macOS Ventura-style Settings in place of Preferences #1215

merged 54 commits into from
Apr 26, 2023

Conversation

austincondiff
Copy link
Collaborator

@austincondiff austincondiff commented Mar 31, 2023 •
edited
Loading

Description

The current Preferences implementation of preferences now will use the new grouped form style introduced in the latest version of SwiftUI and will also adopt a sidebar for to accommodate a larger set of Settings Pages. It also resembles System Settings in macOS Ventura. We are now calling it Settings instead of Preferences to follow the newer macOS naming convention.

Please note: This is a large PR. I'd encourage reviewers to pull it down and play with it in addition to a thorough review of the code.

Related Issues

Checklist

  • General
  • Accounts
  • Behaviors (not yet implemented)
  • Navigation (not yet implemented)
  • Themes
  • TextEditing
  • Terminal
  • Key Bindings (not yet implemented)
  • Source Control
  • Components (not yet implemented)
  • Locations
  • Advanced (not yet implemented)
  • 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

image

image

image

image

image

image

image

image

image

image

image

image

@luah5
Move to ventura-style preferences and refactor preferences (#1213)
ee6b4bd 
* add initial ventura-style preferences ui

* fix lint errors

* refactor Settings -> Preferences

* add comments and rename GeneralSettings -> Preferences

* make font size 12 and images 20x20

* minor rephrase

* add venturacolors.swift

* fix colors

* fix text-misaligment

* remove VStack, fixing an issue

* preferences initial refactor

* continue preference refactor

* refactor SourceControlGeneralView.swift and start refactor on SourceControlGitView

* refactor SourceControlGitView and fix lint errors

* fix issue

* fix code inconstencies

* fix warnings

* edit docs

* fix docs problem

* remove public

* Partially fix search issue

* fix luah5#3

* add explicit values, fix luah5#1 and intiate fix to issue where text if cut-off

* small changes

* add default selection
austincondiff and others added 23 commits April 1, 2023 00:56
@austincondiff
Rearranged files. Window size adjustments. Worked on the settings vie…
64f9242 
…w to get it closer to our target
@austincondiff
Created a custom settings window to set the toolbar style
810e34c
@austincondiff
Added General Settings page.
0699bff
@austincondiff
Cleaned up code in GeneralSettingsView
88f777a
@luah5
add new settings panes
d4aacad
@luah5
fix lint errors
b2c95b3
@luah5
fix problem with settings
28a671b
@austincondiff
Merge branch 'ventura-settings' of https://github.com/luah5/CodeEdit …
5fe9a46 
…into luah5-ventura-settings
@austincondiff
Merge branch 'luah5-ventura-settings' into refactor/settings
473c305
@austincondiff
Reverted Luah's changes from his PR
6ea6dff
@austincondiff
Reintroduced Luah's changes
af0dc22
@austincondiff
Added Text Editing settings page. Started theme settings page
4442f19
@Wouter01
Improved tab width selection
b84bf84 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@austincondiff
Added themes settings page
c1c678b
@austincondiff
Merge branch 'refactor/settings' of github.com:CodeEditApp/CodeEdit i…
62eb166 
…nto refactor/settings
@austincondiff
Added constrainHeightToWindow modifier so sheets in Settings will con…
bed000b 
…strain their height to be within the parent window.
@austincondiff
Cleaned up code and reduced padding on theme color preview
eb19d0a
@austincondiff
Enabled saving of theme details form.
5c54d42
@austincondiff
Fixed searcher gap. Fixed title alignment. Added back button when loo…
f4e27c2 
…king at details view.
@Wouter01
Fixed search bar
5138ca5 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@austincondiff
Added sign in and details views for Accounts Settings
3dc8bdd
@austincondiff
Added dark appearance for GitHub icon
9ff2f4a
@austincondiff
Merge branch 'refactor/settings' of github.com:CodeEditApp/CodeEdit i…
ea0d516 
…nto refactor/settings
@luah5 luah5 mentioned this pull request Apr 7, 2023
Closed
7 tasks
@austincondiff austincondiff requested a review from a team April 13, 2023 15:44
Wouter01 and others added 2 commits April 13, 2023 18:21
@Wouter01
Added fix for sidebar collapsing
39212ff 
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
@lukepistrol
fix swiftlint error
20fc280
@lukepistrol lukepistrol mentioned this pull request Apr 13, 2023
Closed
6 tasks
@austincondiff austincondiff assigned Wouter01 and unassigned luah5 Apr 13, 2023
thecoolwinter
thecoolwinter previously requested changes Apr 16, 2023
View reviewed changes
Copy link
Collaborator

@thecoolwinter thecoolwinter left a comment

Choose a reason for hiding this comment

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

Left a couple comments for changes to make and an indentation. Otherwise great job, this is a large transition and I couldn't find any regressions in any preferences.

One thing that I would suggest that might be out of scope is adding tooltips for settings so users can hover over them and get a longer description of what they do. I noticed there isn't any of those in this PR. SwiftUI makes it quite easy to do with the help modifier.

CodeEdit/Features/Settings/Pages/TextEditingSettings/TextEditingSettingsView.swift Outdated Show resolved Hide resolved
CodeEdit/Features/Settings/Pages/GeneralSettings/GeneralSettingsView.swift Outdated Show resolved Hide resolved
CodeEdit/Features/Settings/Pages/GeneralSettings/GeneralSettingsView.swift Show resolved Hide resolved
CodeEdit/Features/Settings/Pages/TerminalSettings/TerminalSettingsView.swift Outdated Show resolved Hide resolved
CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGitView.swift Show resolved Hide resolved
CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGitView.swift Show resolved Hide resolved
@austincondiff
Added new icon buttonStyle for the upcoming settings table view toolb…
9af0c2b 
…ar. Added new ExternalLink view that we are using in Locations settings.
@austincondiff
Removed SettingsTable from project.pbxproj
6add7ae
@austincondiff
Improved font selection in text editing and terminal settings. Added …
3942d6e 
…a toggle to use text editor font in terminal settings. Using the grouped form stepper throughout.
@austincondiff
Updated monospaced font picker to get fonts after rendering so the re…
9ab720a 
…st of the UI is not delayed while retrieving fonts.
@austincondiff
Fixed lint error
4d1faf1
@austincondiff
Copy link
Collaborator Author

Quick update... I've added a new monospaced font picker as seen here...

Screen.Recording.2023-04-24.at.1.12.30.PM.mp4

@MrDevel0per MrDevel0per mentioned this pull request Apr 24, 2023
Closed
@austincondiff austincondiff dismissed thecoolwinter’s stale review April 25, 2023 22:16

Changes have been made since, need re-review

@austincondiff
Copy link
Collaborator Author

austincondiff commented Apr 25, 2023 •
edited
Loading

One thing that I would suggest that might be out of scope is adding tooltips for settings so users can hover over them and get a longer description of what they do. I noticed there isn't any of those in this PR. SwiftUI makes it quite easy to do with the help modifier.

@thecoolwinter I can't think of anything right away that needs a help tooltip. Let's push this to another scope of work. If you think of anything submit a Settings help tooltips issue and we can add them.

matthijseikelenboom
matthijseikelenboom approved these changes Apr 26, 2023
View reviewed changes
Copy link
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.

LGTM. We do need to have some code style improvements, but that is a project wide thing to fix and unrelated to this PR.

@austincondiff austincondiff merged commit 9ed6467 into main Apr 26, 2023
@austincondiff austincondiff deleted the refactor/settings branch April 26, 2023 14:22
@cryptoAlgorithm cryptoAlgorithm mentioned this pull request May 10, 2023
Merged
@luah5 luah5 mentioned this pull request May 13, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthijseikelenboom matthijseikelenboom matthijseikelenboom approved these changes

@0xWDG 0xWDG 0xWDG approved these changes

@thecoolwinter thecoolwinter Awaiting requested review from thecoolwinter

@Wouter01 Wouter01 Awaiting requested review from Wouter01

Assignees

@austincondiff austincondiff

@Wouter01 Wouter01

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

✨ Refactor Preferences to use new Ventura-style Settings style
7 participants
@austincondiff @0xWDG @matthijseikelenboom @thecoolwinter @Wouter01 @luah5 @lukepistrol