From 2e38bfc45223f78fd74e0090be2c83fc05ac7dc1 Mon Sep 17 00:00:00 2001 From: Yuki Tokuhiro Date: Tue, 20 Aug 2019 16:36:46 -0700 Subject: [PATCH 1/2] Remove preferredStatusBarStyle from STPThreeDSUICustomization --- Stripe/Payments/STPThreeDSUICustomization.m | 8 -------- .../PublicHeaders/STPThreeDSNavigationBarCustomization.h | 4 ++++ Stripe/PublicHeaders/STPThreeDSUICustomization.h | 7 ------- Tests/Tests/STPThreeDSUICustomizationTest.m | 3 --- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/Stripe/Payments/STPThreeDSUICustomization.m b/Stripe/Payments/STPThreeDSUICustomization.m index e7c23bec0b2..2955cd92118 100644 --- a/Stripe/Payments/STPThreeDSUICustomization.m +++ b/Stripe/Payments/STPThreeDSUICustomization.m @@ -120,12 +120,4 @@ - (void)setBlurStyle:(UIBlurEffectStyle)blurStyle { self.uiCustomization.blurStyle = blurStyle; } -- (void)setPreferredStatusBarStyle:(UIStatusBarStyle)preferredStatusBarStyle { - self.uiCustomization.preferredStatusBarStyle = preferredStatusBarStyle; -} - -- (UIStatusBarStyle)preferredStatusBarStyle { - return self.uiCustomization.preferredStatusBarStyle; -} - @end diff --git a/Stripe/PublicHeaders/STPThreeDSNavigationBarCustomization.h b/Stripe/PublicHeaders/STPThreeDSNavigationBarCustomization.h index 694dddb990e..eb7280b4531 100644 --- a/Stripe/PublicHeaders/STPThreeDSNavigationBarCustomization.h +++ b/Stripe/PublicHeaders/STPThreeDSNavigationBarCustomization.h @@ -29,6 +29,10 @@ NS_ASSUME_NONNULL_BEGIN /** The navigation bar style. Defaults to UIBarStyleDefault. + + @note This property controls the `UIStatusBarStyle`. Set this to `UIBarStyleBlack` + to change the `statusBarStyle` to `UIStatusBarStyleLightContent` - even if you also set + `barTintColor` to change the actual color of the navigation bar. */ @property (nonatomic) UIBarStyle barStyle; diff --git a/Stripe/PublicHeaders/STPThreeDSUICustomization.h b/Stripe/PublicHeaders/STPThreeDSUICustomization.h index f89ca4018e0..0b8032215aa 100644 --- a/Stripe/PublicHeaders/STPThreeDSUICustomization.h +++ b/Stripe/PublicHeaders/STPThreeDSUICustomization.h @@ -84,13 +84,6 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nonatomic, strong) STPThreeDSSelectionCustomization *selectionCustomization; -/** - The preferred status bar style for all UIViewControllers displayed during 3D Secure authentication. - - Defaults to `UIStatusBarStyleDefault`. - */ -@property (nonatomic) UIStatusBarStyle preferredStatusBarStyle; - #pragma mark - Progress View /** diff --git a/Tests/Tests/STPThreeDSUICustomizationTest.m b/Tests/Tests/STPThreeDSUICustomizationTest.m index e4d6908b178..98856f54735 100644 --- a/Tests/Tests/STPThreeDSUICustomizationTest.m +++ b/Tests/Tests/STPThreeDSUICustomizationTest.m @@ -90,9 +90,6 @@ - (void)testPropertiesPassedThrough { XCTAssertEqual(UIBlurEffectStyleDark, customization.blurStyle); XCTAssertEqual(customization.blurStyle, customization.uiCustomization.blurStyle); - - XCTAssertEqual(UIStatusBarStyleLightContent, customization.preferredStatusBarStyle); - XCTAssertEqual(customization.preferredStatusBarStyle, customization.uiCustomization.preferredStatusBarStyle); } @end From b5acb538cb33c75b424dc2553e4049a16f7c8d38 Mon Sep 17 00:00:00 2001 From: Yuki Tokuhiro Date: Wed, 21 Aug 2019 15:25:53 -0700 Subject: [PATCH 2/2] Fix test --- Tests/Tests/STPThreeDSUICustomizationTest.m | 1 - 1 file changed, 1 deletion(-) diff --git a/Tests/Tests/STPThreeDSUICustomizationTest.m b/Tests/Tests/STPThreeDSUICustomizationTest.m index 98856f54735..8074e4999a6 100644 --- a/Tests/Tests/STPThreeDSUICustomizationTest.m +++ b/Tests/Tests/STPThreeDSUICustomizationTest.m @@ -80,7 +80,6 @@ - (void)testPropertiesPassedThrough { customization.backgroundColor = UIColor.redColor; customization.activityIndicatorViewStyle = UIActivityIndicatorViewStyleWhiteLarge; customization.blurStyle = UIBlurEffectStyleDark; - customization.preferredStatusBarStyle = UIStatusBarStyleLightContent; XCTAssertEqual(UIColor.redColor, customization.backgroundColor); XCTAssertEqual(customization.backgroundColor, customization.uiCustomization.backgroundColor);