Optimizing imports

PiperOrigin-RevId: 357185618
material-components · Feb 12, 2021 · c53f443 · c53f443
1 parent 2980352
commit c53f443
Show file tree

Hide file tree

Showing 22 changed files with 60 additions and 9 deletions.
diff --git a/components/AppBar/tests/unit/AppBarNavigationControllerNavigationBarHiddenTests.m b/components/AppBar/tests/unit/AppBarNavigationControllerNavigationBarHiddenTests.m
@@ -15,6 +15,7 @@
 #import <XCTest/XCTest.h>
 
 #import "MaterialAppBar.h"
+#import "MaterialFlexibleHeader.h"
 
 @interface AppBarNavigationControllerNavigationBarHiddenTests : XCTestCase
 @property(nonatomic, strong) MDCAppBarNavigationController *appBarNavigationController;

diff --git a/...it/AppBarNavigationControllerNavigationBarHiddenWhenNavigationBarHiddenHidesAppBarTests.m b/...it/AppBarNavigationControllerNavigationBarHiddenWhenNavigationBarHiddenHidesAppBarTests.m
@@ -15,6 +15,7 @@
 #import <XCTest/XCTest.h>
 
 #import "MaterialAppBar.h"
+#import "MaterialFlexibleHeader.h"
 
 @interface AppBarNavigationControllerNavigationBarHiddenWhenNavigationBarHiddenHidesAppBarTests
     : XCTestCase

diff --git a/components/AppBar/tests/unit/AppBarNavigationControllerTests.m b/components/AppBar/tests/unit/AppBarNavigationControllerTests.m
@@ -15,6 +15,7 @@
 #import <XCTest/XCTest.h>
 
 #import "MaterialAppBar.h"
+#import "MaterialFlexibleHeader.h"
 
 @interface AppBarNavigationControllerTests : XCTestCase
 

diff --git a/components/AppBar/tests/unit/AppBarViewControllerTests.m b/components/AppBar/tests/unit/AppBarViewControllerTests.m
@@ -15,6 +15,9 @@
 #import <XCTest/XCTest.h>
 
 #import "MDCAppBarViewController.h"
+#import "MaterialFlexibleHeader.h"
+#import "MaterialHeaderStackView.h"
+#import "MaterialNavigationBar.h"
 
 @interface AppBarViewControllerTests : XCTestCase
 

diff --git a/components/BottomNavigation/tests/snapshot/MDCBottomNavigationBarBlurEffectSnapshotTests.m b/components/BottomNavigation/tests/snapshot/MDCBottomNavigationBarBlurEffectSnapshotTests.m
@@ -20,7 +20,6 @@
 #import "MaterialBottomNavigation.h"
 #import "MaterialInk.h"
 #import "MaterialSnapshot.h"
-#import "supplemental/MDCBottomNavigationSnapshotTestMutableTraitCollection.h"
 #import "supplemental/MDCBottomNavigationSnapshotTestUtilities.h"
 #import "supplemental/MDCFakeBottomNavigationBar.h"
 

diff --git a/components/BottomNavigation/tests/snapshot/MDCBottomNavigationBarControllerSnapshotTests.m b/components/BottomNavigation/tests/snapshot/MDCBottomNavigationBarControllerSnapshotTests.m
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#import "MaterialBottomNavigation.h"
 #import "MaterialSnapshot.h"
 
 #import "MDCBottomNavigationBarController.h"

diff --git a/components/BottomNavigation/tests/snapshot/MDCBottomNavigationBarSnapshotTests.m b/components/BottomNavigation/tests/snapshot/MDCBottomNavigationBarSnapshotTests.m
@@ -25,6 +25,9 @@
 #import "MDCBottomNavigationBar+MaterialTheming.h"
 #import "MaterialInk.h"
 #import "MaterialSnapshot.h"
+#import "MaterialColorScheme.h"
+#import "MaterialContainerScheme.h"
+#import "MaterialTypographyScheme.h"
 
 static const CGFloat kWidthWide = 1600;
 static const CGFloat kWidthNarrow = 240;

diff --git a/components/BottomNavigation/tests/snapshot/MDCBottomNavigationBarThemingSnapshotTests.m b/components/BottomNavigation/tests/snapshot/MDCBottomNavigationBarThemingSnapshotTests.m
@@ -12,12 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#import "MaterialBottomNavigation.h"
 #import "MaterialBottomNavigation+Theming.h"
 
 #import <XCTest/XCTest.h>
 
 #import "../../src/private/MDCBottomNavigationItemView.h"
+#import "MaterialInk.h"
 #import "MaterialSnapshot.h"
+#import "MaterialColorScheme.h"
+#import "MaterialContainerScheme.h"
+#import "MaterialTypographyScheme.h"
 
 static const CGFloat kFakeWidth = 500;
 static const CGFloat kFakeHeight = 75;

diff --git a/components/BottomNavigation/tests/unit/BottomNavigationItemBadgeTests.m b/components/BottomNavigation/tests/unit/BottomNavigationItemBadgeTests.m
@@ -16,7 +16,6 @@
 #import <XCTest/XCTest.h>
 
 #import "../../src/private/MDCBottomNavigationItemBadge.h"
-#import "MaterialBottomNavigation.h"
 
 @interface BottomNavigationItemBadgeTests : XCTestCase
 @property(nonatomic, strong) MDCBottomNavigationItemBadge *badge;

diff --git a/components/BottomNavigation/tests/unit/BottomNavigationItemViewTests.m b/components/BottomNavigation/tests/unit/BottomNavigationItemViewTests.m
@@ -16,6 +16,7 @@
 
 #import "../../src/private/MDCBottomNavigationItemBadge.h"
 #import "../../src/private/MDCBottomNavigationItemView.h"
+#import "MDCBottomNavigationBar.h"
 #import "MDCBottomNavigationItemView+Testing.h"
 
 #import "MaterialInk.h"

diff --git a/components/BottomNavigation/tests/unit/MDCBottomNavigationBarControllerDelegateTests.m b/components/BottomNavigation/tests/unit/MDCBottomNavigationBarControllerDelegateTests.m
@@ -15,6 +15,7 @@
 #import <XCTest/XCTest.h>
 
 #import "MaterialBottomNavigation+BottomNavigationController.h"
+#import "MaterialBottomNavigation.h"
 
 /** Delegate that implements no optional APIs. */
 @interface MDCBottomNavigationBarControllerDelegateWithNoOptionals

diff --git a/components/BottomNavigation/tests/unit/MDCBottomNavigationBarControllerTests.m b/components/BottomNavigation/tests/unit/MDCBottomNavigationBarControllerTests.m
@@ -16,6 +16,7 @@
 #import <XCTest/XCTest.h>
 
 #import "MaterialBottomNavigation+BottomNavigationController.h"
+#import "MaterialBottomNavigation.h"
 
 static CGFloat const kDefaultExpectationTimeout = 15;
 

diff --git a/components/Buttons/examples/ButtonsContentEdgeInsetsExample.m b/components/Buttons/examples/ButtonsContentEdgeInsetsExample.m
@@ -14,8 +14,9 @@
 
 #import <UIKit/UIKit.h>
 
-#import "MaterialButtons+Theming.h"
 #import "MaterialButtons.h"
+#import "MaterialButtons+Theming.h"
+#import "MaterialInk.h"
 #import "MaterialContainerScheme.h"
 
 @interface ButtonsContentEdgeInsetsExample : UIViewController

diff --git a/components/Buttons/examples/ButtonsShapesExample.m b/components/Buttons/examples/ButtonsShapesExample.m
@@ -12,14 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "MaterialButtons+Theming.h"
 #import "MaterialButtons.h"
-#import "MaterialContainerScheme.h"
+#import "MaterialButtons+Theming.h"
 #import "MaterialShapeLibrary.h"
 #import "MaterialShapes.h"
-#import "MaterialTypography.h"
+#import "MaterialColorScheme.h"
+#import "MaterialContainerScheme.h"
 
 #import "supplemental/ButtonsTypicalUseSupplemental.h"
+#import "MaterialShapeScheme.h"
+#import "MaterialTypographyScheme.h"
 
 @interface ButtonsShapesExample ()
 @property(nonatomic, strong) MDCFloatingButton *floatingButton;

diff --git a/components/Buttons/examples/ButtonsTypicalUseExample.m b/components/Buttons/examples/ButtonsTypicalUseExample.m
@@ -14,10 +14,12 @@
 
 #import "MaterialButtons.h"
 #import "MaterialButtons+Theming.h"
-#import "MaterialTypography.h"
+#import "MaterialColorScheme.h"
 #import "MaterialContainerScheme.h"
 
 #import "supplemental/ButtonsTypicalUseSupplemental.h"
+#import "MaterialShapeScheme.h"
+#import "MaterialTypographyScheme.h"
 
 static const CGSize kMinimumAccessibleButtonSize = {64.0, 48.0};
 

diff --git a/components/Buttons/examples/FloatingButtonTypicalUseExample.m b/components/Buttons/examples/FloatingButtonTypicalUseExample.m
@@ -14,9 +14,11 @@
 
 #import <UIKit/UIKit.h>
 
-#import "MaterialButtons+Theming.h"
 #import "MaterialButtons.h"
+#import "MaterialButtons+Theming.h"
+#import "MaterialColorScheme.h"
 #import "MaterialContainerScheme.h"
+#import "MaterialShapeScheme.h"
 
 static NSString *const kButtonLabel = @"Create";
 static NSString *const kMiniButtonLabel = @"Add";

diff --git a/components/TextFields/src/Theming/MDCTextInputControllerFilled+MaterialTheming.m b/components/TextFields/src/Theming/MDCTextInputControllerFilled+MaterialTheming.m
@@ -15,6 +15,10 @@
 #import "MDCTextInputControllerFilled+MaterialTheming.h"
 
 #import <MaterialComponents/MaterialTextFields+ColorThemer.h>
+#import "MDCTextInputControllerFloatingPlaceholder.h"
+#import "MaterialTextFields.h"
+#import "MaterialContainerScheme.h"
+#import "MaterialTypographyScheme+Scheming.h"
 
 @implementation MDCTextInputControllerFilled (MaterialTheming)
 

diff --git a/components/TextFields/src/Theming/MDCTextInputControllerOutlined+MaterialTheming.m b/components/TextFields/src/Theming/MDCTextInputControllerOutlined+MaterialTheming.m
@@ -14,6 +14,16 @@
 
 #import "MDCTextInputControllerOutlined+MaterialTheming.h"
 
+#import "MDCTextInputControllerFloatingPlaceholder.h"
+
+#import "MaterialTextFields.h"
+
+#import "MaterialColorScheme.h"
+
+#import "MaterialContainerScheme.h"
+
+#import "MaterialTypographyScheme+Scheming.h"
+
 static CGFloat const kOutlinedTextFieldActiveAlpha = (CGFloat)0.87;
 static CGFloat const kOutlinedTextFieldOnSurfaceAlpha = (CGFloat)0.6;
 static CGFloat const kOutlinedTextFieldDisabledAlpha = (CGFloat)0.38;

diff --git a/components/TextFields/src/Theming/MDCTextInputControllerUnderline+MaterialTheming.m b/components/TextFields/src/Theming/MDCTextInputControllerUnderline+MaterialTheming.m
@@ -14,6 +14,16 @@
 
 #import "MDCTextInputControllerUnderline+MaterialTheming.h"
 
+#import "MDCTextInputControllerFloatingPlaceholder.h"
+
+#import "MaterialTextFields.h"
+
+#import "MaterialColorScheme.h"
+
+#import "MaterialContainerScheme.h"
+
+#import "MaterialTypographyScheme+Scheming.h"
+
 @implementation MDCTextInputControllerUnderline (MaterialTheming)
 
 - (void)applyThemeWithScheme:(id<MDCContainerScheming>)scheme {

diff --git a/components/private/TextControlsPrivate/src/Shared/MDCTextControlAssistiveLabelView.m b/components/private/TextControlsPrivate/src/Shared/MDCTextControlAssistiveLabelView.m
@@ -14,6 +14,8 @@
 
 #import "MDCTextControlAssistiveLabelView.h"
 
+#import "MDCTextControlAssistiveLabelViewLayout.h"
+
 @interface MDCTextControlAssistiveLabelView ()
 @property(nonatomic, strong) UILabel *leadingAssistiveLabel;
 @property(nonatomic, strong) UILabel *trailingAssistiveLabel;

diff --git a/components/private/TextControlsPrivate/src/Shared/MDCTextControlAssistiveLabelViewLayout.m b/components/private/TextControlsPrivate/src/Shared/MDCTextControlAssistiveLabelViewLayout.m
@@ -14,6 +14,8 @@
 
 #import "MDCTextControlAssistiveLabelViewLayout.h"
 
+#import "MDCTextControlAssistiveLabelDrawPriority.h"
+
 @interface MDCTextControlAssistiveLabelViewLayout ()
 
 @property(nonatomic, assign) CGRect leadingAssistiveLabelFrame;

diff --git a/components/private/TextControlsPrivate/src/Shared/MDCTextControlLabelAnimation.m b/components/private/TextControlsPrivate/src/Shared/MDCTextControlLabelAnimation.m
@@ -14,8 +14,8 @@
 
 #import "MDCTextControlLabelAnimation.h"
 
-#import "MDCTextControl.h"
 #import "MaterialAnimationTiming.h"
+#import "MDCTextControlLabelPosition.h"
 
 @implementation MDCTextControlLabelAnimation