Optimizing imports

PiperOrigin-RevId: 356791916
material-components · Feb 10, 2021 · 25c9049 · 25c9049
1 parent 22cb5af
commit 25c9049
Show file tree

Hide file tree

Showing 21 changed files with 28 additions and 27 deletions.
diff --git a/components/Buttons/tests/unit/MDCButtonAlphaTests.m b/components/Buttons/tests/unit/MDCButtonAlphaTests.m
@@ -15,10 +15,6 @@
 #import <XCTest/XCTest.h>
 
 #import "MaterialButtons.h"
-#import "MaterialShadowElevations.h"
-#import "MaterialShadowLayer.h"
-#import "MaterialShapes.h"
-#import "MaterialTypography.h"
 
 @interface MDCButtonAlphaTests : XCTestCase
 @property(nonatomic, strong, nullable) MDCButton *button;

diff --git a/components/Buttons/tests/unit/MDCButtonColorThemerTests.m b/components/Buttons/tests/unit/MDCButtonColorThemerTests.m
@@ -16,6 +16,7 @@
 
 #import "MaterialButtons+ColorThemer.h"
 #import "MaterialButtons.h"
+#import "MaterialColorScheme.h"
 
 static const CGFloat kEpsilonAccuracy = (CGFloat)0.001;
 

diff --git a/components/Buttons/tests/unit/MDCButtonInterfaceBuilderCompatibilityTests.m b/components/Buttons/tests/unit/MDCButtonInterfaceBuilderCompatibilityTests.m
@@ -16,6 +16,7 @@
 #import <XCTest/XCTest.h>
 
 #import "supplemental/ButtonTestView.h"
+#import "MaterialButtons.h"
 
 @interface MDCButtonInterfaceBuilderCompatibilityTests : XCTestCase
 

diff --git a/components/Buttons/tests/unit/MDCButtonRippleTests.m b/components/Buttons/tests/unit/MDCButtonRippleTests.m
@@ -15,6 +15,7 @@
 #import <XCTest/XCTest.h>
 
 #import "MaterialButtons.h"
+#import "MaterialInk.h"
 #import "MaterialRipple.h"
 
 @interface MDCButton (Testing)

diff --git a/components/Buttons/tests/unit/MDCButtonShapeThemerTests.m b/components/Buttons/tests/unit/MDCButtonShapeThemerTests.m
@@ -14,9 +14,11 @@
 
 #import <XCTest/XCTest.h>
 
-#import "MaterialButtons+ShapeThemer.h"
 #import "MaterialButtons.h"
+#import "MaterialButtons+ShapeThemer.h"
 #import "MaterialShapeLibrary.h"
+#import "MaterialShapes.h"
+#import "MaterialShapeScheme.h"
 
 @interface MDCButtonShapeThemerTests : XCTestCase
 

diff --git a/components/Buttons/tests/unit/MDCButtonSubclassingTests.m b/components/Buttons/tests/unit/MDCButtonSubclassingTests.m
@@ -14,10 +14,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "../../src/private/MDCButton+Subclassing.h"
 #import "MaterialButtons.h"
-#import "MaterialShadowElevations.h"
-#import "MaterialTypography.h"
 
 static const UIEdgeInsets ButtonTestContentEdgeInsets = {1, 2, 3, 4};
 static const CGFloat ButtonTestCornerRadius = (CGFloat)1.234;

diff --git a/components/Buttons/tests/unit/MDCButtonThemerTests.m b/components/Buttons/tests/unit/MDCButtonThemerTests.m
@@ -17,7 +17,6 @@
 #import "MaterialButtons+ButtonThemer.h"
 #import "MaterialButtons.h"
 #import "MaterialColorScheme.h"
-#import "MaterialPalettes.h"
 #import "MaterialTypographyScheme.h"
 
 static const CGFloat kEpsilonAccuracy = (CGFloat)0.001;

diff --git a/components/Buttons/tests/unit/MDCButtonTypographyThemerTests.m b/components/Buttons/tests/unit/MDCButtonTypographyThemerTests.m
@@ -14,8 +14,9 @@
 
 #import <XCTest/XCTest.h>
 
-#import "MaterialButtons+TypographyThemer.h"
 #import "MaterialButtons.h"
+#import "MaterialButtons+TypographyThemer.h"
+#import "MaterialTypographyScheme.h"
 
 @interface MDCButtonTypographyThemerTests : XCTestCase
 @end

diff --git a/components/Dialogs/tests/unit/MDCAlertActionManagerTests.m b/components/Dialogs/tests/unit/MDCAlertActionManagerTests.m
@@ -15,6 +15,7 @@
 #import <XCTest/XCTest.h>
 #import "MaterialButtons.h"
 #import "MDCAlertController+ButtonForAction.h"
+#import "MaterialDialogs.h"
 #import "MDCAlertActionManager.h"
 #import "MDCAlertControllerView+Private.h"
 

diff --git a/components/Dialogs/tests/unit/MDCAlertControllerColorThemerTests.m b/components/Dialogs/tests/unit/MDCAlertControllerColorThemerTests.m
@@ -15,7 +15,9 @@
 #import "MaterialDialogs+ColorThemer.h"
 #import "MaterialDialogs.h"
 
+#import "MDCAlertActionManager.h"
 #import "MDCAlertControllerView+Private.h"
+#import "MaterialColorScheme.h"
 
 #import <XCTest/XCTest.h>
 

diff --git a/components/Dialogs/tests/unit/MDCAlertControllerCustomizationTests.m b/components/Dialogs/tests/unit/MDCAlertControllerCustomizationTests.m
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "MaterialDialogs+TypographyThemer.h"
 #import "MaterialDialogs.h"
 
 #import "MDCAlertControllerView+Private.h"

diff --git a/components/Dialogs/tests/unit/MDCAlertControllerInsetsTests.m b/components/Dialogs/tests/unit/MDCAlertControllerInsetsTests.m
@@ -12,10 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#import "MaterialButtons.h"
 #import "MaterialDialogs.h"
 
 #import "MDCAlertController+ButtonForAction.h"
 #import "MDCAlertController+Testing.h"
+#import "MDCAlertActionManager.h"
 #import "MDCAlertControllerView+Private.h"
 
 #import <XCTest/XCTest.h>

diff --git a/components/Dialogs/tests/unit/MDCAlertControllerRippleTests.m b/components/Dialogs/tests/unit/MDCAlertControllerRippleTests.m
@@ -14,8 +14,10 @@
 
 #import <XCTest/XCTest.h>
 
+#import "MaterialButtons.h"
 #import "MaterialDialogs.h"
 
+#import "MDCAlertActionManager.h"
 #import "MDCAlertControllerView+Private.h"
 
 #pragma mark - Subclasses for testing

diff --git a/components/Dialogs/tests/unit/MDCAlertControllerTests.m b/components/Dialogs/tests/unit/MDCAlertControllerTests.m
@@ -16,6 +16,8 @@
 
 #import "MaterialButtons.h"
 #import "MaterialDialogs.h"
+#import "MDCAlertActionManager.h"
+#import "MaterialShadowElevations.h"
 #import "MaterialTypography.h"
 
 #import "../../src/private/MDCDialogShadowedView.h"

diff --git a/components/Dialogs/tests/unit/MDCAlertControllerTypographyThemerTests.m b/components/Dialogs/tests/unit/MDCAlertControllerTypographyThemerTests.m
@@ -15,7 +15,9 @@
 #import "MaterialDialogs+TypographyThemer.h"
 #import "MaterialDialogs.h"
 
+#import "MDCAlertActionManager.h"
 #import "MDCAlertControllerView+Private.h"
+#import "MaterialTypographyScheme.h"
 
 #import <XCTest/XCTest.h>
 

diff --git a/components/TextControls/examples/supplemental/MDCTextControlConfiguratorExample.m b/components/TextControls/examples/supplemental/MDCTextControlConfiguratorExample.m
@@ -15,13 +15,11 @@
 #import <UIKit/UIKit.h>
 
 #import "MaterialButtons.h"
+#import "MDCTextControlContentViewController.h"
+#import "MaterialColorScheme.h"
 #import "MaterialContainerScheme.h"
-#import "MaterialTextControls+FilledTextFieldsTheming.h"
-#import "MaterialTextControls+OutlinedTextFieldsTheming.h"
-#import "MaterialTextControlsPrivate+Shared.h"
 
 #import "MDCTextControlConfiguratorExample.h"
-#import "MDCTraitEnvironmentChangeDelegate.h"
 
 @interface MDCTextControlConfiguratorExample ()
 

diff --git a/components/TextControls/examples/supplemental/MDCTextControlContentViewController.m b/components/TextControls/examples/supplemental/MDCTextControlContentViewController.m
@@ -16,16 +16,13 @@
 
 #import "MaterialButtons.h"
 
-#import "MDCBaseTextField.h"
 #import "MaterialButtons+Theming.h"
 #import "MaterialColorScheme.h"
 
-#import "MDCFilledTextField+MaterialTheming.h"
-#import "MDCFilledTextField.h"
-#import "MDCOutlinedTextField+MaterialTheming.h"
-#import "MDCOutlinedTextField.h"
 
 #import "MDCTraitEnvironmentChangeDelegate.h"
+#import "MaterialContainerScheme.h"
+#import "MaterialTypographyScheme+Scheming.h"
 
 @interface MDCTextControlContentViewController ()
 

diff --git a/components/TextControls/examples/supplemental/MDCTextControlTextAreaConfiguratorExample.m b/components/TextControls/examples/supplemental/MDCTextControlTextAreaConfiguratorExample.m
@@ -16,6 +16,7 @@
 
 #import "MDCTextControlTextAreaConfiguratorExample.h"
 
+#import "MDCTextControlConfiguratorExample.h"
 #import "MDCTextControlTextAreaContentViewController.h"
 
 static NSString *const kExampleTitle = @"MDCTextControl TextAreas";

diff --git a/components/TextControls/examples/supplemental/MDCTextControlTextAreaContentViewController.m b/components/TextControls/examples/supplemental/MDCTextControlTextAreaContentViewController.m
@@ -14,9 +14,7 @@
 
 #import "MDCTextControlTextAreaContentViewController.h"
 
-#import "MaterialButtons.h"
-
-#import "MaterialButtons+Theming.h"
+#import "MDCTextControlContentViewController.h"
 #import "MDCBaseTextArea.h"
 #import "MaterialColorScheme.h"
 #import "MaterialContainerScheme.h"

diff --git a/components/TextControls/examples/supplemental/MDCTextControlTextFieldConfiguratorExample.m b/components/TextControls/examples/supplemental/MDCTextControlTextFieldConfiguratorExample.m
@@ -16,6 +16,7 @@
 
 #import "MDCTextControlTextFieldConfiguratorExample.h"
 
+#import "MDCTextControlConfiguratorExample.h"
 #import "MDCTextControlTextFieldContentViewController.h"
 
 static NSString *const kExampleTitle = @"MDCTextControl TextFields";

diff --git a/components/TextControls/examples/supplemental/MDCTextControlTextFieldContentViewController.m b/components/TextControls/examples/supplemental/MDCTextControlTextFieldContentViewController.m
@@ -14,10 +14,7 @@
 
 #import "MDCTextControlTextFieldContentViewController.h"
 
-#import "MaterialButtons.h"
-
-#import "MaterialButtons+Theming.h"
-#import "MDCBaseTextField.h"
+#import "MDCTextControlContentViewController.h"
 #import "MaterialTextControls+BaseTextFields.h"
 #import "MaterialColorScheme.h"
 
@@ -28,6 +25,7 @@
 #import "MDCOutlinedTextField+MaterialTheming.h"
 #import "MaterialTextControls+UnderlinedTextFields.h"
 #import "MDCUnderlinedTextField+MaterialTheming.h"
+#import "MaterialContainerScheme.h"
 
 @interface MDCTextControlTextFieldContentViewController ()
 @property(nonatomic, assign) BOOL shouldAddDebugLeadingView;