Improve server addition sheet styling

Michael-128 · Jan 27, 2025 · cdb1257 · cdb1257
1 parent 42e5aeb
commit cdb1257
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/qBitControl/ViewModels/ServersView/ServerAddViewModel.swift b/qBitControl/ViewModels/ServersView/ServerAddViewModel.swift
@@ -21,6 +21,8 @@ class ServerAddViewModel: ObservableObject {
 
     @Published var isCheckingConnection = false;
 
+    public var addButtonColor: Color { self.isCheckingConnection ? Color.gray : Color.blue }
+
     private var alertQueue: [String] = [];
 
     init() { }
@@ -46,7 +48,7 @@ class ServerAddViewModel: ObservableObject {
 
     func validateIsConnecting() -> Bool {
         if (self.isCheckingConnection) {
-            showAlert(message: "Adding, Please wait")
+            //showAlert(message: "Adding, Please wait")
             return false;
         }
 
@@ -74,7 +76,6 @@ class ServerAddViewModel: ObservableObject {
     }
 
     func addServer(server: Server) {
-        showAlert(message: "Add server success!")
         serversHelper.addServer(server: server)
     }
 

diff --git a/qBitControl/Views/ServersViews/ServerAddView.swift b/qBitControl/Views/ServersViews/ServerAddView.swift
@@ -48,13 +48,16 @@ struct ServerAddView: View {
                     } label: {
                         Spacer()
                         if(viewModel.isCheckingConnection) {
-                            Text("ADDING")
+                            Text("ADDING" + "...")
+                                .fontWeight(.bold)
                         } else {
                             Text("ADD")
+                                .fontWeight(.bold)
                         }
                         Spacer()
                     }.buttonStyle(.borderedProminent)
-                }.listRowBackground(Color.blue)
+                        .tint(viewModel.addButtonColor)
+                }.listRowBackground(viewModel.addButtonColor)
             }
             .alert(isPresented: $viewModel.isInvalidAlert) {
                 Alert(title: Text("Invalid server information"), message: Text(viewModel.invalidAlertMessage), dismissButton: .default(Text("OK"), action: {