Improve onboarding servers searching screen

HomeAssistant.xcodeproj/project.pbxproj

@@ -739,7 +739,6 @@
 		427FEE032D9BE7690047C00C /* OnboardingServersListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 427FEE022D9BE7690047C00C /* OnboardingServersListView.swift */; };
 		427FEE072D9C03DE0047C00C /* OnboardingScanningInstanceRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 427FEE062D9C03DE0047C00C /* OnboardingScanningInstanceRow.swift */; };
 		427FEE092D9C04050047C00C /* OnboardingServersListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 427FEE082D9C04050047C00C /* OnboardingServersListViewModel.swift */; };
-		427FEE0B2D9C05EF0047C00C /* ServersScanAnimationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 427FEE0A2D9C05EF0047C00C /* ServersScanAnimationView.swift */; };
 		427FEE0E2D9C22310047C00C /* ManualURLEntryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 427FEE0D2D9C22310047C00C /* ManualURLEntryView.swift */; };
 		427FEE562D9D39A50047C00C /* OnboardingNavigationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 427FEE552D9D39A50047C00C /* OnboardingNavigationView.swift */; };
 		427FEE592D9D48120047C00C /* View+HA.swift in Sources */ = {isa = PBXBuildFile; fileRef = 427FEE572D9D48120047C00C /* View+HA.swift */; };
@@ -919,6 +918,7 @@
 		42D996E62D89863A001737A0 /* Bool+HA.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42D996E42D89863A001737A0 /* Bool+HA.swift */; };
 		42DB4D0B2CEE292D00F6C20D /* AppEntitiesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4297ADA42C89C43F00790812 /* AppEntitiesModel.swift */; };
 		42DB4D0C2CEE292D00F6C20D /* AppEntitiesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4297ADA42C89C43F00790812 /* AppEntitiesModel.swift */; };
+		42DC8B782E14027000D9999E /* SearchingServersAnimationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42DC8B772E14027000D9999E /* SearchingServersAnimationView.swift */; };
 		42DD84162B14D7AC00936F16 /* WebViewExternalBusMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42DD84142B14D68C00936F16 /* WebViewExternalBusMessage.swift */; };
 		42DD84192B14D83B00936F16 /* WebViewExternalBusMessageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42DD84182B14D83B00936F16 /* WebViewExternalBusMessageTests.swift */; };
 		42DE75D32D1061A600FF379F /* PanelsUpdater.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42DE75D12D105F3000FF379F /* PanelsUpdater.swift */; };
@@ -2216,7 +2216,6 @@
 		427FEE022D9BE7690047C00C /* OnboardingServersListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingServersListView.swift; sourceTree = "<group>"; };
 		427FEE062D9C03DE0047C00C /* OnboardingScanningInstanceRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingScanningInstanceRow.swift; sourceTree = "<group>"; };
 		427FEE082D9C04050047C00C /* OnboardingServersListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingServersListViewModel.swift; sourceTree = "<group>"; };
-		427FEE0A2D9C05EF0047C00C /* ServersScanAnimationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServersScanAnimationView.swift; sourceTree = "<group>"; };
 		427FEE0D2D9C22310047C00C /* ManualURLEntryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManualURLEntryView.swift; sourceTree = "<group>"; };
 		427FEE552D9D39A50047C00C /* OnboardingNavigationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingNavigationView.swift; sourceTree = "<group>"; };
 		427FEE572D9D48120047C00C /* View+HA.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+HA.swift"; sourceTree = "<group>"; };
@@ -2364,6 +2363,7 @@
 		42D5ACD82C64C0E000D9C4E2 /* MagicItemAddView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicItemAddView.swift; sourceTree = "<group>"; };
 		42D5ACDA2C64C82600D9C4E2 /* MagicItemAddViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicItemAddViewModel.swift; sourceTree = "<group>"; };
 		42D996E42D89863A001737A0 /* Bool+HA.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bool+HA.swift"; sourceTree = "<group>"; };
+		42DC8B772E14027000D9999E /* SearchingServersAnimationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchingServersAnimationView.swift; sourceTree = "<group>"; };
 		42DD84142B14D68C00936F16 /* WebViewExternalBusMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewExternalBusMessage.swift; sourceTree = "<group>"; };
 		42DD84182B14D83B00936F16 /* WebViewExternalBusMessageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewExternalBusMessageTests.swift; sourceTree = "<group>"; };
 		42DD84322B15DC2F00936F16 /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/Intents.strings; sourceTree = "<group>"; };
@@ -3557,6 +3557,7 @@
 		11AF1ED82528FBAA00AAE364 /* Onboarding */ = {
 			isa = PBXGroup;
 			children = (
+				42DC8B762E14026100D9999E /* Views */,
 				42E95C562CA45EFA0010ECE3 /* OnboardingErrorView.swift */,
 				42E95C582CA46AD50010ECE3 /* ShareActivityView.swift */,
 				42E95C542CA44FC90010ECE3 /* SafariWebView.swift */,
@@ -4386,18 +4387,6 @@
 			path = Views;
 			sourceTree = "<group>";
 		};
-		427FEE052D9C03C50047C00C /* OnboardingServersList */ = {
-			isa = PBXGroup;
-			children = (
-				427FEE0C2D9C221D0047C00C /* ManualURLEntry */,
-				427FEE022D9BE7690047C00C /* OnboardingServersListView.swift */,
-				427FEE062D9C03DE0047C00C /* OnboardingScanningInstanceRow.swift */,
-				427FEE082D9C04050047C00C /* OnboardingServersListViewModel.swift */,
-				427FEE0A2D9C05EF0047C00C /* ServersScanAnimationView.swift */,
-			);
-			path = OnboardingServersList;
-			sourceTree = "<group>";
-		};
 		427FEE0C2D9C221D0047C00C /* ManualURLEntry */ = {
 			isa = PBXGroup;
 			children = (
@@ -4504,7 +4493,10 @@
 		42905D822E1297C500250728 /* Servers */ = {
 			isa = PBXGroup;
 			children = (
-				427FEE052D9C03C50047C00C /* OnboardingServersList */,
+				427FEE0C2D9C221D0047C00C /* ManualURLEntry */,
+				427FEE022D9BE7690047C00C /* OnboardingServersListView.swift */,
+				427FEE062D9C03DE0047C00C /* OnboardingScanningInstanceRow.swift */,
+				427FEE082D9C04050047C00C /* OnboardingServersListViewModel.swift */,
 			);
 			path = Servers;
 			sourceTree = "<group>";
@@ -4875,6 +4867,14 @@
 			path = Add;
 			sourceTree = "<group>";
 		};
+		42DC8B762E14026100D9999E /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				42DC8B772E14027000D9999E /* SearchingServersAnimationView.swift */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
 		42E3B8BB2D8ACDC100F5D084 /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -7828,7 +7828,6 @@
 				420E2AE72C474718004921D8 /* WidgetBasicViewModel.swift in Sources */,
 				1178C4E524D5CEB200FDEC3E /* ConnectionURLViewController.swift in Sources */,
 				42F1DA6B2B4ED1BF002729BC /* CarPlayAreasZonesTemplate.swift in Sources */,
-				427FEE0B2D9C05EF0047C00C /* ServersScanAnimationView.swift in Sources */,
 				11A48D8124CA8ADB0021BDD9 /* NotificationCategory+Observation.swift in Sources */,
 				42462E692D9ED75900ECC8A7 /* LocationPermissionView.swift in Sources */,
 				42D0AE452D88259000D9715A /* WidgetDocumentationLink.swift in Sources */,
@@ -7927,6 +7926,7 @@
 				11B1FFC524CCD72F00F9BCB2 /* VoiceShortcutRow.swift in Sources */,
 				42B74A642D36B17000C37304 /* ReloadWidgetsAppIntent.swift in Sources */,
 				42FCD0152B9B29740057783F /* ThreadCredentialsManagementView.swift in Sources */,
+				42DC8B782E14027000D9999E /* SearchingServersAnimationView.swift in Sources */,
 				42B980DE2DC3599300BC5C08 /* PrivacyView.swift in Sources */,
 				1168BF33271809C600DD4D15 /* OnboardingAuthError.swift in Sources */,
 				B661FB6F226BCCAD00E541DD /* ConnectionSettingsViewController.swift in Sources */,

Sources/App/Onboarding/Steps/Servers/OnboardingScanningInstanceRow.swift

@@ -0,0 +1,94 @@
+import Shared
+import SwiftUI
+
+struct OnboardingScanningInstanceRow: View {
+    private enum Constants {
+        static let iconContainerSize: CGFloat = 60
+        static let minHeight: CGFloat = 60
+    }
+
+    let name: String
+    let internalURLString: String?
+    let externalURLString: String?
+    let internalOrExternalURLString: String
+    let isLoading: Bool
+
+    var body: some View {
+        HStack(spacing: DesignSystem.Spaces.one) {
+            icon
+            VStack(alignment: .leading) {
+                Text(name)
+                    .font(.headline)
+                Text(internalURLString ?? internalOrExternalURLString)
+                    .font(.subheadline)
+                    .foregroundColor(.secondary)
+                if let externalURLString {
+                    Text(externalURLString)
+                        .font(.caption2)
+                        .foregroundColor(.secondary)
+                }
+            }
+            .frame(maxWidth: .infinity, alignment: .leading)
+            if isLoading {
+                HAProgressView(style: .small)
+                    .padding(.trailing, DesignSystem.Spaces.one)
+            }
+        }
+        .frame(maxWidth: .infinity)
+        .frame(minHeight: Constants.minHeight)
+        .padding(DesignSystem.Spaces.one)
+        .overlay(
+            RoundedRectangle(cornerRadius: DesignSystem.CornerRadius.two)
+                .stroke(Color.tileBorder, lineWidth: DesignSystem.Border.Width.default)
+        )
+    }
+
+    private var icon: some View {
+        ZStack {
+            Group {
+                Image(uiImage: Asset.logo.image)
+                    .resizable()
+                    .aspectRatio(contentMode: .fit)
+                if internalURLString == nil, externalURLString != nil {
+                    Image(systemSymbol: .icloudCircleFill)
+                        .foregroundStyle(Color.haPrimary, .white)
+                        .offset(x: 8, y: 12)
+                        .shadow(color: .black.opacity(0.2), radius: 5)
+                }
+            }
+            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
+            .padding(DesignSystem.Spaces.oneAndHalf)
+        }
+        .frame(width: Constants.iconContainerSize, height: Constants.iconContainerSize)
+    }
+}
+
+#Preview {
+    List {
+        Group {
+            OnboardingScanningInstanceRow(
+                name: "Home Assistant",
+                internalURLString: "https://example.com",
+                externalURLString: "https://example.com",
+                internalOrExternalURLString: "https://example.com",
+                isLoading: true
+            )
+            OnboardingScanningInstanceRow(
+                name: "Home Assistant",
+                internalURLString: "https://example.com",
+                externalURLString: "https://example.com",
+                internalOrExternalURLString: "https://example.com",
+                isLoading: false
+            )
+            OnboardingScanningInstanceRow(
+                name: "Home Assistant",
+                internalURLString: "https://example.com",
+                externalURLString: "https://example.com",
+                internalOrExternalURLString: "https://example.com",
+                isLoading: false
+            )
+        }
+        .listRowSeparator(.hidden)
+    }
+    .listStyle(.plain)
+}