From c22a1f0475882d85e9939208ec52ba14a6f3186c Mon Sep 17 00:00:00 2001
From: Robert Moore <rsmoore@google.com>
Date: Mon, 8 Jul 2019 12:41:11 -0400
Subject: [PATCH] [Tabs] Deduplicate item view layout and contentFrame
 calculation. (#7796)

Combines the code that performs layout and content frame calculation.

Part of #7748
---
 .../private/MDCTabBarViewItemView.m           | 109 ++++++++----------
 ...nlyShortTitleSizeToFitLTRLatin_11_2@2x.png | Bin 5771 -> 0 bytes
 ...lyShortTitleSizeToFitRTLArabic_11_2@2x.png | Bin 3984 -> 0 bytes
 3 files changed, 47 insertions(+), 62 deletions(-)
 delete mode 100644 snapshot_test_goldens/goldens_64/MDCTabBarViewItemViewSnapshotTests/testTitleOnlyShortTitleSizeToFitLTRLatin_11_2@2x.png
 delete mode 100644 snapshot_test_goldens/goldens_64/MDCTabBarViewItemViewSnapshotTests/testTitleOnlyShortTitleSizeToFitRTLArabic_11_2@2x.png

diff --git a/components/Tabs/src/TabBarView/private/MDCTabBarViewItemView.m b/components/Tabs/src/TabBarView/private/MDCTabBarViewItemView.m
index a0b990748cf..6be5a16d0c0 100644
--- a/components/Tabs/src/TabBarView/private/MDCTabBarViewItemView.m
+++ b/components/Tabs/src/TabBarView/private/MDCTabBarViewItemView.m
@@ -99,14 +99,14 @@ - (void)commonMDCTabBarViewItemViewInit {
 - (CGRect)contentFrame {
   if (!self.iconImageView.image) {
     if (self.titleLabel.text.length) {
-      return [self contentFrameForTitleLabelInTextOnlyLayout];
+      return [self contentFrameForTitleOnlyLayout];
     }
     return CGRectZero;
   }
   if (self.titleLabel.text.length) {
-    return [self contentFrameForTitleLabelInTextAndImageLayout];
+    return [self contentFrameForTitleAndImageLayout];
   }
-  return [self contentFrameForImageViewInImageOnlyLayout];
+  return [self contentFrameForImageOnlyLayout];
 }
 
 #pragma mark - UIView
@@ -119,56 +119,58 @@ - (void)layoutSubviews {
   }
 
   if (self.titleLabel.text.length && !self.iconImageView.image) {
-    [self layoutSubviewsTextOnly];
+    self.titleLabel.frame = [self titleLabelFrameForTitleOnlyLayout];
     return;
   } else if (!self.titleLabel.text.length && self.iconImageView.image) {
-    [self layoutSubviewsImageOnly];
+    self.iconImageView.frame = [self iconImageViewFrameForImageOnlyLayout];
     return;
   } else {
-    [self layoutSubviewsTextAndImage];
+    CGRect titleLabelFrame = CGRectZero;
+    CGRect iconImageViewFrame = CGRectZero;
+    [self layoutTitleLabelFrame:&titleLabelFrame iconImageViewFrame:&iconImageViewFrame];
+    self.titleLabel.frame = titleLabelFrame;
+    self.iconImageView.frame = iconImageViewFrame;
   }
 }
 
-- (CGRect)contentFrameForTitleLabelInTextOnlyLayout {
-  CGRect insetBounds = UIEdgeInsetsInsetRect(self.bounds, kEdgeInsetsTextOnly);
+- (CGRect)contentFrameForTitleOnlyLayout {
+  return [self titleLabelFrameForTitleOnlyLayout];
+}
 
-  CGSize contentSize = CGSizeMake(CGRectGetWidth(insetBounds), CGRectGetHeight(insetBounds));
-  CGSize labelWidthFitSize = [self.titleLabel sizeThatFits:contentSize];
-  CGSize labelSize =
-      CGSizeMake(labelWidthFitSize.width, MIN(contentSize.height, labelWidthFitSize.height));
-  CGRect contentFrame = CGRectMake(CGRectGetMidX(insetBounds) - (labelWidthFitSize.width / 2),
-                                   CGRectGetMidY(insetBounds) - (labelWidthFitSize.height / 2),
-                                   labelSize.width, labelSize.height);
-  return MDCRectAlignToScale(contentFrame, self.window.screen.scale);
+- (CGRect)contentFrameForImageOnlyLayout {
+  return [self iconImageViewFrameForImageOnlyLayout];
+}
+
+- (CGRect)contentFrameForTitleAndImageLayout {
+  CGRect titleLabelFrame = CGRectZero;
+  CGRect iconImageViewFrame = CGRectZero;
+  [self layoutTitleLabelFrame:&titleLabelFrame iconImageViewFrame:&iconImageViewFrame];
+  return MDCRectAlignToScale(
+      CGRectMake(CGRectGetMinX(titleLabelFrame), CGRectGetMinY(iconImageViewFrame),
+                 CGRectGetWidth(titleLabelFrame),
+                 CGRectGetMaxY(titleLabelFrame) - CGRectGetMinY(iconImageViewFrame)),
+      self.window.screen.scale);
 }
 
-- (void)layoutSubviewsTextOnly {
+- (CGRect)titleLabelFrameForTitleOnlyLayout {
   CGRect contentFrame = UIEdgeInsetsInsetRect(self.bounds, kEdgeInsetsTextOnly);
 
   CGSize contentSize = CGSizeMake(CGRectGetWidth(contentFrame), CGRectGetHeight(contentFrame));
   CGSize labelWidthFitSize = [self.titleLabel sizeThatFits:contentSize];
-  CGSize labelSize =
-      CGSizeMake(contentSize.width, MIN(contentSize.height, labelWidthFitSize.height));
+  CGSize labelSize = CGSizeMake(MIN(contentSize.width, labelWidthFitSize.width),
+                                MIN(contentSize.height, labelWidthFitSize.height));
+  // The label attempted to be taller than allowed by the content insets. Give it the full content
+  // width available.
+  if (labelWidthFitSize.height > contentSize.height) {
+    labelSize = CGSizeMake(contentSize.width, labelSize.height);
+  }
   CGRect labelFrame = CGRectMake(CGRectGetMidX(contentFrame) - (labelSize.width / 2),
                                  CGRectGetMidY(contentFrame) - (labelSize.height / 2),
                                  labelSize.width, labelSize.height);
-  self.titleLabel.frame = MDCRectAlignToScale(labelFrame, self.window.screen.scale);
+  return MDCRectAlignToScale(labelFrame, self.window.screen.scale);
 }
 
-- (CGRect)contentFrameForImageViewInImageOnlyLayout {
-  CGRect insetBounds = UIEdgeInsetsInsetRect(self.bounds, kEdgeInsetsImageOnly);
-
-  CGSize contentSize = CGSizeMake(CGRectGetWidth(insetBounds), CGRectGetHeight(insetBounds));
-  CGSize imageIntrinsicContentSize = self.iconImageView.intrinsicContentSize;
-  CGSize imageFinalSize = CGSizeMake(MIN(contentSize.width, imageIntrinsicContentSize.width),
-                                     MIN(contentSize.height, imageIntrinsicContentSize.height));
-  CGRect contentFrame = CGRectMake(CGRectGetMidX(insetBounds) - (imageFinalSize.width / 2),
-                                   CGRectGetMidY(insetBounds) - (imageFinalSize.height / 2),
-                                   imageFinalSize.width, imageFinalSize.height);
-  return MDCRectAlignToScale(contentFrame, self.window.screen.scale);
-}
-
-- (void)layoutSubviewsImageOnly {
+- (CGRect)iconImageViewFrameForImageOnlyLayout {
   CGRect contentFrame = UIEdgeInsetsInsetRect(self.bounds, kEdgeInsetsImageOnly);
 
   CGSize contentSize = CGSizeMake(CGRectGetWidth(contentFrame), CGRectGetHeight(contentFrame));
@@ -178,34 +180,11 @@ - (void)layoutSubviewsImageOnly {
   CGRect imageViewFrame = CGRectMake(CGRectGetMidX(contentFrame) - (imageFinalSize.width / 2),
                                      CGRectGetMidY(contentFrame) - (imageFinalSize.height / 2),
                                      imageFinalSize.width, imageFinalSize.height);
-  self.iconImageView.frame = MDCRectAlignToScale(imageViewFrame, self.window.screen.scale);
-}
-
-- (CGRect)contentFrameForTitleLabelInTextAndImageLayout {
-  CGRect insetBounds = UIEdgeInsetsInsetRect(self.bounds, kEdgeInsetsTextAndImage);
-
-  CGSize contentSize = CGSizeMake(CGRectGetWidth(insetBounds), CGRectGetHeight(insetBounds));
-  CGSize labelSingleLineSize = self.titleLabel.intrinsicContentSize;
-  CGSize availableIconSize = CGSizeMake(
-      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 imageFinalSize =
-      CGSizeMake(MIN(imageIntrinsicContentSize.width, availableIconSize.width),
-                 MIN(imageIntrinsicContentSize.height, availableIconSize.height));
-
-  // Now position the label from the bottom.
-  CGSize availableLabelSize = CGSizeMake(
-      contentSize.width, contentSize.height - (imageFinalSize.height + kImageTitlePadding));
-  CGSize finalLabelSize = [self.titleLabel sizeThatFits:availableLabelSize];
-  CGRect contentFrame =
-      CGRectMake(CGRectGetMidX(insetBounds) - (finalLabelSize.width / 2),
-                 CGRectGetMinY(insetBounds), finalLabelSize.width, contentSize.height);
-  return MDCRectAlignToScale(contentFrame, self.window.screen.scale);
+  return MDCRectAlignToScale(imageViewFrame, self.window.screen.scale);
 }
 
-- (void)layoutSubviewsTextAndImage {
+- (void)layoutTitleLabelFrame:(CGRect *)titleLabelFrame
+           iconImageViewFrame:(CGRect *)iconImageViewFrame {
   CGRect contentFrame = UIEdgeInsetsInsetRect(self.bounds, kEdgeInsetsTextAndImage);
 
   CGSize contentSize = CGSizeMake(CGRectGetWidth(contentFrame), CGRectGetHeight(contentFrame));
@@ -222,7 +201,13 @@ - (void)layoutSubviewsTextAndImage {
       CGRectMake(CGRectGetMidX(contentFrame) - (imageFinalSize.width / 2),
                  CGRectGetMinY(contentFrame), imageFinalSize.width, imageFinalSize.height);
   imageViewFrame = MDCRectAlignToScale(imageViewFrame, self.window.screen.scale);
-  self.iconImageView.frame = imageViewFrame;
+  if (iconImageViewFrame != NULL) {
+    *iconImageViewFrame = imageViewFrame;
+  }
+
+  if (titleLabelFrame == NULL) {
+    return;
+  }
 
   // Now position the label from the bottom.
   CGSize availableLabelSize =
@@ -233,7 +218,7 @@ - (void)layoutSubviewsTextAndImage {
                                  CGRectGetMaxY(contentFrame) - finalLabelSize.height,
                                  finalLabelSize.width, finalLabelSize.height);
   titleFrame = MDCRectAlignToScale(titleFrame, self.window.screen.scale);
-  self.titleLabel.frame = titleFrame;
+  *titleLabelFrame = titleFrame;
 }
 
 - (CGSize)intrinsicContentSize {
diff --git a/snapshot_test_goldens/goldens_64/MDCTabBarViewItemViewSnapshotTests/testTitleOnlyShortTitleSizeToFitLTRLatin_11_2@2x.png b/snapshot_test_goldens/goldens_64/MDCTabBarViewItemViewSnapshotTests/testTitleOnlyShortTitleSizeToFitLTRLatin_11_2@2x.png
deleted file mode 100644
index a4cb27382b2c5aeea1cceb158bdb4616583e19d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5771
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

diff --git a/snapshot_test_goldens/goldens_64/MDCTabBarViewItemViewSnapshotTests/testTitleOnlyShortTitleSizeToFitRTLArabic_11_2@2x.png b/snapshot_test_goldens/goldens_64/MDCTabBarViewItemViewSnapshotTests/testTitleOnlyShortTitleSizeToFitRTLArabic_11_2@2x.png
deleted file mode 100644
index c735ebfaec8f666933c0a95df52563f9ddd090ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3984
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
SD8R`NWMX*Uphn;8_J09o#2q&P