Merge remote-tracking branch 'upstream/main'

1 files changed, 22 insertions, 30 deletions

diff --git a/Hotline/iOS/TrackerView.swift b/Hotline/iOS/TrackerView.swift
index 43b1916..b2aab61 100644
--- a/Hotline/iOS/TrackerView.swift
+++ b/Hotline/iOS/TrackerView.swift
@@ -10,7 +10,7 @@ struct TrackerConnectView: View {
   @State private var login = ""
   @State private var password = ""
   //  @State private var connecting = false
-
+  
   func connectionStatusToProgress(status: HotlineClientStatus) -> Double {
     switch status {
     case .disconnected:
@@ -54,14 +54,15 @@ struct TrackerConnectView: View {
           .background {
             Color.black.cornerRadius(8).blendMode(.overlay)
           }
-      } else {
+      }
+      else {
         ProgressView(value: connectionStatusToProgress(status: model.status))
           .frame(minHeight: 10)
           .accentColor(colorScheme == .dark ? .white : .black)
       }
-
+      
       Spacer()
-
+      
       HStack {
         Button {
           dismiss()
@@ -75,28 +76,23 @@ struct TrackerConnectView: View {
         .frame(maxWidth: .infinity)
         .foregroundColor(colorScheme == .dark ? .white : .black)
         .background(
-          colorScheme == .dark
-            ? LinearGradient(
-              gradient: Gradient(colors: [Color(white: 0.4), Color(white: 0.3)]), startPoint: .top,
-              endPoint: .bottom)
-            : LinearGradient(
-              gradient: Gradient(colors: [Color(white: 0.95), Color(white: 0.91)]),
-              startPoint: .top, endPoint: .bottom)
+          colorScheme == .dark ?
+          LinearGradient(gradient: Gradient(colors: [Color(white: 0.4), Color(white: 0.3)]), startPoint: .top, endPoint: .bottom)
+          :
+            LinearGradient(gradient: Gradient(colors: [Color(white: 0.95), Color(white: 0.91)]), startPoint: .top, endPoint: .bottom)
         )
         .overlay(
-          RoundedRectangle(cornerRadius: 10.0).stroke(.black, lineWidth: 3).opacity(
-            colorScheme == .dark ? 0.0 : 0.2)
+          RoundedRectangle(cornerRadius: 10.0).stroke(.black, lineWidth: 3).opacity(colorScheme == .dark ? 0.0 : 0.2)
         )
         .cornerRadius(10.0)
         Button {
-          let s = Server(
-            name: nil, description: nil, address: address, port: HotlinePorts.DefaultServerPort,
-            users: 0, login: login, password: password)
+          let s = Server(name: nil, description: nil, address: address, port: HotlinePorts.DefaultServerPort, users: 0, login: login, password: password)
           server = s
           self.model.login(server: s, username: "bolt", iconID: 128) { success in
             if !success {
               print("FAILED LOGIN??")
-            } else {
+            }
+            else {
               self.model.sendUserInfo(username: "bolt", iconID: 128)
               self.model.getUserList()
             }
@@ -110,28 +106,24 @@ struct TrackerConnectView: View {
         .frame(maxWidth: .infinity)
         .foregroundColor(colorScheme == .dark ? .white : .black)
         .background(
-          colorScheme == .dark
-            ? LinearGradient(
-              gradient: Gradient(colors: [Color(white: 0.4), Color(white: 0.3)]), startPoint: .top,
-              endPoint: .bottom)
-            : LinearGradient(
-              gradient: Gradient(colors: [Color(white: 0.95), Color(white: 0.91)]),
-              startPoint: .top, endPoint: .bottom)
+          colorScheme == .dark ?
+          LinearGradient(gradient: Gradient(colors: [Color(white: 0.4), Color(white: 0.3)]), startPoint: .top, endPoint: .bottom)
+          :
+            LinearGradient(gradient: Gradient(colors: [Color(white: 0.95), Color(white: 0.91)]), startPoint: .top, endPoint: .bottom)
         )
         .overlay(
-          RoundedRectangle(cornerRadius: 10.0).stroke(.black, lineWidth: 3).opacity(
-            colorScheme == .dark ? 0.0 : 0.2)
+          RoundedRectangle(cornerRadius: 10.0).stroke(.black, lineWidth: 3).opacity(colorScheme == .dark ? 0.0 : 0.2)
         )
         .cornerRadius(10.0)
       }
       .padding()
     }
     .padding()
-    .onChange(of: model.status) {
+    .onChange(of: self.model.status) {
       print("MODEL STATUS CHANGED")
-      if model.server != nil && server != nil && model.server! == server! {
-        if model.status == .loggedIn {
-          dismiss()
+      if self.model.server != nil && self.server != nil && self.model.server! == server! {
+        if self.model.status == .loggedIn {
+          self.dismiss()
         }
         //          else {
         //            connecting = (model.status != .disconnected)