Merge branch 'main' into 139_ValidationSuccessScreen_DesignUpdate

secant/Assets.xcassets/Backgrounds/calloutBackupFailed.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "calloutBackupFailed.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "calloutBackupFailed@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

secant/Features/BackupFlow/Views/ValidationFailedView.swift

@@ -17,18 +17,18 @@ struct ValidationFailedView: View {
                 VStack {
                     VStack(alignment: .center, spacing: 20) {
                         Text("validationFailed.title")
-                            .font(.custom(FontFamily.Rubik.regular.name, size: 30))
+                            .titleText()
-                            .fixedSize(horizontal: false, vertical: true)
+                            .multilineTextAlignment(.center)
                     }
-                    .padding(.bottom, 20)
+                    .padding(.bottom, 40)
 
                     CircularFrame()
                         .backgroundImage(
-                            Asset.Assets.Backgrounds.callout1.image
+                            Asset.Assets.Backgrounds.calloutBackupFailed.image
                         )
                         .frame(
-                            width: proxy.size.width * 0.84,
+                            width: circularFrameUniformSize(width: proxy.size.width, height: proxy.size.height),
-                            height: proxy.size.width * 0.84
+                            height: circularFrameUniformSize(width: proxy.size.width, height: proxy.size.height)
                         )
                         .badgeIcon(.error)
 
@@ -37,12 +37,14 @@ struct ValidationFailedView: View {
                     VStack(alignment: .center, spacing: 40) {
                         VStack(alignment: .center, spacing: 20) {
                             Text("validationFailed.description")
-                                .bodyText()
+                                .paragraphText()
-                                .fixedSize(horizontal: false, vertical: true)
+                                .multilineTextAlignment(.center)
+                                .padding(.horizontal, 30)
 
                             Text("validationFailed.incorrectBackupDescription")
-                                .bodyText()
+                                .paragraphText()
-                                .fixedSize(horizontal: false, vertical: true)
+                                .multilineTextAlignment(.center)
+                                .padding(.horizontal, 20)
                         }
 
                         Button(
@@ -50,29 +52,64 @@ struct ValidationFailedView: View {
                             label: { Text("validationFailed.button.tryAgain") }
                         )
                         .activeButtonStyle
-                        .frame(height: 60)
+                        .frame(
+                            minWidth: 0,
+                            maxWidth: .infinity,
+                            minHeight: 64,
+                            maxHeight: .infinity,
+                            alignment: .center
+                        )
+                        .fixedSize(horizontal: false, vertical: true)
+                        .padding(.horizontal, 28)
                     }
-                    .padding()
                     
                     Spacer()
                 }
-                .frame(width: proxy.size.width)
                 .scrollableWhenScaledUp()
             }
             .padding()
-            .navigationBarBackButtonHidden(true)
+            .navigationBarHidden(true)
             .applyErredScreenBackground()
         }
+        .preferredColorScheme(.light)
+    }
+}
+
+/// Following computations are necessary to handle properly sizing and positioning of elements
+/// on different devices (apects). iPhone SE and iPhone 8 are similar aspect family devices
+/// while iPhone X, 11, etc are different family devices, capable to use more of the space.
+extension ValidationFailedView {
+    func circularFrameUniformSize(width: CGFloat, height: CGFloat) -> CGFloat {
+        var deviceMultiplier = 1.0
+        
+        if width > 0.0 {
+            let aspect = height / width
+            deviceMultiplier = 1.0 + (((aspect / 1.51) - 1.0) * 2.0)
+        }
+        
+        return width * 0.48 * deviceMultiplier
     }
 }
 
 struct ValidationFailed_Previews: PreviewProvider {
     static var previews: some View {
         Group {
+            NavigationView {
                 ValidationFailedView(store: .demo)
+            }
+            
+            ValidationFailedView(store: .demo)
+                .preferredColorScheme(.dark)
+            
+            ValidationFailedView(store: .demo)
+                .previewDevice(PreviewDevice(rawValue: "iPhone SE (2nd generation)"))
             
             ValidationFailedView(store: .demo)
                 .environment(\.sizeCategory, .accessibilityLarge)
+
+            ValidationFailedView(store: .demo)
+                .environment(\.sizeCategory, .accessibilityLarge)
+                .previewDevice(PreviewDevice(rawValue: "iPhone SE (2nd generation)"))
         }
     }
 }

secant/Generated/XCAssets+Generated.swift

@@ -31,6 +31,7 @@ internal enum Asset {
       internal static let callout4 = ImageAsset(name: "callout4")
       internal static let calloutBackupFlow1 = ImageAsset(name: "calloutBackupFlow1")
       internal static let calloutBackupSucceeded = ImageAsset(name: "calloutBackupSucceeded")
+      internal static let calloutBackupFailed = ImageAsset(name: "calloutBackupFailed")
     }
     internal enum Icons {
       internal static let list = ImageAsset(name: "list")