Optimizing imports

PiperOrigin-RevId: 356966165
material-components · Feb 11, 2021 · 63988b3 · 63988b3
1 parent 6171ea2
commit 63988b3
Show file tree

Hide file tree

Showing 21 changed files with 50 additions and 20 deletions.
diff --git a/catalog/MaterialCatalog/MDCCatalogTiles.m b/catalog/MaterialCatalog/MDCCatalogTiles.m
@@ -15,7 +15,7 @@
 #import <UIKit/UIKit.h>
 
 #import "MDCCatalogTiles.h"
-#import "MaterialThemes.h"
+#import "MaterialColorScheme.h"
 
 UIImage* _Nullable MDCDrawImage(CGRect frame,
                                 MDCDrawFunc drawFunc,

diff --git a/components/AppBar/src/MDCAppBarContainerViewController.m b/components/AppBar/src/MDCAppBarContainerViewController.m
@@ -16,6 +16,7 @@
 
 #import "MDCAppBarViewController.h"
 #import "MaterialFlexibleHeader.h"
+#import "MaterialNavigationBar.h"
 
 @interface MDCAppBarContainerViewController ()
 

diff --git a/components/AppBar/src/MDCAppBarNavigationController.m b/components/AppBar/src/MDCAppBarNavigationController.m
@@ -16,6 +16,8 @@
 
 #import "MDCAppBarNavigationControllerToBeDeprecatedDelegate.h"
 #import "MDCAppBarViewController.h"
+#import "MaterialFlexibleHeader.h"
+#import "MaterialHeaderStackView.h"
 
 #import <objc/runtime.h>
 

diff --git a/components/AppBar/src/MDCAppBarViewController.m b/components/AppBar/src/MDCAppBarViewController.m
@@ -12,22 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "MDCAppBar.h"
+#import "MDCAppBarViewController.h"
 
 #import "MDCAppBarContainerViewController.h"
 
 #import "private/MaterialAppBarStrings.h"
 #import "private/MaterialAppBarStrings_table.h"
 #import "MDCAppBarViewControllerAccessibilityPerformEscapeDelegate.h"
 #import "MaterialFlexibleHeader.h"
+#import "MaterialHeaderStackView.h"
+#import "MaterialNavigationBar.h"
 #import "MaterialShadowElevations.h"
 #import "MaterialShadowLayer.h"
-#import "MaterialTypography.h"
-#import "MaterialApplication.h"
 #import "MaterialIcons+ic_arrow_back.h"
 #import "MaterialUIMetrics.h"
 #import <MDFInternationalization/MDFInternationalization.h>
-#import <MDFTextAccessibility/MDFTextAccessibility.h>
 
 static NSString *const kBarStackKey = @"barStack";
 

diff --git a/components/ButtonBar/examples/ButtonBarCustomizedFontExample.m b/components/ButtonBar/examples/ButtonBarCustomizedFontExample.m
@@ -15,7 +15,9 @@
 #import <UIKit/UIKit.h>
 
 #import "MaterialButtonBar.h"
+#import "MaterialColorScheme.h"
 #import "MaterialContainerScheme.h"
+#import "MaterialTypographyScheme.h"
 
 @interface ButtonBarCustomizedFontExample : UIViewController
 @property(nonatomic, strong) MDCSemanticColorScheme *colorScheme;

diff --git a/components/ButtonBar/examples/ButtonBarMenuExample.m b/components/ButtonBar/examples/ButtonBarMenuExample.m
@@ -16,7 +16,9 @@
 
 #import "MaterialAvailability.h"
 #import "MaterialButtonBar.h"
+#import "MaterialColorScheme.h"
 #import "MaterialContainerScheme.h"
+#import "MaterialTypographyScheme.h"
 
 @interface ButtonBarMenuExample : UIViewController
 @property(nonatomic, strong) MDCSemanticColorScheme *colorScheme;

diff --git a/components/ButtonBar/examples/ButtonBarTypicalUseExample.m b/components/ButtonBar/examples/ButtonBarTypicalUseExample.m
@@ -15,7 +15,9 @@
 #import <UIKit/UIKit.h>
 
 #import "MaterialButtonBar.h"
+#import "MaterialColorScheme.h"
 #import "MaterialContainerScheme.h"
+#import "MaterialTypographyScheme.h"
 
 @interface ButtonBarTypicalUseExample : UIViewController
 @property(nonatomic, strong) MDCSemanticColorScheme *colorScheme;

diff --git a/components/Buttons/src/ButtonThemer/MDCButtonScheme.m b/components/Buttons/src/ButtonThemer/MDCButtonScheme.m
@@ -14,6 +14,12 @@
 
 #import "MDCButtonScheme.h"
 
+#import "MaterialColorScheme.h"
+
+#import "MaterialShapeScheme.h"
+
+#import "MaterialTypographyScheme.h"
+
 @implementation MDCButtonScheme
 
 - (instancetype)init {

diff --git a/components/Buttons/src/ButtonThemer/MDCContainedButtonThemer.m b/components/Buttons/src/ButtonThemer/MDCContainedButtonThemer.m
@@ -14,7 +14,9 @@
 
 #import "MDCContainedButtonThemer.h"
 
+#import "MDCButtonScheme.h"
 #import "MaterialButtons+ColorThemer.h"
+#import "MaterialButtons.h"
 #import "MaterialButtons+ShapeThemer.h"
 #import "MaterialButtons+TypographyThemer.h"
 

diff --git a/components/Buttons/src/ButtonThemer/MDCTextButtonThemer.m b/components/Buttons/src/ButtonThemer/MDCTextButtonThemer.m
@@ -14,7 +14,9 @@
 
 #import "MDCTextButtonThemer.h"
 
+#import "MDCButtonScheme.h"
 #import "MaterialButtons+ColorThemer.h"
+#import "MaterialButtons.h"
 #import "MaterialButtons+ShapeThemer.h"
 #import "MaterialButtons+TypographyThemer.h"
 

diff --git a/components/Cards/src/MDCCard.m b/components/Cards/src/MDCCard.m
@@ -14,8 +14,13 @@
 
 #import "MDCCard.h"
 
-#import "MaterialMath.h"
+#import "MaterialElevation.h"
+#import "MaterialInk.h"
+#import "MaterialRipple.h"
+#import "MaterialShadowElevations.h"
+#import "MaterialShadowLayer.h"
 #import "MaterialShapes.h"
+#import "MaterialMath.h"
 
 static const CGFloat MDCCardShadowElevationNormal = 1;
 static const CGFloat MDCCardShadowElevationHighlighted = 8;

diff --git a/components/Cards/src/MDCCardCollectionCell.m b/components/Cards/src/MDCCardCollectionCell.m
@@ -14,9 +14,14 @@
 
 #import "MDCCardCollectionCell.h"
 
+#import "MaterialElevation.h"
+#import "MaterialInk.h"
+#import "MaterialRipple.h"
+#import "MaterialShadowElevations.h"
+#import "MaterialShadowLayer.h"
+#import "MaterialShapes.h"
 #import "MaterialIcons+ic_check_circle.h"
 #import "MaterialMath.h"
-#import "MaterialShapes.h"
 
 static const CGFloat MDCCardCellCornerRadiusDefault = 4;
 static const CGFloat MDCCardCellSelectedImagePadding = 8;

diff --git a/components/Cards/src/UICollectionViewController+MDCCardReordering.m b/components/Cards/src/UICollectionViewController+MDCCardReordering.m
@@ -14,8 +14,6 @@
 
 #import "UICollectionViewController+MDCCardReordering.h"
 
-#import "MDCCardCollectionCell.h"
-#import "MaterialInk.h"
 
 @implementation UICollectionViewController (MDCCardReordering)
 

diff --git a/components/TextFields/examples/TextFieldControllerStylesExample.m b/components/TextFields/examples/TextFieldControllerStylesExample.m
@@ -18,6 +18,8 @@
 #import "MaterialTextFields.h"
 
 #import "supplemental/TextFieldControllerStylesExampleSupplemental.h"
+#import "MaterialColorScheme.h"
+#import "MaterialContainerScheme.h"
 
 @interface TextFieldControllerStylesExample ()
 

diff --git a/components/TextFields/examples/TextFieldOutlinedExample.m b/components/TextFields/examples/TextFieldOutlinedExample.m
@@ -12,8 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "MaterialTextFields+Theming.h"
 #import "MaterialTextFields.h"
+#import "MaterialTextFields+Theming.h"
+#import "MaterialColorScheme.h"
+#import "MaterialContainerScheme.h"
 
 @interface TextFieldOutlinedObjectiveCExample
     : UIViewController <UITextFieldDelegate, UITextViewDelegate>

diff --git a/components/Typography/src/MDCFontScaler.m b/components/Typography/src/MDCFontScaler.m
@@ -17,7 +17,6 @@
 #import <objc/runtime.h>
 
 #import "UIFont+MaterialScalable.h"
-#import "private/MDCFontTraits.h"
 #import "private/MDCTypographyUtilities.h"
 
 MDCTextStyle const MDCTextStyleHeadline1 = @"MDC.TextStyle.Headline1";

diff --git a/components/Typography/src/UIFont+MaterialScalable.m b/components/Typography/src/UIFont+MaterialScalable.m
@@ -18,7 +18,6 @@
 
 #import "MaterialApplication.h"
 
-#import "MDCTypography.h"
 #import "private/MDCTypographyUtilities.h"
 
 static char MDCFontScaleObjectKey;

diff --git a/components/schemes/Shape/examples/MDCShapeSchemeExampleViewController.m b/components/schemes/Shape/examples/MDCShapeSchemeExampleViewController.m
@@ -18,21 +18,21 @@
 #import "supplemental/MDCShapeExamplesDummyCollectionViewController.h"
 
 #import "MaterialAppBar+ColorThemer.h"
-#import "MaterialAppBar+TypographyThemer.h"
 #import "MaterialAppBar.h"
-#import "MaterialBottomSheet+ShapeThemer.h"
+#import "MaterialAppBar+TypographyThemer.h"
 #import "MaterialBottomSheet.h"
-#import "MaterialButtons+ButtonThemer.h"
+#import "MaterialBottomSheet+ShapeThemer.h"
+#import "MaterialButtons.h"
 #import "MaterialButtons+ShapeThemer.h"
 #import "MaterialButtons+Theming.h"
-#import "MaterialButtons.h"
-#import "MaterialCards+Theming.h"
 #import "MaterialCards.h"
-#import "MaterialChips+Theming.h"
+#import "MaterialCards+Theming.h"
 #import "MaterialChips.h"
+#import "MaterialChips+Theming.h"
+#import "MaterialFlexibleHeader.h"
+#import "MaterialShapes.h"
 #import "MaterialColorScheme.h"
 #import "MaterialContainerScheme.h"
-#import "MaterialShapeLibrary.h"
 #import "MaterialShapeScheme.h"
 #import "MaterialTypographyScheme.h"
 

diff --git a/components/schemes/Shape/examples/MDCShapeWithBorderExample.m b/components/schemes/Shape/examples/MDCShapeWithBorderExample.m
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #import "MaterialCards.h"
-#import "MaterialCards+Theming.h"
 #import "MaterialShapeLibrary.h"
 #import "MaterialShapes.h"
 

diff --git a/components/schemes/Shape/src/MDCShapeCategory.m b/components/schemes/Shape/src/MDCShapeCategory.m
@@ -14,6 +14,7 @@
 
 #import "MDCShapeCategory.h"
 #import "MaterialShapeLibrary.h"
+#import "MaterialShapes.h"
 
 @implementation MDCShapeCategory
 

diff --git a/components/schemes/Shape/src/MDCShapeScheme.m b/components/schemes/Shape/src/MDCShapeScheme.m
@@ -14,6 +14,8 @@
 
 #import "MDCShapeScheme.h"
 
+#import "MDCShapeCategory.h"
+
 @implementation MDCShapeScheme
 
 - (instancetype)init {