Replace HStacks.

CalebRas · CalebRas · commit 0b043742eb3f · 2024-07-29T10:27:43.000-07:00
diff --git a/Shared/Samples/Add dynamic entity layer/AddDynamicEntityLayerView.SettingsView.swift b/Shared/Samples/Add dynamic entity layer/AddDynamicEntityLayerView.SettingsView.swift
@@ -36,12 +36,10 @@ extension AddDynamicEntityLayerView {
                     
                     Section("Observations") {
                         VStack {
-                            HStack {
-                                Text("Observations per track")
-                                Spacer()
-                                Text(model.maximumObservations.formatted())
-                                    .foregroundStyle(.secondary)
-                            }
+                            LabeledContent(
+                                "Observations per track",
+                                value: model.maximumObservations.formatted()
+                            )
                             Slider(value: $model.maximumObservations, in: model.maxObservationRange, step: 1)
                         }
                         HStack {
diff --git a/Shared/Samples/Add features with contingent values/AddFeaturesWithContingentValuesView.AddFeatureView.swift b/Shared/Samples/Add features with contingent values/AddFeaturesWithContingentValuesView.AddFeatureView.swift
@@ -87,11 +87,11 @@ extension AddFeaturesWithContingentValuesView {
                     }
                     
                     VStack {
-                        HStack {
-                            Text("Exclusion Area Buffer Size")
-                            Spacer()
-                            Text("\(Int(selectedBufferSize ?? 0))")
-                        }
+                        LabeledContent(
+                            "Exclusion Area Buffer Size",
+                            value: selectedBufferSize ?? 0,
+                            format: .number.precision(.fractionLength(0))
+                        )
                         
                         Slider(
                             value: Binding(
diff --git a/Shared/Samples/Animate 3D graphic/Animate3DGraphicView.swift b/Shared/Samples/Animate 3D graphic/Animate3DGraphicView.swift
@@ -35,11 +35,11 @@ struct Animate3DGraphicView: View {
             VStack {
                 HStack {
                     Spacer()
-                    VStack {
-                        StatRow("Altitude", value: model.animation.currentFrame.altitude.formatted(.length))
-                        StatRow("Heading", value: model.animation.currentFrame.heading.formatted(.angle))
-                        StatRow("Pitch", value: model.animation.currentFrame.pitch.formatted(.angle))
-                        StatRow("Roll", value: model.animation.currentFrame.roll.formatted(.angle))
+                    VStack(spacing: 3) {
+                        LabeledContent("Altitude", value: model.animation.currentFrame.altitude, format: .length)
+                        LabeledContent("Heading", value: model.animation.currentFrame.heading, format: .angle)
+                        LabeledContent("Pitch", value: model.animation.currentFrame.pitch, format: .angle)
+                        LabeledContent("Roll", value: model.animation.currentFrame.roll, format: .angle)
                     }
                     .frame(width: 170, height: 100)
                     .padding([.leading, .trailing])
@@ -103,7 +103,7 @@ struct Animate3DGraphicView: View {
         List {
             Section("Mission") {
                 VStack {
-                    StatRow("Progress", value: model.animation.progress.formatted(.rounded))
+                    LabeledContent("Progress", value: model.animation.progress, format: .rounded)
                     ProgressView(value: model.animation.progress)
                 }
                 .padding(.vertical)
@@ -135,7 +135,7 @@ struct Animate3DGraphicView: View {
             Section {
                 ForEach(CameraProperty.allCases, id: \.self) { property in
                     VStack {
-                        StatRow(property.label, value: model.cameraPropertyTexts[property] ?? "")
+                        LabeledContent(property.label, value: model.cameraPropertyTexts[property] ?? "")
                         Slider(value: cameraPropertyBinding(for: property), in: property.range, step: 1)
                             .padding(.horizontal)
                     }
@@ -162,27 +162,6 @@ extension Animate3DGraphicView {
         case .pitch: return $model.cameraController.cameraPitchOffset
         }
     }
-    
-    /// A view for displaying a statistic name and value in a row.
-    struct StatRow: View {
-        /// The name of the statistic.
-        var label: String
-        /// The formatted value of the statistic.
-        var value: String
-        
-        init(_ label: String, value: String) {
-            self.label = label
-            self.value = value
-        }
-        
-        var body: some View {
-            HStack {
-                Text(label)
-                Spacer()
-                Text(value)
-            }
-        }
-    }
 }
 
 private extension FormatStyle where Self == Measurement<UnitLength>.FormatStyle {
diff --git a/Shared/Samples/Change map view background/ChangeMapViewBackgroundView.SettingsView.swift b/Shared/Samples/Change map view background/ChangeMapViewBackgroundView.SettingsView.swift
@@ -28,22 +28,11 @@ extension ChangeMapViewBackgroundView {
                     ColorPicker("Color", selection: $model.color)
                     ColorPicker("Line Color", selection: $model.lineColor)
                     VStack {
-                        HStack {
-                            Text("Line Width")
-                            Spacer()
-                            Text(model.lineWidth.formatted())
-                                .foregroundStyle(.secondary)
-                        }
+                        LabeledContent("Line Width", value: model.lineWidth.formatted())
                         Slider(value: $model.lineWidth, in: model.lineWidthRange, step: 1)
                     }
                     VStack {
-                        HStack {
-                            Text("Grid Size")
-                            Spacer()
-                            Text(model.size.formatted())
-                                .foregroundStyle(.secondary)
-                        }
-                        Spacer()
+                        LabeledContent("Grid Size", value: model.size.formatted())
                         Slider(value: $model.size, in: model.sizeRange, step: 1)
                     }
                 }
diff --git a/Shared/Samples/Configure clusters/ConfigureClustersView.SettingsView.swift b/Shared/Samples/Configure clusters/ConfigureClustersView.SettingsView.swift
@@ -58,12 +58,11 @@ extension ConfigureClustersView {
                             model.maxScale = Double(newMaxScale)
                         }
                         
-                        HStack {
-                            Text("Current Map Scale")
-                            Spacer()
-                            Text(mapViewScale, format: .number.precision(.fractionLength(0)))
-                                .foregroundStyle(.secondary)
-                        }
+                        LabeledContent(
+                            "Current Map Scale",
+                            value: mapViewScale,
+                            format: .number.precision(.fractionLength(0))
+                        )
                     }
                 }
                 .navigationTitle("Clustering Settings")
diff --git a/Shared/Samples/Create load report/CreateLoadReportView.Views.swift b/Shared/Samples/Create load report/CreateLoadReportView.Views.swift
@@ -32,9 +32,10 @@ extension CreateLoadReportView {
                                 .onTapGesture {
                                     model.deletePhase(phase)
                                 }
-                            Text("Phase: \(phase.name)")
-                            Spacer()
-                            Text(model.summaryForPhase(phase))
+                            LabeledContent(
+                                "Phase: \(phase.name)",
+                                value: model.summaryForPhase(phase)
+                            )
                         }
                     }
                     .onDelete { indexSet in
diff --git a/Shared/Samples/Densify and generalize geometry/DensifyAndGeneralizeGeometryView.SettingsView.swift b/Shared/Samples/Densify and generalize geometry/DensifyAndGeneralizeGeometryView.SettingsView.swift
@@ -32,11 +32,11 @@ extension DensifyAndGeneralizeGeometryView {
                             model.updateGraphics()
                         }
                     VStack {
-                        HStack {
-                            Text("Max Deviation")
-                            Spacer()
-                            Text(String(Int(model.maxDeviation)))
-                        }
+                        LabeledContent(
+                            "Max Deviation",
+                            value: model.maxDeviation,
+                            format: .number.precision(.fractionLength(0))
+                        )
                         Slider(value: $model.maxDeviation, in: 1...250)
                             .onChange(of: model.maxDeviation) { _ in
                                 model.updateGraphics()
@@ -50,11 +50,11 @@ extension DensifyAndGeneralizeGeometryView {
                             model.updateGraphics()
                         }
                     VStack {
-                        HStack {
-                            Text("Max Segment Length")
-                            Spacer()
-                            Text(String(Int(model.maxSegmentLength)))
-                        }
+                        LabeledContent(
+                            "Max Segment Length",
+                            value: model.maxSegmentLength,
+                            format: .number.precision(.fractionLength(0))
+                        )
                         Slider(value: $model.maxSegmentLength, in: 50...500)
                             .onChange(of: model.maxSegmentLength) { _ in
                                 model.updateGraphics()
diff --git a/Shared/Samples/Set visibility of subtype sublayer/SetVisibilityOfSubtypeSublayerView.Views.swift b/Shared/Samples/Set visibility of subtype sublayer/SetVisibilityOfSubtypeSublayerView.Views.swift
@@ -42,12 +42,7 @@ extension SetVisibilityOfSubtypeSublayerView {
                         }
                 }
                 Section("Sublayer Minimum Scale") {
-                    HStack {
-                        Text("Minimum Scale")
-                        Spacer()
-                        Text(model.minimumScaleText)
-                            .foregroundStyle(.secondary)
-                    }
+                    LabeledContent("Minimum Scale", value: model.minimumScaleText)
                     HStack {
                         Button("Set Current to Minimum Scale") {
                             model.setMinimumScale()
diff --git a/Shared/Samples/Show viewshed from point in scene/ShowViewshedFromPointInSceneView.ViewshedSettingsView.swift b/Shared/Samples/Show viewshed from point in scene/ShowViewshedFromPointInSceneView.ViewshedSettingsView.swift
@@ -66,15 +66,14 @@ extension ShowViewshedFromPointInSceneView {
         
         var body: some View {
             VStack {
-                HStack {
-                    Text(label)
-                    Spacer()
-                    Text(
-                        Measurement(value: measurementValue, unit: unit),
-                        format: .measurement(width: .narrow, numberFormatStyle: .number.precision(.fractionLength(0)))
+                LabeledContent(
+                    label,
+                    value: Measurement(value: measurementValue, unit: unit),
+                    format: .measurement(
+                        width: .narrow,
+                        numberFormatStyle: .number.precision(.fractionLength(0))
                     )
-                    .foregroundStyle(.secondary)
-                }
+                )
                 Slider(value: $measurementValue, in: range)
             }
         }
diff --git a/Shared/Samples/Style symbols from mobile style file/StyleSymbolsFromMobileStyleFileView.SymbolOptionsListView.swift b/Shared/Samples/Style symbols from mobile style file/StyleSymbolsFromMobileStyleFileView.SymbolOptionsListView.swift
@@ -49,12 +49,11 @@ extension StyleSymbolsFromMobileStyleFileView {
                     Section {
                         ColorPicker("Color", selection: $model.symbolOptionSelections.color)
                         VStack {
-                            HStack {
-                                Text("Size")
-                                Spacer()
-                                Text(model.symbolOptionSelections.size.formatted(.number.rounded()))
-                                    .foregroundStyle(.secondary)
-                            }
+                            LabeledContent(
+                                "Size",
+                                value: model.symbolOptionSelections.size,
+                                format: .number.rounded()
+                            )
                             Slider(value: $model.symbolOptionSelections.size, in: 20...60, step: 1)
                         }
                     }
diff --git a/Shared/Supporting Files/Views/AboutView.swift b/Shared/Supporting Files/Views/AboutView.swift
@@ -21,6 +21,10 @@ struct AboutView: View {
         Text("Copyright © 2022 - 2024 Esri. All Rights Reserved.")
     }
     
+    let arcGISVersion = Bundle.arcGIS.version.isEmpty
+    ? Bundle.arcGIS.shortVersion
+    : "\(Bundle.arcGIS.shortVersion) (\(Bundle.arcGIS.version))"
+    
     var body: some View {
         NavigationStack {
             List {
@@ -37,8 +41,8 @@ struct AboutView: View {
                     .frame(maxWidth: .infinity)
                 }
                 Section {
-                    VersionRow(title: "Version", version: Bundle.main.shortVersion)
-                    VersionRow(title: "SDK Version", version: Bundle.arcGIS.shortVersion, build: Bundle.arcGIS.version)
+                    LabeledContent("Version", value: Bundle.main.shortVersion)
+                    LabeledContent("SDK Version", value: arcGISVersion)
                 }
                 Section(header: Text("Powered By")) {
                     Link("ArcGIS Maps SDK for Swift Toolkit", destination: .toolkit)
@@ -67,35 +71,6 @@ struct AboutView: View {
     }
 }
 
-private struct VersionRow: View {
-    let title: String
-    let version: String
-    let build: String
-    
-    init(title: String, version: String, build: String = "") {
-        self.title = title
-        self.version = version
-        self.build = build
-    }
-    
-    var versionText: Text {
-        if !build.isEmpty {
-            return Text("\(version) (\(build))")
-        } else {
-            return Text("\(version)")
-        }
-    }
-    
-    var body: some View {
-        HStack {
-            Text(title)
-            Spacer()
-            versionText
-                .foregroundStyle(.secondary)
-        }
-    }
-}
-
 private extension Bundle {
     // The local package bundle ID is "ArcGIS"; the binary is "com.esri.ArcGIS".
     // By default, the project assumes the dependencies come from GitHub. If they

Original file line number	Diff line number	Diff line change
`@@ -58,12 +58,11 @@ extension ConfigureClustersView {`
`58`	`58`	`model.maxScale = Double(newMaxScale)`
`59`	`59`	`}`
`60`	`60`
`61`		`- HStack {`
`62`		`- Text("Current Map Scale")`
`63`		`- Spacer()`
`64`		`- Text(mapViewScale, format: .number.precision(.fractionLength(0)))`
`65`		`- .foregroundStyle(.secondary)`
`66`		`- }`
	`61`	`+ LabeledContent(`
	`62`	`+ "Current Map Scale",`
	`63`	`+ value: mapViewScale,`
	`64`	`+ format: .number.precision(.fractionLength(0))`
	`65`	`+ )`
`67`	`66`	`}`
`68`	`67`	`}`
`69`	`68`	`.navigationTitle("Clustering Settings")`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,10 @@ extension CreateLoadReportView {`
`32`	`32`	`.onTapGesture {`
`33`	`33`	`model.deletePhase(phase)`
`34`	`34`	`}`
`35`		`- Text("Phase: \(phase.name)")`
`36`		`- Spacer()`
`37`		`- Text(model.summaryForPhase(phase))`
	`35`	`+ LabeledContent(`
	`36`	`+ "Phase: \(phase.name)",`
	`37`	`+ value: model.summaryForPhase(phase)`
	`38`	`+ )`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`	`.onDelete { indexSet in`
Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,7 @@ extension SetVisibilityOfSubtypeSublayerView {`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`Section("Sublayer Minimum Scale") {`
`45`		`- HStack {`
`46`		`- Text("Minimum Scale")`
`47`		`- Spacer()`
`48`		`- Text(model.minimumScaleText)`
`49`		`- .foregroundStyle(.secondary)`
`50`		`- }`
	`45`	`+ LabeledContent("Minimum Scale", value: model.minimumScaleText)`
`51`	`46`	`HStack {`
`52`	`47`	`Button("Set Current to Minimum Scale") {`
`53`	`48`	`model.setMinimumScale()`