From 484ada167a3afb433acf331596c749936c246362 Mon Sep 17 00:00:00 2001 From: Jerry Date: Tue, 4 Jun 2024 02:11:09 +0800 Subject: [PATCH] perf: replace deprecated modifier --- CodeEdit/Features/About/Views/BlurButtonStyle.swift | 2 +- CodeEdit/Features/CodeEditUI/Views/KeyValueTable.swift | 2 +- CodeEdit/Features/CodeEditUI/Views/PaneTextField.swift | 2 +- CodeEdit/Features/CodeEditUI/Views/SegmentedControl.swift | 2 +- .../Editor/TabBar/Tabs/Tab/EditorTabCloseButton.swift | 2 +- .../Pages/AccountsSettings/AccountsSettingsAccountLink.swift | 2 +- .../Pages/AccountsSettings/AccountsSettingsProviderRow.swift | 2 +- .../Pages/AccountsSettings/AccountsSettingsSigninView.swift | 2 +- .../Pages/ThemeSettings/ThemeSettingsColorPreview.swift | 2 +- .../UtilityArea/Toolbar/UtilityAreaFilterTextField.swift | 5 +++-- CodeEdit/Features/Welcome/Views/WelcomeActionView.swift | 2 +- CodeEdit/Features/Welcome/Views/WelcomeView.swift | 2 +- 12 files changed, 14 insertions(+), 13 deletions(-) diff --git a/CodeEdit/Features/About/Views/BlurButtonStyle.swift b/CodeEdit/Features/About/Views/BlurButtonStyle.swift index 1ec9cc5ca..768f84131 100644 --- a/CodeEdit/Features/About/Views/BlurButtonStyle.swift +++ b/CodeEdit/Features/About/Views/BlurButtonStyle.swift @@ -50,6 +50,6 @@ struct BlurButtonStyle: ButtonStyle { Color.black } } - .cornerRadius(6) + .clipShape(RoundedRectangle(cornerRadius: 6)) } } diff --git a/CodeEdit/Features/CodeEditUI/Views/KeyValueTable.swift b/CodeEdit/Features/CodeEditUI/Views/KeyValueTable.swift index 46ce8d3bc..32847dfd6 100644 --- a/CodeEdit/Features/CodeEditUI/Views/KeyValueTable.swift +++ b/CodeEdit/Features/CodeEditUI/Views/KeyValueTable.swift @@ -152,7 +152,7 @@ struct KeyValueTable: View { showingModal = false } } - .cornerRadius(6) + .clipShape(RoundedRectangle(cornerRadius: 6)) .onAppear(perform: updateTableItems) } } diff --git a/CodeEdit/Features/CodeEditUI/Views/PaneTextField.swift b/CodeEdit/Features/CodeEditUI/Views/PaneTextField.swift index 560a45152..9c0d8e0ff 100644 --- a/CodeEdit/Features/CodeEditUI/Views/PaneTextField.swift +++ b/CodeEdit/Features/CodeEditUI/Views/PaneTextField.swift @@ -119,7 +119,7 @@ struct PaneTextField: View .overlay( RoundedRectangle(cornerRadius: 6) .stroke(isFocused || !text.isEmpty || hasValue ? .tertiary : .quaternary, lineWidth: 1.25) - .cornerRadius(6) + .clipShape(RoundedRectangle(cornerRadius: 6)) .disabled(true) .edgesIgnoringSafeArea(.all) ) diff --git a/CodeEdit/Features/CodeEditUI/Views/SegmentedControl.swift b/CodeEdit/Features/CodeEditUI/Views/SegmentedControl.swift index 0b142e54e..e91ce0abd 100644 --- a/CodeEdit/Features/CodeEditUI/Views/SegmentedControl.swift +++ b/CodeEdit/Features/CodeEditUI/Views/SegmentedControl.swift @@ -75,7 +75,7 @@ struct SegmentedControlItem: View { .background( background ) - .cornerRadius(5) + .clipShape(RoundedRectangle(cornerRadius: 5)) .onTapGesture { action() } diff --git a/CodeEdit/Features/Editor/TabBar/Tabs/Tab/EditorTabCloseButton.swift b/CodeEdit/Features/Editor/TabBar/Tabs/Tab/EditorTabCloseButton.swift index 75b734cd5..f7d39e769 100644 --- a/CodeEdit/Features/Editor/TabBar/Tabs/Tab/EditorTabCloseButton.swift +++ b/CodeEdit/Features/Editor/TabBar/Tabs/Tab/EditorTabCloseButton.swift @@ -65,7 +65,7 @@ struct EditorTabCloseButton: View { ) ) .foregroundColor(isPressingClose ? .primary : .secondary) - .cornerRadius(2) + .clipShape(RoundedRectangle(cornerRadius: 2)) .contentShape(Rectangle()) .gesture( DragGesture(minimumDistance: 0) diff --git a/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsAccountLink.swift b/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsAccountLink.swift index ed3621cd2..51a92e099 100644 --- a/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsAccountLink.swift +++ b/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsAccountLink.swift @@ -25,7 +25,7 @@ struct AccountsSettingsAccountLink: View { Image(account.provider.iconName) .resizable() .aspectRatio(contentMode: .fill) - .cornerRadius(6) + .clipShape(RoundedRectangle(cornerRadius: 6)) .frame(width: 26, height: 26) .padding(.top, 2) .padding(.bottom, 2) diff --git a/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsProviderRow.swift b/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsProviderRow.swift index 154661d78..d986fc7db 100644 --- a/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsProviderRow.swift +++ b/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsProviderRow.swift @@ -20,7 +20,7 @@ struct AccountsSettingsProviderRow: View { Image(iconName) .resizable() .aspectRatio(contentMode: .fill) - .cornerRadius(6) + .clipShape(RoundedRectangle(cornerRadius: 6)) .frame(width: 28, height: 28) Text(name) Spacer() diff --git a/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsSigninView.swift b/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsSigninView.swift index b2965e16a..3d20848f3 100644 --- a/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsSigninView.swift +++ b/CodeEdit/Features/Settings/Pages/AccountsSettings/AccountsSettingsSigninView.swift @@ -67,7 +67,7 @@ struct AccountsSettingsSigninView: View { Image(provider.iconName) .resizable() .aspectRatio(contentMode: .fill) - .cornerRadius(12) + .clipShape(RoundedRectangle(cornerRadius: 12)) .frame(width: 52, height: 52) .padding(.top, 5) Text("Sign in to \(provider.name)") diff --git a/CodeEdit/Features/Settings/Pages/ThemeSettings/ThemeSettingsColorPreview.swift b/CodeEdit/Features/Settings/Pages/ThemeSettings/ThemeSettingsColorPreview.swift index 77f39f9f5..42e2f9752 100644 --- a/CodeEdit/Features/Settings/Pages/ThemeSettings/ThemeSettingsColorPreview.swift +++ b/CodeEdit/Features/Settings/Pages/ThemeSettings/ThemeSettingsColorPreview.swift @@ -78,7 +78,7 @@ struct ThemeSettingsColorPreviewColor: View { var body: some View { color .frame(width: 5, height: 5) - .cornerRadius(5) + .clipShape(RoundedRectangle(cornerRadius: 5)) .overlay { ZStack { Circle() diff --git a/CodeEdit/Features/UtilityArea/Toolbar/UtilityAreaFilterTextField.swift b/CodeEdit/Features/UtilityArea/Toolbar/UtilityAreaFilterTextField.swift index 523055b7b..5909ff0c8 100644 --- a/CodeEdit/Features/UtilityArea/Toolbar/UtilityAreaFilterTextField.swift +++ b/CodeEdit/Features/UtilityArea/Toolbar/UtilityAreaFilterTextField.swift @@ -27,10 +27,11 @@ struct UtilityAreaFilterTextField: View { .padding(.horizontal, 5) .frame(height: 22) .background(Color(nsColor: isFocused ? .textBackgroundColor : .quaternaryLabelColor)) - .cornerRadius(7) + .clipShape(RoundedRectangle(cornerRadius: 7)) .overlay( RoundedRectangle(cornerRadius: 7) - .stroke(isFocused ? .secondary : .tertiary, lineWidth: 0.75).cornerRadius(7) + .stroke(isFocused ? .secondary : .tertiary, lineWidth: 0.75) + .clipShape(RoundedRectangle(cornerRadius: 7)) ) } diff --git a/CodeEdit/Features/Welcome/Views/WelcomeActionView.swift b/CodeEdit/Features/Welcome/Views/WelcomeActionView.swift index 900feb6b3..ded382068 100644 --- a/CodeEdit/Features/Welcome/Views/WelcomeActionView.swift +++ b/CodeEdit/Features/Welcome/Views/WelcomeActionView.swift @@ -42,6 +42,6 @@ struct WelcomeActionButtonStyle: ButtonStyle { .padding(7) .frame(height: 36) .background(Color(.labelColor).opacity(configuration.isPressed ? 0.1 : 0.05)) - .cornerRadius(8) + .clipShape(RoundedRectangle(cornerRadius: 8)) } } diff --git a/CodeEdit/Features/Welcome/Views/WelcomeView.swift b/CodeEdit/Features/Welcome/Views/WelcomeView.swift index ca5357284..8e1d7e60d 100644 --- a/CodeEdit/Features/Welcome/Views/WelcomeView.swift +++ b/CodeEdit/Features/Welcome/Views/WelcomeView.swift @@ -141,7 +141,7 @@ struct WelcomeView: View { Rectangle() .frame(width: 104, height: 104) .foregroundColor(.accentColor) - .cornerRadius(24) + .clipShape(RoundedRectangle(cornerRadius: 24)) .blur(radius: 64) .opacity(0.5) }