Optimizing imports

PiperOrigin-RevId: 357185900
material-components · Feb 12, 2021 · 4c86b13 · 4c86b13
1 parent 8ce743c
commit 4c86b13
Show file tree

Hide file tree

Showing 23 changed files with 54 additions and 25 deletions.
diff --git a/components/Buttons/src/MDCFlatButton.m b/components/Buttons/src/MDCFlatButton.m
@@ -14,8 +14,9 @@
 
 #import "MDCFlatButton.h"
 
-#import "MaterialShadowElevations.h"
 #import "private/MDCButton+Subclassing.h"
+#import "MDCButton.h"
+#import "MaterialShadowElevations.h"
 
 @interface MDCFlatButton ()
 @property(nonatomic) BOOL hasOpaqueBackground;

diff --git a/components/Buttons/src/MDCFloatingButton.m b/components/Buttons/src/MDCFloatingButton.m
@@ -14,9 +14,9 @@
 
 #import "MDCFloatingButton.h"
 
-#import "private/MDCButton+Subclassing.h"
 #import "private/MDCFloatingButtonModeAnimator.h"
 #import "private/MDCFloatingButtonModeAnimatorDelegate.h"
+#import "MDCButton.h"
 #import "MaterialShadowElevations.h"
 
 #import <MDFInternationalization/MDFInternationalization.h>

diff --git a/components/Buttons/src/MDCRaisedButton.m b/components/Buttons/src/MDCRaisedButton.m
@@ -15,7 +15,6 @@
 #import "MDCRaisedButton.h"
 
 #import "MaterialShadowElevations.h"
-#import "private/MDCButton+Subclassing.h"
 
 @implementation MDCRaisedButton
 

diff --git a/components/Chips/tests/unit/ChipsDelegateTests.m b/components/Chips/tests/unit/ChipsDelegateTests.m
@@ -15,8 +15,9 @@
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 
-#import "MDCTextField+Testing.h"
 #import "MaterialChips.h"
+#import "MaterialTextFields.h"
+#import "MDCTextField+Testing.h"
 
 @interface ChipsDelegateTests : XCTestCase <MDCChipFieldDelegate>
 

diff --git a/components/Chips/tests/unit/ChipsTests.m b/components/Chips/tests/unit/ChipsTests.m
@@ -16,7 +16,8 @@
 
 #import <XCTest/XCTest.h>
 
-#import "../../src/MDCChipField.h"
+#import "MaterialElevation.h"
+#import "MaterialTextFields.h"
 #import "MaterialTypography.h"
 
 // Expose internal methods for testing

diff --git a/components/Chips/tests/unit/MDCChipFieldDelegateTests.m b/components/Chips/tests/unit/MDCChipFieldDelegateTests.m
@@ -16,6 +16,8 @@
 
 #import "MDCChipField.h"
 #import "MDCChipFieldDelegate.h"
+#import "MDCChipView.h"
+#import "MaterialTextFields.h"
 
 /**
  A class to record messages from MDCChipField.

diff --git a/components/Chips/tests/unit/MDCChipViewTests.m b/components/Chips/tests/unit/MDCChipViewTests.m
@@ -15,6 +15,7 @@
 #import <XCTest/XCTest.h>
 
 #import "MDCChipView.h"
+#import "MaterialShadowElevations.h"
 
 static inline UIImage *TestImage(CGSize size) {
   CGFloat scale = [UIScreen mainScreen].scale;

diff --git a/components/FeatureHighlight/examples/FeatureHighlightColorExample.m b/components/FeatureHighlight/examples/FeatureHighlightColorExample.m
@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "MaterialFeatureHighlight.h"
 #import "supplemental/FeatureHighlightExampleSupplemental.h"
+#import "MaterialCollections.h"
+#import "MaterialFeatureHighlight.h"
 
 @implementation FeatureHighlightColorExample
 

diff --git a/components/FeatureHighlight/examples/FeatureHighlightScalableDynamicTypeController.m b/components/FeatureHighlight/examples/FeatureHighlightScalableDynamicTypeController.m
@@ -16,7 +16,6 @@
 
 #import "MaterialButtons.h"
 #import "MaterialFeatureHighlight.h"
-#import "MaterialTypographyScheme.h"
 
 @implementation FeatureHighlightScalableDynamicTypeController
 

diff --git a/components/FeatureHighlight/examples/FeatureHighlightShownViewExample.m b/components/FeatureHighlight/examples/FeatureHighlightShownViewExample.m
@@ -12,11 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "MaterialButtons+Theming.h"
+#import "supplemental/FeatureHighlightExampleSupplemental.h"
 #import "MaterialButtons.h"
+#import "MaterialButtons+Theming.h"
 #import "MaterialFeatureHighlight+ColorThemer.h"
 #import "MaterialFeatureHighlight.h"
-#import "supplemental/FeatureHighlightExampleSupplemental.h"
+#import "MaterialColorScheme.h"
+#import "MaterialContainerScheme.h"
+#import "MaterialTypographyScheme.h"
 
 @implementation FeatureHighlightShownViewExample
 

diff --git a/components/FeatureHighlight/examples/FeatureHighlightTypicalUseViewController.m b/components/FeatureHighlight/examples/FeatureHighlightTypicalUseViewController.m
@@ -12,9 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#import "supplemental/FeatureHighlightExampleSupplemental.h"
 #import "MaterialFeatureHighlight+ColorThemer.h"
 #import "MaterialFeatureHighlight.h"
-#import "supplemental/FeatureHighlightExampleSupplemental.h"
+#import "MaterialColorScheme.h"
+#import "MaterialTypographyScheme.h"
 
 @implementation FeatureHighlightTypicalUseViewController
 

diff --git a/components/Snackbar/examples/SnackbarInputAccessoryViewController.m b/components/Snackbar/examples/SnackbarInputAccessoryViewController.m
@@ -14,7 +14,6 @@
 
 #import <UIKit/UIKit.h>
 
-#import "MaterialPalettes.h"
 #import "MaterialSnackbar.h"
 
 @interface SnackbarInputAccessoryViewController : UIViewController

diff --git a/components/Snackbar/examples/SnackbarOverlayViewExample.m b/components/Snackbar/examples/SnackbarOverlayViewExample.m
@@ -14,9 +14,13 @@
 
 #import <UIKit/UIKit.h>
 
-#import "MaterialOverlay.h"
-#import "MaterialSnackbar.h"
 #import "supplemental/SnackbarExampleSupplemental.h"
+#import "MaterialButtons.h"
+#import "MaterialCollections.h"
+#import "MaterialSnackbar.h"
+#import "MaterialOverlay.h"
+#import "MaterialColorScheme.h"
+#import "MaterialTypographyScheme.h"
 
 static const CGFloat kFABBottomOffset = 24;
 static const CGFloat kFABSideOffset = 24;

diff --git a/components/Snackbar/examples/SnackbarSimpleExample.m b/components/Snackbar/examples/SnackbarSimpleExample.m
@@ -14,9 +14,13 @@
 
 #import <UIKit/UIKit.h>
 
+#import "supplemental/SnackbarExampleSupplemental.h"
+#import "MaterialButtons.h"
+#import "MaterialCollections.h"
 #import "MaterialPalettes.h"
 #import "MaterialSnackbar.h"
-#import "supplemental/SnackbarExampleSupplemental.h"
+#import "MaterialColorScheme.h"
+#import "MaterialTypographyScheme.h"
 
 @interface SnackbarSimpleExample : SnackbarExample <MDCSnackbarManagerDelegate>
 @end

diff --git a/components/Snackbar/examples/SnackbarSuspensionExample.m b/components/Snackbar/examples/SnackbarSuspensionExample.m
@@ -14,8 +14,11 @@
 
 #import <UIKit/UIKit.h>
 
-#import "MaterialSnackbar.h"
 #import "supplemental/SnackbarExampleSupplemental.h"
+#import "MaterialCollections.h"
+#import "MaterialSnackbar.h"
+#import "MaterialColorScheme.h"
+#import "MaterialTypographyScheme.h"
 
 static NSString *const kCategoryA = @"CategoryA";
 static NSString *const kCategoryB = @"CategoryB";

diff --git a/components/Tabs/examples/MDCTabBarViewTypicalExampleViewController.m b/components/Tabs/examples/MDCTabBarViewTypicalExampleViewController.m
@@ -17,12 +17,15 @@
 #import "MaterialActionSheet.h"  // ComponentImport
 #import "MaterialActionSheet+Theming.h"  // SubtargetImport
 #import "MaterialAnimationTiming.h"  // ComponentImport
+#import "MaterialButtons.h"
 #import "MaterialButtons+Theming.h"  // ComponentImport
 #import "MaterialTabs+TabBarView.h"
 #import "MaterialIcons+ic_check.h"  // PrivateSubtargetImport
 #import "MaterialIcons+ic_settings.h"  // PrivateSubtargetImport
 #import "MaterialMath.h"  // PrivateImport
+#import "MaterialColorScheme.h"
 #import "MaterialContainerScheme.h"  // SchemeImport
+#import "MaterialTypographyScheme+Scheming.h"
 
 static NSString *const kExampleTitle = @"TabBarView";
 

diff --git a/components/Tabs/examples/TabBarIconExample.m b/components/Tabs/examples/TabBarIconExample.m
@@ -16,8 +16,11 @@
 
 #import "MaterialAppBar+ColorThemer.h"
 #import "MaterialAppBar.h"
+#import "MaterialButtons.h"
+#import "MaterialHeaderStackView.h"
 #import "MaterialTabs.h"
 #import "MaterialTabs+Theming.h"
+#import "MaterialColorScheme.h"
 #import "MaterialContainerScheme.h"
 
 @interface TabBarIconExample ()

diff --git a/components/Tabs/examples/TabBarTextOnlyExample.m b/components/Tabs/examples/TabBarTextOnlyExample.m
@@ -14,14 +14,14 @@
 
 #import <UIKit/UIKit.h>
 
-#import "MDCTabBarDisplayDelegate.h"
+#import "supplemental/TabBarTextOnlyExampleSupplemental.h"
 #import "MaterialAppBar.h"
-#import "MaterialButtons.h"
 #import "MaterialCollections.h"
-#import "MaterialContainerScheme.h"
-#import "MaterialTabs+Theming.h"
+#import "MaterialHeaderStackView.h"
+#import "MDCTabBarDisplayDelegate.h"
 #import "MaterialTabs.h"
-#import "supplemental/TabBarTextOnlyExampleSupplemental.h"
+#import "MaterialTabs+Theming.h"
+#import "MaterialContainerScheme.h"
 
 @implementation TabBarTextOnlyExample
 

diff --git a/components/Tabs/examples/TabBarViewControllerExample.m b/components/Tabs/examples/TabBarViewControllerExample.m
@@ -14,11 +14,10 @@
 
 #import <UIKit/UIKit.h>
 
-#import "MaterialColorScheme.h"
-#import "MaterialSlider.h"
-#import "MaterialTabs+Theming.h"
-#import "MaterialTabs.h"
 #import "supplemental/TabBarViewControllerExampleSupplemental.h"
+#import "MaterialTabs.h"
+#import "MaterialTabs+Theming.h"
+#import "MaterialContainerScheme.h"
 
 @implementation TabBarViewControllerExample
 

diff --git a/components/Tabs/tests/snapshot/TabBarView/MDCTabBarViewIntegrationSnapshotTests.m b/components/Tabs/tests/snapshot/TabBarView/MDCTabBarViewIntegrationSnapshotTests.m
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#import "MaterialFlexibleHeader.h"
+#import "MaterialNavigationBar.h"
 #import "MaterialSnapshot.h"
 
 #import "MDCTabBarView.h"

diff --git a/components/Tabs/tests/snapshot/TabBarView/MDCTabBarViewItemViewSnapshotTests.m b/components/Tabs/tests/snapshot/TabBarView/MDCTabBarViewItemViewSnapshotTests.m
@@ -17,7 +17,7 @@
 #import <CoreGraphics/CoreGraphics.h>
 #import "../../../src/TabBarView/MDCTabBarView.h"
 #import "../../../src/TabBarView/private/MDCTabBarViewItemView.h"
-#import "../../../src/TabBarView/private/MDCTabBarViewItemViewDelegate.h"
+#import "MaterialRipple.h"
 #import "MaterialSnapshot.h"
 
 /** Minimum width of an item view for proper layout. */

diff --git a/components/Tabs/tests/snapshot/TabBarView/MDCTabBarViewLayoutStyleSnapshotTests.m b/components/Tabs/tests/snapshot/TabBarView/MDCTabBarViewLayoutStyleSnapshotTests.m
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#import "MaterialRipple.h"
 #import "MaterialSnapshot.h"
 
 #import "../../../src/TabBarView/private/MDCTabBarViewItemView.h"

diff --git a/components/Tabs/tests/snapshot/TabBarView/MDCTabBarViewSnapshotTests.m b/components/Tabs/tests/snapshot/TabBarView/MDCTabBarViewSnapshotTests.m
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#import "MaterialRipple.h"
 #import "MaterialSnapshot.h"
 
 #import "../../../src/TabBarView/private/MDCTabBarViewItemView.h"