Optimizing imports

PiperOrigin-RevId: 356967514

Author: Jeff Verkoeyen

components/Cards/tests/snapshot/MDCCardCustomTraitCollectionSnapshotTests.m

@@ -15,8 +15,9 @@
 #import "MaterialSnapshot.h"
 
 #import "MaterialAvailability.h"
-#import "MaterialCards+Theming.h"
 #import "MaterialCards.h"
+#import "MaterialColorScheme.h"
+#import "MaterialContainerScheme.h"
 
 /**
  An MDCCard subclass that allows the user to override the @c traitCollection property.

components/Cards/tests/snapshot/MDCCardSnapshotTests.m

@@ -12,9 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "MaterialCards+Theming.h"
 #import "MaterialCards.h"
+#import "MaterialCards+Theming.h"
 #import "MaterialSnapshot.h"
+#import "MaterialColorScheme.h"
+#import "MaterialContainerScheme.h"
 
 @interface MDCCardSnapshotTests : MDCSnapshotTestCase
 

components/Chips/src/MDCChipField.m

@@ -14,6 +14,7 @@
 
 #import "MDCChipField.h"
 
+#import "MDCChipView.h"
 #import <MDFInternationalization/MDFInternationalization.h>
 
 #import "MDCChipFieldDelegate.h"

components/Chips/src/MDCChipView.m

@@ -15,12 +15,12 @@
 #import "MDCChipView.h"
 #import "private/MDCChipView+Private.h"
 
+#import "MaterialElevation.h"
 #import <MDFInternationalization/MDFInternationalization.h>
 
 #import "MaterialInk.h"
 #import "MaterialRipple.h"
 #import "MaterialShadowElevations.h"
-#import "MaterialShadowLayer.h"
 #import "MaterialShapeLibrary.h"
 #import "MaterialShapes.h"
 #import "MaterialTypography.h"

components/Collections/examples/supplemental/CollectionsEditingManyCellsExampleSupplemental.m

@@ -14,6 +14,8 @@
 
 #import "CollectionsEditingManyCellsExampleSupplemental.h"
 
+#import "MaterialCollections.h"
+
 @implementation CollectionsEditingManyCellsExample (Supplemental)
 
 #pragma mark - CatalogByConvention

components/Collections/examples/supplemental/CollectionsSectionInsetsExampleSupplemental.m

@@ -14,6 +14,8 @@
 
 #import "CollectionsSectionInsetsExampleSupplemental.h"
 
+#import "MaterialCollections.h"
+
 @implementation CollectionsSectionInsetsExample (Supplemental)
 
 - (void)viewDidLoad {

components/Collections/src/MDCCollectionViewController.m

@@ -19,9 +19,10 @@
 #import "private/MDCCollectionViewEditor.h"
 #import "private/MDCCollectionViewStyler.h"
 #import "MaterialCollectionCells.h"
+#import "MDCCollectionViewEditing.h"
+#import "MDCCollectionViewEditingDelegate.h"
 #import "MDCCollectionViewFlowLayout.h"
-#import "MaterialInk.h"
-#import "MaterialRipple.h"
+#import "MDCCollectionInfoBarViewDelegate.h"
 
 #include <tgmath.h>
 

components/Collections/src/MDCCollectionViewFlowLayout.m

@@ -14,13 +14,12 @@
 
 #import "MDCCollectionViewFlowLayout.h"
 
-#import "MDCCollectionViewController.h"
-#import "MDCCollectionViewEditingDelegate.h"
-#import "MDCCollectionViewStyling.h"
-#import "MaterialCollectionLayoutAttributes.h"
 #import "private/MDCCollectionGridBackgroundView.h"
 #import "private/MDCCollectionInfoBarView.h"
-#import "private/MDCCollectionViewEditor.h"
+#import "MaterialCollectionLayoutAttributes.h"
+#import "MDCCollectionViewController.h"
+#import "MDCCollectionViewEditing.h"
+#import "MDCCollectionViewEditingDelegate.h"
 
 #include <tgmath.h>
 

components/Dialogs/src/MDCDialogPresentationController.m

@@ -16,7 +16,7 @@
 
 #import "private/MDCDialogShadowedView.h"
 #import "MDCDialogPresentationControllerDelegate.h"
-#import "MaterialShadowLayer.h"
+#import "MaterialShadowElevations.h"
 #import "MaterialKeyboardWatcher.h"
 
 static const CGFloat MDCDialogMinimumWidth = 280;

components/Dialogs/src/Theming/MDCAlertController+MaterialTheming.m

@@ -12,11 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import <MaterialComponents/MDCAlertController+ButtonForAction.h>
-#import <MaterialComponents/MaterialDialogs+ColorThemer.h>
-#import <MaterialComponents/MaterialDialogs+TypographyThemer.h>
-#import <MaterialComponents/MaterialShadowElevations.h>
+#import "MaterialButtons.h"
 #import "MaterialButtons+Theming.h"
+#import "MDCAlertController+ButtonForAction.h"  // TODO(b/126884296): One-off transformation needs fixing in copy.bara.sky
+#import "MaterialDialogs.h"
+#import "MaterialShadowElevations.h"  // ComponentImport
+#import "MaterialColorScheme.h"
+#import "MaterialContainerScheme.h"
+#import "MaterialTypographyScheme.h"
+#import "MaterialTypographyScheme+Scheming.h"
 
 static const CGFloat kCornerRadius = 4;
 

components/Dialogs/src/Theming/MDCDialogPresentationController+MaterialTheming.m

@@ -14,6 +14,14 @@
 
 #import "MDCDialogPresentationController+MaterialTheming.h"
 
+#import "MaterialDialogs.h"
+
+#import "MaterialShadowElevations.h"
+
+#import "MaterialColorScheme.h"
+
+#import "MaterialContainerScheme.h"
+
 static const CGFloat kCornerRadius = 4;
 
 @implementation MDCDialogPresentationController (MaterialTheming)

components/Dialogs/src/private/MDCAlertActionManager.m

@@ -14,6 +14,7 @@
 
 #import "MDCAlertActionManager.h"
 #import "MaterialButtons.h"
+#import "MaterialDialogs.h"
 
 @interface MDCAlertActionManager ()
 

components/Dialogs/src/private/MDCAlertControllerView+Private.m

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "MDCAlertControllerView.h"
 #import "MDCAlertActionManager.h"
 #import "MDCAlertControllerView+Private.h"
 
+#import "MaterialShadowElevations.h"
 #import <MDFInternationalization/MDFInternationalization.h>
 
 #import "MaterialButtons.h"

components/FeatureHighlight/tests/unit/FeatureHighlightAccessibilityTests.m

@@ -14,7 +14,6 @@
 
 #import <XCTest/XCTest.h>
 
-#import "MDCFeatureHighlightView+Private.h"
 #import "MaterialFeatureHighlight.h"
 
 @interface MDCFeatureHighlightViewController (Testing)

components/FeatureHighlight/tests/unit/FeatureHighlightColorThemerTests.m

@@ -14,6 +14,7 @@
 
 #import "MaterialFeatureHighlight+ColorThemer.h"
 #import "MaterialFeatureHighlight.h"
+#import "MaterialColorScheme.h"
 
 #import <XCTest/XCTest.h>
 

components/FlexibleHeader/src/MDCFlexibleHeaderView.m

@@ -19,10 +19,15 @@
 #import "private/MDCFlexibleHeaderTopSafeArea.h"
 #import "private/MDCFlexibleHeaderView+Private.h"
 #import "private/MDCStatusBarShifter.h"
+#import "MaterialElevation.h"
 #import "MDCFlexibleHeaderView+ShiftBehavior.h"
 #import "MDCFlexibleHeaderViewAnimationDelegate.h"
 #import "MDCFlexibleHeaderViewDelegate.h"
+#import "MaterialFlexibleHeader+ShiftBehavior.h"
 #import "MaterialFlexibleHeader+ShiftBehaviorEnabledWithStatusBar.h"
+#import "MDCFlexibleHeaderMinMaxHeightDelegate.h"
+#import "MDCFlexibleHeaderTopSafeAreaDelegate.h"
+#import "MDCStatusBarShifterDelegate.h"
 #import "MaterialShadowElevations.h"
 #import "MaterialApplication.h"
 #import "MaterialMath.h"

components/FlexibleHeader/src/MDCFlexibleHeaderViewController.m

@@ -21,6 +21,7 @@
 #import "MDCFlexibleHeaderSafeAreaDelegate.h"
 #import "MDCFlexibleHeaderView+ShiftBehavior.h"
 #import "MDCFlexibleHeaderView.h"
+#import "MDCFlexibleHeaderViewDelegate.h"
 #import "MDCFlexibleHeaderViewLayoutDelegate.h"
 #import "MaterialFlexibleHeader+ShiftBehaviorEnabledWithStatusBar.h"
 #import "MaterialApplication.h"

components/FlexibleHeader/src/private/MDCFlexibleHeaderShifter.m

@@ -13,6 +13,8 @@
 // limitations under the License.
 
 #import "MDCFlexibleHeaderShifter.h"
+#import "MDCFlexibleHeaderView+ShiftBehavior.h"
+#import "MaterialFlexibleHeader+ShiftBehavior.h"
 #import "MaterialFlexibleHeader+ShiftBehaviorEnabledWithStatusBar.h"
 
 // The suffix for an app extension bundle path.

components/FlexibleHeader/src/private/MDCFlexibleHeaderTopSafeArea.m

@@ -16,7 +16,6 @@
 
 #import "MDCFlexibleHeaderTopSafeArea.h"
 
-#import "MDCFlexibleHeaderView.h"
 #import "MDCFlexibleHeaderTopSafeAreaDelegate.h"
 
 // The default status bar height for non-X devices.

components/Ink/tests/unit/MDCInkLayerTests.m

@@ -15,6 +15,7 @@
 #import <XCTest/XCTest.h>
 
 #import "../../src/private/MDCInkLayer.h"
+#import "MDCInkLayerDelegate.h"
 
 #pragma mark - Fake classes
 

components/Ink/tests/unit/MDCLegacyInkLayerTests.m

@@ -14,7 +14,8 @@
 
 #import <XCTest/XCTest.h>
 #import "../../src/private/MDCLegacyInkLayer+Private.h"
-#import "MaterialInk.h"
+#import "MDCLegacyInkLayer.h"
+#import "MDCLegacyInkLayerRippleDelegate.h"
 
 #pragma mark - Property exposure
 

components/List/examples/MDCBaseCellExample.m

@@ -15,6 +15,8 @@
 #import "MDCBaseCellExample.h"
 
 #import "MaterialList.h"
+#import "MaterialColorScheme.h"
+#import "MaterialContainerScheme.h"
 
 @implementation MDCBaseCellExample
 

components/List/examples/MDCSelfSizingStereoCellExample.m

@@ -14,6 +14,7 @@
 
 #import "MDCSelfSizingStereoCellExample.h"
 
+#import "MaterialContainerScheme.h"
 #import <MDFInternationalization/MDFInternationalization.h>
 
 #import "MaterialList+Theming.h"