Fix 4593: Crash in Onboarding when accessibility is extremely large

brave · Dec 14, 2021 · f699f2a · f699f2a
1 parent 017a9fe
commit f699f2a
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/Client/Frontend/Browser/Onboarding/Welcome/WelcomeViewCallout.swift b/Client/Frontend/Browser/Onboarding/Welcome/WelcomeViewCallout.swift
@@ -263,14 +263,17 @@ class WelcomeViewCallout: UIView {
 
             detailsLabel.do {
                 $0.text = details
-                $0.font = .preferredFont(forTextStyle: .body)
+                // Calling .preferredFont(forTextStyle: .body) will freeze the app, and crash!
+                // It creates an Out of Memory exception if the font is not .scaledFont!
+                // This is an OS bug. Fortunately our extension creates a scaled font properly.
+                $0.font = .preferredFont(for: .body, weight: .regular)
                 $0.alpha = 1.0
                 $0.isHidden = false
             }
 
             primaryButton.do {
                 $0.setTitle(buttonTitle, for: .normal)
-                $0.titleLabel?.font = .preferredFont(forTextStyle: .body)
+                $0.titleLabel?.font = .preferredFont(for: .body, weight: .regular)
                 $0.addAction(UIAction(identifier: .init(rawValue: "primary.action"), handler: { _ in
                     action()
                 }), for: .touchUpInside)
@@ -309,14 +312,14 @@ class WelcomeViewCallout: UIView {
 
             detailsLabel.do {
                 $0.text = info.details
-                $0.font = .preferredFont(forTextStyle: .body)
+                $0.font = .preferredFont(for: .body, weight: .regular)
                 $0.alpha = 1.0
                 $0.isHidden = false
             }
 
             primaryButton.do {
                 $0.setTitle(info.primaryButtonTitle, for: .normal)
-                $0.titleLabel?.font = .preferredFont(forTextStyle: .body)
+                $0.titleLabel?.font = .preferredFont(for: .body, weight: .regular)
                 $0.addAction(UIAction(identifier: .init(rawValue: "primary.action"), handler: { _ in
                     info.primaryAction()
                 }), for: .touchUpInside)
@@ -362,14 +365,14 @@ class WelcomeViewCallout: UIView {
 
             detailsLabel.do {
                 $0.text = info.details
-                $0.font = .preferredFont(forTextStyle: .body)
+                $0.font = .preferredFont(for: .body, weight: .regular)
                 $0.alpha = 1.0
                 $0.isHidden = false
             }
 
             primaryButton.do {
                 $0.setTitle(info.primaryButtonTitle, for: .normal)
-                $0.titleLabel?.font = .preferredFont(forTextStyle: .body)
+                $0.titleLabel?.font = .preferredFont(for: .body, weight: .regular)
                 $0.addAction(UIAction(identifier: .init(rawValue: "primary.action"), handler: { _ in
                     info.primaryAction()
                 }), for: .touchUpInside)
@@ -380,7 +383,7 @@ class WelcomeViewCallout: UIView {
             secondaryLabel.do {
                 $0.text = Strings.Callout.defaultBrowserCalloutSecondaryButtonDescription
                 $0.textAlignment = .right
-                $0.font = .preferredFont(forTextStyle: .body)
+                $0.font = .preferredFont(for: .body, weight: .regular)
                 $0.alpha = 1.0
                 $0.isHidden = false
                 $0.numberOfLines = 1
@@ -417,7 +420,7 @@ class WelcomeViewCallout: UIView {
 
             detailsLabel.do {
                 $0.text = "\(details)\n\(moreDetails)"
-                $0.font = .preferredFont(forTextStyle: .body)
+                $0.font = .preferredFont(for: .body, weight: .regular)
                 $0.alpha = 1.0
                 $0.isHidden = false
             }