From 62e9faefd5f12f5fe6dc88a076ddf7cafda75ee5 Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Thu, 6 Jul 2023 03:19:58 -0700 Subject: [PATCH] Remove deprecated uses of UIActivityIndicatorViewStyle (#38208) Summary: Super simple change to replace some deprecated ENUM values with the correct one, now that we're on iOS 13.0+. From `UIActivityIndicator.h`: ``` typedef NS_ENUM(NSInteger, UIActivityIndicatorViewStyle) { UIActivityIndicatorViewStyleMedium API_AVAILABLE(ios(13.0), tvos(13.0)) = 100, UIActivityIndicatorViewStyleLarge API_AVAILABLE(ios(13.0), tvos(13.0)) = 101, UIActivityIndicatorViewStyleWhiteLarge API_DEPRECATED_WITH_REPLACEMENT("UIActivityIndicatorViewStyleLarge", ios(2.0, 13.0), tvos(9.0, 13.0)) = 0, UIActivityIndicatorViewStyleWhite API_DEPRECATED_WITH_REPLACEMENT("UIActivityIndicatorViewStyleMedium", ios(2.0, 13.0), tvos(9.0, 13.0)) = 1, UIActivityIndicatorViewStyleGray API_DEPRECATED_WITH_REPLACEMENT("UIActivityIndicatorViewStyleMedium", ios(2.0, 13.0)) API_UNAVAILABLE(tvos) = 2, }; ``` ## Changelog: [IOS] [CHANGED] - Remove deprecated uses of UIActivityIndicatorViewStyle Pull Request resolved: https://github.com/facebook/react-native/pull/38208 Test Plan: CI should pass Reviewed By: cipolleschi Differential Revision: D47254035 Pulled By: rshest fbshipit-source-id: 6d3270899e8d52611d91c777f324c3c6f0c520be --- .../RCTActivityIndicatorViewComponentView.mm | 4 ++-- .../React/Views/RCTActivityIndicatorViewManager.m | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm index eb0d5682f5d..c570f329f8d 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm @@ -21,9 +21,9 @@ static UIActivityIndicatorViewStyle convertActivityIndicatorViewStyle(const Acti { switch (size) { case ActivityIndicatorViewSize::Small: - return UIActivityIndicatorViewStyleWhite; + return UIActivityIndicatorViewStyleMedium; case ActivityIndicatorViewSize::Large: - return UIActivityIndicatorViewStyleWhiteLarge; + return UIActivityIndicatorViewStyleLarge; } } diff --git a/packages/react-native/React/Views/RCTActivityIndicatorViewManager.m b/packages/react-native/React/Views/RCTActivityIndicatorViewManager.m index 10ef8ae7630..74c71c453b7 100644 --- a/packages/react-native/React/Views/RCTActivityIndicatorViewManager.m +++ b/packages/react-native/React/Views/RCTActivityIndicatorViewManager.m @@ -18,10 +18,10 @@ RCT_ENUM_CONVERTER( UIActivityIndicatorViewStyle, (@{ - @"large" : @(UIActivityIndicatorViewStyleWhiteLarge), - @"small" : @(UIActivityIndicatorViewStyleWhite), + @"large" : @(UIActivityIndicatorViewStyleLarge), + @"small" : @(UIActivityIndicatorViewStyleMedium), }), - UIActivityIndicatorViewStyleWhiteLarge, + UIActivityIndicatorViewStyleLarge, integerValue) @end