Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: ListItem.showsDisclosureIndicator for iOS >= 14.0 #142

Merged
merged 1 commit into from
Oct 13, 2023
Merged

fix: ListItem.showsDisclosureIndicator for iOS >= 14.0 #142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions packages/react-native-carplay/ios/RNCarPlay.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,14 +963,20 @@ - (void) applyConfigForMapTemplate:(CPMapTemplate*)mapTemplate templateId:(NSStr
NSMutableArray *_items = [NSMutableArray array];
int index = startIndex;
for (NSDictionary *item in items) {
BOOL _showsDisclosureIndicator = [item objectForKey:@"showsDisclosureIndicator"];
BOOL _showsDisclosureIndicator = [[item objectForKey:@"showsDisclosureIndicator"] isEqualToNumber:[NSNumber numberWithInt:1]];
NSString *_detailText = [item objectForKey:@"detailText"];
NSString *_text = [item objectForKey:@"text"];
UIImage *_image = [RCTConvert UIImage:[item objectForKey:@"image"]];
if (item[@"imgUrl"]) {
_image = [[UIImage alloc] initWithData:[NSData dataWithContentsOfURL:[NSURL URLWithString:[RCTConvert NSString:item[@"imgUrl"]]]]];
}
CPListItem *_item = [[CPListItem alloc] initWithText:_text detailText:_detailText image:_image showsDisclosureIndicator:_showsDisclosureIndicator];
CPListItem *_item;
if (@available(iOS 14.0, *)) {
CPListItemAccessoryType accessoryType = _showsDisclosureIndicator ? CPListItemAccessoryTypeDisclosureIndicator : CPListItemAccessoryTypeNone;
_item = [[CPListItem alloc] initWithText:_text detailText:_detailText image:_image accessoryImage:nil accessoryType:accessoryType];
} else {
_item = [[CPListItem alloc] initWithText:_text detailText:_detailText image:_image showsDisclosureIndicator:_showsDisclosureIndicator];
}
if ([item objectForKey:@"isPlaying"]) {
[_item setPlaying:[RCTConvert BOOL:[item objectForKey:@"isPlaying"]]];
}
Expand Down