#Buttons Update image size to always be square

PiperOrigin-RevId: 757920651

Author: codeman7

components/M3CButton/src/M3CButton.h

@@ -76,10 +76,13 @@ and edge insets. This method is available in iOS 15.0 and later.
 
  @seealso @c setFont:forSize:
 
- @param symbolFont The font to be applied to the button.
+ @param symbolSize The initial size of the image.
+ @param textStyle The scaling curve applied to the image size to support dynamic type.
  @param size The size of the button.
  */
-- (void)setSymbolFont:(UIFont *)symbolFont forSize:(M3CButtonSize)size API_AVAILABLE(ios(15.0));
+- (void)setSymbolSize:(CGFloat)symbolSize
+            textStyle:(UIFontTextStyle)textStyle
+              forSize:(M3CButtonSize)size API_AVAILABLE(ios(15.0));
 
 /**
  Sets the corner radius for a particular size.

components/M3CButton/src/M3CButton.m

@@ -9,6 +9,29 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+/** Used to store the scaling curve and initial size of the @c imageView of a @c M3CButton. */
+@interface M3CIconAttributes : NSObject
+
+@property(nonatomic, copy, readonly) UIFontTextStyle textStyle;
+@property(nonatomic, assign, readonly) CGFloat pointSize;
+
+- (instancetype)initWithTextStyle:(UIFontTextStyle)textStyle pointSize:(CGFloat)pointSize;
+
+@end
+
+@implementation M3CIconAttributes
+
+- (instancetype)initWithTextStyle:(UIFontTextStyle)textStyle pointSize:(CGFloat)pointSize {
+  self = [super init];
+  if (self) {
+    _textStyle = [textStyle copy];  // Use copy for NSString properties
+    _pointSize = pointSize;
+  }
+  return self;
+}
+
+@end
+
 // Minimum touch size recommended by Apple:
 // https://developer.apple.com/design/human-interface-guidelines/accessibility#Mobility
 static const CGFloat kMinimumTouchTarget = 44.f;
@@ -19,7 +42,7 @@ @interface M3CButton () {
   NSMutableDictionary<NSNumber *, UIColor *> *_borderColors;
   NSMutableDictionary<NSNumber *, MDCShadow *> *_shadows;
   NSMutableDictionary<NSNumber *, UIFont *> *_fonts;
-  NSMutableDictionary<NSNumber *, UIFont *> *_symbolFonts;
+  NSMutableDictionary<NSNumber *, M3CIconAttributes *> *_symbolFonts;
   NSMutableDictionary<NSNumber *, NSNumber *> *_cornerRadius;
   NSMutableDictionary<NSNumber *, NSNumber *> *_pressedCornerRadius;
   NSMutableDictionary<NSNumber *, NSValue *> *_imageEdgeInsetsForSize;
@@ -161,8 +184,11 @@ - (void)setFont:(UIFont *)font forSize:(M3CButtonSize)size API_AVAILABLE(ios(15.
   [self updateFont];
 }
 
-- (void)setSymbolFont:(UIFont *)font forSize:(M3CButtonSize)size API_AVAILABLE(ios(15.0)) {
-  _symbolFonts[@(size)] = font;
+- (void)setSymbolSize:(CGFloat)symbolSize
+            textStyle:(UIFontTextStyle)textStyle
+              forSize:(M3CButtonSize)size API_AVAILABLE(ios(15.0)) {
+  _symbolFonts[@(size)] = [[M3CIconAttributes alloc] initWithTextStyle:textStyle
+                                                             pointSize:symbolSize];
 
   [self updateSymbolFont];
 }
@@ -264,14 +290,14 @@ - (void)updateFont {
 }
 
 - (void)updateSymbolFont {
-  UIFont *currentFont = nil;
+  M3CIconAttributes *currentAttributes = nil;
 
   if (@available(iOS 15.0, *)) {
-    currentFont = _symbolFonts[@(self.buttonSize)];
-    if (_buttonSizeSet && !(currentFont == nil)) {
-      [self setPreferredSymbolConfiguration:[UIImageSymbolConfiguration
-                                                configurationWithFont:currentFont]
-                            forImageInState:UIControlStateNormal];
+    currentAttributes = _symbolFonts[@(self.buttonSize)];
+    if (_buttonSizeSet && currentAttributes != nil) {
+      CGFloat pointSize = [[UIFontMetrics metricsForTextStyle:currentAttributes.textStyle]
+          scaledValueForValue:currentAttributes.pointSize];
+      self.imageView.bounds = CGRectMake(0, 0, pointSize, pointSize);
     }
   }
 }
@@ -578,6 +604,7 @@ - (void)layoutSubviews {
   [super layoutSubviews];
   [self setCapsuleCornersBasedOn:self.frame.size];
   [self updateShadows];
+  [self updateSymbolFont];
 
   if (_buttonSizeSet) {
     if (_visualContentSize.width < kMinimumTouchTarget ||