copied item properties when using setItems

PiperOrigin-RevId: 705965889

Author: Nobody

components/BottomNavigation/src/MDCBottomNavigationBar.m

@@ -824,14 +824,9 @@ - (void)updateBarItems {
     itemView.selectionIndicatorColor = self.selectionIndicatorColor;
     itemView.selectionIndicatorSize = self.selectionIndicatorSize;
     [self configureTitleStateForItemView:itemView];
-    [self configureItemView:itemView withItem:self.barItems[i].item];
-    // TODO(b/378528228): Consolidate this inside configureItemView once clients are fully migrated
-    // to setBarItems.
-    itemView.badgeAppearance = self.itemBadgeAppearance;
-    if (self.barItems[i].badgeAppearance != nil) {
-      MDCBadgeAppearance *_Nonnull nonnullAppearance = self.barItems[i].badgeAppearance;
-      itemView.badgeAppearance = nonnullAppearance;
-    }
+    [self configureItemView:itemView
+                   withItem:self.barItems[i].item
+                 appearance:self.barItems[i].badgeAppearance];
 
     [itemView.button addTarget:self
                         action:@selector(didTouchUpInsidebarItemButton:)
@@ -913,12 +908,9 @@ - (void)setItems:(NSArray<UITabBarItem *> *)items {
     itemView.selected = NO;
     itemView.displayTitleInVerticalLayout = self.displayItemTitlesInVerticalLayout;
     itemView.enableVerticalLayout = self.enableVerticalLayout;
-    itemView.badgeAppearance = _itemBadgeAppearance;
 
-    itemView.selectionIndicatorColor = self.selectionIndicatorColor;
-    itemView.selectionIndicatorSize = self.selectionIndicatorSize;
     [self configureTitleStateForItemView:itemView];
-    [self configureItemView:itemView withItem:items[i]];
+    [self configureItemView:itemView withItem:items[i] appearance:self.itemBadgeAppearance];
 
     [itemView.button addTarget:self
                         action:@selector(didTouchUpInsideButton:)

components/BottomNavigation/src/private/MDCBottomNavigationBar+ItemView.h

@@ -15,6 +15,8 @@
 #import "MDCBottomNavigationBar.h"
 #import "MDCBottomNavigationItemView.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 /**
  This category extracts logic for item view configuration out of the primary MDCBottomNavigationBar
  implementation.
@@ -28,6 +30,10 @@
  @param itemView The MDCBottomNavigationItemView instance to be configured.
  @param item The item used to configure the itemView.
  */
-- (void)configureItemView:(MDCBottomNavigationItemView *)itemView withItem:(UITabBarItem *)item;
+- (void)configureItemView:(MDCBottomNavigationItemView *)itemView
+                 withItem:(UITabBarItem *)item
+               appearance:(nullable MDCBadgeAppearance *)appearance;
 
 @end
+
+NS_ASSUME_NONNULL_END

components/BottomNavigation/src/private/MDCBottomNavigationBar+ItemView.m

@@ -25,16 +25,23 @@ @implementation MDCBottomNavigationBar (ItemViewConfiguration)
 
 #pragma mark - Public
 
-- (void)configureItemView:(MDCBottomNavigationItemView *)itemView withItem:(UITabBarItem *)item {
+- (void)configureItemView:(MDCBottomNavigationItemView *)itemView
+                 withItem:(UITabBarItem *)item
+               appearance:(nullable MDCBadgeAppearance *)appearance {
   [self configure:itemView withItem:item];
   [self configureAppearanceForItemView:itemView];
   [self configurePointerInteractionForItemView:itemView];
+  if (appearance != nil) {
+    MDCBadgeAppearance *_Nonnull nonnullAppearance = appearance;
+    itemView.badgeAppearance = nonnullAppearance;
+  }
 }
 
 #pragma mark - Private
 
 - (void)configureAppearanceForItemView:(MDCBottomNavigationItemView *)itemView {
   itemView.badgeAppearance = self.itemBadgeAppearance;
+  itemView.badgeHorizontalOffset = self.itemBadgeHorizontalOffset;
   itemView.selectionIndicatorSize = self.selectionIndicatorSize;
   itemView.showsSelectionIndicator = self.showsSelectionIndicator;
 
@@ -48,10 +55,8 @@ - (void)configureColorsForItemView:(MDCBottomNavigationItemView *)itemView {
   // depends on the value of rippleColor.
   itemView.rippleColor = self.rippleColor;
   itemView.selectedItemTintColor = self.selectedItemTintColor;
-
   itemView.unselectedItemTintColor = self.unselectedItemTintColor;
   itemView.selectedItemTitleColor = self.selectedItemTitleColor;
-
   itemView.selectionIndicatorColor = self.selectionIndicatorColor;
 }