Merge branch 'develop' into doug/888_add_url_previews

This commit is contained in:
Doug
2021-09-07 17:51:31 +01:00
58 changed files with 659 additions and 217 deletions
@@ -134,7 +134,7 @@ const CGFloat kComposerContainerTrailingPadding = 12;
{
[self.attachMediaButton setImage:[UIImage imageNamed:@"upload_icon_dark"] forState:UIControlStateNormal];
}
else if (ThemeService.shared.theme.userInterfaceStyle == UIUserInterfaceStyleDark) {
else if (@available(iOS 12.0, *) && ThemeService.shared.theme.userInterfaceStyle == UIUserInterfaceStyleDark) {
[self.attachMediaButton setImage:[UIImage imageNamed:@"upload_icon_dark"] forState:UIControlStateNormal];
}