Skip to content

Account Setting SSH Keys Picker #1249

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

Merged
austincondiff merged 12 commits into from
May 3, 2023
Merged

Account Setting SSH Keys Picker #1249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
22cfcde
Finding ssh keys in ~/.ssh and adding them to the ssh key dropdown in…
austincondiff Apr 28, 2023
0eb6761
Added jump actions to the SSH Keys Picker menu (Chose... and Create a…
austincondiff Apr 28, 2023
9bb145a
urlProtocol/cloneUsing is now a new enum called URLProtocol. SSH Key …
austincondiff Apr 29, 2023
c59eb67
Merge branch 'main' into account-settings-ssh-key-picker
austincondiff Apr 30, 2023
842fe8c
Update AccountsSettingsDetailsView.swift
austincondiff Apr 30, 2023
e813f0e
Fixed state initial value
austincondiff May 1, 2023
e3cdc4a
Fixed binding issue where value changes wouldn't update view
austincondiff May 1, 2023
d6d3cf3
Cleaned up code
austincondiff May 1, 2023
41c96a9
Fixed delete account error
austincondiff May 1, 2023
44ecaf5
Using the ssh key file path instead of the file content as the tag
austincondiff May 1, 2023
10306c0
Made Account window title update live
austincondiff May 1, 2023
d07d52f
Merge branch 'main' into account-settings-ssh-key-picker
austincondiff May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions CodeEdit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@
B61A606929F4481A009B43F9 /* MonospacedFontPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B61A606829F4481A009B43F9 /* MonospacedFontPicker.swift */; };
B61DA9DF29D929E100BF4A43 /* GeneralSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B61DA9DE29D929E100BF4A43 /* GeneralSettingsView.swift */; };
B640A99E29E2184700715F20 /* SettingsForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = B640A99D29E2184700715F20 /* SettingsForm.swift */; };
B640A9A129E2188F00715F20 /* SettingsDetailsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B640A9A029E2188F00715F20 /* SettingsDetailsView.swift */; };
B640A9A129E2188F00715F20 /* View+NavigationBarBackButtonVisible.swift in Sources */ = {isa = PBXBuildFile; fileRef = B640A9A029E2188F00715F20 /* View+NavigationBarBackButtonVisible.swift */; };
B658FB3427DA9E1000EA4DBD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B658FB3327DA9E1000EA4DBD /* Assets.xcassets */; };
B658FB3727DA9E1000EA4DBD /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B658FB3627DA9E1000EA4DBD /* Preview Assets.xcassets */; };
B66A4E4529C8E86D004573B4 /* CommandsFixes.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66A4E4429C8E86D004573B4 /* CommandsFixes.swift */; };
Expand All @@ -325,6 +325,8 @@
B66A4E5329C91831004573B4 /* CodeEditCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66A4E5229C91831004573B4 /* CodeEditCommands.swift */; };
B66A4E5629C918A0004573B4 /* SceneID.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66A4E5529C918A0004573B4 /* SceneID.swift */; };
B685DE7929CC9CCD002860C8 /* StatusBarIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = B685DE7829CC9CCD002860C8 /* StatusBarIcon.swift */; };
B697937A29FF5668002027EC /* AccountsSettingsAccountLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = B697937929FF5668002027EC /* AccountsSettingsAccountLink.swift */; };
B6A43C5D29FC4AF00027E0E0 /* CreateSSHKeyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A43C5C29FC4AF00027E0E0 /* CreateSSHKeyView.swift */; };
B6C6A42A297716A500A3D28F /* TabBarItemCloseButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C6A429297716A500A3D28F /* TabBarItemCloseButton.swift */; };
B6C6A42E29771A8D00A3D28F /* TabBarItemButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C6A42D29771A8D00A3D28F /* TabBarItemButtonStyle.swift */; };
B6C6A43029771F7100A3D28F /* TabBarItemBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C6A42F29771F7100A3D28F /* TabBarItemBackground.swift */; };
Expand All @@ -333,7 +335,7 @@
B6E41C7029DD157F0088F9F4 /* AccountsSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E41C6F29DD157F0088F9F4 /* AccountsSettingsView.swift */; };
B6E41C7429DD40010088F9F4 /* View+HideSidebarToggle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E41C7329DD40010088F9F4 /* View+HideSidebarToggle.swift */; };
B6E41C7929DE02800088F9F4 /* AccountSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E41C7829DE02800088F9F4 /* AccountSelectionView.swift */; };
B6E41C7C29DE2B110088F9F4 /* AccoundsSettingsProviderRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E41C7B29DE2B110088F9F4 /* AccoundsSettingsProviderRow.swift */; };
B6E41C7C29DE2B110088F9F4 /* AccountsSettingsProviderRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E41C7B29DE2B110088F9F4 /* AccountsSettingsProviderRow.swift */; };
B6E41C8B29DE7AE80088F9F4 /* AccountsSettingsSigninView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E41C8A29DE7AE80088F9F4 /* AccountsSettingsSigninView.swift */; };
B6E41C8F29DE9CD80088F9F4 /* AccountsSettingsDetailsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E41C8E29DE9CD80088F9F4 /* AccountsSettingsDetailsView.swift */; };
B6E41C9429DEAE260088F9F4 /* SourceControlAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E41C9329DEAE260088F9F4 /* SourceControlAccount.swift */; };
Expand Down Expand Up @@ -717,7 +719,7 @@
B61A606829F4481A009B43F9 /* MonospacedFontPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonospacedFontPicker.swift; sourceTree = "<group>"; };
B61DA9DE29D929E100BF4A43 /* GeneralSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralSettingsView.swift; sourceTree = "<group>"; };
B640A99D29E2184700715F20 /* SettingsForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsForm.swift; sourceTree = "<group>"; };
B640A9A029E2188F00715F20 /* SettingsDetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsDetailsView.swift; sourceTree = "<group>"; };
B640A9A029E2188F00715F20 /* View+NavigationBarBackButtonVisible.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+NavigationBarBackButtonVisible.swift"; sourceTree = "<group>"; };
B658FB2C27DA9E0F00EA4DBD /* CodeEdit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CodeEdit.app; sourceTree = BUILT_PRODUCTS_DIR; };
B658FB3127DA9E0F00EA4DBD /* WorkspaceView.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = WorkspaceView.swift; sourceTree = "<group>"; tabWidth = 4; };
B658FB3327DA9E1000EA4DBD /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
Expand All @@ -732,6 +734,8 @@
B66A4E5229C91831004573B4 /* CodeEditCommands.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CodeEditCommands.swift; sourceTree = "<group>"; };
B66A4E5529C918A0004573B4 /* SceneID.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneID.swift; sourceTree = "<group>"; };
B685DE7829CC9CCD002860C8 /* StatusBarIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBarIcon.swift; sourceTree = "<group>"; };
B697937929FF5668002027EC /* AccountsSettingsAccountLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsSettingsAccountLink.swift; sourceTree = "<group>"; };
B6A43C5C29FC4AF00027E0E0 /* CreateSSHKeyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateSSHKeyView.swift; sourceTree = "<group>"; };
B6C6A429297716A500A3D28F /* TabBarItemCloseButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarItemCloseButton.swift; sourceTree = "<group>"; };
B6C6A42D29771A8D00A3D28F /* TabBarItemButtonStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabBarItemButtonStyle.swift; sourceTree = "<group>"; };
B6C6A42F29771F7100A3D28F /* TabBarItemBackground.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarItemBackground.swift; sourceTree = "<group>"; };
Expand All @@ -740,7 +744,7 @@
B6E41C6F29DD157F0088F9F4 /* AccountsSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsSettingsView.swift; sourceTree = "<group>"; };
B6E41C7329DD40010088F9F4 /* View+HideSidebarToggle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+HideSidebarToggle.swift"; sourceTree = "<group>"; };
B6E41C7829DE02800088F9F4 /* AccountSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountSelectionView.swift; sourceTree = "<group>"; };
B6E41C7B29DE2B110088F9F4 /* AccoundsSettingsProviderRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccoundsSettingsProviderRow.swift; sourceTree = "<group>"; };
B6E41C7B29DE2B110088F9F4 /* AccountsSettingsProviderRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsSettingsProviderRow.swift; sourceTree = "<group>"; };
B6E41C8A29DE7AE80088F9F4 /* AccountsSettingsSigninView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsSettingsSigninView.swift; sourceTree = "<group>"; };
B6E41C8E29DE9CD80088F9F4 /* AccountsSettingsDetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsSettingsDetailsView.swift; sourceTree = "<group>"; };
B6E41C9329DEAE260088F9F4 /* SourceControlAccount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlAccount.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2194,10 +2198,10 @@
children = (
B6041F4C29D7A4E9000F3454 /* SettingsPageView.swift */,
B640A99D29E2184700715F20 /* SettingsForm.swift */,
B640A9A029E2188F00715F20 /* SettingsDetailsView.swift */,
B6EA1FFF29DB7966001BF195 /* SettingsColorPicker.swift */,
B61A606829F4481A009B43F9 /* MonospacedFontPicker.swift */,
B61A606029F188AB009B43F9 /* ExternalLink.swift */,
B640A9A029E2188F00715F20 /* View+NavigationBarBackButtonVisible.swift */,
B6EA200129DB7F81001BF195 /* View+ConstrainHeightToWindow.swift */,
B6E41C7329DD40010088F9F4 /* View+HideSidebarToggle.swift */,
);
Expand All @@ -2209,10 +2213,12 @@
children = (
B6E41C9229DEAE0A0088F9F4 /* Models */,
B6E41C6F29DD157F0088F9F4 /* AccountsSettingsView.swift */,
B6E41C7B29DE2B110088F9F4 /* AccoundsSettingsProviderRow.swift */,
B697937929FF5668002027EC /* AccountsSettingsAccountLink.swift */,
B6E41C7B29DE2B110088F9F4 /* AccountsSettingsProviderRow.swift */,
B6E41C7829DE02800088F9F4 /* AccountSelectionView.swift */,
B6E41C8A29DE7AE80088F9F4 /* AccountsSettingsSigninView.swift */,
B6E41C8E29DE9CD80088F9F4 /* AccountsSettingsDetailsView.swift */,
B6A43C5C29FC4AF00027E0E0 /* CreateSSHKeyView.swift */,
);
path = AccountsSettings;
sourceTree = "<group>";
Expand Down Expand Up @@ -2758,7 +2764,7 @@
587B9E8929301D8F00AC7927 /* GitHubGist.swift in Sources */,
0485EB1F27E7458B00138301 /* WorkspaceCodeFileView.swift in Sources */,
58D01C94293167DC00C5B6B4 /* Color+HEX.swift in Sources */,
B640A9A129E2188F00715F20 /* SettingsDetailsView.swift in Sources */,
B640A9A129E2188F00715F20 /* View+NavigationBarBackButtonVisible.swift in Sources */,
58798251292E78D80085B254 /* OtherFileView.swift in Sources */,
587B9E7929301D8F00AC7927 /* GitHubIssueRouter.swift in Sources */,
587B9E8029301D8F00AC7927 /* GitHubConfiguration.swift in Sources */,
Expand All @@ -2781,9 +2787,10 @@
587B9E9529301D8F00AC7927 /* BitBucketUser.swift in Sources */,
587B9E7C29301D8F00AC7927 /* GitHubRepositoryRouter.swift in Sources */,
286471AB27ED51FD0039369D /* ProjectNavigatorView.swift in Sources */,
B6E41C7C29DE2B110088F9F4 /* AccoundsSettingsProviderRow.swift in Sources */,
B6E41C7C29DE2B110088F9F4 /* AccountsSettingsProviderRow.swift in Sources */,
6CAAF68A29BC9C2300A1F48A /* (null) in Sources */,
6CFF967629BEBCD900182D6F /* FileCommands.swift in Sources */,
B697937A29FF5668002027EC /* AccountsSettingsAccountLink.swift in Sources */,
B685DE7929CC9CCD002860C8 /* StatusBarIcon.swift in Sources */,
587B9DA629300ABD00AC7927 /* ToolbarBranchPicker.swift in Sources */,
58F2EB05292FB2B0004A9BDE /* Settings.swift in Sources */,
Expand All @@ -2805,6 +2812,7 @@
5879821B292D92370085B254 /* SearchResultMatchModel.swift in Sources */,
587B9E5929301D8F00AC7927 /* GitCheckoutBranchView+CheckoutBranch.swift in Sources */,
58F2EB09292FB2B0004A9BDE /* TerminalSettings.swift in Sources */,
B6A43C5D29FC4AF00027E0E0 /* CreateSSHKeyView.swift in Sources */,
B6EA200229DB7F81001BF195 /* View+ConstrainHeightToWindow.swift in Sources */,
6C48D8F42972DB1A00D6D205 /* Env+Window.swift in Sources */,
6C5FDF7A29E6160000BC08C0 /* AppSettings.swift in Sources */,
Expand Down
36 changes: 36 additions & 0 deletions CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsAccountLink.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
//
// AccountsSettingsAccountLink.swift
// CodeEdit
//
// Created by Austin Condiff on 4/30/23.
//

import SwiftUI

struct AccountsSettingsAccountLink: View {
@Binding var account: SourceControlAccount

init(_ account: Binding<SourceControlAccount>) {
_account = account
}

var body: some View {
NavigationLink(destination: AccountsSettingsDetailsView($account)) {
Label {
Text(account.description)
Text(account.name)
.font(.footnote)
.foregroundColor(.secondary)
} icon: {
Image(account.provider.iconName)
.resizable()
.aspectRatio(contentMode: .fill)
.cornerRadius(6)
.frame(width: 26, height: 26)
.padding(.top, 2)
.padding(.bottom, 2)
.padding(.leading, 2)
}
}
}
}
Loading