forked from wix/react-native-navigation
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix iOS 15 bars appearance (wix#7270)
Following wix#7266 and especially [my comment there](wix#7266 (comment)), I'm opening this PR to provide a quick fix to people experiencing issues when building RNN using Xcode 13. This should be considered a fix PR rather than a feature PR, as what it's doing is basically duplicating the already set `standardAppearance` to a `scrollEdgeAppearance`. What this means is that the bars will have the same visual aspect whether they're displayed alongside the edge of a scroll view. In a future, more elaborate PR, we could imagine a way to be able to provide `scrollEdgeAppearance` values from JS for more control over the native bars. Fixes wix#7266 Fixes wix#7268 Co-authored-by: Yogev Ben David <yogev132@gmail.com>
- Loading branch information
Showing
15 changed files
with
137 additions
and
56 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,21 @@ | ||
#import "BottomTabPresenterCreator.h" | ||
#import "BottomTabAppearancePresenter.h" | ||
#import "RNNTabBarItemCreator.h" | ||
#import "TabBarItemAppearanceCreator.h" | ||
#import "TabBarItemIOS15Creator.h" | ||
|
||
@implementation BottomTabPresenterCreator | ||
|
||
+ (BottomTabPresenter *)createWithDefaultOptions:(RNNNavigationOptions *)defaultOptions { | ||
if (@available(iOS 13.0, *)) { | ||
return [[BottomTabAppearancePresenter alloc] initWithDefaultOptions:defaultOptions]; | ||
RNNTabBarItemCreator *tabCreator; | ||
if (@available(iOS 15.0, *)) { | ||
tabCreator = [TabBarItemIOS15Creator new]; | ||
} else if (@available(iOS 13.0, *)) { | ||
tabCreator = [TabBarItemAppearanceCreator new]; | ||
} else { | ||
return [[BottomTabPresenter alloc] initWithDefaultOptions:defaultOptions]; | ||
tabCreator = [RNNTabBarItemCreator new]; | ||
} | ||
|
||
return [[BottomTabPresenter alloc] initWithDefaultOptions:defaultOptions tabCreator:tabCreator]; | ||
} | ||
|
||
@end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
#import "TabBarItemAppearanceCreator.h" | ||
|
||
API_AVAILABLE(ios(15.0)) | ||
@interface TabBarItemIOS15Creator : TabBarItemAppearanceCreator | ||
|
||
@end |
Oops, something went wrong.