@@ -75,27 +75,29 @@ struct JetpackInstallStepsView: View {
7575 }
7676
7777 // Install steps
78- ForEach ( JetpackInstallStep . allCases) { step in
79- HStack ( spacing: Constants . stepItemSpacing) {
80- if step == currentStep, step != . done {
81- ActivityIndicator ( isAnimating: . constant( true ) , style: . medium)
82- } else if step > currentStep {
83- Image ( uiImage: . checkEmptyCircleImage)
84- . resizable ( )
85- . frame ( width: Constants . stepImageSize * scale, height: Constants . stepImageSize * scale)
86- } else {
87- Image ( uiImage: . checkCircleImage)
88- . resizable ( )
89- . frame ( width: Constants . stepImageSize * scale, height: Constants . stepImageSize * scale)
90- }
91-
92- Text ( step. title)
93- . font ( . body)
94- . if ( step <= currentStep) {
95- $0. bold ( )
78+ VStack ( alignment: . leading, spacing: Constants . stepItemsVerticalSpacing) {
79+ ForEach ( JetpackInstallStep . allCases) { step in
80+ HStack ( spacing: Constants . stepItemHorizontalSpacing) {
81+ if step == currentStep, step != . done {
82+ ActivityIndicator ( isAnimating: . constant( true ) , style: . medium)
83+ } else if step > currentStep {
84+ Image ( uiImage: . checkEmptyCircleImage)
85+ . resizable ( )
86+ . frame ( width: Constants . stepImageSize * scale, height: Constants . stepImageSize * scale)
87+ } else {
88+ Image ( uiImage: . checkCircleImage)
89+ . resizable ( )
90+ . frame ( width: Constants . stepImageSize * scale, height: Constants . stepImageSize * scale)
9691 }
97- . foregroundColor ( Color ( . text) )
98- . opacity ( step <= currentStep ? 1 : 0.5 )
92+
93+ Text ( step. title)
94+ . font ( . body)
95+ . if ( step <= currentStep) {
96+ $0. bold ( )
97+ }
98+ . foregroundColor ( Color ( . text) )
99+ . opacity ( step <= currentStep ? 1 : 0.5 )
100+ }
99101 }
100102 }
101103 }
@@ -108,8 +110,7 @@ struct JetpackInstallStepsView: View {
108110 Button ( Localization . doneButton, action: dismissAction)
109111 . buttonStyle ( PrimaryButtonStyle ( ) )
110112 . fixedSize ( horizontal: false , vertical: true )
111- . padding ( . horizontal, Constants . actionButtonMargin)
112- . padding ( . bottom, Constants . actionButtonMargin)
113+ . padding ( Constants . actionButtonMargin)
113114 }
114115 }
115116}
@@ -124,7 +125,8 @@ private extension JetpackInstallStepsView {
124125 static let connectionIconSize : CGFloat = 10
125126 static let textSpacing : CGFloat = 12
126127 static let actionButtonMargin : CGFloat = 16
127- static let stepItemSpacing : CGFloat = 24
128+ static let stepItemHorizontalSpacing : CGFloat = 24
129+ static let stepItemsVerticalSpacing : CGFloat = 20
128130 static let stepImageSize : CGFloat = 24
129131 }
130132
0 commit comments