From 16463a6ca0dc6ae3546d02bc4f9b9c4e6a638e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1rady=20Mil=C3=A1n?= <61704770+MilanVarady@users.noreply.github.com> Date: Wed, 1 Jan 2025 23:14:33 +0100 Subject: [PATCH] Remove bigButton style Remove the custom bigButton style in favor of using the .controlSize(.large) modifier --- Applite.xcodeproj/project.pbxproj | 12 ------ Applite/Styles/BigButtonStyle.swift | 40 ------------------- .../Content View/ContentView+DetailView.swift | 3 +- .../DownloadView+NoSearchResults.swift | 2 +- .../Update/UpdateView+UpdateAllButton.swift | 3 +- .../Settings/SettingsView+Uninstaller.swift | 4 +- Applite/Views/Setup/SetupView+AllSet.swift | 3 +- .../Views/Setup/SetupView+BrewInstall.swift | 2 +- .../Setup/SetupView+BrewTypeSelection.swift | 5 ++- .../SetupView+PageControllerButtons.swift | 5 ++- Applite/Views/UninstallSelfView.swift | 8 ++-- 11 files changed, 21 insertions(+), 66 deletions(-) delete mode 100755 Applite/Styles/BigButtonStyle.swift diff --git a/Applite.xcodeproj/project.pbxproj b/Applite.xcodeproj/project.pbxproj index 9ec12a0..660322a 100644 --- a/Applite.xcodeproj/project.pbxproj +++ b/Applite.xcodeproj/project.pbxproj @@ -44,7 +44,6 @@ 418989B22A35D651004AC23B /* isBrewPathValid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 418989B12A35D651004AC23B /* isBrewPathValid.swift */; }; 418989B42A35D67C004AC23B /* isCommandLineToolsInstalled.swift in Sources */ = {isa = PBXBuildFile; fileRef = 418989B32A35D67C004AC23B /* isCommandLineToolsInstalled.swift */; }; 4189CE392937CD41009C836D /* Shimmer in Frameworks */ = {isa = PBXBuildFile; productRef = 4189CE382937CD41009C836D /* Shimmer */; }; - 4189CE41293C980E009C836D /* BigButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4189CE40293C980E009C836D /* BigButtonStyle.swift */; }; 418E9EF42AACD9C000046A58 /* CircularProgress in Frameworks */ = {isa = PBXBuildFile; productRef = 418E9EF32AACD9C000046A58 /* CircularProgress */; }; 418F331C28EB3D540023D76F /* AppGridView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 418F331B28EB3D540023D76F /* AppGridView.swift */; }; 418F332428EC8BA10023D76F /* Cask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 418F332328EC8BA10023D76F /* Cask.swift */; }; @@ -144,7 +143,6 @@ 418989AE2A33B65A004AC23B /* SmallProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmallProgressView.swift; sourceTree = ""; }; 418989B12A35D651004AC23B /* isBrewPathValid.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = isBrewPathValid.swift; sourceTree = ""; }; 418989B32A35D67C004AC23B /* isCommandLineToolsInstalled.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = isCommandLineToolsInstalled.swift; sourceTree = ""; }; - 4189CE40293C980E009C836D /* BigButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BigButtonStyle.swift; sourceTree = ""; }; 418F331B28EB3D540023D76F /* AppGridView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppGridView.swift; sourceTree = ""; }; 418F332328EC8BA10023D76F /* Cask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cask.swift; sourceTree = ""; }; 418F332528EC921D0023D76F /* CaskData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CaskData.swift; sourceTree = ""; }; @@ -280,14 +278,6 @@ path = "Brew Installation"; sourceTree = ""; }; - 4126354C2A79195200155034 /* Styles */ = { - isa = PBXGroup; - children = ( - 4189CE40293C980E009C836D /* BigButtonStyle.swift */, - ); - path = Styles; - sourceTree = ""; - }; 413E60B52BBAE58B00978F6A /* Network Proxy */ = { isa = PBXGroup; children = ( @@ -321,7 +311,6 @@ 414074F428DF53E80073EB22 /* AppliteApp.swift */, 414074F828DF53EB0073EB22 /* Assets.xcassets */, 4140750328DF5ED00073EB22 /* Views */, - 4126354C2A79195200155034 /* Styles */, 418F332228EC8B120023D76F /* Model */, 4191393129269FD600F1D75D /* Utilities */, 412635402A77F99F00155034 /* Extensions */, @@ -707,7 +696,6 @@ 414074F728DF53E80073EB22 /* ContentView.swift in Sources */, 419256392D1DF35C00D9EF10 /* SettingsView+Uninstaller.swift in Sources */, 419256472D1E0B0900D9EF10 /* BrewPathSelectorView+GetPathDescription.swift in Sources */, - 4189CE41293C980E009C836D /* BigButtonStyle.swift in Sources */, 41DF006429EAA094004EB7AE /* SendNotification.swift in Sources */, 419256622D1E15EA00D9EF10 /* UpdateView+UpdateUnavailable.swift in Sources */, 41857B752912D94A004A1894 /* CategoryView.swift in Sources */, diff --git a/Applite/Styles/BigButtonStyle.swift b/Applite/Styles/BigButtonStyle.swift deleted file mode 100755 index 0f00585..0000000 --- a/Applite/Styles/BigButtonStyle.swift +++ /dev/null @@ -1,40 +0,0 @@ -// -// BigButtonStyle.swift -// Applite -// -// Created by Milán Várady on 2022. 12. 04.. -// - -import SwiftUI - -/// A customizable big button style -public struct BigButtonStyle: ButtonStyle { - var foregroundColor: Color - var backgroundColor: Color - var pressedColor: Color - - public func makeBody(configuration: Self.Configuration) -> some View { - configuration.label - .font(.headline) - .padding(10) - .foregroundColor(foregroundColor) - .background(configuration.isPressed ? pressedColor : backgroundColor) - .cornerRadius(8) - } -} - -extension View { - func bigButton ( - foregroundColor: Color = .white, - backgroundColor: Color = .gray, - pressedColor: Color = .accentColor - ) -> some View { - self.buttonStyle( - BigButtonStyle ( - foregroundColor: foregroundColor, - backgroundColor: backgroundColor, - pressedColor: pressedColor - ) - ) - } -} diff --git a/Applite/Views/Content View/ContentView+DetailView.swift b/Applite/Views/Content View/ContentView+DetailView.swift index 20d69b4..f769c1a 100644 --- a/Applite/Views/Content View/ContentView+DetailView.swift +++ b/Applite/Views/Content View/ContentView+DetailView.swift @@ -26,8 +26,7 @@ extension ContentView { } label: { Label("Retry load", systemImage: "arrow.clockwise.circle") } - .bigButton() - .disabled(false) + .controlSize(.large) } .frame(maxWidth: 600) } diff --git a/Applite/Views/Detail Views/Download/DownloadView+NoSearchResults.swift b/Applite/Views/Detail Views/Download/DownloadView+NoSearchResults.swift index 53e79fa..7e06597 100644 --- a/Applite/Views/Detail Views/Download/DownloadView+NoSearchResults.swift +++ b/Applite/Views/Detail Views/Download/DownloadView+NoSearchResults.swift @@ -28,7 +28,7 @@ extension DownloadView { } label: { Label("Turn off few downloads filter", systemImage: "slider.horizontal.2.square.on.square") } - .bigButton() + .controlSize(.large) .help("Apps with few downloads are hidden, consider turning off this filter") } } diff --git a/Applite/Views/Detail Views/Update/UpdateView+UpdateAllButton.swift b/Applite/Views/Detail Views/Update/UpdateView+UpdateAllButton.swift index 69ed9e2..54f2103 100644 --- a/Applite/Views/Detail Views/Update/UpdateView+UpdateAllButton.swift +++ b/Applite/Views/Detail Views/Update/UpdateView+UpdateAllButton.swift @@ -41,7 +41,8 @@ extension UpdateView { Text("Update All") } } - .bigButton(backgroundColor: .accentColor) + .buttonStyle(.borderedProminent) + .controlSize(.large) .padding(.vertical) .disabled(isUpdatingAll) } diff --git a/Applite/Views/Settings/SettingsView+Uninstaller.swift b/Applite/Views/Settings/SettingsView+Uninstaller.swift index 9292768..0aeaf8b 100644 --- a/Applite/Views/Settings/SettingsView+Uninstaller.swift +++ b/Applite/Views/Settings/SettingsView+Uninstaller.swift @@ -18,7 +18,9 @@ extension SettingsView { } label: { Label("Uninstall", systemImage: "trash.fill") } - .bigButton(foregroundColor: .white, backgroundColor: .red) + .buttonStyle(.borderedProminent) + .tint(.red) + .controlSize(.large) Text("Uninstall \(Bundle.main.appName), related files and cache.") } diff --git a/Applite/Views/Setup/SetupView+AllSet.swift b/Applite/Views/Setup/SetupView+AllSet.swift index ab5a226..c75d00c 100644 --- a/Applite/Views/Setup/SetupView+AllSet.swift +++ b/Applite/Views/Setup/SetupView+AllSet.swift @@ -20,7 +20,8 @@ extension SetupView { Button("Start Using \(Bundle.main.appName)") { setupComplete = true } - .bigButton(backgroundColor: .accentColor) + .buttonStyle(.borderedProminent) + .controlSize(.large) } } } diff --git a/Applite/Views/Setup/SetupView+BrewInstall.swift b/Applite/Views/Setup/SetupView+BrewInstall.swift index d32c4f1..58d9adf 100644 --- a/Applite/Views/Setup/SetupView+BrewInstall.swift +++ b/Applite/Views/Setup/SetupView+BrewInstall.swift @@ -49,7 +49,7 @@ extension SetupView { } label: { Label("Retry Install", systemImage: "arrow.clockwise.circle") } - .bigButton(backgroundColor: .secondary) + .controlSize(.large) } } .frame(width: 440) diff --git a/Applite/Views/Setup/SetupView+BrewTypeSelection.swift b/Applite/Views/Setup/SetupView+BrewTypeSelection.swift index d9865e1..1a4b21b 100644 --- a/Applite/Views/Setup/SetupView+BrewTypeSelection.swift +++ b/Applite/Views/Setup/SetupView+BrewTypeSelection.swift @@ -26,13 +26,14 @@ extension SetupView { page = .brewPathSelection BrewPaths.selectedBrewOption = .defaultAppleSilicon } - .bigButton() + .controlSize(.large) Button("No (I don't know what it is)") { page = .brewInstall BrewPaths.selectedBrewOption = .appPath } - .bigButton(backgroundColor: .accentColor) + .buttonStyle(.borderedProminent) + .controlSize(.large) } Spacer() diff --git a/Applite/Views/Setup/SetupView+PageControllerButtons.swift b/Applite/Views/Setup/SetupView+PageControllerButtons.swift index bc527e6..1a772b8 100644 --- a/Applite/Views/Setup/SetupView+PageControllerButtons.swift +++ b/Applite/Views/Setup/SetupView+PageControllerButtons.swift @@ -39,7 +39,7 @@ extension SetupView { page = pageBefore } } - .bigButton(backgroundColor: Color(red: 0.7, green: 0.7, blue: 0.7)) + .controlSize(.large) } Button("Continue") { @@ -49,7 +49,8 @@ extension SetupView { } } .disabled(!canContinue) - .bigButton(backgroundColor: canContinue ? .accentColor : .gray) + .buttonStyle(.borderedProminent) + .controlSize(.large) } .padding(.trailing) .padding(.bottom, 8) diff --git a/Applite/Views/UninstallSelfView.swift b/Applite/Views/UninstallSelfView.swift index 96b0aec..5aeac12 100755 --- a/Applite/Views/UninstallSelfView.swift +++ b/Applite/Views/UninstallSelfView.swift @@ -29,13 +29,15 @@ struct UninstallSelfView: View { Divider() .padding(.vertical) - Button { + Button(role: .destructive) { showConfirmation = true } label: { Label("Uninstall \(Bundle.main.appName)", systemImage: "trash.fill") } - .bigButton(foregroundColor: .white, backgroundColor: .red) - + .buttonStyle(.borderedProminent) + .tint(.red) + .controlSize(.large) + Spacer() } .frame(width: 400, height: 250)