#Tabs Add IconSize parameter to MDCTabBarView

PiperOrigin-RevId: 620265575
material-components · Mar 29, 2024 · 48cd681 · 48cd681
1 parent 69f2f02
commit 48cd681
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 3 deletions.
diff --git a/components/Tabs/src/TabBarView/MDCTabBarView.h b/components/Tabs/src/TabBarView/MDCTabBarView.h
@@ -93,6 +93,15 @@ __attribute__((objc_subclassing_restricted)) @interface MDCTabBarView : UIScroll
  */
 @property(nonatomic) BOOL disableRippleBehavior;
 
+/**
+ The size of the icons within the tab bar.
+
+ This property is not respected unless a value other than @c CGSizeZero is used.
+
+ @note Defaults to CGSizeZero.
+ */
+@property(nonatomic, assign) CGSize itemIconSize;
+
 /**
  The default appearance to be used for all item badges.
 

diff --git a/components/Tabs/src/TabBarView/MDCTabBarView.m b/components/Tabs/src/TabBarView/MDCTabBarView.m
@@ -179,7 +179,7 @@ - (void)commonMDCTabBarViewInit {
   _itemBadgeAppearance = [[MDCBadgeAppearance alloc] init];
   _itemBadgeAppearance.textColor = UIColor.whiteColor;
   _itemBadgeAppearance.font = [UIFont systemFontOfSize:kBadgeFontSize];
-
+  _itemIconSize = CGSizeZero;
   _selectionIndicatorView = [[MDCTabBarViewIndicatorView alloc] init];
   _selectionIndicatorView.translatesAutoresizingMaskIntoConstraints = NO;
   _selectionIndicatorView.userInteractionEnabled = NO;
@@ -313,6 +313,7 @@ - (void)setItems:(NSArray<UITabBarItem *> *)items {
       mdcItemView.rippleTouchController.rippleView.rippleColor = self.rippleColor;
 
       mdcItemView.badgeAppearance = self.itemBadgeAppearance;
+      mdcItemView.iconSize = self.itemIconSize;
 
 #if defined(__IPHONE_13_0) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0)
       if (@available(iOS 13, *)) {
@@ -375,6 +376,16 @@ - (void)setItemBadgeAppearance:(MDCBadgeAppearance *)itemBadgeAppearance {
   }
 }
 
+- (void)setItemIconSize:(CGSize)itemIconSize {
+  _itemIconSize = itemIconSize;
+
+  for (UIView *itemView in self.itemViews) {
+    if ([itemView isKindOfClass:[MDCTabBarViewItemView class]]) {
+      ((MDCTabBarViewItemView *)itemView).iconSize = _itemIconSize;
+    }
+  }
+}
+
 - (void)setDisableRippleBehavior:(BOOL)disableRippleBehavior {
   _disableRippleBehavior = disableRippleBehavior;
 

diff --git a/components/Tabs/src/TabBarView/private/MDCTabBarViewItemView.h b/components/Tabs/src/TabBarView/private/MDCTabBarViewItemView.h
@@ -37,6 +37,15 @@ NS_ASSUME_NONNULL_BEGIN
 /** The image view to display the icon. */
 @property(nonatomic, strong, nonnull) UIImageView *iconImageView;
 
+/**
+ The size of the icon.
+
+ This property is not respected unless a value other than @c CGSizeZero is used.
+
+ @note Defaults to CGSizeZero.
+ */
+@property(nonatomic, assign) CGSize iconSize;
+
 /** The label to display the title. */
 @property(nonatomic, strong, nonnull) UILabel *titleLabel;
 

diff --git a/components/Tabs/src/TabBarView/private/MDCTabBarViewItemView.m b/components/Tabs/src/TabBarView/private/MDCTabBarViewItemView.m
@@ -111,6 +111,8 @@ - (void)commonMDCTabBarViewItemViewInit {
     [self addSubview:_badge];
     _badge.hidden = YES;
   }
+
+  _iconSize = CGSizeZero;
 }
 
 - (CGPoint)badgeCenterFromFrame:(CGRect)frame isRTL:(BOOL)isRTL {
@@ -200,7 +202,9 @@ - (CGRect)iconImageViewFrameForImageOnlyLayout {
       self.bounds, [self contentInsetsForItemViewStyle:MDCTabBarViewItemViewStyleImageOnly]);
 
   CGSize contentSize = CGSizeMake(CGRectGetWidth(contentFrame), CGRectGetHeight(contentFrame));
-  CGSize imageIntrinsicContentSize = self.iconImageView.intrinsicContentSize;
+  CGSize imageIntrinsicContentSize = CGSizeEqualToSize(self.iconSize, CGSizeZero)
+                                         ? self.iconImageView.intrinsicContentSize
+                                         : self.iconSize;
   CGSize imageFinalSize = CGSizeMake(MIN(contentSize.width, imageIntrinsicContentSize.width),
                                      MIN(contentSize.height, imageIntrinsicContentSize.height));
   CGRect imageViewFrame = CGRectMake(CGRectGetMidX(contentFrame) - (imageFinalSize.width / 2),
@@ -220,7 +224,9 @@ - (void)layoutTitleLabelFrame:(CGRect *)titleLabelFrame
       contentSize.width, contentSize.height - (kImageTitlePadding + labelSingleLineSize.height));
 
   // Position the image, limiting it so that at least 1 line of text remains.
-  CGSize imageIntrinsicContentSize = self.iconImageView.intrinsicContentSize;
+  CGSize imageIntrinsicContentSize = CGSizeEqualToSize(self.iconSize, CGSizeZero)
+                                         ? self.iconImageView.intrinsicContentSize
+                                         : self.iconSize;
   CGSize imageFinalSize =
       CGSizeMake(MIN(imageIntrinsicContentSize.width, availableIconSize.width),
                  MIN(imageIntrinsicContentSize.height, availableIconSize.height));
@@ -411,6 +417,12 @@ - (void)setBadgeColor:(nullable UIColor *)badgeColor {
   [self commitBadgeAppearance];
 }
 
+- (void)setIconSize:(CGSize)iconSize {
+  _iconSize = iconSize;
+
+  [self setNeedsLayout];
+}
+
 #pragma mark - UIAccessibility
 
 - (nullable NSString *)accessibilityLabel {