diff --git a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift index 74f4038f8ecd..8e5336fa6f94 100644 --- a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift +++ b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift @@ -11,6 +11,7 @@ enum FeatureFlag: Int, CaseIterable { case commentModerationUpdate case compliancePopover case googleDomainsCard + case newTabIcons /// Returns a boolean indicating if the feature is enabled var enabled: Bool { @@ -37,6 +38,8 @@ enum FeatureFlag: Int, CaseIterable { return true case .googleDomainsCard: return false + case .newTabIcons: + return BuildConfiguration.current == .localDeveloper } } @@ -77,6 +80,8 @@ extension FeatureFlag { return "Compliance Popover" case .googleDomainsCard: return "Google Domains Promotional Card" + case .newTabIcons: + return "New Tab Icons" } } } diff --git a/WordPress/Classes/ViewRelated/System/Coordinators/MySitesCoordinator.swift b/WordPress/Classes/ViewRelated/System/Coordinators/MySitesCoordinator.swift index d8a6da4360bc..1aa129f7ce44 100644 --- a/WordPress/Classes/ViewRelated/System/Coordinators/MySitesCoordinator.swift +++ b/WordPress/Classes/ViewRelated/System/Coordinators/MySitesCoordinator.swift @@ -69,9 +69,14 @@ class MySitesCoordinator: NSObject { navigationController.restorationIdentifier = MySitesCoordinator.navigationControllerRestorationID navigationController.navigationBar.isTranslucent = false - let tabBarImage = AppStyleGuide.mySiteTabIcon - navigationController.tabBarItem.image = tabBarImage - navigationController.tabBarItem.selectedImage = tabBarImage + if FeatureFlag.newTabIcons.enabled { + navigationController.tabBarItem.image = UIImage(named: "tab-bar-home-unselected")?.withRenderingMode(.alwaysOriginal) + navigationController.tabBarItem.selectedImage = UIImage(named: "tab-bar-home-selected") + } else { + let tabBarImage = AppStyleGuide.mySiteTabIcon + navigationController.tabBarItem.image = tabBarImage + navigationController.tabBarItem.selectedImage = tabBarImage + } navigationController.tabBarItem.accessibilityLabel = NSLocalizedString("My Site", comment: "The accessibility value of the my site tab.") navigationController.tabBarItem.accessibilityIdentifier = "mySitesTabButton" navigationController.tabBarItem.title = NSLocalizedString("My Site", comment: "The accessibility value of the my site tab.") diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController+MeTab.swift b/WordPress/Classes/ViewRelated/System/WPTabBarController+MeTab.swift index e803229578bd..82fdacb20be1 100644 --- a/WordPress/Classes/ViewRelated/System/WPTabBarController+MeTab.swift +++ b/WordPress/Classes/ViewRelated/System/WPTabBarController+MeTab.swift @@ -14,9 +14,13 @@ extension WPTabBarController { NotificationCenter.default.addObserver(self, selector: #selector(accountDidChange), name: .WPAccountEmailAndDefaultBlogUpdated, object: nil) } - @objc func configureMeTabImage(placeholderImage: UIImage) { - meNavigationController?.tabBarItem.image = placeholderImage - meNavigationController?.tabBarItem.selectedImage = placeholderImage + @objc func configureMeTabImage(placeholderImage: UIImage?) { + configureMeTabImage(unselectedPlaceholderImage: placeholderImage, selectedPlaceholderImage: placeholderImage) + } + + @objc func configureMeTabImage(unselectedPlaceholderImage: UIImage?, selectedPlaceholderImage: UIImage?) { + meNavigationController?.tabBarItem.image = unselectedPlaceholderImage + meNavigationController?.tabBarItem.selectedImage = selectedPlaceholderImage guard let account = defaultAccount(), let email = account.email else { @@ -45,14 +49,20 @@ extension WPTabBarController { } @objc private func accountDidChange() { - configureMeTabImage(placeholderImage: UIImage(named: "icon-tab-me") ?? UIImage()) + guard FeatureFlag.newTabIcons.enabled else { + configureMeTabImage(placeholderImage: UIImage(named: "icon-tab-me")) + return + } + + configureMeTabImage(unselectedPlaceholderImage: UIImage(named: "tab-bar-me-unselected"), + selectedPlaceholderImage: UIImage(named: "tab-bar-me-selected")) } } extension UITabBarItem { func configureGravatarImage(_ image: UIImage) { - let gravatarIcon = image.gravatarIcon(size: 28.0) + let gravatarIcon = image.gravatarIcon(size: 26.0) self.image = gravatarIcon?.blackAndWhite?.withAlpha(0.36) self.selectedImage = gravatarIcon } diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController+Swift.swift b/WordPress/Classes/ViewRelated/System/WPTabBarController+Swift.swift index 0ab38e7acbff..a6becc8df5a2 100644 --- a/WordPress/Classes/ViewRelated/System/WPTabBarController+Swift.swift +++ b/WordPress/Classes/ViewRelated/System/WPTabBarController+Swift.swift @@ -106,4 +106,18 @@ extension WPTabBarController { return selectedViewController.supportedInterfaceOrientations } + + @objc func animateSelectedItem(_ item: UITabBarItem, for tabBar: UITabBar) { + + guard let index = tabBar.items?.firstIndex(of: item), tabBar.subviews.count > index + 1, + let imageView = tabBar.subviews[index + 1].subviews.last as? UIImageView else { + return + } + + let bounceAnimation = CAKeyframeAnimation(keyPath: "transform.scale") + bounceAnimation.values = [0.8, 1.02, 1.0] + bounceAnimation.duration = TimeInterval(0.2) + bounceAnimation.calculationMode = CAAnimationCalculationMode.cubic + imageView.layer.add(bounceAnimation, forKey: nil) + } } diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController.m b/WordPress/Classes/ViewRelated/System/WPTabBarController.m index 390af0d56201..cf722e609c93 100644 --- a/WordPress/Classes/ViewRelated/System/WPTabBarController.m +++ b/WordPress/Classes/ViewRelated/System/WPTabBarController.m @@ -181,9 +181,14 @@ - (UINavigationController *)readerNavigationController _readerNavigationController.navigationBar.translucent = NO; _readerNavigationController.view.backgroundColor = [UIColor murielBasicBackground]; - UIImage *readerTabBarImage = [UIImage imageNamed:@"icon-tab-reader"]; - _readerNavigationController.tabBarItem.image = readerTabBarImage; - _readerNavigationController.tabBarItem.selectedImage = readerTabBarImage; + if ([Feature enabled:FeatureFlagNewTabIcons]) { + _readerNavigationController.tabBarItem.image = [[UIImage imageNamed:@"tab-bar-reader-unselected"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; + _readerNavigationController.tabBarItem.selectedImage = [UIImage imageNamed:@"tab-bar-reader-selected"]; + } else { + UIImage *readerTabBarImage = [UIImage imageNamed:@"icon-tab-reader"]; + _readerNavigationController.tabBarItem.image = readerTabBarImage; + _readerNavigationController.tabBarItem.selectedImage = readerTabBarImage; + } _readerNavigationController.restorationIdentifier = WPReaderNavigationRestorationID; _readerNavigationController.tabBarItem.accessibilityIdentifier = @"readerTabButton"; _readerNavigationController.tabBarItem.title = NSLocalizedString(@"Reader", @"The accessibility value of the Reader tab."); @@ -207,11 +212,19 @@ - (UINavigationController *)notificationsNavigationController } _notificationsNavigationController = [[UINavigationController alloc] initWithRootViewController:rootViewController]; _notificationsNavigationController.navigationBar.translucent = NO; - self.notificationsTabBarImage = [UIImage imageNamed:@"icon-tab-notifications"]; - NSString *unreadImageName = [AppConfiguration isJetpack] ? @"icon-tab-notifications-unread-jetpack" : @"icon-tab-notifications-unread"; - self.notificationsTabBarImageUnread = [[UIImage imageNamed:unreadImageName] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; - _notificationsNavigationController.tabBarItem.image = self.notificationsTabBarImage; - _notificationsNavigationController.tabBarItem.selectedImage = self.notificationsTabBarImage; + if ([Feature enabled:FeatureFlagNewTabIcons]) { + self.notificationsTabBarImage = [[UIImage imageNamed:@"tab-bar-notifications-unselected"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; + NSString *unreadImageName = [AppConfiguration isJetpack] ? @"tab-bar-notifications-unread-jp" : @"tab-bar-notifications-unread-wp"; + self.notificationsTabBarImageUnread = [[UIImage imageNamed:unreadImageName] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; + _notificationsNavigationController.tabBarItem.image = self.notificationsTabBarImage; + _notificationsNavigationController.tabBarItem.selectedImage = [UIImage imageNamed:@"tab-bar-notifications-selected"]; + } else { + self.notificationsTabBarImage = [UIImage imageNamed:@"icon-tab-notifications"]; + NSString *unreadImageName = [AppConfiguration isJetpack] ? @"icon-tab-notifications-unread-jetpack" : @"icon-tab-notifications-unread"; + self.notificationsTabBarImageUnread = [[UIImage imageNamed:unreadImageName] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; + _notificationsNavigationController.tabBarItem.image = self.notificationsTabBarImage; + _notificationsNavigationController.tabBarItem.selectedImage = self.notificationsTabBarImage; + } _notificationsNavigationController.restorationIdentifier = WPNotificationsNavigationRestorationID; _notificationsNavigationController.tabBarItem.accessibilityIdentifier = @"notificationsTabButton"; _notificationsNavigationController.tabBarItem.accessibilityLabel = NSLocalizedString(@"Notifications", @"Notifications tab bar item accessibility label"); @@ -224,7 +237,12 @@ - (UINavigationController *)meNavigationController { if (!_meNavigationController) { _meNavigationController = [[UINavigationController alloc] initWithRootViewController:self.meViewController]; - [self configureMeTabImageWithPlaceholderImage:[UIImage imageNamed:@"icon-tab-me"]]; + if ([Feature enabled:FeatureFlagNewTabIcons]) { + [self configureMeTabImageWithUnselectedPlaceholderImage:[[UIImage imageNamed:@"tab-bar-me-unselected"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] + selectedPlaceholderImage:[UIImage imageNamed:@"tab-bar-me-selected"]]; + } else { + [self configureMeTabImageWithPlaceholderImage:[UIImage imageNamed:@"icon-tab-me"]]; + } _meNavigationController.restorationIdentifier = WPMeNavigationRestorationID; _meNavigationController.tabBarItem.accessibilityLabel = NSLocalizedString(@"Me", @"The accessibility value of the me tab."); _meNavigationController.tabBarItem.accessibilityIdentifier = @"meTabButton"; @@ -472,6 +490,16 @@ - (void)showNotificationsTabForNoteWithID:(NSString *)notificationID [self.notificationsViewController showDetailsForNotificationWithID:notificationID]; } +#pragma mark - UITabBarDelegate + +- (void)tabBar:(UITabBar *)tabBar didSelectItem:(UITabBarItem *)item +{ + UIImpactFeedbackGenerator *generator = [[UIImpactFeedbackGenerator alloc] initWithStyle:UIImpactFeedbackStyleMedium]; + [generator impactOccurred]; + + [self animateSelectedItem:item for:tabBar]; +} + #pragma mark - Zendesk Notifications - (void)updateIconIndicators:(NSNotification *)notification diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/Contents.json new file mode 100644 index 000000000000..73c00596a7fc --- /dev/null +++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-selected.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-selected.imageset/Contents.json new file mode 100644 index 000000000000..389937d2e482 --- /dev/null +++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-selected.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "tab-bar-home-selected.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-selected.imageset/tab-bar-home-selected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-selected.imageset/tab-bar-home-selected.pdf new file mode 100644 index 000000000000..cf3214b74428 Binary files /dev/null and b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-selected.imageset/tab-bar-home-selected.pdf differ diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/Contents.json new file mode 100644 index 000000000000..406a1bf929c8 --- /dev/null +++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "tab-bar-home-unselected.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "tab-bar-home-unselected-dark.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/tab-bar-home-unselected-dark.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/tab-bar-home-unselected-dark.pdf new file mode 100644 index 000000000000..7982e2fb7e8b Binary files /dev/null and b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/tab-bar-home-unselected-dark.pdf differ diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/tab-bar-home-unselected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/tab-bar-home-unselected.pdf new file mode 100644 index 000000000000..a04417928e26 Binary files /dev/null and b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/tab-bar-home-unselected.pdf differ diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-selected.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-selected.imageset/Contents.json new file mode 100644 index 000000000000..fd311e91eeb0 --- /dev/null +++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-selected.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "tab-bar-me-selected.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-selected.imageset/tab-bar-me-selected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-selected.imageset/tab-bar-me-selected.pdf new file mode 100644 index 000000000000..a8f6dcf410a0 Binary files /dev/null and b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-selected.imageset/tab-bar-me-selected.pdf differ diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/Contents.json new file mode 100644 index 000000000000..506d3351507e --- /dev/null +++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "tab-bar-me-unselected.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "tab-bar-me-unselected-dark.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/tab-bar-me-unselected-dark.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/tab-bar-me-unselected-dark.pdf new file mode 100644 index 000000000000..03957cbba0e4 Binary files /dev/null and b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/tab-bar-me-unselected-dark.pdf differ diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/tab-bar-me-unselected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/tab-bar-me-unselected.pdf new file mode 100644 index 000000000000..7f6272ef5bf8 Binary files /dev/null and b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/tab-bar-me-unselected.pdf differ diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-selected.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-selected.imageset/Contents.json new file mode 100644 index 000000000000..a62a87b53879 --- /dev/null +++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-selected.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "tab-bar-notifications-selected.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-selected.imageset/tab-bar-notifications-selected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-selected.imageset/tab-bar-notifications-selected.pdf new file mode 100644 index 000000000000..222f8140415c Binary files /dev/null and b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-selected.imageset/tab-bar-notifications-selected.pdf differ diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/Contents.json new file mode 100644 index 000000000000..f9f8ed8b37b1 --- /dev/null +++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "tab-bar-notifications-unread-jp.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "tab-bar-notifications-unread-jp-dark.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/tab-bar-notifications-unread-jp-dark.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/tab-bar-notifications-unread-jp-dark.pdf new file mode 100644 index 000000000000..21cd3e937b19 Binary files /dev/null and b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/tab-bar-notifications-unread-jp-dark.pdf differ diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/tab-bar-notifications-unread-jp.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/tab-bar-notifications-unread-jp.pdf new file mode 100644 index 000000000000..2c0cdbc01368 Binary files /dev/null and b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/tab-bar-notifications-unread-jp.pdf differ diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/Contents.json new file mode 100644 index 000000000000..28b70218b344 --- /dev/null +++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "tab-bar-notifications-unread-wp.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "tab-bar-notifications-unread-wp-dark.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/tab-bar-notifications-unread-wp-dark.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/tab-bar-notifications-unread-wp-dark.pdf new file mode 100644 index 000000000000..f830b4afc8bd Binary files /dev/null and b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/tab-bar-notifications-unread-wp-dark.pdf differ diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/tab-bar-notifications-unread-wp.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/tab-bar-notifications-unread-wp.pdf new file mode 100644 index 000000000000..3d4ff59f51af Binary files /dev/null and b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/tab-bar-notifications-unread-wp.pdf differ diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/Contents.json new file mode 100644 index 000000000000..98462678c016 --- /dev/null +++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "tab-bar-notifications-unselected.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "tab-bar-notifications-unselected-dark.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/tab-bar-notifications-unselected-dark.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/tab-bar-notifications-unselected-dark.pdf new file mode 100644 index 000000000000..64520deb2378 Binary files /dev/null and b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/tab-bar-notifications-unselected-dark.pdf differ diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/tab-bar-notifications-unselected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/tab-bar-notifications-unselected.pdf new file mode 100644 index 000000000000..3663a2fa0a02 Binary files /dev/null and b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/tab-bar-notifications-unselected.pdf differ diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-selected.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-selected.imageset/Contents.json new file mode 100644 index 000000000000..aedb797c23ed --- /dev/null +++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-selected.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "tab-bar-reader-selected.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-selected.imageset/tab-bar-reader-selected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-selected.imageset/tab-bar-reader-selected.pdf new file mode 100644 index 000000000000..339c6d26aa43 Binary files /dev/null and b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-selected.imageset/tab-bar-reader-selected.pdf differ diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/Contents.json new file mode 100644 index 000000000000..44332fb41316 --- /dev/null +++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "tab-bar-reader-unselected.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "tab-bar-reader-unselected-dark.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/tab-bar-reader-unselected-dark.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/tab-bar-reader-unselected-dark.pdf new file mode 100644 index 000000000000..ad4e40803f65 Binary files /dev/null and b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/tab-bar-reader-unselected-dark.pdf differ diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/tab-bar-reader-unselected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/tab-bar-reader-unselected.pdf new file mode 100644 index 000000000000..f8f89ece67cf Binary files /dev/null and b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/tab-bar-reader-unselected.pdf differ